1253 - new notion of 'predefined globals in scenarios'

1 files changed, 11 insertions, 11 deletions

diff --git a/cpp/.traces/clear-line-erases-printed-characters2 b/cpp/.traces/clear-line-erases-printed-characters2
index 8c44d490..282bfe35 100644
--- a/cpp/.traces/clear-line-erases-printed-characters2
+++ b/cpp/.traces/clear-line-erases-printed-characters2
@@ -34,7 +34,7 @@ after-brace/0: screen-should-contain ...
 new/0: routine allocated memory from 1000 to 101000
 schedule/0: clear-line-erases-printed-characters2
 run/0: instruction clear-line-erases-printed-characters2/0
-run/0: {name: "screen", value: 999, type: 2, properties: ["screen": "address"]} <- assume-screen/115 {name: "5", value: 5, type: 0, properties: ["5": "literal", "width": ]}, {name: "3", value: 3, type: 0, properties: ["3": "literal", "height": ]}
+run/0: {name: "screen", value: 900, type: 2, properties: ["screen": "address"]} <- assume-screen/115 {name: "5", value: 5, type: 0, properties: ["5": "literal", "width": ]}, {name: "3", value: 3, type: 0, properties: ["3": "literal", "height": ]}
 run/0: instruction init-fake-screen/0
 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", "capacity": ]}
 mem/0: array size is 30
@@ -746,7 +746,7 @@ run/0: instruction init-fake-screen/14
 run/0: reply/33 {name: "result", value: 1, type: 2-11, properties: ["result": "address":"screen"]}
 mem/0: location 1002 is 1031
 run/0: result 0 is 1031
-mem/0: storing 1031 in location 999
+mem/0: storing 1031 in location 900
 run/0: instruction clear-line-erases-printed-characters2/1
 run/0: run/43 {name: "
     # print a character
@@ -780,8 +780,8 @@ after-brace/0: print-character ...
 after-brace/0: move-cursor ...
 after-brace/0: clear-line ...
 run/0: instruction run1001/0
-run/0: {name: "screen", value: 999, type: 2, properties: ["screen": "address"]} <- print-character/117 {name: "screen", value: 999, type: 2, properties: ["screen": "address"]}, {name: "97", value: 97, type: 0, properties: ["97": "literal"]}
-mem/0: location 999 is 1031
+run/0: {name: "screen", value: 900, type: 2, properties: ["screen": "address"]} <- print-character/117 {name: "screen", value: 900, type: 2, properties: ["screen": "address"]}, {name: "97", value: 97, type: 0, properties: ["97": "literal"]}
+mem/0: location 900 is 1031
 run/0: instruction print-character/0
 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
@@ -896,10 +896,10 @@ run/0: instruction print-character/18
 run/0: reply/33 {name: "x", value: 1, type: 2-11, properties: ["x": "address":"screen", "same-as-ingredient": "0"]}
 mem/0: location 1085 is 1031
 run/0: result 0 is 1031
-mem/0: storing 1031 in location 999
+mem/0: storing 1031 in location 900
 run/0: instruction run1001/1
-run/0: {name: "screen", value: 999, type: 2, properties: ["screen": "address"]} <- move-cursor/120 {name: "screen", value: 999, type: 2, properties: ["screen": "address"]}, {name: "0", value: 0, type: 0, properties: ["0": "literal", "row": ]}, {name: "0", value: 0, type: 0, properties: ["0": "literal", "column": ]}
-mem/0: location 999 is 1031
+run/0: {name: "screen", value: 900, type: 2, properties: ["screen": "address"]} <- move-cursor/120 {name: "screen", value: 900, type: 2, properties: ["screen": "address"]}, {name: "0", value: 0, type: 0, properties: ["0": "literal", "row": ]}, {name: "0", value: 0, type: 0, properties: ["0": "literal", "column": ]}
+mem/0: location 900 is 1031
 run/0: instruction move-cursor/0
 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
@@ -953,10 +953,10 @@ run/0: instruction move-cursor/10
 run/0: reply/33 {name: "x", value: 1, type: 2-11, properties: ["x": "address":"screen", "same-as-ingredient": "0"]}
 mem/0: location 1116 is 1031
 run/0: result 0 is 1031
-mem/0: storing 1031 in location 999
+mem/0: storing 1031 in location 900
 run/0: instruction run1001/2
-run/0: {name: "screen", value: 999, type: 2, properties: ["screen": "address"]} <- clear-line/118 {name: "screen", value: 999, type: 2, properties: ["screen": "address"]}
-mem/0: location 999 is 1031
+run/0: {name: "screen", value: 900, type: 2, properties: ["screen": "address"]} <- clear-line/118 {name: "screen", value: 900, type: 2, properties: ["screen": "address"]}
+mem/0: location 900 is 1031
 run/0: instruction clear-line/0
 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
@@ -1689,7 +1689,7 @@ run/0: instruction clear-line/14
 run/0: reply/33 {name: "x", value: 1, type: 2-11, properties: ["x": "address":"screen", "same-as-ingredient": "0"]}
 mem/0: location 1147 is 1031
 run/0: result 0 is 1031
-mem/0: storing 1031 in location 999
+mem/0: storing 1031 in location 900
 run/0: instruction clear-line-erases-printed-characters2/2
 run/0: screen-should-contain/59 {name: "
     .     .