1013

21 files changed, 35 insertions, 35 deletions

diff --git a/cpp/.traces/array_length b/cpp/.traces/array_length
index 45e8181d..c9f0863f 100644
--- a/cpp/.traces/array_length
+++ b/cpp/.traces/array_length
@@ -11,7 +11,7 @@ parse/0: instruction: 1
 parse/0:   ingredient: {name: "16", value: 0, type: 0, properties: ["16": "literal"]}
 parse/0:   product: {name: "4", value: 0, type: 1, properties: ["4": "integer"]}
 parse/0: instruction: 25
-parse/0:   ingredient: {name: "1", value: 0, type: 4-1, properties: ["1": "array":"integer"]}
+parse/0:   ingredient: {name: "1", value: 0, type: 5-1, properties: ["1": "array":"integer"]}
 parse/0:   product: {name: "5", value: 0, type: 1, properties: ["5": "integer"]}
 after-brace/0: recipe main
 after-brace/0: copy ...
diff --git a/cpp/.traces/convert_names_handles_records b/cpp/.traces/convert_names_handles_records
index 7cc1c8bb..0073519a 100644
--- a/cpp/.traces/convert_names_handles_records
+++ b/cpp/.traces/convert_names_handles_records
@@ -1,6 +1,6 @@
 parse/0: instruction: 1
 parse/0:   ingredient: {name: "0", value: 0, type: 0, properties: ["0": "literal"]}
-parse/0:   product: {name: "a", value: 0, type: 5, properties: ["a": "point"]}
+parse/0:   product: {name: "a", value: 0, type: 6, properties: ["a": "point"]}
 parse/0: instruction: 1
 parse/0:   ingredient: {name: "0", value: 0, type: 0, properties: ["0": "literal"]}
 parse/0:   product: {name: "b", value: 0, type: 1, properties: ["b": "integer"]}
diff --git a/cpp/.traces/convert_names_transforms_record_elements b/cpp/.traces/convert_names_transforms_record_elements
index fca15808..7711e827 100644
--- a/cpp/.traces/convert_names_transforms_record_elements
+++ b/cpp/.traces/convert_names_transforms_record_elements
@@ -1,9 +1,9 @@
 parse/0: instruction: 18
-parse/0:   ingredient: {name: "0", value: 0, type: 5, properties: ["0": "point"]}
+parse/0:   ingredient: {name: "0", value: 0, type: 6, properties: ["0": "point"]}
 parse/0:   ingredient: {name: "y", value: 0, type: 0, properties: ["y": "offset"]}
 parse/0:   product: {name: "a", value: 0, type: 1, properties: ["a": "integer"]}
 parse/0: instruction: 18
-parse/0:   ingredient: {name: "0", value: 0, type: 5, properties: ["0": "point"]}
+parse/0:   ingredient: {name: "0", value: 0, type: 6, properties: ["0": "point"]}
 parse/0:   ingredient: {name: "x", value: 0, type: 0, properties: ["x": "offset"]}
 parse/0:   product: {name: "b", value: 0, type: 1, properties: ["b": "integer"]}
 name/0: field y of type point is at offset 1
diff --git a/cpp/.traces/copy_array b/cpp/.traces/copy_array
index 3fa366c5..57491c4c 100644
--- a/cpp/.traces/copy_array
+++ b/cpp/.traces/copy_array
@@ -11,8 +11,8 @@ parse/0: instruction: 1
 parse/0:   ingredient: {name: "16", value: 0, type: 0, properties: ["16": "literal"]}
 parse/0:   product: {name: "4", value: 0, type: 1, properties: ["4": "integer"]}
 parse/0: instruction: 1
-parse/0:   ingredient: {name: "1", value: 0, type: 4-1, properties: ["1": "array":"integer"]}
-parse/0:   product: {name: "5", value: 0, type: 4-1, properties: ["5": "array":"integer"]}
+parse/0:   ingredient: {name: "1", value: 0, type: 5-1, properties: ["1": "array":"integer"]}
+parse/0:   product: {name: "5", value: 0, type: 5-1, properties: ["5": "array":"integer"]}
 after-brace/0: recipe main
 after-brace/0: copy ...
 after-brace/0: copy ...
