Fix errors on Travis CI

Takishima · Takishima · commit eb6643032e60 · 2021-02-24T16:29:02.000+01:00
diff --git a/projectq/libs/qasm/_parse_qasm_pyparsing.py b/projectq/libs/qasm/_parse_qasm_pyparsing.py
@@ -19,9 +19,9 @@
 from copy import deepcopy
 import operator as op
 from pyparsing import (Literal, Word, Group, Or, CharsNotIn, Optional,
-                       nestedExpr, Suppress, removeQuotes, Empty,
-                       cppStyleComment, cStyleComment, dblQuotedString, alphas,
-                       alphanums, pyparsing_common)
+                       OneOrMore, ZeroOrMore, nestedExpr, Suppress,
+                       removeQuotes, Empty, cppStyleComment, cStyleComment,
+                       dblQuotedString, alphas, alphanums, pyparsing_common)
 
 from projectq.ops import All, Measure
 
@@ -412,8 +412,8 @@ def __init__(self, s, loc, toks):
             self.qubits = [QubitProxy(qubit) for qubit in toks[1]]
         else:
             param_str = s[loc:s.find(';', loc)]
-            self.params = param_str[param_str.find('(') +
-                                    1:param_str.rfind(')')].split(',')
+            self.params = param_str[param_str.find('(')
+                                    + 1:param_str.rfind(')')].split(',')
             self.qubits = [QubitProxy(qubit) for qubit in toks[2]]
 
     def eval(self, eng):
@@ -567,8 +567,8 @@ class IfOp:
     logical_bin_op = Or(
         [greater, greater_equal, less, less_equal, equal, not_equal])
 
