Update gold files

phanrahan · Oct 3, 2018 · acb99a8 · acb99a8
1 parent 9cc70b1
commit acb99a8
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 64 deletions.
diff --git a/tests/test_circuit/gold/test_for_loop_def.json b/tests/test_circuit/gold/test_for_loop_def.json
@@ -8,7 +8,7 @@
           ["I1","BitIn"],
           ["O","Bit"]
         ]],
-        "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"35"}
+        "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"50"}
       },
       "main":{
         "type":["Record",[
@@ -18,33 +18,33 @@
         "instances":{
           "inst0":{
             "modref":"global.And2",
-            "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"41"}
+            "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"56"}
           },
           "inst1":{
             "modref":"global.And2",
-            "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"41"}
+            "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"56"}
           },
           "inst2":{
             "modref":"global.And2",
-            "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"41"}
+            "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"56"}
           },
           "inst3":{
             "modref":"global.And2",
-            "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"41"}
+            "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"56"}
           }
         },
         "connections":[
-          ["self.I.0","inst0.I0",{"filename":"tests/test_circuit/test_define.py","lineno":"43"}],
-          ["self.I.1","inst0.I1",{"filename":"tests/test_circuit/test_define.py","lineno":"44"}],
-          ["inst1.I0","inst0.O",{"filename":"tests/test_circuit/test_define.py","lineno":"46"}],
-          ["self.I.1","inst1.I1",{"filename":"tests/test_circuit/test_define.py","lineno":"47"}],
-          ["inst2.I0","inst1.O",{"filename":"tests/test_circuit/test_define.py","lineno":"46"}],
-          ["self.I.1","inst2.I1",{"filename":"tests/test_circuit/test_define.py","lineno":"47"}],
-          ["inst3.I0","inst2.O",{"filename":"tests/test_circuit/test_define.py","lineno":"46"}],
-          ["self.I.1","inst3.I1",{"filename":"tests/test_circuit/test_define.py","lineno":"47"}],
-          ["self.O","inst3.O",{"filename":"tests/test_circuit/test_define.py","lineno":"50"}]
+          ["self.I.0","inst0.I0",{"filename":"tests/test_circuit/test_define.py","lineno":"58"}],
+          ["self.I.1","inst0.I1",{"filename":"tests/test_circuit/test_define.py","lineno":"59"}],
+          ["inst1.I0","inst0.O",{"filename":"tests/test_circuit/test_define.py","lineno":"61"}],
+          ["self.I.1","inst1.I1",{"filename":"tests/test_circuit/test_define.py","lineno":"62"}],
+          ["inst2.I0","inst1.O",{"filename":"tests/test_circuit/test_define.py","lineno":"61"}],
+          ["self.I.1","inst2.I1",{"filename":"tests/test_circuit/test_define.py","lineno":"62"}],
+          ["inst3.I0","inst2.O",{"filename":"tests/test_circuit/test_define.py","lineno":"61"}],
+          ["self.I.1","inst3.I1",{"filename":"tests/test_circuit/test_define.py","lineno":"62"}],
+          ["self.O","inst3.O",{"filename":"tests/test_circuit/test_define.py","lineno":"65"}]
         ],
-        "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"37"}
+        "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"52"}
       }
     }
   }

diff --git a/tests/test_circuit/gold/test_for_loop_def.v b/tests/test_circuit/gold/test_for_loop_def.v
@@ -1,30 +1,30 @@
-// Defined at tests/test_circuit/test_define.py:37
+// Defined at tests/test_circuit/test_define.py:52
 module main (input [1:0] I, output  O);
 wire  inst0_O;
 wire  inst1_O;
 wire  inst2_O;
 wire  inst3_O;
-// Instanced at tests/test_circuit/test_define.py:41
-// Argument I0(I[0]) wired at tests/test_circuit/test_define.py:43
-// Argument I1(I[1]) wired at tests/test_circuit/test_define.py:44
-// Argument O(inst0_O) wired at tests/test_circuit/test_define.py:46
+// Instanced at tests/test_circuit/test_define.py:56
+// Argument I0(I[0]) wired at tests/test_circuit/test_define.py:58
+// Argument I1(I[1]) wired at tests/test_circuit/test_define.py:59
+// Argument O(inst0_O) wired at tests/test_circuit/test_define.py:61
 And2 inst0 (.I0(I[0]), .I1(I[1]), .O(inst0_O));
