1226 - bugfix in allocating arrays

Also our first test of printing to screen.

1 files changed, 28 insertions, 28 deletions

diff --git a/cpp/.traces/array-from-args b/cpp/.traces/array-from-args
index 173e1fb3..d999e006 100644
--- a/cpp/.traces/array-from-args
+++ b/cpp/.traces/array-from-args
@@ -97,8 +97,8 @@ run/0: instruction init-array/8
 run/0: {name: "result", value: 4, type: 2-5-1, properties: ["result": "address":"array":"location"]} <- new {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: 1030
-mem/0: storing 1030 in location 1005
+mem/0: new alloc: 1031
+mem/0: storing 1031 in location 1005
 run/0: instruction init-array/9
 run/0: rewind-ingredients 
 run/0: instruction init-array/10
@@ -130,18 +130,18 @@ 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 {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 1030
+mem/0: location 1005 is 1031
 run/0: ingredient 1 is {name: "i", value: 5, type: 1, properties: ["i": "integer"]}
 mem/0: location 1006 is 0
-run/0: address to copy is 1031
-run/0: product 0 is 1031
-mem/0: storing 1031 in location 1008
+run/0: address to copy is 1032
+run/0: product 0 is 1032
+mem/0: storing 1032 in location 1008
 run/0: instruction init-array/17
 run/0: {name: "tmp", value: 7, type: 2-1, properties: ["tmp": "address":"location", "deref": ]} <- copy {name: "curr-value", value: 2, type: 1, properties: ["curr-value": "location"]}
 run/0: ingredient 0 is curr-value
 mem/0: location 1003 is 0
-mem/0: location 1008 is 1031
-mem/0: storing 0 in location 1031
+mem/0: location 1008 is 1032
+mem/0: storing 0 in location 1032
 run/0: instruction init-array/18
 run/0: {name: "i", value: 5, type: 1, properties: ["i": "integer"]} <- add {name: "i", value: 5, type: 1, properties: ["i": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
 run/0: ingredient 0 is i
@@ -178,18 +178,18 @@ 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 {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 1030
+mem/0: location 1005 is 1031
 run/0: ingredient 1 is {name: "i", value: 5, type: 1, properties: ["i": "integer"]}
 mem/0: location 1006 is 1
-run/0: address to copy is 1032
-run/0: product 0 is 1032
-mem/0: storing 1032 in location 1008
+run/0: address to copy is 1033
+run/0: product 0 is 1033
+mem/0: storing 1033 in location 1008
 run/0: instruction init-array/17
 run/0: {name: "tmp", value: 7, type: 2-1, properties: ["tmp": "address":"location", "deref": ]} <- copy {name: "curr-value", value: 2, type: 1, properties: ["curr-value": "location"]}
 run/0: ingredient 0 is curr-value
 mem/0: location 1003 is 1
-mem/0: location 1008 is 1032
-mem/0: storing 1 in location 1032
+mem/0: location 1008 is 1033
+mem/0: storing 1 in location 1033
 run/0: instruction init-array/18
 run/0: {name: "i", value: 5, type: 1, properties: ["i": "integer"]} <- add {name: "i", value: 5, type: 1, properties: ["i": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
 run/0: ingredient 0 is i
@@ -226,18 +226,18 @@ 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 {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 1030
+mem/0: location 1005 is 1031
 run/0: ingredient 1 is {name: "i", value: 5, type: 1, properties: ["i": "integer"]}
 mem/0: location 1006 is 2
-run/0: address to copy is 1033
-run/0: product 0 is 1033
-mem/0: storing 1033 in location 1008
+run/0: address to copy is 1034
+run/0: product 0 is 1034
+mem/0: storing 1034 in location 1008
 run/0: instruction init-array/17
 run/0: {name: "tmp", value: 7, type: 2-1, properties: ["tmp": "address":"location", "deref": ]} <- copy {name: "curr-value", value: 2, type: 1, properties: ["curr-value": "location"]}
 run/0: ingredient 0 is curr-value
 mem/0: location 1003 is 2
-mem/0: location 1008 is 1033
-mem/0: storing 2 in location 1033
+mem/0: location 1008 is 1034
+mem/0: storing 2 in location 1034
 run/0: instruction init-array/18
 run/0: {name: "i", value: 5, type: 1, properties: ["i": "integer"]} <- add {name: "i", value: 5, type: 1, properties: ["i": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
 run/0: ingredient 0 is i
@@ -265,17 +265,17 @@ run/0: ingredient 1 is
 run/0: jumping to instruction 20
 run/0: instruction init-array/21
 run/0: reply {name: "result", value: 4, type: 2-5-1, properties: ["result": "address":"array":"location"]}
-mem/0: location 1005 is 1030
-run/0: result 0 is 1030
-mem/0: storing 1030 in location 1
+mem/0: location 1005 is 1031
+run/0: result 0 is 1031
+mem/0: storing 1031 in location 1
 run/0: instruction test-array-from-args/1
 run/0: {name: "2", value: 2, type: 5-1, properties: ["2": "array":"location"]} <- copy {name: "1", value: 1, type: 2-5-1, properties: ["1": "address":"array":"location", "deref": ]}
 run/0: ingredient 0 is 1
-mem/0: location 1 is 1030
-mem/0: location 1030 is 3
-mem/0: location 1031 is 0
-mem/0: location 1032 is 1
-mem/0: location 1033 is 2
+mem/0: location 1 is 1031
+mem/0: location 1031 is 3
+mem/0: location 1032 is 0
+mem/0: location 1033 is 1
+mem/0: location 1034 is 2
 mem/0: storing 3 in location 2
 mem/0: storing 0 in location 3
 mem/0: storing 1 in location 4