0.2.4 Fixed array literal parsing in the cal block (#5)

Author: aspcompiler

source/openpulse/openpulse/__init__.py

@@ -14,7 +14,7 @@
 the :obj:`~parser.parse` function.
 """
 
-__version__ = "0.2.3"
+__version__ = "0.2.4"
 
 from . import ast
 

source/openpulse/openpulse/parser.py

@@ -120,7 +120,11 @@ def _in_subroutine(self):
     def _in_loop(self):
         return any(
             isinstance(
-                scope, (openpulseParser.ForStatementContext, openpulseParser.WhileStatementContext)
+                scope,
+                (
+                    openpulseParser.ForStatementContext,
+                    openpulseParser.WhileStatementContext,
+                ),
             )
             for scope in reversed(self._current_context())
         )
@@ -134,6 +138,20 @@ def _visitPulseType(self, ctx: openpulseParser.ScalarTypeContext):
         if ctx.FRAME():
             return openpulse_ast.FrameType()
 
+    @span
+    def visitArrayLiteral(self, ctx: qasm3Parser.ArrayLiteralContext):
+        array_literal_element = (
+            openpulseParser.ExpressionContext,
+            openpulseParser.ArrayLiteralContext,
+        )
+
+        def predicate(child):
+            return isinstance(child, array_literal_element)
+
+        return ast.ArrayLiteral(
+            values=[self.visit(element) for element in ctx.getChildren(predicate=predicate)],
+        )
+
     @span
     def visitCalibrationBlock(self, ctx: openpulseParser.CalibrationBlockContext):
         with self._push_context(ctx):
@@ -202,6 +220,7 @@ def visitReturnStatement(self, ctx: qasm3Parser.ReturnStatementContext):
 # Reuse some QASMNodeVisitor methods in OpenPulseNodeVisitor
 # The following methods are overridden in OpenPulseNodeVisitor and thus not imported:
 """
+    "visitArrayLiteral",
     "visitIndexOperator",
     "visitRangeExpression",
     "visitReturnStatement",
@@ -213,7 +232,6 @@ def visitReturnStatement(self, ctx: qasm3Parser.ReturnStatementContext):
 OpenPulseNodeVisitor.visitAliasExpression = QASMNodeVisitor.visitAliasExpression
 OpenPulseNodeVisitor.visitAnnotation = QASMNodeVisitor.visitAnnotation
 OpenPulseNodeVisitor.visitArgumentDefinition = QASMNodeVisitor.visitArgumentDefinition
-OpenPulseNodeVisitor.visitArrayLiteral = QASMNodeVisitor.visitArrayLiteral
 OpenPulseNodeVisitor.visitArrayType = QASMNodeVisitor.visitArrayType
 OpenPulseNodeVisitor.visitAssignmentStatement = QASMNodeVisitor.visitAssignmentStatement
 OpenPulseNodeVisitor.visitBarrierStatement = QASMNodeVisitor.visitBarrierStatement

source/openpulse/tests/test_openpulse_parser.py

@@ -7,6 +7,8 @@
 from openpulse.parser import parse
 from openpulse.ast import (
     AngleType,
+    ArrayLiteral,
+    ArrayType,
     CalibrationDefinition,
     CalibrationStatement,
     ClassicalArgument,
@@ -94,7 +96,8 @@ def test_calibration_definition():
                                     arguments=[Identifier(name="$1")],
                                 ),
                                 UnaryExpression(
-                                    op=UnaryOperator["-"], expression=Identifier(name="theta")
+                                    op=UnaryOperator["-"],
+                                    expression=Identifier(name="theta"),
                                 ),
                             ],
                         )
@@ -194,7 +197,10 @@ def test_calibration2():
                         identifier=Identifier(name="readout_waveform_wf"),
                         init_expression=FunctionCall(
                             name=Identifier(name="constant"),
-                            arguments=[FloatLiteral(value=5e-06), FloatLiteral(value=0.03)],
+                            arguments=[
+                                FloatLiteral(value=5e-06),
+                                FloatLiteral(value=0.03),
+                            ],
                         ),
                     ),
                     ForInLoop(
@@ -229,6 +235,39 @@ def test_calibration2():
     SpanGuard().visit(program)
 
 
+def test_array():
+    p = """
+    cal {
+        array[int[32], 4] my_array = {3, 4, 5, 5};
+    }
+    """.strip()
+    program = parse(p)
+    assert _remove_spans(program) == Program(
+        statements=[
+            CalibrationStatement(
+                body=[
+                    ClassicalDeclaration(
+                        type=ArrayType(
+                            base_type=IntType(size=IntegerLiteral(value=32)),
+                            dimensions=[IntegerLiteral(value=4)],
+                        ),
+                        identifier=Identifier(name="my_array"),
+                        init_expression=ArrayLiteral(
+                            values=[
+                                IntegerLiteral(value=3),
+                                IntegerLiteral(value=4),
+                                IntegerLiteral(value=5),
+                                IntegerLiteral(value=5),
+                            ],
+                        ),
+                    )
+                ]
+            )
+        ]
+    )
+    SpanGuard().visit(program)
+
+
 @pytest.mark.parametrize(
     "p",
     [
@@ -261,11 +300,6 @@ def test_calibration2():
             }
         }
         """,
-        """
-        cal {
-            array[int[32], 3] my_ints = {5, 6, 7};
-        }
-        """,
     ],
 )
 def test_parsing(p: str):