3108

10 files changed, 12 insertions, 11 deletions

diff --git a/030container.cc b/030container.cc
index 14964a14..0c3da911 100644
--- a/030container.cc
+++ b/030container.cc
@@ -491,7 +491,6 @@ container foo [
   x:number
   y:bar
 ]
-
 container bar [
   x:number
   y:number
@@ -654,7 +653,6 @@ def main [
 def main [
   1:bar <- copy 0/unsafe
 ]
-
 container bar [
   x:number
 ]
diff --git a/031merge.cc b/031merge.cc
index 034a62da..abc1bbc5 100644
--- a/031merge.cc
+++ b/031merge.cc
@@ -5,7 +5,6 @@ container foo [
   x:number
   y:number
 ]
-
 def main [
   1:foo <- merge 3, 4
 ]
diff --git a/033exclusive_container.cc b/033exclusive_container.cc
index f986b093..fc7708bc 100644
--- a/033exclusive_container.cc
+++ b/033exclusive_container.cc
@@ -231,7 +231,6 @@ exclusive-container foo [
   x:number
   y:number
 ]
-
 def main [
   1:number <- copy 34
   2:foo <- merge 0/x, 1:number  # tag must be a literal when merging exclusive containers
diff --git a/045closure_name.cc b/045closure_name.cc
index 3b62ba58..77389b3a 100644
--- a/045closure_name.cc
+++ b/045closure_name.cc
@@ -10,14 +10,12 @@ def main [
   2:number/raw <- increment-counter 1:address:array:location/names:new-counter
   3:number/raw <- increment-counter 1:address:array:location/names:new-counter
 ]
-
 def new-counter [
   default-space:address:array:location <- new location:type, 30
   x:number <- copy 23
   y:number <- copy 3  # variable that will be incremented
   return default-space:address:array:location
 ]
-
 def increment-counter [
   default-space:address:array:location <- new location:type, 30
   0:address:array:location/names:new-counter <- next-ingredient  # outer space must be created by 'new-counter' above
@@ -25,7 +23,6 @@ def increment-counter [
   y:number <- copy 234  # dummy
   return y:number/space:1
 ]
-
 +name: lexically surrounding space for recipe increment-counter comes from new-counter
 +mem: storing 5 in location 3
 
diff --git a/047check_type_by_name.cc b/047check_type_by_name.cc
index 3778fa79..7812044b 100644
--- a/047check_type_by_name.cc
+++ b/047check_type_by_name.cc
@@ -71,18 +71,23 @@ def main [
   x:number <- copy 1
   y:number <- add x, 1
 ]
+# x is in location 1, y in location 2
++mem: storing 2 in location 2
 
 :(scenario transform_fills_in_missing_types_in_product)
 def main [
   x:number <- copy 1
   x <- copy 2
 ]
+# x is in location 1
++mem: storing 2 in location 1
 
 :(scenario transform_fills_in_missing_types_in_product_and_ingredient)
 def main [
   x:number <- copy 1
   x <- add x, 1
 ]
+# x is in location 1
 +mem: storing 2 in location 1
 
 :(scenario transform_fails_on_missing_types_in_first_mention)
diff --git a/050scenario.cc b/050scenario.cc
index b177cab9..cdfab9c5 100644
--- a/050scenario.cc
+++ b/050scenario.cc
@@ -32,6 +32,7 @@ scenario foo [
     2 <- 13
   ]
 ]
+# checks are inside scenario
 
 :(scenario scenario_check_memory_and_trace)
 scenario foo [
@@ -49,6 +50,7 @@ scenario foo [
     a: x y z
   ]
 ]
+# checks are inside scenario
 
 //:: Core data structure
 
@@ -220,7 +222,6 @@ void test_maybe_make_raw() {
 def scenario-foo [
   1:number <- copy 34
 ]
-
 def scenario-foo [
   1:number <- copy 35
 ]
@@ -659,6 +660,7 @@ def main [
   ]
   check-trace-count-for-label 1, [a]
 ]
+# checks are inside scenario
 
 :(before "End Primitive Recipe Declarations")
 CHECK_TRACE_COUNT_FOR_LABEL,
diff --git a/052tangle.cc b/052tangle.cc
index c3ad4485..ebfdbeae 100644
--- a/052tangle.cc
+++ b/052tangle.cc
@@ -12,7 +12,6 @@ def main [
   <label1>
   3:number <- copy 0
 ]
-
 before <label1> [
   2:number <- copy 0
 ]
diff --git a/054static_dispatch.cc b/054static_dispatch.cc
index 90aad945..17d82545 100644
--- a/054static_dispatch.cc
+++ b/054static_dispatch.cc
@@ -422,7 +422,6 @@ def main [
   5:boolean <- copy 0/false
   6:boolean <- equal 4:boolean, 5:boolean
 ]
-
 # temporarily hardcode number equality to always fail
 def equal x:number, y:number -> z:boolean [
   local-scope
diff --git a/056shape_shifting_recipe.cc b/056shape_shifting_recipe.cc
index ead3296e..5cbbfa59 100644
--- a/056shape_shifting_recipe.cc
+++ b/056shape_shifting_recipe.cc
@@ -604,6 +604,7 @@ def foo x:c:_bar:_baz [
   local-scope
   load-ingredients
 ]
+# no errors
 
 :(scenario shape_shifting_recipe_type_deduction_ignores_offsets)
 def main [
@@ -1102,7 +1103,6 @@ $error: 0
 def add a:address:foo:_elem [
   assert 0, [should not get here]
 ]
-
 def main [
   # call primitive add with literal 0
   add 0, 0
diff --git a/082scenario_screen.cc b/082scenario_screen.cc
index 9c2cfe71..20cf5c84 100644
--- a/082scenario_screen.cc
+++ b/082scenario_screen.cc
@@ -19,6 +19,7 @@ scenario screen-in-scenario [
     .     .
   ]
 ]
+# checks are inside scenario
 
 :(scenario screen_in_scenario_unicode)
 scenario screen-in-scenario-unicode-color [
@@ -36,6 +37,7 @@ scenario screen-in-scenario-unicode-color [
     .     .
   ]
 ]
+# checks are inside scenario
 
 :(scenario screen_in_scenario_color)
 # screen-should-contain can check unicode characters in the fake screen
@@ -70,6 +72,7 @@ scenario screen-in-scenario-color [
     .     .
   ]
 ]
+# checks are inside scenario
 
 :(scenario screen_in_scenario_error)
 % Scenario_testing_scenario = true;