1226 - bugfix in allocating arrays

Also our first test of printing to screen.

1 files changed, 75 insertions, 75 deletions

diff --git a/cpp/.traces/channel-new-empty-not-full b/cpp/.traces/channel-new-empty-not-full
index 46b69534..74584d36 100644
--- a/cpp/.traces/channel-new-empty-not-full
+++ b/cpp/.traces/channel-new-empty-not-full
@@ -21,34 +21,34 @@ mem/0: array size is 30
 mem/0: new alloc: 1000
 run/0: instruction init-channel/1
 run/0: {name: "result", value: 1, type: 2-10, properties: ["result": "address":"channel"]} <- new {name: "channel", value: 10, type: 0, properties: ["channel": "type"]}
-mem/0: new alloc: 1030
-mem/0: storing 1030 in location 1002
+mem/0: new alloc: 1031
+mem/0: storing 1031 in location 1002
 run/0: instruction init-channel/2
 run/0: {name: "full", value: 2, type: 2-1, properties: ["full": "address":"integer"]} <- get-address {name: "result", value: 1, type: 2-10, properties: ["result": "address":"channel", "deref": ]}, {name: "first-full", value: 0, type: 0, properties: ["first-full": "offset"]}
 run/0: ingredient 0 is result
-mem/0: location 1002 is 1030
+mem/0: location 1002 is 1031
 run/0: ingredient 1 is first-full
-run/0: address to copy is 1030
-run/0: product 0 is 1030
-mem/0: storing 1030 in location 1003
+run/0: address to copy is 1031
+run/0: product 0 is 1031
+mem/0: storing 1031 in location 1003
 run/0: instruction init-channel/3
 run/0: {name: "full", value: 2, type: 2-1, properties: ["full": "address":"integer", "deref": ]} <- copy {name: "0", value: 0, type: 0, properties: ["0": "literal"]}
 run/0: ingredient 0 is 0
-mem/0: location 1003 is 1030
-mem/0: storing 0 in location 1030
+mem/0: location 1003 is 1031
+mem/0: storing 0 in location 1031
 run/0: instruction init-channel/4
 run/0: {name: "free", value: 3, type: 2-1, properties: ["free": "address":"integer"]} <- get-address {name: "result", value: 1, type: 2-10, properties: ["result": "address":"channel", "deref": ]}, {name: "first-free", value: 1, type: 0, properties: ["first-free": "offset"]}
 run/0: ingredient 0 is result
-mem/0: location 1002 is 1030
+mem/0: location 1002 is 1031
 run/0: ingredient 1 is first-free
-run/0: address to copy is 1031
-run/0: product 0 is 1031
-mem/0: storing 1031 in location 1004
+run/0: address to copy is 1032
+run/0: product 0 is 1032
+mem/0: storing 1032 in location 1004
 run/0: instruction init-channel/5
 run/0: {name: "free", value: 3, type: 2-1, properties: ["free": "address":"integer", "deref": ]} <- copy {name: "0", value: 0, type: 0, properties: ["0": "literal"]}
 run/0: ingredient 0 is 0
-mem/0: location 1004 is 1031
-mem/0: storing 0 in location 1031
+mem/0: location 1004 is 1032
+mem/0: storing 0 in location 1032
 run/0: instruction init-channel/6
 run/0: {name: "capacity", value: 4, type: 1, properties: ["capacity": "integer"]} <- next-ingredient 
 run/0: product 0 is 3
@@ -63,159 +63,159 @@ mem/0: storing 4 in location 1005
 run/0: instruction init-channel/8
 run/0: {name: "dest", value: 5, type: 2-2-5-1, properties: ["dest": "address":"address":"array":"location"]} <- get-address {name: "result", value: 1, type: 2-10, properties: ["result": "address":"channel", "deref": ]}, {name: "data", value: 2, type: 0, properties: ["data": "offset"]}
 run/0: ingredient 0 is result
-mem/0: location 1002 is 1030
+mem/0: location 1002 is 1031
 run/0: ingredient 1 is data
