9 files changed, 23 insertions, 23 deletions
diff --git a/cpp/.traces/calling_recipe b/cpp/.traces/calling_recipe
index cb35c59d..763acb53 100644
--- a/cpp/.traces/calling_recipe
+++ b/cpp/.traces/calling_recipe
@@ -3,10 +3,10 @@ parse/0: instruction: 2
 parse/0:   ingredient: {name: "2", value: 0, type: 0, properties: ["2": "literal"]}
 parse/0:   ingredient: {name: "2", value: 0, type: 0, properties: ["2": "literal"]}
 parse/0:   product: {name: "3", value: 0, type: 1, properties: ["3": "integer"]}
-after-brace/0: recipe f
-after-brace/0: add ...
 after-brace/0: recipe main
 after-brace/0: f ...
+after-brace/0: recipe f
+after-brace/0: add ...
 run/0: instruction main/0
 run/0: instruction f/0
 run/0: ingredient 0 is 2
diff --git a/cpp/.traces/closure b/cpp/.traces/closure
index 73ba0a6e..f8bd5a9a 100644
--- a/cpp/.traces/closure
+++ b/cpp/.traces/closure
@@ -39,11 +39,16 @@ parse/0: instruction: 28
 parse/0:   ingredient: {name: "y", value: 0, type: 1, properties: ["y": "integer", "space": "1"]}
 name/0: recipe increment-counter is surrounded by init-counter
 new/0: location -> 1
+new/0: location -> 1
 name/0: assign x 1
 name/0: assign y 2
 new/0: space -> 0
 name/0: assign y 1
-new/0: location -> 1
+after-brace/0: recipe main
+after-brace/0: new ...
+after-brace/0: init-counter ...
+after-brace/0: increment-counter ...
+after-brace/0: increment-counter ...
 after-brace/0: recipe init-counter
 after-brace/0: new ...
 after-brace/0: copy ...
@@ -55,11 +60,6 @@ after-brace/0: next-ingredient ...
 after-brace/0: add ...
 after-brace/0: copy ...
 after-brace/0: reply ...
-after-brace/0: recipe main
-after-brace/0: new ...
-after-brace/0: init-counter ...
-after-brace/0: increment-counter ...
-after-brace/0: increment-counter ...
 run/0: instruction main/0
 mem/0: new alloc: 1000
 mem/0: array size is 30
