WIP: converting OpenQASM to YaoBlocks

.gitignore

@@ -1 +1,2 @@
 /docs/build/
+Manifest.toml

src/YaoBlocksQASM.jl

@@ -1,6 +1,6 @@
 module YaoBlocksQASM
 
-export convert_to_qasm
+export convert_to_qasm, toblocks, @qasm_str
 
 using YaoBlocks
 

test/runtests.jl

@@ -2,8 +2,70 @@ using OpenQASM, YaoBlocksQASM, Yao
 using Test
 
 @testset "YaoBlocksQASM.jl" begin
-    qasm = """
-        OPENQASM 2.0;
+  qasm = """
+      OPENQASM 2.0;
+      include "qelib1.inc";
+      qreg q[3];
+      creg c1[3];
+      h q[0];
+      CX q[1],q[2];
+      cy q[1],q[0];
+      cz q[0],q[2];
+      x q[0];
+      swap q[1],q[2];
+      id q[0];
+      t q[1];
+      rz(0.7) q[2];
+      z q[0];
+      p(0.7) q[1];
+      ry(0.7) q[2];
+      y q[0];
+      rx(0.7) q[1];
+      measure q[0] -> c1[0];
+      measure q[1] -> c1[1];
+      measure q[2] -> c1[2];    
+  """
+
+  ast = OpenQASM.parse(qasm)
+  qc = chain(
+    3,
+    put(1 => H),
+    control(2, 3 => X),
+    control(2, 1 => Y),
+    control(1, 3 => Z),
+    put(1 => X),
+    swap(2, 3),
+    put(1 => I2),
+    put(2 => T),
+    put(3 => Rz(0.7)),
+    put(1 => Z),
+    put(2 => shift(0.7)),
+    put(3 => Ry(0.7)),
+    put(1 => Y),
+    put(2 => Rx(0.7)),
+    Yao.Measure(3),
+  )
+
+  qc_blocks = toblocks(Module(), LineNumberNode(1), OpenQASM.parse( qasm))
+
+  @testset "convert YaoBlocks to QASM" begin
+    ast1 = convert_to_qasm(qc, 1)
+
+    @test ast.version == ast1.version
+
+    for i = 1:length(ast.prog)
+      @test "$(ast.prog[i])" == "$(ast1.prog[i])"
+    end
+  end
+
+  @testset "convert QASM to YaoBlocks" begin
+    @info typeof(qc_blocks)
+    println("converted circuit $qc_blocks")
+
+  end
+
+  @testset "use marco" begin
+    circuit = @qasm_str """OPENQASM 2.0;
         include "qelib1.inc";
         qreg q[3];
         creg c1[3];
@@ -24,32 +86,15 @@ using Test
         measure q[0] -> c1[0];
         measure q[1] -> c1[1];
         measure q[2] -> c1[2];    
-    """
-
-    ast = OpenQASM.parse(qasm)
-    qc = chain(
-        3,
-        put(1 => H),
-        control(2, 3 => X),
-        control(2, 1 => Y),
-        control(1, 3 => Z),
-        put(1 => X),
-        swap(2, 3),
-        put(1 => I2),
-        put(2 => T),
-        put(3 => Rz(0.7)),
-        put(1 => Z),
-        put(2 => shift(0.7)),
-        put(3 => Ry(0.7)),
-        put(1 => Y),
-        put(2 => Rx(0.7)),
-        Yao.Measure(3),
-    )
-    ast1 = convert_to_qasm(qc, 1)
+              """
+    println(circuit)
+  end
+
+ # @testset "check equivalence of converting to and from OpenQASM from YaoBlocks" begin
+ #   reconverted_circuit = convert_to_qasm(qc,3)
+ #   @test circuit == reconverted_circuit
+ #   # TODO implemet full test
+ # end
 
-    @test ast.version == ast1.version
 
-    for i = 1:length(ast.prog)
-        @test "$(ast.prog[i])" == "$(ast1.prog[i])"
-    end
 end