-    cond_expr = (CommonTokens.variable_expr.copy() + logical_bin_op +
-                 CharsNotIn('()'))
+    cond_expr = (CommonTokens.variable_expr.copy() + logical_bin_op
+                 + CharsNotIn('()'))
 
     def __init__(self, if_str, loc, toks):
         """
@@ -763,11 +763,12 @@ def __init__(self):
         # Variable declarations
 
         # e.g. qubit[10] qr, qs / int[5] i, j
-        variable_decl_const_bits = type_t + Group(cname + (comma + cname)[...])
+        variable_decl_const_bits = type_t + Group(cname
+                                                  + ZeroOrMore(comma + cname))
 
         # e.g. qubit qr[10], qs[2] / int i[5], j[10]
-        variable_decl_var_bits = var_type + Group(variable_expr +
-                                                  (comma + variable_expr)[...])
+        variable_decl_var_bits = var_type + Group(
+            variable_expr + ZeroOrMore(comma + variable_expr))
 
         # e.g. int[10] i = 5;
         variable_decl_assign = type_t + cname + equal_sign + Group(expr)
@@ -781,11 +782,11 @@ def __init__(self):
         # ----------------------------------------------------------------------
         # Gate operations
 
-        gate_op_no_param = cname + Group(variable_expr +
-                                         (comma + variable_expr)[...])
-        gate_op_w_param = cname + Group(
-            nestedExpr(ignoreExpr=comma)) + Group(variable_expr +
-                                                  (comma + variable_expr)[...])
+        gate_op_no_param = cname + Group(variable_expr
+                                         + ZeroOrMore(comma + variable_expr))
+        gate_op_w_param = cname + Group(nestedExpr(
+            ignoreExpr=comma)) + Group(variable_expr
+                                       + ZeroOrMore(comma + variable_expr))
 
         # ----------------------------------
         # Measure gate operations
@@ -810,7 +811,7 @@ def __init__(self):
 
         # NB: not exactly 100% OpenQASM 3.0 conformant...
         if_expr_qasm3 = (Literal("if") + nestedExpr(ignoreExpr=comma) +
-                         (lbrace + Group(gate_op + end)[1, ...] + rbrace))
+                         (lbrace + OneOrMore(Group(gate_op + end)) + rbrace))
         if_expr = (if_expr_qasm2 ^ if_expr_qasm3).addParseAction(IfOp)
 
         assign_op = (cname + equal_sign + Group(expr)).addParseAction(AssignOp)
@@ -829,30 +830,31 @@ def __init__(self):
 
         param_decl = Group(param_decl_qasm2 ^ param_decl_qasm3)
 
-        qargs_list = Group(cname + (comma + cname)[...])
+        qargs_list = Group(cname + ZeroOrMore(comma + cname))
 
-        gate_def_no_args = (lpar + rpar)[...] + Group(Empty()) + qargs_list
-        gate_def_w_args = (lpar + Group(param_decl +
-                                        (comma + param_decl)[...]) + rpar +
-                           qargs_list)
+        gate_def_no_args = ZeroOrMore(lpar + rpar) + Group(
+            Empty()) + qargs_list
+        gate_def_w_args = (lpar
+                           + Group(param_decl + ZeroOrMore(comma + param_decl))
+                           + rpar + qargs_list)
         gate_def_expr = (Literal("gate") + cname +
-                         (gate_def_no_args ^ gate_def_w_args) + lbrace + Group(
-                             (gate_op + end)[...]) +
-                         rbrace).addParseAction(GateDefOp)
+                         (gate_def_no_args ^ gate_def_w_args) + lbrace
+                         + Group(ZeroOrMore(gate_op + end))
+                         + rbrace).addParseAction(GateDefOp)
 
         # ----------------------------------
         # Opaque gate declarations operations
 
         opaque_def_expr = (Literal("opaque") + cname +
-                           (gate_def_no_args ^ gate_def_w_args) +
-                           end).addParseAction(OpaqueDefOp)
+                           (gate_def_no_args ^ gate_def_w_args)
+                           + end).addParseAction(OpaqueDefOp)
 
         # ----------------------------------------------------------------------
         # Control related expressions (OpenQASM 3.0)
 
-        # control_var_type = Or([length_t, stretch_t + int_v[...]])
+        # control_var_type = Or([length_t, stretch_t + ZeroOrMore(int_v)])
 
-        # lengthof_arg = Word(alphanums + '_+-*/%{}[]')[1, ...]
+        # lengthof_arg = OneOrMore(Word(alphanums + '_+-*/%{}[]'))
         # lengthof_op = Literal("lengthof") + lpar + lengthof_arg + rpar
 
         # units = Word(alphas)
@@ -864,16 +866,16 @@ def __init__(self):
         # control_variable_decl_statement = Group(
         #     Or([control_variable_decl, control_variable_decl_assign]))
 
-        # control_func_arg = Word(alphanums + '_+-*/%')[1, ...]
+        # control_func_arg = OneOrMore(Word(alphanums + '_+-*/%'))
         # control_func_op = Literal("rotary")
 
         # rotary_op = (control_func_op + lpar + control_func_arg + rpar + lbra
         #              + ((float_v + units) ^ control_func_arg) + rbra +
-        #              variable_expr + (comma + variable_expr)[...])
+        #              variable_expr + ZeroOrMore(comma + variable_expr))
 
-        # delay_arg = Word(alphanums + '_+-*/%')[1, ...]
+        # delay_arg = OneOrMore(Word(alphanums + '_+-*/%'))
         # delay_op = Literal("delay") + lbra + delay_arg + rbra + Optional(
-        #     variable_expr + (comma + variable_expr)[...])
+        #     variable_expr + ZeroOrMore(comma + variable_expr))
 
         # control_op = Group(Or([rotary_op, delay_op]))
 
@@ -882,8 +884,8 @@ def __init__(self):
         header = (Suppress("OPENQASM") +
                   (int_v ^ float_v).addParseAction(QASMVersionOp) + end)
 
-        include = (Suppress("include") + string_v.addParseAction(IncludeOp) +
-                   end)
+        include = (Suppress("include") + string_v.addParseAction(IncludeOp)
+                   + end)
 
         statement = (
             (measure_op + end)
@@ -898,7 +900,7 @@ def __init__(self):
             # | (control_op + end).addParseAction(lambda toks: [])
         )
 
-        self.parser = header + include[...] + statement[...]
+        self.parser = header + ZeroOrMore(include) + ZeroOrMore(statement)
         self.parser.ignore(cppStyleComment)
         self.parser.ignore(cStyleComment)
 
diff --git a/projectq/libs/qasm/_pyparsing_expr.py b/projectq/libs/qasm/_pyparsing_expr.py
@@ -20,9 +20,9 @@
 from numbers import Number
 import operator
 
-from pyparsing import (Literal, Word, Group, Forward, alphas, alphanums, Regex,
-                       CaselessKeyword, Suppress, delimitedList,
-                       pyparsing_common)
+from pyparsing import (Literal, Word, Group, Forward, ZeroOrMore, alphas,
+                       alphanums, Regex, CaselessKeyword, Suppress,
+                       delimitedList, pyparsing_common)
 
 # ==============================================================================
 
@@ -103,12 +103,12 @@ def insert_fn_argcount_tuple(toks):
             num_args = len(toks[0])
             toks.insert(0, (fn_name, num_args))
 
-        var_expr = (cname + (lbra + int_v + rbra)[...]).addParseAction(
+        var_expr = (cname + ZeroOrMore(lbra + int_v + rbra)).addParseAction(
             self._eval_var_expr)
 
-        fn_call = (cname + lpar - Group(expr_list) +
-                   rpar).setParseAction(insert_fn_argcount_tuple)
-        atom = (addop[...] +
+        fn_call = (cname + lpar - Group(expr_list)
+                   + rpar).setParseAction(insert_fn_argcount_tuple)
+        atom = (ZeroOrMore(addop) +
                 ((fn_call | pi_const | e_const | var_expr | fnumber
                   | cname).setParseAction(push_first)
                  | Group(lpar + expr + rpar))).setParseAction(push_unary_minus)
@@ -118,9 +118,11 @@ def insert_fn_argcount_tuple(toks):
         # exponents, instead of left-to-right that is, 2^3^2 = 2^(3^2), not
         # (2^3)^2.
         factor = Forward()
-        factor <<= atom + (expop + factor).setParseAction(push_first)[...]
-        term = factor + (multop + factor).setParseAction(push_first)[...]
-        expr <<= term + (addop + term).setParseAction(push_first)[...]
+        factor <<= atom + ZeroOrMore(
+            (expop + factor).setParseAction(push_first))
+        term = factor + ZeroOrMore(
+            (multop + factor).setParseAction(push_first))
+        expr <<= term + ZeroOrMore((addop + term).setParseAction(push_first))
         self.bnf = expr
 
     def parse(self, expr):
