2282

Switch format for tracing reagents in preparation for trees rather than
arrays of properties.

1 files changed, 28 insertions, 28 deletions

diff --git a/011load.cc b/011load.cc
index 44d906a3..19756fc1 100644
--- a/011load.cc
+++ b/011load.cc
@@ -6,8 +6,8 @@ recipe main [
   1:number <- copy 23
 ]
 +parse: instruction: copy
-+parse:   ingredient: {name: "23", properties: ["23": "literal"]}
-+parse:   product: {name: "1", properties: ["1": "number"]}
++parse:   ingredient: {"23": "literal"}
++parse:   product: {"1": "number"}
 
 :(code)
 vector<recipe_ordinal> load(string form) {
@@ -254,8 +254,8 @@ recipe main [
   1:number <- copy 23
 ]
 +parse: instruction: copy
-+parse:   ingredient: {name: "23", properties: ["23": "literal"]}
-+parse:   product: {name: "1", properties: ["1": "number"]}
++parse:   ingredient: {"23": "literal"}
++parse:   product: {"1": "number"}
 
 :(scenario parse_comment_amongst_instruction)
 recipe main [
@@ -263,8 +263,8 @@ recipe main [
   1:number <- copy 23
 ]
 +parse: instruction: copy
-+parse:   ingredient: {name: "23", properties: ["23": "literal"]}
-+parse:   product: {name: "1", properties: ["1": "number"]}
++parse:   ingredient: {"23": "literal"}
++parse:   product: {"1": "number"}
 
 :(scenario parse_comment_amongst_instruction_2)
 recipe main [
@@ -273,8 +273,8 @@ recipe main [
   # comment
 ]
 +parse: instruction: copy
-+parse:   ingredient: {name: "23", properties: ["23": "literal"]}
-+parse:   product: {name: "1", properties: ["1": "number"]}
++parse:   ingredient: {"23": "literal"}
++parse:   product: {"1": "number"}
 
 :(scenario parse_comment_amongst_instruction_3)
 recipe main [
@@ -283,19 +283,19 @@ recipe main [
   2:number <- copy 23
 ]
 +parse: instruction: copy
-+parse:   ingredient: {name: "23", properties: ["23": "literal"]}
-+parse:   product: {name: "1", properties: ["1": "number"]}
++parse:   ingredient: {"23": "literal"}
++parse:   product: {"1": "number"}
 +parse: instruction: copy
-+parse:   ingredient: {name: "23", properties: ["23": "literal"]}
-+parse:   product: {name: "2", properties: ["2": "number"]}
++parse:   ingredient: {"23": "literal"}
++parse:   product: {"2": "number"}
 
 :(scenario parse_comment_after_instruction)
 recipe main [
   1:number <- copy 23  # comment
 ]
 +parse: instruction: copy
-+parse:   ingredient: {name: "23", properties: ["23": "literal"]}
-+parse:   product: {name: "1", properties: ["1": "number"]}
++parse:   ingredient: {"23": "literal"}
++parse:   product: {"1": "number"}
 
 :(scenario parse_label)
 recipe main [
@@ -314,43 +314,43 @@ recipe main [
   1:number <- copy 23/foo:bar:baz
 ]
 +parse: instruction: copy
-+parse:   ingredient: {name: "23", properties: ["23": "literal", "foo": "bar":"baz"]}
-+parse:   product: {name: "1", properties: ["1": "number"]}
++parse:   ingredient: {"23": "literal", "foo": <"bar" : "baz">}
++parse:   product: {"1": "number"}
 
 :(scenario parse_multiple_products)
 recipe main [
   1:number, 2:number <- copy 23
 ]
 +parse: instruction: copy
-+parse:   ingredient: {name: "23", properties: ["23": "literal"]}
-+parse:   product: {name: "1", properties: ["1": "number"]}
-+parse:   product: {name: "2", properties: ["2": "number"]}
++parse:   ingredient: {"23": "literal"}
++parse:   product: {"1": "number"}
++parse:   product: {"2": "number"}
 
 :(scenario parse_multiple_ingredients)
 recipe main [
   1:number, 2:number <- copy 23, 4:number
 ]
 +parse: instruction: copy
-+parse:   ingredient: {name: "23", properties: ["23": "literal"]}
-+parse:   ingredient: {name: "4", properties: ["4": "number"]}
-+parse:   product: {name: "1", properties: ["1": "number"]}
-+parse:   product: {name: "2", properties: ["2": "number"]}
++parse:   ingredient: {"23": "literal"}
++parse:   ingredient: {"4": "number"}
++parse:   product: {"1": "number"}
++parse:   product: {"2": "number"}
 
 :(scenario parse_multiple_types)
 recipe main [
   1:number, 2:address:number <- copy 23, 4:number
 ]
 +parse: instruction: copy
-+parse:   ingredient: {name: "23", properties: ["23": "literal"]}
-+parse:   ingredient: {name: "4", properties: ["4": "number"]}
-+parse:   product: {name: "1", properties: ["1": "number"]}
-+parse:   product: {name: "2", properties: ["2": "address":"number"]}
++parse:   ingredient: {"23": "literal"}
++parse:   ingredient: {"4": "number"}
++parse:   product: {"1": "number"}
++parse:   product: {"2": <"address" : "number">}
 
 :(scenario parse_properties)
 recipe main [
   1:number:address/lookup <- copy 23
 ]
-+parse:   product: {name: "1", properties: ["1": "number":"address", "lookup": ]}
++parse:   product: {"1": <"number" : "address">, "lookup": ""}
 
 //: this test we can't represent with a scenario
 :(code)