diff --git a/cpp/.traces/copy_handles_nested_record_elements b/cpp/.traces/copy_handles_nested_record_elements
index 62861f27..8ca9a547 100644
--- a/cpp/.traces/copy_handles_nested_record_elements
+++ b/cpp/.traces/copy_handles_nested_record_elements
@@ -8,8 +8,8 @@ parse/0: instruction: 1
 parse/0:   ingredient: {name: "36", value: 0, type: 0, properties: ["36": "literal"]}
 parse/0:   product: {name: "14", value: 0, type: 1, properties: ["14": "integer"]}
 parse/0: instruction: 1
-parse/0:   ingredient: {name: "12", value: 0, type: 6, properties: ["12": "point-integer"]}
-parse/0:   product: {name: "15", value: 0, type: 6, properties: ["15": "point-integer"]}
+parse/0:   ingredient: {name: "12", value: 0, type: 7, properties: ["12": "point-integer"]}
+parse/0:   product: {name: "15", value: 0, type: 7, properties: ["15": "point-integer"]}
 after-brace/0: recipe main
 after-brace/0: copy ...
 after-brace/0: copy ...
diff --git a/cpp/.traces/copy_multiple_locations b/cpp/.traces/copy_multiple_locations
index 2012361e..0633b157 100644
--- a/cpp/.traces/copy_multiple_locations
+++ b/cpp/.traces/copy_multiple_locations
@@ -5,8 +5,8 @@ parse/0: instruction: 1
 parse/0:   ingredient: {name: "35", value: 0, type: 0, properties: ["35": "literal"]}
 parse/0:   product: {name: "2", value: 0, type: 1, properties: ["2": "integer"]}
 parse/0: instruction: 1
-parse/0:   ingredient: {name: "1", value: 0, type: 5, properties: ["1": "point"]}
-parse/0:   product: {name: "3", value: 0, type: 5, properties: ["3": "point"]}
+parse/0:   ingredient: {name: "1", value: 0, type: 6, properties: ["1": "point"]}
+parse/0:   product: {name: "3", value: 0, type: 6, properties: ["3": "point"]}
 after-brace/0: recipe main
 after-brace/0: copy ...
 after-brace/0: copy ...
diff --git a/cpp/.traces/get b/cpp/.traces/get
index 683c03fd..39778dbf 100644
--- a/cpp/.traces/get
+++ b/cpp/.traces/get
@@ -5,7 +5,7 @@ parse/0: instruction: 1
 parse/0:   ingredient: {name: "35", value: 0, type: 0, properties: ["35": "literal"]}
 parse/0:   product: {name: "13", value: 0, type: 1, properties: ["13": "integer"]}
 parse/0: instruction: 18
-parse/0:   ingredient: {name: "12", value: 0, type: 5, properties: ["12": "point"]}
+parse/0:   ingredient: {name: "12", value: 0, type: 6, properties: ["12": "point"]}
 parse/0:   ingredient: {name: "1", value: 0, type: 0, properties: ["1": "offset"]}
 parse/0:   product: {name: "15", value: 0, type: 1, properties: ["15": "integer"]}
 after-brace/0: recipe main
diff --git a/cpp/.traces/get_address b/cpp/.traces/get_address
index 3ec7c7bc..1a37c192 100644
--- a/cpp/.traces/get_address
+++ b/cpp/.traces/get_address
@@ -5,7 +5,7 @@ parse/0: instruction: 1
 parse/0:   ingredient: {name: "35", value: 0, type: 0, properties: ["35": "literal"]}
 parse/0:   product: {name: "13", value: 0, type: 1, properties: ["13": "integer"]}
 parse/0: instruction: 19
-parse/0:   ingredient: {name: "12", value: 0, type: 5, properties: ["12": "point"]}
+parse/0:   ingredient: {name: "12", value: 0, type: 6, properties: ["12": "point"]}
 parse/0:   ingredient: {name: "1", value: 0, type: 0, properties: ["1": "offset"]}
 parse/0:   product: {name: "15", value: 0, type: 2-1, properties: ["15": "address":"integer"]}
 after-brace/0: recipe main
