use to_ast to create the ast node after _to_oqpy_expression

Author: jcjaskula-aws

oqpy/base.py

@@ -470,17 +470,14 @@ def to_ast(self, program: Program) -> ast.Expression:
 def to_ast(program: Program, item: AstConvertible) -> ast.Expression:
     """Convert an object to an AST node."""
     if hasattr(item, "_to_oqpy_expression"):
-        item = cast(ExpressionConvertible, item)
-        return item._to_oqpy_expression().to_ast(program)
+        item = cast(ExpressionConvertible, item)._to_oqpy_expression()
     if hasattr(item, "_to_cached_oqpy_expression"):
         item = cast(CachedExpressionConvertible, item)
         if item._oqpy_cache_key is None:
             item._oqpy_cache_key = uuid.uuid1()
         if item._oqpy_cache_key not in program.expr_cache:
-            program.expr_cache[item._oqpy_cache_key] = item._to_cached_oqpy_expression().to_ast(
-                program
-            )
-        return program.expr_cache[item._oqpy_cache_key]
+            program.expr_cache[item._oqpy_cache_key] = item._to_cached_oqpy_expression()
+        item = program.expr_cache[item._oqpy_cache_key]
     if isinstance(item, (complex, np.complexfloating)):
         if item.imag == 0:
             return to_ast(program, item.real)

tests/test_directives.py

@@ -1586,21 +1586,26 @@ def _to_oqpy_expression(self):
     class C:
         def _to_oqpy_expression(self):
             return 1e-7
+        def __rmul__(self, other):
+            return other * self._to_oqpy_expression()
 
     frame = FrameVar(name="f1")
     prog = Program()
     prog.set(A("a1"), 2)
+    prog.set(FloatVar(name="c1"), 3 * C())
     prog.delay(A("a2"), frame)
     prog.delay(B("b1"), frame)
     prog.delay(C(), frame)
     expected = textwrap.dedent(
         """
         OPENQASM 3.0;
         duration a1 = 100.0ns;
+        float[64] c1;
         duration a2 = 100.0ns;
         frame f1;
         float[64] b1 = 1e-07;
         a1 = 2;
+        c1 = 3e-07;
         delay[a2] f1;
         delay[b1 * 1s] f1;
         delay[100.0ns] f1;