1246

1 files changed, 25 insertions, 25 deletions

diff --git a/cpp/.traces/brace_conversion_and_run b/cpp/.traces/brace_conversion_and_run
index 9aafc716..172de7f0 100644
--- a/cpp/.traces/brace_conversion_and_run
+++ b/cpp/.traces/brace_conversion_and_run
@@ -40,27 +40,27 @@ after-brace/0: copy ...
 new/0: routine allocated memory from 1000 to 101000
 schedule/0: test-factorial
 run/0: instruction test-factorial/0
-run/0: {name: "1", value: 1, type: 1, properties: ["1": "integer"]} <- copy {name: "5", value: 5, type: 0, properties: ["5": "literal"]}
+run/0: {name: "1", value: 1, type: 1, properties: ["1": "integer"]} <- copy/1 {name: "5", value: 5, type: 0, properties: ["5": "literal"]}
 run/0: ingredient 0 is 5
 mem/0: storing 5 in location 1
 run/0: instruction test-factorial/1
-run/0: {name: "2", value: 2, type: 1, properties: ["2": "integer"]} <- copy {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
+run/0: {name: "2", value: 2, type: 1, properties: ["2": "integer"]} <- copy/1 {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
 run/0: ingredient 0 is 1
 mem/0: storing 1 in location 2
 run/0: instruction test-factorial/3
-run/0: {name: "3", value: 3, type: 3, properties: ["3": "boolean"]} <- equal {name: "1", value: 1, type: 1, properties: ["1": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
+run/0: {name: "3", value: 3, type: 3, properties: ["3": "boolean"]} <- equal/13 {name: "1", value: 1, type: 1, properties: ["1": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
 run/0: ingredient 0 is 1
 mem/0: location 1 is 5
 run/0: ingredient 1 is 1
 run/0: product 0 is 0
 mem/0: storing 0 in location 3
 run/0: instruction test-factorial/4
-run/0: break-if {name: "3", value: 3, type: 3, properties: ["3": "boolean"]}, {name: "", value: 3, type: , properties: ["": ]}
+run/0: break-if/11 {name: "3", value: 3, type: 3, properties: ["3": "boolean"]}, {name: "", value: 3, type: , properties: ["": ]}
 mem/0: location 3 is 0
 run/0: ingredient 0 is 0
 run/0: jump-if fell through
 run/0: instruction test-factorial/5
-run/0: {name: "2", value: 2, type: 1, properties: ["2": "integer"]} <- multiply {name: "2", value: 2, type: 1, properties: ["2": "integer"]}, {name: "1", value: 1, type: 1, properties: ["1": "integer"]}
+run/0: {name: "2", value: 2, type: 1, properties: ["2": "integer"]} <- multiply/4 {name: "2", value: 2, type: 1, properties: ["2": "integer"]}, {name: "1", value: 1, type: 1, properties: ["1": "integer"]}
 run/0: ingredient 0 is 2
 mem/0: location 2 is 1
 run/0: ingredient 1 is 1
@@ -69,30 +69,30 @@ run/0: ingredient 1 is 5
 run/0: product 0 is 5
 mem/0: storing 5 in location 2
 run/0: instruction test-factorial/6
-run/0: {name: "1", value: 1, type: 1, properties: ["1": "integer"]} <- subtract {name: "1", value: 1, type: 1, properties: ["1": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
+run/0: {name: "1", value: 1, type: 1, properties: ["1": "integer"]} <- subtract/3 {name: "1", value: 1, type: 1, properties: ["1": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
 run/0: ingredient 0 is 1
 mem/0: location 1 is 5
 run/0: ingredient 1 is 1
 run/0: product 0 is 4
 mem/0: storing 4 in location 1
 run/0: instruction test-factorial/7
-run/0: loop {name: "", value: -5, type: , properties: ["": ]}
+run/0: loop/10 {name: "", value: -5, type: , properties: ["": ]}
 run/0: ingredient 0 is -5
 run/0: jumping to instruction 3
 run/0: instruction test-factorial/3
-run/0: {name: "3", value: 3, type: 3, properties: ["3": "boolean"]} <- equal {name: "1", value: 1, type: 1, properties: ["1": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
+run/0: {name: "3", value: 3, type: 3, properties: ["3": "boolean"]} <- equal/13 {name: "1", value: 1, type: 1, properties: ["1": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
 run/0: ingredient 0 is 1
 mem/0: location 1 is 4
 run/0: ingredient 1 is 1
 run/0: product 0 is 0
 mem/0: storing 0 in location 3
 run/0: instruction test-factorial/4
-run/0: break-if {name: "3", value: 3, type: 3, properties: ["3": "boolean"]}, {name: "", value: 3, type: , properties: ["": ]}
+run/0: break-if/11 {name: "3", value: 3, type: 3, properties: ["3": "boolean"]}, {name: "", value: 3, type: , properties: ["": ]}
 mem/0: location 3 is 0
 run/0: ingredient 0 is 0
 run/0: jump-if fell through
 run/0: instruction test-factorial/5
-run/0: {name: "2", value: 2, type: 1, properties: ["2": "integer"]} <- multiply {name: "2", value: 2, type: 1, properties: ["2": "integer"]}, {name: "1", value: 1, type: 1, properties: ["1": "integer"]}
+run/0: {name: "2", value: 2, type: 1, properties: ["2": "integer"]} <- multiply/4 {name: "2", value: 2, type: 1, properties: ["2": "integer"]}, {name: "1", value: 1, type: 1, properties: ["1": "integer"]}
 run/0: ingredient 0 is 2
 mem/0: location 2 is 5
 run/0: ingredient 1 is 1
@@ -101,30 +101,30 @@ run/0: ingredient 1 is 4
 run/0: product 0 is 20
 mem/0: storing 20 in location 2
 run/0: instruction test-factorial/6
-run/0: {name: "1", value: 1, type: 1, properties: ["1": "integer"]} <- subtract {name: "1", value: 1, type: 1, properties: ["1": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
+run/0: {name: "1", value: 1, type: 1, properties: ["1": "integer"]} <- subtract/3 {name: "1", value: 1, type: 1, properties: ["1": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
 run/0: ingredient 0 is 1
 mem/0: location 1 is 4
 run/0: ingredient 1 is 1
 run/0: product 0 is 3
 mem/0: storing 3 in location 1
 run/0: instruction test-factorial/7
-run/0: loop {name: "", value: -5, type: , properties: ["": ]}
+run/0: loop/10 {name: "", value: -5, type: , properties: ["": ]}
 run/0: ingredient 0 is -5
 run/0: jumping to instruction 3
 run/0: instruction test-factorial/3
-run/0: {name: "3", value: 3, type: 3, properties: ["3": "boolean"]} <- equal {name: "1", value: 1, type: 1, properties: ["1": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
+run/0: {name: "3", value: 3, type: 3, properties: ["3": "boolean"]} <- equal/13 {name: "1", value: 1, type: 1, properties: ["1": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
 run/0: ingredient 0 is 1
 mem/0: location 1 is 3
 run/0: ingredient 1 is 1
 run/0: product 0 is 0
 mem/0: storing 0 in location 3
 run/0: instruction test-factorial/4
-run/0: break-if {name: "3", value: 3, type: 3, properties: ["3": "boolean"]}, {name: "", value: 3, type: , properties: ["": ]}
+run/0: break-if/11 {name: "3", value: 3, type: 3, properties: ["3": "boolean"]}, {name: "", value: 3, type: , properties: ["": ]}
 mem/0: location 3 is 0
 run/0: ingredient 0 is 0
 run/0: jump-if fell through
 run/0: instruction test-factorial/5
-run/0: {name: "2", value: 2, type: 1, properties: ["2": "integer"]} <- multiply {name: "2", value: 2, type: 1, properties: ["2": "integer"]}, {name: "1", value: 1, type: 1, properties: ["1": "integer"]}
+run/0: {name: "2", value: 2, type: 1, properties: ["2": "integer"]} <- multiply/4 {name: "2", value: 2, type: 1, properties: ["2": "integer"]}, {name: "1", value: 1, type: 1, properties: ["1": "integer"]}
 run/0: ingredient 0 is 2
 mem/0: location 2 is 20
 run/0: ingredient 1 is 1
@@ -133,30 +133,30 @@ run/0: ingredient 1 is 3
 run/0: product 0 is 60
 mem/0: storing 60 in location 2
 run/0: instruction test-factorial/6
-run/0: {name: "1", value: 1, type: 1, properties: ["1": "integer"]} <- subtract {name: "1", value: 1, type: 1, properties: ["1": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
+run/0: {name: "1", value: 1, type: 1, properties: ["1": "integer"]} <- subtract/3 {name: "1", value: 1, type: 1, properties: ["1": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
 run/0: ingredient 0 is 1
 mem/0: location 1 is 3
 run/0: ingredient 1 is 1
 run/0: product 0 is 2
 mem/0: storing 2 in location 1
 run/0: instruction test-factorial/7
-run/0: loop {name: "", value: -5, type: , properties: ["": ]}
+run/0: loop/10 {name: "", value: -5, type: , properties: ["": ]}
 run/0: ingredient 0 is -5
 run/0: jumping to instruction 3
 run/0: instruction test-factorial/3
-run/0: {name: "3", value: 3, type: 3, properties: ["3": "boolean"]} <- equal {name: "1", value: 1, type: 1, properties: ["1": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
+run/0: {name: "3", value: 3, type: 3, properties: ["3": "boolean"]} <- equal/13 {name: "1", value: 1, type: 1, properties: ["1": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
 run/0: ingredient 0 is 1
 mem/0: location 1 is 2
 run/0: ingredient 1 is 1
 run/0: product 0 is 0
 mem/0: storing 0 in location 3
 run/0: instruction test-factorial/4
-run/0: break-if {name: "3", value: 3, type: 3, properties: ["3": "boolean"]}, {name: "", value: 3, type: , properties: ["": ]}
+run/0: break-if/11 {name: "3", value: 3, type: 3, properties: ["3": "boolean"]}, {name: "", value: 3, type: , properties: ["": ]}
 mem/0: location 3 is 0
 run/0: ingredient 0 is 0
 run/0: jump-if fell through
 run/0: instruction test-factorial/5
-run/0: {name: "2", value: 2, type: 1, properties: ["2": "integer"]} <- multiply {name: "2", value: 2, type: 1, properties: ["2": "integer"]}, {name: "1", value: 1, type: 1, properties: ["1": "integer"]}
+run/0: {name: "2", value: 2, type: 1, properties: ["2": "integer"]} <- multiply/4 {name: "2", value: 2, type: 1, properties: ["2": "integer"]}, {name: "1", value: 1, type: 1, properties: ["1": "integer"]}
 run/0: ingredient 0 is 2
 mem/0: location 2 is 60
 run/0: ingredient 1 is 1
@@ -165,31 +165,31 @@ run/0: ingredient 1 is 2
 run/0: product 0 is 120
 mem/0: storing 120 in location 2
 run/0: instruction test-factorial/6
-run/0: {name: "1", value: 1, type: 1, properties: ["1": "integer"]} <- subtract {name: "1", value: 1, type: 1, properties: ["1": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
+run/0: {name: "1", value: 1, type: 1, properties: ["1": "integer"]} <- subtract/3 {name: "1", value: 1, type: 1, properties: ["1": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
 run/0: ingredient 0 is 1
 mem/0: location 1 is 2
 run/0: ingredient 1 is 1
 run/0: product 0 is 1
 mem/0: storing 1 in location 1
 run/0: instruction test-factorial/7
-run/0: loop {name: "", value: -5, type: , properties: ["": ]}
+run/0: loop/10 {name: "", value: -5, type: , properties: ["": ]}
 run/0: ingredient 0 is -5
 run/0: jumping to instruction 3
 run/0: instruction test-factorial/3
-run/0: {name: "3", value: 3, type: 3, properties: ["3": "boolean"]} <- equal {name: "1", value: 1, type: 1, properties: ["1": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
+run/0: {name: "3", value: 3, type: 3, properties: ["3": "boolean"]} <- equal/13 {name: "1", value: 1, type: 1, properties: ["1": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
 run/0: ingredient 0 is 1
 mem/0: location 1 is 1
 run/0: ingredient 1 is 1
 run/0: product 0 is 1
 mem/0: storing 1 in location 3
 run/0: instruction test-factorial/4
-run/0: break-if {name: "3", value: 3, type: 3, properties: ["3": "boolean"]}, {name: "", value: 3, type: , properties: ["": ]}
+run/0: break-if/11 {name: "3", value: 3, type: 3, properties: ["3": "boolean"]}, {name: "", value: 3, type: , properties: ["": ]}
 mem/0: location 3 is 1
 run/0: ingredient 0 is 1
 run/0: ingredient 1 is 
 run/0: jumping to instruction 8
 run/0: instruction test-factorial/9
-run/0: {name: "4", value: 4, type: 1, properties: ["4": "integer"]} <- copy {name: "2", value: 2, type: 1, properties: ["2": "integer"]}
+run/0: {name: "4", value: 4, type: 1, properties: ["4": "integer"]} <- copy/1 {name: "2", value: 2, type: 1, properties: ["2": "integer"]}
 run/0: ingredient 0 is 2
 mem/0: location 2 is 120
 mem/0: storing 120 in location 4