-// Instanced at tests/test_circuit/test_define.py:41
-// Argument I0(inst0_O) wired at tests/test_circuit/test_define.py:46
-// Argument I1(I[1]) wired at tests/test_circuit/test_define.py:47
-// Argument O(inst1_O) wired at tests/test_circuit/test_define.py:46
+// Instanced at tests/test_circuit/test_define.py:56
+// Argument I0(inst0_O) wired at tests/test_circuit/test_define.py:61
+// Argument I1(I[1]) wired at tests/test_circuit/test_define.py:62
+// Argument O(inst1_O) wired at tests/test_circuit/test_define.py:61
 And2 inst1 (.I0(inst0_O), .I1(I[1]), .O(inst1_O));
-// Instanced at tests/test_circuit/test_define.py:41
-// Argument I0(inst1_O) wired at tests/test_circuit/test_define.py:46
-// Argument I1(I[1]) wired at tests/test_circuit/test_define.py:47
-// Argument O(inst2_O) wired at tests/test_circuit/test_define.py:46
+// Instanced at tests/test_circuit/test_define.py:56
+// Argument I0(inst1_O) wired at tests/test_circuit/test_define.py:61
+// Argument I1(I[1]) wired at tests/test_circuit/test_define.py:62
+// Argument O(inst2_O) wired at tests/test_circuit/test_define.py:61
 And2 inst2 (.I0(inst1_O), .I1(I[1]), .O(inst2_O));
-// Instanced at tests/test_circuit/test_define.py:41
-// Argument I0(inst2_O) wired at tests/test_circuit/test_define.py:46
-// Argument I1(I[1]) wired at tests/test_circuit/test_define.py:47
-// Argument O(inst3_O) wired at tests/test_circuit/test_define.py:50
+// Instanced at tests/test_circuit/test_define.py:56
+// Argument I0(inst2_O) wired at tests/test_circuit/test_define.py:61
+// Argument I1(I[1]) wired at tests/test_circuit/test_define.py:62
+// Argument O(inst3_O) wired at tests/test_circuit/test_define.py:65
 And2 inst3 (.I0(inst2_O), .I1(I[1]), .O(inst3_O));
-// Wired at tests/test_circuit/test_define.py:50
+// Wired at tests/test_circuit/test_define.py:65
 assign O = inst3_O;
 endmodule
 
diff --git a/tests/test_circuit/gold/test_interleaved_instance_wiring.json b/tests/test_circuit/gold/test_interleaved_instance_wiring.json
@@ -8,7 +8,7 @@
           ["I1","BitIn"],
           ["O","Bit"]
         ]],
-        "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"65"}
+        "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"80"}
       },
       "main":{
         "type":["Record",[
@@ -18,27 +18,27 @@
         "instances":{
           "inst0":{
             "modref":"global.And2",
-            "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"69"}
+            "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"84"}
           },
           "inst1":{
             "modref":"global.And2",
-            "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"70"}
+            "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"85"}
           },
           "inst2":{
             "modref":"global.And2",
-            "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"76"}
+            "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"91"}
           }
         },
         "connections":[
-          ["self.I.0","inst0.I0",{"filename":"tests/test_circuit/test_define.py","lineno":"72"}],
-          ["self.I.1","inst0.I1",{"filename":"tests/test_circuit/test_define.py","lineno":"73"}],
-          ["inst1.I0","inst0.O",{"filename":"tests/test_circuit/test_define.py","lineno":"74"}],
-          ["self.I.1","inst1.I1",{"filename":"tests/test_circuit/test_define.py","lineno":"75"}],
-          ["inst2.I0","inst1.O",{"filename":"tests/test_circuit/test_define.py","lineno":"77"}],
-          ["self.I.0","inst2.I1",{"filename":"tests/test_circuit/test_define.py","lineno":"78"}],
-          ["self.O","inst2.O",{"filename":"tests/test_circuit/test_define.py","lineno":"80"}]
+          ["self.I.0","inst0.I0",{"filename":"tests/test_circuit/test_define.py","lineno":"87"}],
+          ["self.I.1","inst0.I1",{"filename":"tests/test_circuit/test_define.py","lineno":"88"}],
+          ["inst1.I0","inst0.O",{"filename":"tests/test_circuit/test_define.py","lineno":"89"}],
+          ["self.I.1","inst1.I1",{"filename":"tests/test_circuit/test_define.py","lineno":"90"}],
+          ["inst2.I0","inst1.O",{"filename":"tests/test_circuit/test_define.py","lineno":"92"}],
+          ["self.I.0","inst2.I1",{"filename":"tests/test_circuit/test_define.py","lineno":"93"}],
+          ["self.O","inst2.O",{"filename":"tests/test_circuit/test_define.py","lineno":"95"}]
         ],
-        "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"67"}
+        "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"82"}
       }
     }
   }

