Merge pull request #407 from QE-Lab/fix-cqasm-reader-cr

Fix parsing of real numbers in gate arguments in cQASM

Author: jvanstraten

src/cqasm/cqasm_reader.cc

@@ -188,7 +188,7 @@ class AngleFromParameter : public Value<Real> {
         Real val;
         if (auto i = operands[index]->as_const_int()) {
             val = i->value;
-        } else if (auto r = operands[index]->as_const_int()) {
+        } else if (auto r = operands[index]->as_const_real()) {
             val = r->value;
         } else {
             throw Exception("expected a real number at " + location(*operands[index]));

tests/golden/test_cqasm_real_numbers.qasm

@@ -0,0 +1,7 @@
+version 1.0
+# this file has been automatically generated by the OpenQL compiler please do not modify it manually.
+qubits 10
+
+._0
+    rx q[0], 1
+    wait 1

tests/test_cqasm_reader.py

@@ -59,6 +59,21 @@ def test_single_bit_kernel_operations(self):
         program.compile()
         self.assertTrue(file_compare(os.path.join(output_dir, name + '.qasm'), os.path.join(curdir, 'golden', name + '.qasm')))
 
+    def test_cqasm_real_numbers(self):
+        config_fn = os.path.join(curdir, 'hardware_config_qx.json')
+        platform = ql.Platform('seven_qubits_chip', config_fn)
+        number_qubits = platform.get_qubit_number()
+        name = 'test_cqasm_real_numbers'
+        program = ql.Program(name, platform, number_qubits)
+        qasm_rdr = ql.cQasmReader(platform, program)
+        qasm_str = "version 1.0\n"  \
+                   "qubits 5\n"     \
+                   "error_model depolarizing_channel, 0.001\n"  \
+                   "rx q[0], 1.0\n"
+        qasm_rdr.string2circuit(qasm_str)
+        program.compile()
+        self.assertTrue(file_compare(os.path.join(output_dir, name + '.qasm'), os.path.join(curdir, 'golden', name + '.qasm')))
+
     def test_sub_circuit_programs(self):
         config_fn = os.path.join(curdir, 'hardware_config_cc_light.json')
         platform = ql.Platform('seven_qubits_chip', config_fn)