3966

15 files changed, 19 insertions, 19 deletions

diff --git a/000organization.cc b/000organization.cc
index b1f1dc07..b795d8ab 100644
--- a/000organization.cc
+++ b/000organization.cc
@@ -132,5 +132,5 @@ int main(int argc, char* argv[]) {
 //: end.
 :(code)
 void reset() {
-  // End Setup
+  // End Reset
 }
diff --git a/002test.cc b/002test.cc
index 0fa39bf1..f6623c90 100644
--- a/002test.cc
+++ b/002test.cc
@@ -36,7 +36,7 @@ bool Passed = true;  // set this to false inside any test to indicate failure
     return;  /* Currently we stop at the very first failure. */ \
   }
 
-:(before "End Setup")
+:(before "End Reset")
 Passed = true;
 
 :(before "End Commandline Parsing")
diff --git a/003trace.cc b/003trace.cc
index 390a2b5e..ea0c2882 100644
--- a/003trace.cc
+++ b/003trace.cc
@@ -80,7 +80,7 @@ struct trace_line {
 bool Hide_errors = false;
 bool Dump_trace = false;
 string Dump_label = "";
-:(before "End Setup")
+:(before "End Reset")
 Hide_errors = false;
 Dump_trace = false;
 Dump_label = "";
diff --git a/010vm.cc b/010vm.cc
index 839cd356..09348f2d 100644
--- a/010vm.cc
+++ b/010vm.cc
@@ -108,7 +108,7 @@ type_tree::type_tree(string name) :atom(true), name(name), value(get(Type_ordina
 :(before "End Globals")
 // Locations refer to a common 'memory'. Each location can store a number.
 map<int, double> Memory;
-:(before "End Setup")
+:(before "End Reset")
 Memory.clear();
 
 :(after "Types")
@@ -214,7 +214,7 @@ put(Recipe_ordinal, "main", Next_recipe_ordinal++);
 // End Load Recipes
 :(before "End Commandline Parsing")
 assert(Next_recipe_ordinal < 1000);  // recipes being tested didn't overflow into test space
-:(before "End Setup")
+:(before "End Reset")
 Next_recipe_ordinal = 1000;  // consistent new numbers for each test
 
 //: One final detail: tests can modify our global tables of recipes and types,
@@ -227,7 +227,7 @@ map<string, type_ordinal> Type_ordinal_snapshot;
 map<type_ordinal, type_info> Type_snapshot;
 :(before "End One-time Setup")
 save_snapshots();
-:(before "End Setup")
+:(before "End Reset")
 restore_snapshots();
 
 :(code)
diff --git a/011load.cc b/011load.cc
index 926a02ad..b89d18fe 100644
--- a/011load.cc
+++ b/011load.cc
@@ -372,7 +372,7 @@ def main[
 //: we'll want to disable the errors.
 :(before "End Globals")
 bool Disable_redefine_checks = false;
-:(before "End Setup")
+:(before "End Reset")
 Disable_redefine_checks = false;
 :(code)
 bool should_check_for_redefine(const string& recipe_name) {
diff --git a/020run.cc b/020run.cc
index b059224e..d70577ea 100644
--- a/020run.cc
+++ b/020run.cc
@@ -48,7 +48,7 @@ struct routine {
 
 :(before "End Globals")
 routine* Current_routine = NULL;
-:(before "End Setup")
+:(before "End Reset")
 Current_routine = NULL;
 
 :(code)
diff --git a/030container.cc b/030container.cc
index 507dace3..23901b3f 100644
--- a/030container.cc
+++ b/030container.cc
@@ -770,7 +770,7 @@ void expand_type_abbreviations_in_containers(unused const recipe_ordinal r) {
 
 //: ensure scenarios are consistent by always starting new container
 //: declarations at the same type number
-:(before "End Setup")  //: for tests
+:(before "End Reset")  //: for tests
 Next_type_ordinal = 1000;
 :(before "End Test Run Initialization")
 assert(Next_type_ordinal < 1000);
diff --git a/034address.cc b/034address.cc
index d4c3e4d7..266580a1 100644
--- a/034address.cc
+++ b/034address.cc
@@ -293,7 +293,7 @@ void transform_new_to_allocate(const recipe_ordinal r) {
 extern const int Reserved_for_tests = 1000;
 int Memory_allocated_until = Reserved_for_tests;
 int Initial_memory_per_routine = 100000;
-:(before "End Setup")
+:(before "End Reset")
 Memory_allocated_until = Reserved_for_tests;
 Initial_memory_per_routine = 100000;
 :(before "End routine Fields")
@@ -357,7 +357,7 @@ int allocate(int size) {
 //? int Num_alloc = 0;
 //? int Total_free = 0;
 //? int Num_free = 0;
-//? :(before "End Setup")
+//? :(before "End Reset")
 //? if (!Memory.empty()) {
 //?   cerr << Total_alloc << "/" << Num_alloc
 //?        << " vs " << Total_free << "/" << Num_free << '\n';
diff --git a/050scenario.cc b/050scenario.cc
index fb0a0114..13f24d78 100644
--- a/050scenario.cc
+++ b/050scenario.cc
@@ -365,7 +365,7 @@ def main [
 
 :(before "End Globals")
 bool Scenario_testing_scenario = false;
-:(before "End Setup")
+:(before "End Reset")
 Scenario_testing_scenario = false;
 
 :(scenario memory_check)
diff --git a/052tangle.cc b/052tangle.cc
index 2136a60d..909fc9f7 100644
--- a/052tangle.cc
+++ b/052tangle.cc
@@ -34,7 +34,7 @@ $mem: 3
 :(before "End Globals")
 map<string /*label*/, recipe> Before_fragments, After_fragments;
 set<string /*label*/> Fragments_used;
-:(before "End Setup")
+:(before "End Reset")
 Before_fragments.clear();
 After_fragments.clear();
 Fragments_used.clear();
diff --git a/067random.cc b/067random.cc
index 42a48867..d80adb4d 100644
--- a/067random.cc
+++ b/067random.cc
@@ -30,5 +30,5 @@ case MAKE_RANDOM_NONDETERMINISTIC: {
 }
 
 // undo non-determinism in later tests
-:(before "End Setup")
+:(before "End Reset")
 srand(0);
diff --git a/072scheduler.cc b/072scheduler.cc
index 9a914cc5..e3ac18cf 100644
--- a/072scheduler.cc
+++ b/072scheduler.cc
@@ -50,7 +50,7 @@ state = RUNNING;
 :(before "End Globals")
 vector<routine*> Routines;
 int Current_routine_index = 0;
-:(before "End Setup")
+:(before "End Reset")
 Scheduling_interval = 500;
 for (int i = 0;  i < SIZE(Routines);  ++i)
   delete Routines.at(i);
@@ -144,7 +144,7 @@ void run_main(int argc, char* argv[]) {
 int id;
 :(before "End Globals")
 int Next_routine_id = 1;
-:(before "End Setup")
+:(before "End Reset")
 Next_routine_id = 1;
 :(before "End routine Constructor")
 id = Next_routine_id;
diff --git a/082scenario_screen.cc b/082scenario_screen.cc
index 4ee62e06..ee90819e 100644
--- a/082scenario_screen.cc
+++ b/082scenario_screen.cc
@@ -140,7 +140,7 @@ $error: 0
 :(before "End Globals")
 extern const int Max_variables_in_scenarios = Reserved_for_tests-100;
 int Next_predefined_global_for_scenarios = Max_variables_in_scenarios;
-:(before "End Setup")
+:(before "End Reset")
 assert(Next_predefined_global_for_scenarios < Reserved_for_tests);
 
 :(before "End Globals")
diff --git a/101run_sandboxed.cc b/101run_sandboxed.cc
index b6d42835..859aa223 100644
--- a/101run_sandboxed.cc
+++ b/101run_sandboxed.cc
@@ -77,7 +77,7 @@ case RUN_SANDBOXED: {
 bool Track_most_recent_products = false;
 int Call_depth_to_track_most_recent_products_at = 0;
 string Most_recent_products;
-:(before "End Setup")
+:(before "End Reset")
 Track_most_recent_products = false;
 Call_depth_to_track_most_recent_products_at = 0;
 Most_recent_products = "";
diff --git a/999spaces.cc b/999spaces.cc
index e28faa78..219e695d 100644
--- a/999spaces.cc
+++ b/999spaces.cc
@@ -9,7 +9,7 @@
 //: Location 0 - unused (since it can help uncover bugs)
 //: Locations 1-899 - reserved for tests
 //: Locations 900-999 - reserved for predefined globals in Mu scenarios, like keyboard, screen, etc.
-:(before "End Setup")
+:(before "End Reset")
 assert(Max_variables_in_scenarios == 900);
 //: Locations 1000 ('Reserved_for_tests') onward - available to the allocator in chunks of size Initial_memory_per_routine.
 assert(Reserved_for_tests == 1000);