-run/0: address to copy is 1032
-run/0: product 0 is 1032
-mem/0: storing 1032 in location 1006
+run/0: address to copy is 1033
+run/0: product 0 is 1033
+mem/0: storing 1033 in location 1006
 run/0: instruction init-channel/9
 run/0: {name: "dest", value: 5, type: 2-2-5-1, properties: ["dest": "address":"address":"array":"location", "deref": ]} <- new {name: "location", value: 1, type: 0, properties: ["location": "type"]}, {name: "capacity", value: 4, type: 1, properties: ["capacity": "integer"]}
 mem/0: location 1005 is 4
 mem/0: array size is 4
-mem/0: new alloc: 1033
-mem/0: location 1006 is 1032
-mem/0: storing 1033 in location 1032
+mem/0: new alloc: 1034
+mem/0: location 1006 is 1033
+mem/0: storing 1034 in location 1033
 run/0: instruction init-channel/10
 run/0: reply {name: "result", value: 1, type: 2-10, properties: ["result": "address":"channel"]}
-mem/0: location 1002 is 1030
-run/0: result 0 is 1030
-mem/0: storing 1030 in location 1
+mem/0: location 1002 is 1031
+run/0: result 0 is 1031
+mem/0: storing 1031 in location 1
 run/0: instruction test-channel-new-empty-not-full/1
 run/0: {name: "2", value: 2, type: 1, properties: ["2": "integer"]} <- channel-empty? {name: "1", value: 1, type: 2-10, properties: ["1": "address":"channel"]}
