Combine retval variable names

src/braket/experimental/autoqasm/constants.py

@@ -33,8 +33,5 @@
 QUBIT_REGISTER = "__qubits__"
 """Qubits are globally addressed, and so we can specify a single qubit register name."""
 
-AUTOGRAPH_RETVAL_VARIABLE_NAME = "retval_"
-"""A special name for variables assigned to the return values of AutoGraph function calls."""
-
-AUTOQASM_RETVAL_VARIABLE_NAME = "__retval__"
-"""A special name for variables assigned to the return values of AutoQASM function calls."""
+RETVAL_VARIABLE_NAME = "retval_"
+"""A special name for variables assigned to the return values of function calls."""

src/braket/experimental/autoqasm/operators/assignments.py

@@ -43,7 +43,7 @@ def assign_stmt(target_name: str, value: Any) -> Any:
     if isinstance(value, UndefinedReturnValue):
         return value
 
-    if target_name == constants.AUTOGRAPH_RETVAL_VARIABLE_NAME:
+    if target_name == constants.RETVAL_VARIABLE_NAME:
         # AutoGraph transpiles return statements like
         #    return <return_value>
         # into
@@ -58,7 +58,6 @@ def assign_stmt(target_name: str, value: Any) -> Any:
             return value
 
         value = types.wrap_value(value)
-        target_name = constants.AUTOQASM_RETVAL_VARIABLE_NAME
 
     if isinstance(value, oqpy.base.Var):
         oqpy_program = program.get_program_conversion_context().get_oqpy_program()

test/unit_tests/braket/experimental/autoqasm/test_api.py

@@ -807,8 +807,8 @@ def caller() -> int:
 
     expected_qasm = """OPENQASM 3.0;
 def retval_test() -> int[32] {
-    int[32] __retval__ = 1;
-    return __retval__;
+    int[32] retval_ = 1;
+    return retval_;
 }
 int[32] __int_1__ = 0;
 __int_1__ = retval_test();"""
@@ -829,8 +829,8 @@ def caller() -> aq.BitVar:
 
     expected_qasm = """OPENQASM 3.0;
 def retval_test() -> bit {
-    bit __retval__ = 1;
-    return __retval__;
+    bit retval_ = 1;
+    return retval_;
 }
 bit __bit_0__;
 __bit_0__ = retval_test();"""