1242 - simpler implementation for 'scenario'

Also now has the side effect that scenarios can have any number of 'run'
or check or any future blocks, in any order.

1 files changed, 40 insertions, 5 deletions

diff --git a/cpp/.traces/integer-to-decimal-digit-positive b/cpp/.traces/integer-to-decimal-digit-positive
index df2d858d..69bbc01c 100644
--- a/cpp/.traces/integer-to-decimal-digit-positive
+++ b/cpp/.traces/integer-to-decimal-digit-positive
@@ -1,15 +1,40 @@
+parse/0: instruction: run
+parse/0:   ingredient: {name: "
+    1:address:array:character/raw <- integer-to-decimal-string 234:literal
+    2:array:character/raw <- copy 1:address:array:character/deref/raw
+  ", value: 0, type: 0, properties: ["
+    1:address:array:character/raw <- integer-to-decimal-string 234:literal
+    2:array:character/raw <- copy 1:address:array:character/deref/raw
+  ": "literal-string"]}
+parse/0: instruction: memory-should-contain
+parse/0:   ingredient: {name: "
+    2:string <- [234]
+  ", value: 0, type: 0, properties: ["
+    2:string <- [234]
+  ": "literal-string"]}
+after-brace/0: recipe integer-to-decimal-digit-positive
+after-brace/0: run ...
+after-brace/0: memory-should-contain ...
+new/0: routine allocated memory from 1000 to 101000
+schedule/0: integer-to-decimal-digit-positive
+run/0: instruction integer-to-decimal-digit-positive/0
+run/0: run {name: "
+    1:address:array:character/raw <- integer-to-decimal-string 234:literal
+    2:array:character/raw <- copy 1:address:array:character/deref/raw
+  ", value: 0, type: 0, properties: ["
+    1:address:array:character/raw <- integer-to-decimal-string 234:literal
+    2:array:character/raw <- copy 1:address:array:character/deref/raw
+  ": "literal-string"]}
 parse/0: instruction: integer-to-decimal-string
 parse/0:   ingredient: {name: "234", value: 0, type: 0, properties: ["234": "literal"]}
 parse/0:   product: {name: "1", value: 0, type: 2-5-4, properties: ["1": "address":"array":"character", "raw": ]}
 parse/0: instruction: copy
 parse/0:   ingredient: {name: "1", value: 0, type: 2-5-4, properties: ["1": "address":"array":"character", "deref": , "raw": ]}
 parse/0:   product: {name: "2", value: 0, type: 5-4, properties: ["2": "array":"character", "raw": ]}
-after-brace/0: recipe test-integer-to-decimal-digit-positive
+after-brace/0: recipe tmp0
 after-brace/0: integer-to-decimal-string ...
 after-brace/0: copy ...
-new/0: routine allocated memory from 1000 to 101000
-schedule/0: test-integer-to-decimal-digit-positive
-run/0: instruction test-integer-to-decimal-digit-positive/0
+run/0: instruction tmp0/0
 run/0: {name: "1", value: 1, type: 2-5-4, properties: ["1": "address":"array":"character", "raw": ]} <- integer-to-decimal-string {name: "234", value: 234, type: 0, properties: ["234": "literal"]}
 run/0: instruction integer-to-decimal-string/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"]}
@@ -788,7 +813,7 @@ run/0: reply {name: "result", value: 2, type: 2-5-4, properties: ["result": "add
 mem/0: location 1003 is 1281
 run/0: result 0 is 1281
 mem/0: storing 1281 in location 1
-run/0: instruction test-integer-to-decimal-digit-positive/1
+run/0: instruction tmp0/1
 run/0: {name: "2", value: 2, type: 5-4, properties: ["2": "array":"character", "raw": ]} <- copy {name: "1", value: 1, type: 2-5-4, properties: ["1": "address":"array":"character", "deref": , "raw": ]}
 run/0: ingredient 0 is 1
 mem/0: location 1 is 1281
@@ -800,3 +825,13 @@ mem/0: storing 3 in location 2
 mem/0: storing 50 in location 3
 mem/0: storing 51 in location 4
 mem/0: storing 52 in location 5
+run/0: instruction integer-to-decimal-digit-positive/1
+run/0: memory-should-contain {name: "
+    2:string <- [234]
+  ", value: 0, type: 0, properties: ["
+    2:string <- [234]
+  ": "literal-string"]}
+run/0: checking array length at 2
+run/0: checking location 3
+run/0: checking location 4
+run/0: checking location 5