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, 0 insertions, 210 deletions

diff --git a/cpp/.traces/factorial-test b/cpp/.traces/factorial-test
deleted file mode 100644
index 1729d718..00000000
--- a/cpp/.traces/factorial-test
+++ /dev/null
@@ -1,210 +0,0 @@
-parse/0: instruction: 108
-parse/0:   ingredient: {name: "5", value: 0, type: 0, properties: ["5": "literal"]}
-parse/0:   product: {name: "1", value: 0, type: 1, properties: ["1": "integer"]}
-after-brace/0: recipe test-factorial-test
-after-brace/0: factorial ...
-run/0: instruction test-factorial-test/0
-run/0: instruction factorial/0
-mem/0: new alloc: 1000
-mem/0: array size is 30
-run/0: instruction factorial/1
-run/0: product 0 is 5
-mem/0: storing 5 in location 1002
-run/0: instruction factorial/3
-run/0: ingredient 0 is n
-mem/0: location 1002 is 5
-run/0: ingredient 1 is 0
-run/0: product 0 is 0
-mem/0: storing 0 in location 1003
-run/0: instruction factorial/4
-mem/0: location 1003 is 0
-run/0: ingredient 0 is 0
-run/0: ingredient 1 is 
-run/0: jumping to instruction 6
-run/0: instruction factorial/7
-run/0: ingredient 0 is n
-mem/0: location 1002 is 5
-run/0: ingredient 1 is 1
-run/0: product 0 is 4
-mem/0: storing 4 in location 1004
-run/0: instruction factorial/8
-mem/0: location 1004 is 4
-run/0: instruction factorial/0
-mem/0: new alloc: 1030
-mem/0: array size is 30
-run/0: instruction factorial/1
-run/0: product 0 is 4
-mem/0: storing 4 in location 1032
-run/0: instruction factorial/3
-run/0: ingredient 0 is n
-mem/0: location 1032 is 4
-run/0: ingredient 1 is 0
-run/0: product 0 is 0
-mem/0: storing 0 in location 1033
-run/0: instruction factorial/4
-mem/0: location 1033 is 0
-run/0: ingredient 0 is 0
-run/0: ingredient 1 is 
-run/0: jumping to instruction 6
-run/0: instruction factorial/7
-run/0: ingredient 0 is n
-mem/0: location 1032 is 4
-run/0: ingredient 1 is 1
-run/0: product 0 is 3
-mem/0: storing 3 in location 1034
-run/0: instruction factorial/8
-mem/0: location 1034 is 3
-run/0: instruction factorial/0
-mem/0: new alloc: 1060
-mem/0: array size is 30
-run/0: instruction factorial/1
-run/0: product 0 is 3
-mem/0: storing 3 in location 1062
-run/0: instruction factorial/3
-run/0: ingredient 0 is n
-mem/0: location 1062 is 3
-run/0: ingredient 1 is 0
-run/0: product 0 is 0
-mem/0: storing 0 in location 1063
-run/0: instruction factorial/4
-mem/0: location 1063 is 0
-run/0: ingredient 0 is 0
-run/0: ingredient 1 is 
-run/0: jumping to instruction 6
-run/0: instruction factorial/7
-run/0: ingredient 0 is n
-mem/0: location 1062 is 3
-run/0: ingredient 1 is 1
-run/0: product 0 is 2
-mem/0: storing 2 in location 1064
-run/0: instruction factorial/8
-mem/0: location 1064 is 2
-run/0: instruction factorial/0
-mem/0: new alloc: 1090
-mem/0: array size is 30
-run/0: instruction factorial/1
-run/0: product 0 is 2
-mem/0: storing 2 in location 1092
-run/0: instruction factorial/3
-run/0: ingredient 0 is n
-mem/0: location 1092 is 2
-run/0: ingredient 1 is 0
-run/0: product 0 is 0
-mem/0: storing 0 in location 1093
-run/0: instruction factorial/4
-mem/0: location 1093 is 0
-run/0: ingredient 0 is 0
-run/0: ingredient 1 is 
-run/0: jumping to instruction 6
-run/0: instruction factorial/7
-run/0: ingredient 0 is n
-mem/0: location 1092 is 2
-run/0: ingredient 1 is 1
-run/0: product 0 is 1
-mem/0: storing 1 in location 1094
-run/0: instruction factorial/8
-mem/0: location 1094 is 1
-run/0: instruction factorial/0
-mem/0: new alloc: 1120
-mem/0: array size is 30
-run/0: instruction factorial/1
-run/0: product 0 is 1
-mem/0: storing 1 in location 1122
-run/0: instruction factorial/3
-run/0: ingredient 0 is n
-mem/0: location 1122 is 1
-run/0: ingredient 1 is 0
-run/0: product 0 is 0
-mem/0: storing 0 in location 1123
-run/0: instruction factorial/4
-mem/0: location 1123 is 0
-run/0: ingredient 0 is 0
-run/0: ingredient 1 is 
-run/0: jumping to instruction 6
-run/0: instruction factorial/7
-run/0: ingredient 0 is n
-mem/0: location 1122 is 1
-run/0: ingredient 1 is 1
-run/0: product 0 is 0
-mem/0: storing 0 in location 1124
-run/0: instruction factorial/8
-mem/0: location 1124 is 0
-run/0: instruction factorial/0
-mem/0: new alloc: 1150
-mem/0: array size is 30
-run/0: instruction factorial/1
-run/0: product 0 is 0
-mem/0: storing 0 in location 1152
-run/0: instruction factorial/3
-run/0: ingredient 0 is n
-mem/0: location 1152 is 0
-run/0: ingredient 1 is 0
-run/0: product 0 is 1
-mem/0: storing 1 in location 1153
-run/0: instruction factorial/4
-mem/0: location 1153 is 1
-run/0: ingredient 0 is 1
-run/0: jump-unless fell through
-run/0: instruction factorial/5
-run/0: result 0 is 1
-mem/0: storing 1 in location 1125
-run/0: instruction factorial/9
-run/0: ingredient 0 is subresult
-mem/0: location 1125 is 1
-run/0: ingredient 1 is n
-mem/0: location 1122 is 1
-run/0: ingredient 1 is 1
-run/0: product 0 is 1
-mem/0: storing 1 in location 1126
-run/0: instruction factorial/10
-mem/0: location 1126 is 1
-run/0: result 0 is 1
-mem/0: storing 1 in location 1095
-run/0: instruction factorial/9
-run/0: ingredient 0 is subresult
-mem/0: location 1095 is 1
-run/0: ingredient 1 is n
-mem/0: location 1092 is 2
-run/0: ingredient 1 is 2
-run/0: product 0 is 2
-mem/0: storing 2 in location 1096
-run/0: instruction factorial/10
-mem/0: location 1096 is 2
-run/0: result 0 is 2
-mem/0: storing 2 in location 1065
-run/0: instruction factorial/9
-run/0: ingredient 0 is subresult
-mem/0: location 1065 is 2
-run/0: ingredient 1 is n
-mem/0: location 1062 is 3
-run/0: ingredient 1 is 3
-run/0: product 0 is 6
-mem/0: storing 6 in location 1066
-run/0: instruction factorial/10
-mem/0: location 1066 is 6
-run/0: result 0 is 6
-mem/0: storing 6 in location 1035
-run/0: instruction factorial/9
-run/0: ingredient 0 is subresult
-mem/0: location 1035 is 6
-run/0: ingredient 1 is n
-mem/0: location 1032 is 4
-run/0: ingredient 1 is 4
-run/0: product 0 is 24
-mem/0: storing 24 in location 1036
-run/0: instruction factorial/10
-mem/0: location 1036 is 24
-run/0: result 0 is 24
-mem/0: storing 24 in location 1005
-run/0: instruction factorial/9
-run/0: ingredient 0 is subresult
-mem/0: location 1005 is 24
-run/0: ingredient 1 is n
-mem/0: location 1002 is 5
-run/0: ingredient 1 is 5
-run/0: product 0 is 120
-mem/0: storing 120 in location 1006
-run/0: instruction factorial/10
-mem/0: location 1006 is 120
-run/0: result 0 is 120
-mem/0: storing 120 in location 1