diff --git a/tests/test_circuit/gold/test_interleaved_instance_wiring.v b/tests/test_circuit/gold/test_interleaved_instance_wiring.v
@@ -1,24 +1,24 @@
-// Defined at tests/test_circuit/test_define.py:67
+// Defined at tests/test_circuit/test_define.py:82
 module main (input [1:0] I, output  O);
 wire  inst0_O;
 wire  inst1_O;
 wire  inst2_O;
-// Instanced at tests/test_circuit/test_define.py:69
-// Argument I0(I[0]) wired at tests/test_circuit/test_define.py:72
-// Argument I1(I[1]) wired at tests/test_circuit/test_define.py:73
-// Argument O(inst0_O) wired at tests/test_circuit/test_define.py:74
+// Instanced at tests/test_circuit/test_define.py:84
+// Argument I0(I[0]) wired at tests/test_circuit/test_define.py:87
+// Argument I1(I[1]) wired at tests/test_circuit/test_define.py:88
+// Argument O(inst0_O) wired at tests/test_circuit/test_define.py:89
 And2 inst0 (.I0(I[0]), .I1(I[1]), .O(inst0_O));
-// Instanced at tests/test_circuit/test_define.py:70
-// Argument I0(inst0_O) wired at tests/test_circuit/test_define.py:74
-// Argument I1(I[1]) wired at tests/test_circuit/test_define.py:75
-// Argument O(inst1_O) wired at tests/test_circuit/test_define.py:77
+// Instanced at tests/test_circuit/test_define.py:85
+// Argument I0(inst0_O) wired at tests/test_circuit/test_define.py:89
+// Argument I1(I[1]) wired at tests/test_circuit/test_define.py:90
+// Argument O(inst1_O) wired at tests/test_circuit/test_define.py:92
 And2 inst1 (.I0(inst0_O), .I1(I[1]), .O(inst1_O));
-// Instanced at tests/test_circuit/test_define.py:76
-// Argument I0(inst1_O) wired at tests/test_circuit/test_define.py:77
-// Argument I1(I[0]) wired at tests/test_circuit/test_define.py:78
-// Argument O(inst2_O) wired at tests/test_circuit/test_define.py:80
+// Instanced at tests/test_circuit/test_define.py:91
+// Argument I0(inst1_O) wired at tests/test_circuit/test_define.py:92
+// Argument I1(I[0]) wired at tests/test_circuit/test_define.py:93
+// Argument O(inst2_O) wired at tests/test_circuit/test_define.py:95
 And2 inst2 (.I0(inst1_O), .I1(I[0]), .O(inst2_O));
-// Wired at tests/test_circuit/test_define.py:80
+// Wired at tests/test_circuit/test_define.py:95
 assign O = inst2_O;
 endmodule
 
diff --git a/tests/test_circuit/gold/test_simple_def_class.json b/tests/test_circuit/gold/test_simple_def_class.json
@@ -7,7 +7,8 @@
           ["I0","BitIn"],
           ["I1","BitIn"],
           ["O","Bit"]
-        ]]
+        ]],
+        "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"12"}
       },
       "main":{
         "type":["Record",[
@@ -21,10 +22,11 @@
           }
         },
         "connections":[
-          ["self.I.0","inst0.I0"],
-          ["self.I.1","inst0.I1"],
-          ["self.O","inst0.O"]
-        ]
+          ["self.I.0","inst0.I0",{"filename":"tests/test_circuit/test_define.py","lineno":"18"}],
+          ["self.I.1","inst0.I1",{"filename":"tests/test_circuit/test_define.py","lineno":"19"}],
+          ["self.O","inst0.O",{"filename":"tests/test_circuit/test_define.py","lineno":"20"}]
+        ],
+        "metadata":{"filename":"tests/test_circuit/test_define.py","lineno":"14"}
       }
     }
   }