1962

Standardize test names.

9 files changed, 29 insertions, 29 deletions

diff --git a/011load.cc b/011load.cc
index 34d6c457..5f172aae 100644
--- a/011load.cc
+++ b/011load.cc
@@ -260,7 +260,7 @@ recipe main [
 +parse:   ingredient: {name: "23", properties: ["23": "literal"]}
 +parse:   product: {name: "1", properties: ["1": "number"]}
 
-:(scenario parse_comment_amongst_instruction2)
+:(scenario parse_comment_amongst_instruction_2)
 recipe main [
   # comment
   1:number <- copy 23
@@ -270,7 +270,7 @@ recipe main [
 +parse:   ingredient: {name: "23", properties: ["23": "literal"]}
 +parse:   product: {name: "1", properties: ["1": "number"]}
 
-:(scenario parse_comment_amongst_instruction3)
+:(scenario parse_comment_amongst_instruction_3)
 recipe main [
   1:number <- copy 23
   # comment
diff --git a/022boolean.cc b/022boolean.cc
index a2406613..ead678cf 100644
--- a/022boolean.cc
+++ b/022boolean.cc
@@ -27,7 +27,7 @@ recipe main [
 ]
 +mem: storing 0 in location 3
 
-:(scenario and2)
+:(scenario and_2)
 recipe main [
   1:boolean <- and 1, 1
 ]
@@ -39,7 +39,7 @@ recipe main [
 ]
 +mem: storing 0 in location 1
 
-:(scenario and_multiple2)
+:(scenario and_multiple_2)
 recipe main [
   1:boolean <- and 1, 1, 1
 ]
@@ -72,7 +72,7 @@ recipe main [
 ]
 +mem: storing 1 in location 3
 
-:(scenario or2)
+:(scenario or_2)
 recipe main [
   1:boolean <- or 0, 0
 ]
@@ -84,7 +84,7 @@ recipe main [
 ]
 +mem: storing 0 in location 1
 
-:(scenario or_multiple2)
+:(scenario or_multiple_2)
 recipe main [
   1:boolean <- or 0, 0, 1
 ]
diff --git a/024compare.cc b/024compare.cc
index fb3481fd..619caa03 100644
--- a/024compare.cc
+++ b/024compare.cc
@@ -33,7 +33,7 @@ recipe main [
 +mem: location 2 is 33
 +mem: storing 0 in location 3
 
-:(scenario equal2)
+:(scenario equal_2)
 recipe main [
   1:number <- copy 34
   2:number <- copy 34
@@ -49,7 +49,7 @@ recipe main [
 ]
 +mem: storing 1 in location 1
 
-:(scenario equal_multiple2)
+:(scenario equal_multiple_2)
 recipe main [
   1:number <- equal 34, 34, 35
 ]
@@ -91,7 +91,7 @@ recipe main [
 ]
 +mem: storing 1 in location 3
 
-:(scenario greater_than2)
+:(scenario greater_than_2)
 recipe main [
   1:number <- copy 34
   2:number <- copy 34
@@ -105,7 +105,7 @@ recipe main [
 ]
 +mem: storing 1 in location 1
 
-:(scenario greater_than_multiple2)
+:(scenario greater_than_multiple_2)
 recipe main [
   1:boolean <- greater-than 36, 35, 35
 ]
@@ -147,7 +147,7 @@ recipe main [
 ]
 +mem: storing 1 in location 3
 
-:(scenario lesser_than2)
+:(scenario lesser_than_2)
 recipe main [
   1:number <- copy 34
   2:number <- copy 33
@@ -161,7 +161,7 @@ recipe main [
 ]
 +mem: storing 1 in location 1
 
-:(scenario lesser_than_multiple2)
+:(scenario lesser_than_multiple_2)
 recipe main [
   1:boolean <- lesser-than 34, 35, 35
 ]
@@ -203,7 +203,7 @@ recipe main [
 ]
 +mem: storing 1 in location 3
 
-:(scenario greater_or_equal2)
+:(scenario greater_or_equal_2)
 recipe main [
   1:number <- copy 34
   2:number <- copy 34
@@ -211,7 +211,7 @@ recipe main [
 ]
 +mem: storing 1 in location 3
 
-:(scenario greater_or_equal3)
+:(scenario greater_or_equal_3)
 recipe main [
   1:number <- copy 34
   2:number <- copy 35
@@ -225,7 +225,7 @@ recipe main [
 ]
 +mem: storing 1 in location 1
 
-:(scenario greater_or_equal_multiple2)
+:(scenario greater_or_equal_multiple_2)
 recipe main [
   1:boolean <- greater-or-equal 36, 35, 36
 ]
@@ -267,7 +267,7 @@ recipe main [
 ]
 +mem: storing 1 in location 3
 
-:(scenario lesser_or_equal2)
+:(scenario lesser_or_equal_2)
 recipe main [
   1:number <- copy 33
   2:number <- copy 33
@@ -275,7 +275,7 @@ recipe main [
 ]
 +mem: storing 1 in location 3
 
-:(scenario lesser_or_equal3)
+:(scenario lesser_or_equal_3)
 recipe main [
   1:number <- copy 34
   2:number <- copy 33
@@ -289,7 +289,7 @@ recipe main [
 ]
 +mem: storing 1 in location 1
 
-:(scenario lesser_or_equal_multiple2)
+:(scenario lesser_or_equal_multiple_2)
 recipe main [
   1:boolean <- lesser-or-equal 34, 35, 34
 ]
diff --git a/030container.cc b/030container.cc
index d53786c4..f7fe8e3a 100644
--- a/030container.cc
+++ b/030container.cc
@@ -72,7 +72,7 @@ recipe main [
 ]
 +mem: storing 1 in location 7
 
-:(scenario compare_multiple_locations2)
+:(scenario compare_multiple_locations_2)
 recipe main [
   1:number <- copy 34  # first
   2:number <- copy 35
@@ -183,7 +183,7 @@ recipe main [
 ]
 +warn: main: invalid offset 2 for point-number
 
-:(scenario get_out_of_bounds2)
+:(scenario get_out_of_bounds_2)
 % Hide_warnings = true;
 recipe main [
   12:number <- copy 34
@@ -240,7 +240,7 @@ recipe main [
 ]
 +warn: invalid offset 2 for point-number
 
-:(scenario get_address_out_of_bounds2)
+:(scenario get_address_out_of_bounds_2)
 % Hide_warnings = true;
 recipe main [
   12:number <- copy 34
diff --git a/032array.cc b/032array.cc
index ab519477..7220e0f0 100644
--- a/032array.cc
+++ b/032array.cc
@@ -141,7 +141,7 @@ recipe main [
 ]
 +warn: main: invalid index 4
 
-:(scenario index_out_of_bounds2)
+:(scenario index_out_of_bounds_2)
 % Hide_warnings = true;
 recipe main [
   1:number <- copy 3  # 3 points
@@ -216,7 +216,7 @@ recipe main [
 ]
 +warn: main: invalid index 4
 
-:(scenario index_address_out_of_bounds2)
+:(scenario index_address_out_of_bounds_2)
 % Hide_warnings = true;
 recipe main [
   1:number <- copy 3  # 3 points
diff --git a/036call_reply.cc b/036call_reply.cc
index 9a1a9b7e..f5ccc7f2 100644
--- a/036call_reply.cc
+++ b/036call_reply.cc
@@ -124,7 +124,7 @@ recipe test1 [
 ]
 +mem: storing 35 in location 1
 
-:(scenario reply_if2)
+:(scenario reply_if_2)
 recipe main [
   1:number <- test1
 ]
diff --git a/040brace.cc b/040brace.cc
index dcacdace..113a7517 100644
--- a/040brace.cc
+++ b/040brace.cc
@@ -196,7 +196,7 @@ recipe main [
 +after-brace: jump 0:offset
 +after-brace: jump 0:offset
 
-:(scenario break_cascading2)
+:(scenario break_cascading_2)
 recipe main [
   1:number <- copy 0
   2:number <- copy 0
@@ -261,7 +261,7 @@ recipe main [
 ]
 +after-brace: jump 3:offset
 
-:(scenario break_nested_degenerate2)
+:(scenario break_nested_degenerate_2)
 recipe main [
   1:number <- copy 0
   {
diff --git a/042name.cc b/042name.cc
index 45f5a3b2..7b976f88 100644
--- a/042name.cc
+++ b/042name.cc
@@ -158,7 +158,7 @@ recipe main [
 ]
 +warn: mixing variable names and numeric addresses in main
 
-:(scenario transform_names_warns_when_mixing_names_and_numeric_locations2)
+:(scenario transform_names_warns_when_mixing_names_and_numeric_locations_2)
 % Hide_warnings = true;
 recipe main [
   x:number <- copy 1
diff --git a/073scenario_screen_test.mu b/073scenario_screen_test.mu
index 79831ca0..b3fc6b04 100644
--- a/073scenario_screen_test.mu
+++ b/073scenario_screen_test.mu
@@ -1,6 +1,6 @@
 # To check our support for screens in scenarios, rewrite tests from print.mu
 
-scenario print-character-at-top-left2 [
+scenario print-character-at-top-left-2 [
   assume-screen 3/width, 2/height
   run [
     screen:address <- print-character screen:address, 97/a
@@ -11,7 +11,7 @@ scenario print-character-at-top-left2 [
   ]
 ]
 
-scenario clear-line-erases-printed-characters2 [
+scenario clear-line-erases-printed-characters-2 [
   assume-screen 5/width, 3/height
   run [
     # print a character