diff --git a/cpp/.traces/get_address_indirect b/cpp/.traces/get_address_indirect
index c7a2dfd7..2f2af58b 100644
--- a/cpp/.traces/get_address_indirect
+++ b/cpp/.traces/get_address_indirect
@@ -8,7 +8,7 @@ parse/0: instruction: 1
 parse/0:   ingredient: {name: "35", value: 0, type: 0, properties: ["35": "literal"]}
 parse/0:   product: {name: "3", value: 0, type: 1, properties: ["3": "integer"]}
 parse/0: instruction: 19
-parse/0:   ingredient: {name: "1", value: 0, type: 2-5, properties: ["1": "address":"point", "deref": ]}
+parse/0:   ingredient: {name: "1", value: 0, type: 2-6, properties: ["1": "address":"point", "deref": ]}
 parse/0:   ingredient: {name: "0", value: 0, type: 0, properties: ["0": "offset"]}
 parse/0:   product: {name: "4", value: 0, type: 1, properties: ["4": "integer"]}
 after-brace/0: recipe main
diff --git a/cpp/.traces/get_handles_nested_record_elements b/cpp/.traces/get_handles_nested_record_elements
index e048dbd2..4334fc26 100644
--- a/cpp/.traces/get_handles_nested_record_elements
+++ b/cpp/.traces/get_handles_nested_record_elements
@@ -8,7 +8,7 @@ parse/0: instruction: 1
 parse/0:   ingredient: {name: "36", value: 0, type: 0, properties: ["36": "literal"]}
 parse/0:   product: {name: "14", value: 0, type: 1, properties: ["14": "integer"]}
 parse/0: instruction: 18
-parse/0:   ingredient: {name: "12", value: 0, type: 6, properties: ["12": "point-integer"]}
+parse/0:   ingredient: {name: "12", value: 0, type: 7, properties: ["12": "point-integer"]}
 parse/0:   ingredient: {name: "1", value: 0, type: 0, properties: ["1": "offset"]}
 parse/0:   product: {name: "15", value: 0, type: 1, properties: ["15": "integer"]}
 after-brace/0: recipe main
diff --git a/cpp/.traces/get_indirect b/cpp/.traces/get_indirect
index 9f0c38b5..98e9d9c6 100644
--- a/cpp/.traces/get_indirect
+++ b/cpp/.traces/get_indirect
@@ -8,7 +8,7 @@ parse/0: instruction: 1
 parse/0:   ingredient: {name: "35", value: 0, type: 0, properties: ["35": "literal"]}
 parse/0:   product: {name: "3", value: 0, type: 1, properties: ["3": "integer"]}
 parse/0: instruction: 18
-parse/0:   ingredient: {name: "1", value: 0, type: 2-5, properties: ["1": "address":"point", "deref": ]}
+parse/0:   ingredient: {name: "1", value: 0, type: 2-6, properties: ["1": "address":"point", "deref": ]}
 parse/0:   ingredient: {name: "0", value: 0, type: 0, properties: ["0": "offset"]}
 parse/0:   product: {name: "4", value: 0, type: 1, properties: ["4": "integer"]}
 after-brace/0: recipe main
diff --git a/cpp/.traces/include_nonderef_properties b/cpp/.traces/include_nonderef_properties
index 77d3a94e..835c973a 100644
--- a/cpp/.traces/include_nonderef_properties
+++ b/cpp/.traces/include_nonderef_properties
@@ -8,7 +8,7 @@ parse/0: instruction: 1
 parse/0:   ingredient: {name: "35", value: 0, type: 0, properties: ["35": "literal"]}
 parse/0:   product: {name: "3", value: 0, type: 1, properties: ["3": "integer"]}
 parse/0: instruction: 18
-parse/0:   ingredient: {name: "1", value: 0, type: 2-5, properties: ["1": "address":"point", "deref": , "foo": ]}
+parse/0:   ingredient: {name: "1", value: 0, type: 2-6, properties: ["1": "address":"point", "deref": , "foo": ]}
 parse/0:   ingredient: {name: "0", value: 0, type: 0, properties: ["0": "offset"]}
 parse/0:   product: {name: "4", value: 0, type: 1, properties: ["4": "integer"]}
 after-brace/0: recipe main