-mem/0: location 1 is 1030
+mem/0: location 1 is 1031
 run/0: instruction channel-empty?/0
 run/0: {name: "default-space", value: 0, type: 2-5-1, properties: ["default-space": "address":"array":"location"]} <- new {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: 1037
+mem/0: new alloc: 1039
 run/0: instruction channel-empty?/1
 run/0: {name: "chan", value: 1, type: 2-10, properties: ["chan": "address":"channel"]} <- next-ingredient 
-run/0: product 0 is 1030
-mem/0: storing 1030 in location 1039
+run/0: product 0 is 1031
+mem/0: storing 1031 in location 1041
 run/0: instruction channel-empty?/2
 run/0: {name: "full", value: 2, type: 1, properties: ["full": "integer"]} <- get {name: "chan", value: 1, type: 2-10, properties: ["chan": "address":"channel", "deref": ]}, {name: "first-full", value: 0, type: 0, properties: ["first-full": "offset"]}
 run/0: ingredient 0 is chan
-mem/0: location 1039 is 1030
+mem/0: location 1041 is 1031
 run/0: ingredient 1 is first-full
-run/0: address to copy is 1030
+run/0: address to copy is 1031
 run/0: its type is 1
-mem/0: location 1030 is 0
+mem/0: location 1031 is 0
 run/0: product 0 is 0
-mem/0: storing 0 in location 1040
+mem/0: storing 0 in location 1042
 run/0: instruction channel-empty?/3
 run/0: {name: "free", value: 3, type: 1, properties: ["free": "integer"]} <- get {name: "chan", value: 1, type: 2-10, properties: ["chan": "address":"channel", "deref": ]}, {name: "first-free", value: 1, type: 0, properties: ["first-free": "offset"]}
 run/0: ingredient 0 is chan
-mem/0: location 1039 is 1030
+mem/0: location 1041 is 1031
 run/0: ingredient 1 is first-free
-run/0: address to copy is 1031
+run/0: address to copy is 1032
 run/0: its type is 1
-mem/0: location 1031 is 0
+mem/0: location 1032 is 0
 run/0: product 0 is 0
-mem/0: storing 0 in location 1041
+mem/0: storing 0 in location 1043
 run/0: instruction channel-empty?/4
 run/0: {name: "result", value: 4, type: 3, properties: ["result": "boolean"]} <- equal {name: "full", value: 2, type: 1, properties: ["full": "integer"]}, {name: "free", value: 3, type: 1, properties: ["free": "integer"]}
 run/0: ingredient 0 is full
-mem/0: location 1040 is 0
+mem/0: location 1042 is 0
 run/0: ingredient 1 is free
-mem/0: location 1041 is 0
+mem/0: location 1043 is 0
 run/0: product 0 is 1
-mem/0: storing 1 in location 1042
+mem/0: storing 1 in location 1044
 run/0: instruction channel-empty?/5
 run/0: reply {name: "result", value: 4, type: 3, properties: ["result": "boolean"]}
-mem/0: location 1042 is 1
+mem/0: location 1044 is 1
 run/0: result 0 is 1
 mem/0: storing 1 in location 2
 run/0: instruction test-channel-new-empty-not-full/2
 run/0: {name: "3", value: 3, type: 1, properties: ["3": "integer"]} <- channel-full? {name: "1", value: 1, type: 2-10, properties: ["1": "address":"channel"]}
-mem/0: location 1 is 1030
+mem/0: location 1 is 1031
 run/0: instruction channel-full?/0
 run/0: {name: "default-space", value: 0, type: 2-5-1, properties: ["default-space": "address":"array":"location"]} <- new {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: 1067
+mem/0: new alloc: 1070
 run/0: instruction channel-full?/1
 run/0: {name: "chan", value: 1, type: 2-10, properties: ["chan": "address":"channel"]} <- next-ingredient 
-run/0: product 0 is 1030
-mem/0: storing 1030 in location 1069
+run/0: product 0 is 1031
+mem/0: storing 1031 in location 1072
 run/0: instruction channel-full?/2
 run/0: {name: "tmp", value: 2, type: 1, properties: ["tmp": "integer"]} <- get {name: "chan", value: 1, type: 2-10, properties: ["chan": "address":"channel", "deref": ]}, {name: "first-free", value: 1, type: 0, properties: ["first-free": "offset"]}
 run/0: ingredient 0 is chan
-mem/0: location 1069 is 1030
+mem/0: location 1072 is 1031
 run/0: ingredient 1 is first-free
-run/0: address to copy is 1031
+run/0: address to copy is 1032
 run/0: its type is 1
-mem/0: location 1031 is 0
+mem/0: location 1032 is 0
 run/0: product 0 is 0
-mem/0: storing 0 in location 1070
+mem/0: storing 0 in location 1073
 run/0: instruction channel-full?/3
 run/0: {name: "tmp", value: 2, type: 1, properties: ["tmp": "integer"]} <- add {name: "tmp", value: 2, type: 1, properties: ["tmp": "integer"]}, {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
 run/0: ingredient 0 is tmp
-mem/0: location 1070 is 0
+mem/0: location 1073 is 0
 run/0: ingredient 1 is 1
 run/0: product 0 is 1
-mem/0: storing 1 in location 1070
+mem/0: storing 1 in location 1073
 run/0: instruction channel-full?/5
 run/0: {name: "len", value: 3, type: 1, properties: ["len": "integer"]} <- channel-capacity {name: "chan", value: 1, type: 2-10, properties: ["chan": "address":"channel"]}
-mem/0: location 1069 is 1030
+mem/0: location 1072 is 1031
 run/0: instruction channel-capacity/0
 run/0: {name: "default-space", value: 0, type: 2-5-1, properties: ["default-space": "address":"array":"location"]} <- new {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: 1097
+mem/0: new alloc: 1101
 run/0: instruction channel-capacity/1
 run/0: {name: "chan", value: 1, type: 2-10, properties: ["chan": "address":"channel"]} <- next-ingredient 
-run/0: product 0 is 1030
-mem/0: storing 1030 in location 1099
+run/0: product 0 is 1031
+mem/0: storing 1031 in location 1103
 run/0: instruction channel-capacity/2
 run/0: {name: "q", value: 2, type: 2-5-1, properties: ["q": "address":"array":"location"]} <- get {name: "chan", value: 1, type: 2-10, properties: ["chan": "address":"channel", "deref": ]}, {name: "data", value: 2, type: 0, properties: ["data": "offset"]}
 run/0: ingredient 0 is chan
-mem/0: location 1099 is 1030
+mem/0: location 1103 is 1031
 run/0: ingredient 1 is data
-run/0: address to copy is 1032
+run/0: address to copy is 1033
 run/0: its type is 2
-mem/0: location 1032 is 1033
-run/0: product 0 is 1033
-mem/0: storing 1033 in location 1100
+mem/0: location 1033 is 1034
+run/0: product 0 is 1034
+mem/0: storing 1034 in location 1104
 run/0: instruction channel-capacity/3
 run/0: {name: "result", value: 3, type: 1, properties: ["result": "integer"]} <- length {name: "q", value: 2, type: 2-5-1, properties: ["q": "address":"array":"location", "deref": ]}
-mem/0: location 1100 is 1033
-mem/0: storing 4 in location 1101
+mem/0: location 1104 is 1034
+mem/0: storing 4 in location 1105
 run/0: instruction channel-capacity/4
 run/0: reply {name: "result", value: 3, type: 1, properties: ["result": "integer"]}
-mem/0: location 1101 is 4
+mem/0: location 1105 is 4
 run/0: result 0 is 4
-mem/0: storing 4 in location 1071
+mem/0: storing 4 in location 1074
 run/0: instruction channel-full?/6
 run/0: {name: "at-end?", value: 4, type: 3, properties: ["at-end?": "boolean"]} <- greater-or-equal {name: "tmp", value: 2, type: 1, properties: ["tmp": "integer"]}, {name: "len", value: 3, type: 1, properties: ["len": "integer"]}
 run/0: ingredient 0 is tmp
-mem/0: location 1070 is 1
+mem/0: location 1073 is 1
 run/0: ingredient 1 is len
-mem/0: location 1071 is 4
+mem/0: location 1074 is 4
 run/0: product 0 is 0
-mem/0: storing 0 in location 1072
+mem/0: storing 0 in location 1075
 run/0: instruction channel-full?/7
 run/0: break-unless {name: "at-end?", value: 4, type: 3, properties: ["at-end?": "boolean"]}, {name: "", value: 1, type: , properties: ["": ]}
-mem/0: location 1072 is 0
+mem/0: location 1075 is 0
 run/0: ingredient 0 is 0
 run/0: ingredient 1 is 
 run/0: jumping to instruction 9
 run/0: instruction channel-full?/10
 run/0: {name: "full", value: 5, type: 1, properties: ["full": "integer"]} <- get {name: "chan", value: 1, type: 2-10, properties: ["chan": "address":"channel", "deref": ]}, {name: "first-full", value: 0, type: 0, properties: ["first-full": "offset"]}
 run/0: ingredient 0 is chan
-mem/0: location 1069 is 1030
+mem/0: location 1072 is 1031
 run/0: ingredient 1 is first-full
-run/0: address to copy is 1030
+run/0: address to copy is 1031
 run/0: its type is 1
-mem/0: location 1030 is 0
+mem/0: location 1031 is 0
 run/0: product 0 is 0
-mem/0: storing 0 in location 1073
+mem/0: storing 0 in location 1076
 run/0: instruction channel-full?/11
 run/0: {name: "result", value: 6, type: 3, properties: ["result": "boolean"]} <- equal {name: "full", value: 5, type: 1, properties: ["full": "integer"]}, {name: "tmp", value: 2, type: 1, properties: ["tmp": "integer"]}
 run/0: ingredient 0 is full
-mem/0: location 1073 is 0
+mem/0: location 1076 is 0
 run/0: ingredient 1 is tmp
-mem/0: location 1070 is 1
+mem/0: location 1073 is 1
 run/0: product 0 is 0
-mem/0: storing 0 in location 1074
+mem/0: storing 0 in location 1077
 run/0: instruction channel-full?/12
 run/0: reply {name: "result", value: 6, type: 3, properties: ["result": "boolean"]}
-mem/0: location 1074 is 0
+mem/0: location 1077 is 0
 run/0: result 0 is 0
 mem/0: storing 0 in location 3