804 - reagent can have multiple types

5 files changed, 28 insertions, 29 deletions

diff --git a/cpp/.traces/copy_multiple_locations b/cpp/.traces/copy_multiple_locations
index d721dafb..9711636e 100644
--- a/cpp/.traces/copy_multiple_locations
+++ b/cpp/.traces/copy_multiple_locations
@@ -3,10 +3,10 @@ parse/0:   ingredient: {name: "34", type: 0}
 parse/0:   product: {name: "1", type: 1}
 parse/0: instruction: 1
 parse/0:   ingredient: {name: "0", type: 0}
-parse/0:   product: {name: "2", type: 2}
+parse/0:   product: {name: "2", type: 3}
 parse/0: instruction: 1
-parse/0:   ingredient: {name: "1", type: 3}
-parse/0:   product: {name: "3", type: 3}
+parse/0:   ingredient: {name: "1", type: 4}
+parse/0:   product: {name: "3", type: 4}
 run/0: instruction 0
 run/0: ingredient 0 is 34
 mem/0: storing in location 1
diff --git a/cpp/.traces/get b/cpp/.traces/get
index 019070c2..38ec2a4c 100644
--- a/cpp/.traces/get
+++ b/cpp/.traces/get
@@ -3,11 +3,11 @@ parse/0:   ingredient: {name: "34", type: 0}
 parse/0:   product: {name: "12", type: 1}
 parse/0: instruction: 1
 parse/0:   ingredient: {name: "0", type: 0}
-parse/0:   product: {name: "13", type: 2}
+parse/0:   product: {name: "13", type: 3}
 parse/0: instruction: 18
-parse/0:   ingredient: {name: "12", type: 3}
+parse/0:   ingredient: {name: "12", type: 4}
 parse/0:   ingredient: {name: "1", type: 0}
-parse/0:   product: {name: "15", type: 2}
+parse/0:   product: {name: "15", type: 3}
 run/0: instruction 0
 run/0: ingredient 0 is 34
 mem/0: storing in location 12
@@ -17,10 +17,10 @@ mem/0: storing in location 13
 run/0: instruction 2
 run/0: ingredient 0 is 12
 run/0: base address 12
-run/0: base type is 3
+run/0: base type is 4
 run/0: ingredient 1 is 1
 run/0: address to copy is 13
-run/0: its type is 2
+run/0: its type is 3
 mem/0: location 13 is 0
 run/0: product 0 is 0
 mem/0: storing in location 15
diff --git a/cpp/.traces/get_address b/cpp/.traces/get_address
index 359df5d0..2635ebe0 100644
--- a/cpp/.traces/get_address
+++ b/cpp/.traces/get_address
@@ -3,17 +3,11 @@ parse/0:   ingredient: {name: "34", type: 0}
 parse/0:   product: {name: "12", type: 1}
 parse/0: instruction: 1
 parse/0:   ingredient: {name: "0", type: 0}
-parse/0:   product: {name: "13", type: 2}
+parse/0:   product: {name: "13", type: 3}
 parse/0: instruction: 19
-parse/0:   ingredient: {name: "12", type: 3}
+parse/0:   ingredient: {name: "12", type: 4}
 parse/0:   ingredient: {name: "1", type: 0}
-parse/0:   ingredient: {name: "#", type: 0}
-parse/0:   ingredient: {name: "todo", type: 0}
-parse/0:   ingredient: {name: "product", type: 0}
-parse/0:   ingredient: {name: "is", type: 0}
-parse/0:   ingredient: {name: "an", type: 0}
-parse/0:   ingredient: {name: "address", type: 0}
-parse/0:   product: {name: "15", type: 1}
+parse/0:   product: {name: "15", type: 2-1}
 run/0: instruction 0
 run/0: ingredient 0 is 34
 mem/0: storing in location 12
@@ -23,7 +17,7 @@ mem/0: storing in location 13
 run/0: instruction 2
 run/0: ingredient 0 is 12
 run/0: base address 12
-run/0: base type is 3
+run/0: base type is 4
 run/0: ingredient 1 is 1
 run/0: address to copy is 13
 run/0: product 0 is 13
diff --git a/cpp/.traces/jump_backward b/cpp/.traces/jump_backward
index 18a79084..033b1dfd 100644
--- a/cpp/.traces/jump_backward
+++ b/cpp/.traces/jump_backward
@@ -1,20 +1,20 @@
 parse/0: instruction: 10
 parse/0:   ingredient: {name: "1", type: 0}
-parse/0:   ingredient: {name: "//", type: 0}
-parse/0:   ingredient: {name: "0", type: 0}
-parse/0:   ingredient: {name: "-+", type: 0}
+parse/0:   ingredient: {name: "//", type: }
+parse/0:   ingredient: {name: "0", type: }
+parse/0:   ingredient: {name: "-+", type: }
 parse/0: instruction: 10
 parse/0:   ingredient: {name: "1", type: 0}
-parse/0:   ingredient: {name: "//", type: 0}
-parse/0:   ingredient: {name: "|", type: 0}
-parse/0:   ingredient: {name: "1", type: 0}
-parse/0:   ingredient: {name: "+-+", type: 0}
+parse/0:   ingredient: {name: "//", type: }
+parse/0:   ingredient: {name: "|", type: }
+parse/0:   ingredient: {name: "1", type: }
+parse/0:   ingredient: {name: "+-+", type: }
 parse/0: instruction: 10
 parse/0:   ingredient: {name: "-2", type: 0}
-parse/0:   ingredient: {name: "//", type: 0}
-parse/0:   ingredient: {name: "2", type: 0}
-parse/0:   ingredient: {name: "+-->+", type: 0}
-parse/0:   ingredient: {name: "|", type: 0}
+parse/0:   ingredient: {name: "//", type: }
+parse/0:   ingredient: {name: "2", type: }
+parse/0:   ingredient: {name: "+-->+", type: }
+parse/0:   ingredient: {name: "|", type: }
 run/0: instruction 0
 run/0: ingredient 0 is 1
 run/0: instruction 2
diff --git a/cpp/.traces/parse_multiple_types b/cpp/.traces/parse_multiple_types
new file mode 100644
index 00000000..319aad1f
--- /dev/null
+++ b/cpp/.traces/parse_multiple_types
@@ -0,0 +1,5 @@
+parse/0: instruction: 1
+parse/0:   ingredient: {name: "23", type: 0}
+parse/0:   ingredient: {name: "4", type: 1}
+parse/0:   product: {name: "1", type: 1}
+parse/0:   product: {name: "2", type: 2-1}