940 - c++: some changes to instruction model

1 files changed, 7 insertions, 7 deletions

diff --git a/cpp/.traces/and b/cpp/.traces/and
index 4bbf11c3..b487c4e4 100644
--- a/cpp/.traces/and
+++ b/cpp/.traces/and
@@ -1,13 +1,13 @@
 parse/0: instruction: 1
-parse/0:   ingredient: {name: "1", type: 0}
-parse/0:   product: {name: "1", type: 1}
+parse/0:   ingredient: {name: "1", value: 1, type: 0, properties: [1: literal]}
+parse/0:   product: {name: "1", value: 1, type: 1, properties: [1: integer]}
 parse/0: instruction: 1
-parse/0:   ingredient: {name: "0", type: 0}
-parse/0:   product: {name: "2", type: 1}
+parse/0:   ingredient: {name: "0", value: 0, type: 0, properties: [0: literal]}
+parse/0:   product: {name: "2", value: 2, type: 1, properties: [2: integer]}
 parse/0: instruction: 7
-parse/0:   ingredient: {name: "1", type: 1}
-parse/0:   ingredient: {name: "2", type: 1}
-parse/0:   product: {name: "3", type: 1}
+parse/0:   ingredient: {name: "1", value: 1, type: 1, properties: [1: integer]}
+parse/0:   ingredient: {name: "2", value: 2, type: 1, properties: [2: integer]}
+parse/0:   product: {name: "3", value: 3, type: 1, properties: [3: integer]}
 run/0: instruction main/0
 run/0: ingredient 0 is 1
 mem/0: storing in location 1