diff --git a/cpp/.traces/index b/cpp/.traces/index
index cee3a327..e9f3dd08 100644
--- a/cpp/.traces/index
+++ b/cpp/.traces/index
@@ -11,7 +11,7 @@ parse/0: instruction: 1
 parse/0:   ingredient: {name: "16", value: 0, type: 0, properties: ["16": "literal"]}
 parse/0:   product: {name: "4", value: 0, type: 1, properties: ["4": "integer"]}
 parse/0: instruction: 20
-parse/0:   ingredient: {name: "1", value: 0, type: 4-1, properties: ["1": "array":"integer"]}
+parse/0:   ingredient: {name: "1", value: 0, type: 5-1, properties: ["1": "array":"integer"]}
 parse/0:   ingredient: {name: "0", value: 0, type: 0, properties: ["0": "literal"]}
 parse/0:   product: {name: "5", value: 0, type: 1, properties: ["5": "integer"]}
 after-brace/0: recipe main
@@ -33,7 +33,7 @@ run/0: instruction main/3
 run/0: ingredient 0 is 16
 mem/0: storing 16 in location 4
 run/0: instruction main/4
-run/0: ingredient 0 is {name: "1", value: 1, type: 4-1, properties: ["1": "array":"integer"]}
+run/0: ingredient 0 is {name: "1", value: 1, type: 5-1, properties: ["1": "array":"integer"]}
 run/0: ingredient 1 is {name: "0", value: 0, type: 0, properties: ["0": "literal"]}
 run/0: address to copy is 2
 run/0: its type is 1
diff --git a/cpp/.traces/index_address b/cpp/.traces/index_address
index 5310f6c7..ca503f99 100644
--- a/cpp/.traces/index_address
+++ b/cpp/.traces/index_address
@@ -11,7 +11,7 @@ parse/0: instruction: 1
 parse/0:   ingredient: {name: "16", value: 0, type: 0, properties: ["16": "literal"]}
 parse/0:   product: {name: "4", value: 0, type: 1, properties: ["4": "integer"]}
 parse/0: instruction: 21
-parse/0:   ingredient: {name: "1", value: 0, type: 4-1, properties: ["1": "array":"integer"]}
+parse/0:   ingredient: {name: "1", value: 0, type: 5-1, properties: ["1": "array":"integer"]}
 parse/0:   ingredient: {name: "0", value: 0, type: 0, properties: ["0": "literal"]}
 parse/0:   product: {name: "5", value: 0, type: 1, properties: ["5": "integer"]}
 after-brace/0: recipe main
diff --git a/cpp/.traces/index_direct_offset b/cpp/.traces/index_direct_offset
index 27daf63e..67bbbde6 100644
--- a/cpp/.traces/index_direct_offset
+++ b/cpp/.traces/index_direct_offset
@@ -14,7 +14,7 @@ parse/0: instruction: 1
 parse/0:   ingredient: {name: "0", value: 0, type: 0, properties: ["0": "literal"]}
 parse/0:   product: {name: "5", value: 0, type: 1, properties: ["5": "integer"]}
 parse/0: instruction: 20
-parse/0:   ingredient: {name: "1", value: 0, type: 4-1, properties: ["1": "array":"integer"]}
+parse/0:   ingredient: {name: "1", value: 0, type: 5-1, properties: ["1": "array":"integer"]}
 parse/0:   ingredient: {name: "5", value: 0, type: 1, properties: ["5": "integer"]}
 parse/0:   product: {name: "6", value: 0, type: 1, properties: ["6": "integer"]}
 after-brace/0: recipe main
@@ -40,7 +40,7 @@ run/0: instruction main/4
 run/0: ingredient 0 is 0
 mem/0: storing 0 in location 5
 run/0: instruction main/5
-run/0: ingredient 0 is {name: "1", value: 1, type: 4-1, properties: ["1": "array":"integer"]}
+run/0: ingredient 0 is {name: "1", value: 1, type: 5-1, properties: ["1": "array":"integer"]}
 run/0: ingredient 1 is {name: "5", value: 5, type: 1, properties: ["5": "integer"]}
 mem/0: location 5 is 0
 run/0: address to copy is 2
