about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--060rewrite_literal_string.cc4
-rw-r--r--082scenario_screen.cc5
-rw-r--r--085scenario_console.cc4
3 files changed, 10 insertions, 3 deletions
diff --git a/060rewrite_literal_string.cc b/060rewrite_literal_string.cc
index 707a8e3d..cf0ec24b 100644
--- a/060rewrite_literal_string.cc
+++ b/060rewrite_literal_string.cc
@@ -27,13 +27,11 @@ void initialize_transform_rewrite_literal_string_to_text() {
   recipes_taking_literal_strings.insert("assert");
   recipes_taking_literal_strings.insert("new");
   recipes_taking_literal_strings.insert("run");
-  recipes_taking_literal_strings.insert("assume-console");
   recipes_taking_literal_strings.insert("memory-should-contain");
   recipes_taking_literal_strings.insert("trace-should-contain");
   recipes_taking_literal_strings.insert("trace-should-not-contain");
   recipes_taking_literal_strings.insert("check-trace-count-for-label");
-  recipes_taking_literal_strings.insert("screen-should-contain");
-  recipes_taking_literal_strings.insert("screen-should-contain-in-color");
+  // End initialize_transform_rewrite_literal_string_to_text()
 }
 
 void rewrite_literal_string_to_text(recipe_ordinal r) {
diff --git a/082scenario_screen.cc b/082scenario_screen.cc
index e79f66cb..d150ba3a 100644
--- a/082scenario_screen.cc
+++ b/082scenario_screen.cc
@@ -4,6 +4,11 @@
 //: instructions in the scenario. 'screen-should-contain' can check unicode
 //: characters in the fake screen
 
+//: first make sure we don't mangle these functions in other transforms
+:(before "End initialize_transform_rewrite_literal_string_to_text()")
+recipes_taking_literal_strings.insert("screen-should-contain");
+recipes_taking_literal_strings.insert("screen-should-contain-in-color");
+
 :(scenarios run_mu_scenario)
 :(scenario screen_in_scenario)
 scenario screen-in-scenario [
diff --git a/085scenario_console.cc b/085scenario_console.cc
index f6c17054..b6f820f1 100644
--- a/085scenario_console.cc
+++ b/085scenario_console.cc
@@ -4,6 +4,10 @@
 //: scenario. Like with the fake screen, 'assume-console' transparently
 //: supports unicode.
 
+//: first make sure we don't mangle these functions in other transforms
+:(before "End initialize_transform_rewrite_literal_string_to_text()")
+recipes_taking_literal_strings.insert("assume-console");
+
 :(scenarios run_mu_scenario)
 :(scenario keyboard_in_scenario)
 scenario keyboard-in-scenario [