1247

1 files changed, 16 insertions, 16 deletions

diff --git a/cpp/.traces/array-from-args b/cpp/.traces/array-from-args
index d033bb80..a9d4341f 100644
--- a/cpp/.traces/array-from-args
+++ b/cpp/.traces/array-from-args
@@ -24,7 +24,7 @@ after-brace/0: memory-should-contain ...
 new/0: routine allocated memory from 1000 to 101000
 schedule/0: array-from-args
 run/0: instruction array-from-args/0
-run/0: run/42 {name: "
+run/0: run/43 {name: "
     1:address:array:location <- init-array 0:literal, 1:literal, 2:literal
     2:array:location <- copy 1:address:array:location/deref
   ", value: 0, type: 0, properties: ["
@@ -45,7 +45,7 @@ after-brace/0: copy ...
 run/0: instruction run1001/0
 run/0: {name: "1", value: 1, type: 2-5-1, properties: ["1": "address":"array":"location"]} <- init-array/114 {name: "0", value: 0, type: 0, properties: ["0": "literal"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}, {name: "2", value: 2, type: 0, properties: ["2": "literal"]}
 run/0: instruction init-array/0
-run/0: {name: "default-space", value: 0, type: 2-5-1, properties: ["default-space": "address":"array":"location"]} <- new/41 {name: "location", value: 1, type: 0, properties: ["location": "type"]}, {name: "30", value: 30, type: 0, properties: ["30": "literal"]}
+run/0: {name: "default-space", value: 0, type: 2-5-1, properties: ["default-space": "address":"array":"location"]} <- new/42 {name: "location", value: 1, type: 0, properties: ["location": "type"]}, {name: "30", value: 30, type: 0, properties: ["30": "literal"]}
 mem/0: array size is 30
 mem/0: new alloc: 1000
 run/0: instruction init-array/1
@@ -53,7 +53,7 @@ run/0: {name: "capacity", value: 1, type: 1, properties: ["capacity": "integer"]
 run/0: ingredient 0 is 0
 mem/0: storing 0 in location 1002
 run/0: instruction init-array/3
-run/0: {name: "curr-value", value: 2, type: 1, properties: ["curr-value": "location"]}, {name: "exists?", value: 3, type: 3, properties: ["exists?": "boolean"]} <- next-ingredient/29 
+run/0: {name: "curr-value", value: 2, type: 1, properties: ["curr-value": "location"]}, {name: "exists?", value: 3, type: 3, properties: ["exists?": "boolean"]} <- next-ingredient/30 
 run/0: product 0 is 0
 mem/0: storing 0 in location 1003
 mem/0: storing 1 in location 1004
@@ -74,7 +74,7 @@ run/0: loop/10 {name: "", value: -4, type: , properties: ["": ]}
 run/0: ingredient 0 is -4
 run/0: jumping to instruction 3
 run/0: instruction init-array/3
-run/0: {name: "curr-value", value: 2, type: 1, properties: ["curr-value": "location"]}, {name: "exists?", value: 3, type: 3, properties: ["exists?": "boolean"]} <- next-ingredient/29 
+run/0: {name: "curr-value", value: 2, type: 1, properties: ["curr-value": "location"]}, {name: "exists?", value: 3, type: 3, properties: ["exists?": "boolean"]} <- next-ingredient/30 
 run/0: product 0 is 1
 mem/0: storing 1 in location 1003
 mem/0: storing 1 in location 1004
@@ -95,7 +95,7 @@ run/0: loop/10 {name: "", value: -4, type: , properties: ["": ]}
 run/0: ingredient 0 is -4
 run/0: jumping to instruction 3
 run/0: instruction init-array/3
-run/0: {name: "curr-value", value: 2, type: 1, properties: ["curr-value": "location"]}, {name: "exists?", value: 3, type: 3, properties: ["exists?": "boolean"]} <- next-ingredient/29 
+run/0: {name: "curr-value", value: 2, type: 1, properties: ["curr-value": "location"]}, {name: "exists?", value: 3, type: 3, properties: ["exists?": "boolean"]} <- next-ingredient/30 
 run/0: product 0 is 2
 mem/0: storing 2 in location 1003
 mem/0: storing 1 in location 1004
@@ -116,7 +116,7 @@ run/0: loop/10 {name: "", value: -4, type: , properties: ["": ]}
 run/0: ingredient 0 is -4
 run/0: jumping to instruction 3
 run/0: instruction init-array/3
-run/0: {name: "curr-value", value: 2, type: 1, properties: ["curr-value": "location"]}, {name: "exists?", value: 3, type: 3, properties: ["exists?": "boolean"]} <- next-ingredient/29 
+run/0: {name: "curr-value", value: 2, type: 1, properties: ["curr-value": "location"]}, {name: "exists?", value: 3, type: 3, properties: ["exists?": "boolean"]} <- next-ingredient/30 
 mem/0: storing 0 in location 1004
 run/0: instruction init-array/4
 run/0: break-unless/12 {name: "exists?", value: 3, type: 3, properties: ["exists?": "boolean"]}, {name: "", value: 2, type: , properties: ["": ]}
@@ -125,13 +125,13 @@ run/0: ingredient 0 is 0
 run/0: ingredient 1 is 
 run/0: jumping to instruction 7
 run/0: instruction init-array/8
-run/0: {name: "result", value: 4, type: 2-5-1, properties: ["result": "address":"array":"location"]} <- new/41 {name: "location", value: 1, type: 0, properties: ["location": "type"]}, {name: "capacity", value: 1, type: 1, properties: ["capacity": "integer"]}
+run/0: {name: "result", value: 4, type: 2-5-1, properties: ["result": "address":"array":"location"]} <- new/42 {name: "location", value: 1, type: 0, properties: ["location": "type"]}, {name: "capacity", value: 1, type: 1, properties: ["capacity": "integer"]}
 mem/0: location 1002 is 3
 mem/0: array size is 3
 mem/0: new alloc: 1031
 mem/0: storing 1031 in location 1005
 run/0: instruction init-array/9
-run/0: rewind-ingredients/30 
+run/0: rewind-ingredients/31 
 run/0: instruction init-array/10
 run/0: {name: "i", value: 5, type: 1, properties: ["i": "integer"]} <- copy/1 {name: "0", value: 0, type: 0, properties: ["0": "literal"]}
 run/0: ingredient 0 is 0
@@ -150,7 +150,7 @@ mem/0: location 1007 is 0
 run/0: ingredient 0 is 0
 run/0: jump-if fell through
 run/0: instruction init-array/14
-run/0: {name: "curr-value", value: 2, type: 1, properties: ["curr-value": "location"]}, {name: "exists?", value: 3, type: 3, properties: ["exists?": "boolean"]} <- next-ingredient/29 
+run/0: {name: "curr-value", value: 2, type: 1, properties: ["curr-value": "location"]}, {name: "exists?", value: 3, type: 3, properties: ["exists?": "boolean"]} <- next-ingredient/30 
 run/0: product 0 is 0
 mem/0: storing 0 in location 1003
 mem/0: storing 1 in location 1004
@@ -159,7 +159,7 @@ run/0: assert/19 {name: "exists?", value: 3, type: 3, properties: ["exists?": "b
 run/0: ingredient 0 is exists?
 mem/0: location 1004 is 1
 run/0: instruction init-array/16
-run/0: {name: "tmp", value: 7, type: 2-1, properties: ["tmp": "address":"location"]} <- index-address/26 {name: "result", value: 4, type: 2-5-1, properties: ["result": "address":"array":"location", "deref": ]}, {name: "i", value: 5, type: 1, properties: ["i": "integer"]}
+run/0: {name: "tmp", value: 7, type: 2-1, properties: ["tmp": "address":"location"]} <- index-address/27 {name: "result", value: 4, type: 2-5-1, properties: ["result": "address":"array":"location", "deref": ]}, {name: "i", value: 5, type: 1, properties: ["i": "integer"]}
 run/0: ingredient 0 is result
 mem/0: location 1005 is 1031
 run/0: ingredient 1 is {name: "i", value: 5, type: 1, properties: ["i": "integer"]}
@@ -198,7 +198,7 @@ mem/0: location 1007 is 0
 run/0: ingredient 0 is 0
 run/0: jump-if fell through
 run/0: instruction init-array/14
-run/0: {name: "curr-value", value: 2, type: 1, properties: ["curr-value": "location"]}, {name: "exists?", value: 3, type: 3, properties: ["exists?": "boolean"]} <- next-ingredient/29 
+run/0: {name: "curr-value", value: 2, type: 1, properties: ["curr-value": "location"]}, {name: "exists?", value: 3, type: 3, properties: ["exists?": "boolean"]} <- next-ingredient/30 
 run/0: product 0 is 1
 mem/0: storing 1 in location 1003
 mem/0: storing 1 in location 1004
@@ -207,7 +207,7 @@ run/0: assert/19 {name: "exists?", value: 3, type: 3, properties: ["exists?": "b
 run/0: ingredient 0 is exists?
 mem/0: location 1004 is 1
 run/0: instruction init-array/16
-run/0: {name: "tmp", value: 7, type: 2-1, properties: ["tmp": "address":"location"]} <- index-address/26 {name: "result", value: 4, type: 2-5-1, properties: ["result": "address":"array":"location", "deref": ]}, {name: "i", value: 5, type: 1, properties: ["i": "integer"]}
+run/0: {name: "tmp", value: 7, type: 2-1, properties: ["tmp": "address":"location"]} <- index-address/27 {name: "result", value: 4, type: 2-5-1, properties: ["result": "address":"array":"location", "deref": ]}, {name: "i", value: 5, type: 1, properties: ["i": "integer"]}
 run/0: ingredient 0 is result
 mem/0: location 1005 is 1031
 run/0: ingredient 1 is {name: "i", value: 5, type: 1, properties: ["i": "integer"]}
@@ -246,7 +246,7 @@ mem/0: location 1007 is 0
 run/0: ingredient 0 is 0
 run/0: jump-if fell through
 run/0: instruction init-array/14
-run/0: {name: "curr-value", value: 2, type: 1, properties: ["curr-value": "location"]}, {name: "exists?", value: 3, type: 3, properties: ["exists?": "boolean"]} <- next-ingredient/29 
+run/0: {name: "curr-value", value: 2, type: 1, properties: ["curr-value": "location"]}, {name: "exists?", value: 3, type: 3, properties: ["exists?": "boolean"]} <- next-ingredient/30 
 run/0: product 0 is 2
 mem/0: storing 2 in location 1003
 mem/0: storing 1 in location 1004
@@ -255,7 +255,7 @@ run/0: assert/19 {name: "exists?", value: 3, type: 3, properties: ["exists?": "b
 run/0: ingredient 0 is exists?
 mem/0: location 1004 is 1
 run/0: instruction init-array/16
-run/0: {name: "tmp", value: 7, type: 2-1, properties: ["tmp": "address":"location"]} <- index-address/26 {name: "result", value: 4, type: 2-5-1, properties: ["result": "address":"array":"location", "deref": ]}, {name: "i", value: 5, type: 1, properties: ["i": "integer"]}
+run/0: {name: "tmp", value: 7, type: 2-1, properties: ["tmp": "address":"location"]} <- index-address/27 {name: "result", value: 4, type: 2-5-1, properties: ["result": "address":"array":"location", "deref": ]}, {name: "i", value: 5, type: 1, properties: ["i": "integer"]}
 run/0: ingredient 0 is result
 mem/0: location 1005 is 1031
 run/0: ingredient 1 is {name: "i", value: 5, type: 1, properties: ["i": "integer"]}
@@ -295,7 +295,7 @@ run/0: ingredient 0 is 1
 run/0: ingredient 1 is 
 run/0: jumping to instruction 20
 run/0: instruction init-array/21
-run/0: reply/32 {name: "result", value: 4, type: 2-5-1, properties: ["result": "address":"array":"location"]}
+run/0: reply/33 {name: "result", value: 4, type: 2-5-1, properties: ["result": "address":"array":"location"]}
 mem/0: location 1005 is 1031
 run/0: result 0 is 1031
 mem/0: storing 1031 in location 1
@@ -312,7 +312,7 @@ mem/0: storing 0 in location 3
 mem/0: storing 1 in location 4
 mem/0: storing 2 in location 5
 run/0: instruction array-from-args/1
-run/0: memory-should-contain/43 {name: "
+run/0: memory-should-contain/44 {name: "
     2 <- 3  # array length
     3 <- 0
     4 <- 1