diff --git a/cpp/.traces/ingredient b/cpp/.traces/ingredient
index 4b028b84..0d8fbf96 100644
--- a/cpp/.traces/ingredient
+++ b/cpp/.traces/ingredient
@@ -7,11 +7,11 @@ parse/0:   product: {name: "12", value: 0, type: 1, properties: ["12": "integer"
 parse/0: instruction: 25
 parse/0:   product: {name: "13", value: 0, type: 1, properties: ["13": "integer"]}
 parse/0:   product: {name: "1", value: 0, type: 3, properties: ["1": "boolean"]}
+after-brace/0: recipe main
+after-brace/0: f ...
 after-brace/0: recipe f
 after-brace/0: ingredient ...
 after-brace/0: next-ingredient ...
-after-brace/0: recipe main
-after-brace/0: f ...
 run/0: instruction main/0
 run/0: instruction f/0
 run/0: product 0 is 2
diff --git a/cpp/.traces/next_ingredient b/cpp/.traces/next_ingredient
index c9ce76a0..0d6c4bb8 100644
--- a/cpp/.traces/next_ingredient
+++ b/cpp/.traces/next_ingredient
@@ -6,11 +6,11 @@ parse/0: instruction: 2
 parse/0:   ingredient: {name: "1", value: 0, type: 0, properties: ["1": "literal"]}
 parse/0:   ingredient: {name: "12", value: 0, type: 1, properties: ["12": "integer"]}
 parse/0:   product: {name: "13", value: 0, type: 1, properties: ["13": "integer"]}
+after-brace/0: recipe main
+after-brace/0: f ...
 after-brace/0: recipe f
 after-brace/0: next-ingredient ...
 after-brace/0: add ...
-after-brace/0: recipe main
-after-brace/0: f ...
 run/0: instruction main/0
 run/0: instruction f/0
 run/0: product 0 is 2
diff --git a/cpp/.traces/next_ingredient_missing b/cpp/.traces/next_ingredient_missing
index 07d681ca..385f047b 100644
--- a/cpp/.traces/next_ingredient_missing
+++ b/cpp/.traces/next_ingredient_missing
@@ -2,10 +2,10 @@ parse/0: instruction: 1001
 parse/0: instruction: 25
 parse/0:   product: {name: "_", value: 0, type: 0, properties: ["_": "dummy"]}
 parse/0:   product: {name: "12", value: 0, type: 1, properties: ["12": "integer"]}
-after-brace/0: recipe f
-after-brace/0: next-ingredient ...
 after-brace/0: recipe main
 after-brace/0: f ...
+after-brace/0: recipe f
+after-brace/0: next-ingredient ...
 run/0: instruction main/0
 run/0: instruction f/0
 mem/0: storing 0 in location 12
diff --git a/cpp/.traces/reply b/cpp/.traces/reply
index a58a1193..566299b7 100644
--- a/cpp/.traces/reply
+++ b/cpp/.traces/reply
@@ -11,12 +11,12 @@ parse/0:   product: {name: "13", value: 0, type: 1, properties: ["13": "integer"
 parse/0: instruction: 28
 parse/0:   ingredient: {name: "12", value: 0, type: 1, properties: ["12": "integer"]}
 parse/0:   ingredient: {name: "13", value: 0, type: 1, properties: ["13": "integer"]}
+after-brace/0: recipe main
+after-brace/0: f ...
 after-brace/0: recipe f
 after-brace/0: next-ingredient ...
 after-brace/0: add ...
 after-brace/0: reply ...
-after-brace/0: recipe main
-after-brace/0: f ...
 run/0: instruction main/0
 run/0: instruction f/0
 run/0: product 0 is 2
diff --git a/cpp/.traces/reply_container b/cpp/.traces/reply_container
index 9a5d430f..10cc9548 100644
--- a/cpp/.traces/reply_container
+++ b/cpp/.traces/reply_container
@@ -8,12 +8,12 @@ parse/0:   ingredient: {name: "35", value: 0, type: 0, properties: ["35": "liter
 parse/0:   product: {name: "13", value: 0, type: 1, properties: ["13": "integer"]}
 parse/0: instruction: 28
 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
 after-brace/0: next-ingredient ...
 after-brace/0: copy ...
 after-brace/0: reply ...
-after-brace/0: recipe main
-after-brace/0: f ...
 run/0: instruction main/0
 run/0: instruction f/0
 run/0: product 0 is 2
diff --git a/cpp/.traces/return_on_fallthrough b/cpp/.traces/return_on_fallthrough
index 4408c63a..d7ac00e1 100644
--- a/cpp/.traces/return_on_fallthrough
+++ b/cpp/.traces/return_on_fallthrough
@@ -14,14 +14,14 @@ parse/0:   product: {name: "4", value: 0, type: 1, properties: ["4": "integer"]}
 parse/0: instruction: 1
 parse/0:   ingredient: {name: "34", value: 0, type: 0, properties: ["34": "literal"]}
 parse/0:   product: {name: "5", value: 0, type: 1, properties: ["5": "integer"]}
-after-brace/0: recipe f
-after-brace/0: copy ...
-after-brace/0: copy ...
 after-brace/0: recipe main
 after-brace/0: f ...
 after-brace/0: copy ...
 after-brace/0: copy ...
 after-brace/0: copy ...
+after-brace/0: recipe f
+after-brace/0: copy ...
+after-brace/0: copy ...
 run/0: instruction main/0
 run/0: instruction f/0
 run/0: ingredient 0 is 34
diff --git a/cpp/.traces/rewind_ingredients b/cpp/.traces/rewind_ingredients
index 9c36302a..ed1bff38 100644
--- a/cpp/.traces/rewind_ingredients
+++ b/cpp/.traces/rewind_ingredients
@@ -9,13 +9,13 @@ parse/0: instruction: 26
 parse/0: instruction: 25
 parse/0:   product: {name: "13", value: 0, type: 1, properties: ["13": "integer"]}
 parse/0:   product: {name: "2", value: 0, type: 3, properties: ["2": "boolean"]}
+after-brace/0: recipe main
+after-brace/0: f ...
 after-brace/0: recipe f
 after-brace/0: next-ingredient ...
 after-brace/0: next-ingredient ...
 after-brace/0: rewind-ingredients ...
 after-brace/0: next-ingredient ...
-after-brace/0: recipe main
-after-brace/0: f ...
 run/0: instruction main/0
 run/0: instruction f/0
 run/0: product 0 is 2