diff --git a/cpp/.traces/index_indirect b/cpp/.traces/index_indirect
index 7ae6b2d1..0b3bb283 100644
--- a/cpp/.traces/index_indirect
+++ b/cpp/.traces/index_indirect
@@ -12,9 +12,9 @@ parse/0:   ingredient: {name: "16", value: 0, type: 0, properties: ["16": "liter
 parse/0:   product: {name: "4", value: 0, type: 1, properties: ["4": "integer"]}
 parse/0: instruction: 1
 parse/0:   ingredient: {name: "1", value: 0, type: 0, properties: ["1": "literal"]}
-parse/0:   product: {name: "5", value: 0, type: 2-4-1, properties: ["5": "address":"array":"integer"]}
+parse/0:   product: {name: "5", value: 0, type: 2-5-1, properties: ["5": "address":"array":"integer"]}
 parse/0: instruction: 20
-parse/0:   ingredient: {name: "5", value: 0, type: 2-4-1, properties: ["5": "address":"array":"integer", "deref": ]}
+parse/0:   ingredient: {name: "5", value: 0, type: 2-5-1, properties: ["5": "address":"array":"integer", "deref": ]}
 parse/0:   ingredient: {name: "1", value: 0, type: 0, properties: ["1": "literal"]}
 parse/0:   product: {name: "6", value: 0, type: 1, properties: ["6": "integer"]}
 after-brace/0: recipe main
@@ -40,7 +40,7 @@ run/0: instruction main/4
 run/0: ingredient 0 is 1
 mem/0: storing 1 in location 5
 run/0: instruction main/5
-run/0: ingredient 0 is {name: "5", value: 5, type: 2-4-1, properties: ["5": "address":"array":"integer", "deref": ]}
+run/0: ingredient 0 is {name: "5", value: 5, type: 2-5-1, properties: ["5": "address":"array":"integer", "deref": ]}
 mem/0: location 5 is 1
 run/0: ingredient 1 is {name: "1", value: 1, type: 0, properties: ["1": "literal"]}
 run/0: address to copy is 3
diff --git a/cpp/.traces/new_array b/cpp/.traces/new_array
index 803f2c6e..d7cd46fc 100644
--- a/cpp/.traces/new_array
+++ b/cpp/.traces/new_array
@@ -1,13 +1,13 @@
 parse/0: instruction: 24
 parse/0:   ingredient: {name: "integer", value: 0, type: 0, properties: ["integer": "type"]}
 parse/0:   ingredient: {name: "5", value: 0, type: 0, properties: ["5": "literal"]}
-parse/0:   product: {name: "1", value: 0, type: 2-4-1, properties: ["1": "address":"array":"integer", "raw": ]}
+parse/0:   product: {name: "1", value: 0, type: 2-5-1, properties: ["1": "address":"array":"integer", "raw": ]}
 parse/0: instruction: 24
 parse/0:   ingredient: {name: "integer", value: 0, type: 0, properties: ["integer": "type"]}
 parse/0:   product: {name: "2", value: 0, type: 2-1, properties: ["2": "address":"integer", "raw": ]}
 parse/0: instruction: 3
 parse/0:   ingredient: {name: "2", value: 0, type: 2-1, properties: ["2": "address":"integer", "raw": ]}
-parse/0:   ingredient: {name: "1", value: 0, type: 2-4-1, properties: ["1": "address":"array":"integer", "raw": ]}
+parse/0:   ingredient: {name: "1", value: 0, type: 2-5-1, properties: ["1": "address":"array":"integer", "raw": ]}
 parse/0:   product: {name: "3", value: 0, type: 1, properties: ["3": "integer", "raw": ]}
 new/0: integer -> 1
 new/0: integer -> 1
diff --git a/cpp/.traces/new_string b/cpp/.traces/new_string
index 1c87c169..56b9ae0f 100644
--- a/cpp/.traces/new_string
+++ b/cpp/.traces/new_string
@@ -1,10 +1,10 @@
 parse/0: instruction: 24
 parse/0:   ingredient: {name: "abc def", value: 0, type: 0, properties: ["abc def": "literal-string"]}
-parse/0:   product: {name: "1", value: 0, type: 2-4-7, properties: ["1": "address":"array":"character"]}
+parse/0:   product: {name: "1", value: 0, type: 2-5-8, properties: ["1": "address":"array":"character"]}
 parse/0: instruction: 20
-parse/0:   ingredient: {name: "1", value: 0, type: 2-4-7, properties: ["1": "address":"array":"character", "deref": ]}
+parse/0:   ingredient: {name: "1", value: 0, type: 2-5-8, properties: ["1": "address":"array":"character", "deref": ]}
 parse/0:   ingredient: {name: "5", value: 0, type: 0, properties: ["5": "literal"]}
-parse/0:   product: {name: "2", value: 0, type: 7, properties: ["2": "character"]}
+parse/0:   product: {name: "2", value: 0, type: 8, properties: ["2": "character"]}
 new/0: abc def -> 0
 after-brace/0: recipe main
 after-brace/0: new ...
@@ -12,11 +12,11 @@ after-brace/0: index ...
 run/0: instruction main/0
 mem/0: storing 1000 in location 1
 run/0: instruction main/1
-run/0: ingredient 0 is {name: "1", value: 1, type: 2-4-7, properties: ["1": "address":"array":"character", "deref": ]}
+run/0: ingredient 0 is {name: "1", value: 1, type: 2-5-8, properties: ["1": "address":"array":"character", "deref": ]}
 mem/0: location 1 is 1000
 run/0: ingredient 1 is {name: "5", value: 5, type: 0, properties: ["5": "literal"]}
 run/0: address to copy is 1006
-run/0: its type is 7
+run/0: its type is 8
 mem/0: location 1006 is 101
 run/0: product 0 is 101
 mem/0: storing 101 in location 2
diff --git a/cpp/.traces/reply_record b/cpp/.traces/reply_record
index ea2d38f0..cce9d8e3 100644
--- a/cpp/.traces/reply_record
+++ b/cpp/.traces/reply_record
@@ -1,13 +1,13 @@
 parse/0: instruction: 101
 parse/0:   ingredient: {name: "2", value: 0, type: 0, properties: ["2": "literal"]}
-parse/0:   product: {name: "3", value: 0, type: 5, properties: ["3": "point"]}
+parse/0:   product: {name: "3", value: 0, type: 6, properties: ["3": "point"]}
 parse/0: instruction: 22
 parse/0:   product: {name: "12", value: 0, type: 1, properties: ["12": "integer"]}
 parse/0: instruction: 1
 parse/0:   ingredient: {name: "35", value: 0, type: 0, properties: ["35": "literal"]}
 parse/0:   product: {name: "13", value: 0, type: 1, properties: ["13": "integer"]}
 parse/0: instruction: 23
-parse/0:   ingredient: {name: "12", value: 0, type: 5, properties: ["12": "point"]}
+parse/0:   ingredient: {name: "12", value: 0, type: 6, properties: ["12": "point"]}
 after-brace/0: recipe main
 after-brace/0: f ...
 after-brace/0: recipe f
diff --git a/cpp/.traces/string_literal b/cpp/.traces/string_literal
index eabc7af9..39e204e3 100644
--- a/cpp/.traces/string_literal
+++ b/cpp/.traces/string_literal
@@ -1,6 +1,6 @@
 parse/0: instruction: 24
 parse/0:   ingredient: {name: "abc def", value: 0, type: 0, properties: ["abc def": "literal-string"]}
-parse/0:   product: {name: "1", value: 0, type: 2-4-7, properties: ["1": "address":"array":"character"]}
+parse/0:   product: {name: "1", value: 0, type: 2-5-8, properties: ["1": "address":"array":"character"]}
 new/0: abc def -> 0
 after-brace/0: recipe main
 after-brace/0: new ...
diff --git a/cpp/.traces/string_literal_nested b/cpp/.traces/string_literal_nested
index 5f54d8c3..5fd3fbff 100644
--- a/cpp/.traces/string_literal_nested
+++ b/cpp/.traces/string_literal_nested
@@ -1,6 +1,6 @@
 parse/0: instruction: 24
 parse/0:   ingredient: {name: "abc [def]", value: 0, type: 0, properties: ["abc [def]": "literal-string"]}
-parse/0:   product: {name: "1", value: 0, type: 2-4-7, properties: ["1": "address":"array":"character"]}
+parse/0:   product: {name: "1", value: 0, type: 2-5-8, properties: ["1": "address":"array":"character"]}
 new/0: abc [def] -> 0
 after-brace/0: recipe main
 after-brace/0: new ...