about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2015-07-25 00:24:12 -0700
committerKartik K. Agaram <vc@akkartik.com>2015-07-25 00:24:12 -0700
commit7381b17c351ae6e63a7bc3ad65839fa28ff5cbd4 (patch)
tree5d2873f34459ab57631012e6b17c7caa2e46d2ec
parentc5e965d87fe2ef50ac70722eea73e89095b9178d (diff)
downloadmu-7381b17c351ae6e63a7bc3ad65839fa28ff5cbd4.tar.gz
1846
-rw-r--r--011load.cc6
-rw-r--r--050scenario.cc2
-rw-r--r--081run_interactive.cc4
3 files changed, 6 insertions, 6 deletions
diff --git a/011load.cc b/011load.cc
index 7135b548..978d2fae 100644
--- a/011load.cc
+++ b/011load.cc
@@ -204,12 +204,12 @@ void skip_comma(istream& in) {
 //: step on their own toes. But there'll be many occasions later where
 //: we'll want to disable the warnings.
 :(before "End Globals")
-bool Hide_redefine_warnings = false;
+bool Disable_redefine_warnings = false;
 :(before "End Setup")
-Hide_redefine_warnings = false;
+Disable_redefine_warnings = false;
 :(code)
 bool warn_on_redefine(const string& recipe_name) {
-  if (Hide_redefine_warnings) return false;
+  if (Disable_redefine_warnings) return false;
   return true;
 }
 
diff --git a/050scenario.cc b/050scenario.cc
index b0322917..a0d72615 100644
--- a/050scenario.cc
+++ b/050scenario.cc
@@ -159,7 +159,7 @@ void run_mu_scenario(const scenario& s) {
 :(scenarios run)
 :(scenario warn_on_redefine_scenario)
 % Hide_warnings = true;
-% Hide_redefine_warnings = true;
+% Disable_redefine_warnings = true;
 recipe scenario-foo [
   1:number <- copy 34:literal
 ]
diff --git a/081run_interactive.cc b/081run_interactive.cc
index 36a0ec1a..bbb49a97 100644
--- a/081run_interactive.cc
+++ b/081run_interactive.cc
@@ -270,11 +270,11 @@ case RELOAD: {
     Trace_stream->collect_layer = "warn";
   }
   Hide_warnings = true;
-  Hide_redefine_warnings = true;
+  Disable_redefine_warnings = true;
   load(read_mu_string(ingredients.at(0).at(0)));
   transform_all();
   Trace_stream->newline();  // flush trace
-  Hide_redefine_warnings = false;
+  Disable_redefine_warnings = false;
   Hide_warnings = false;
   products.resize(1);
   products.at(0).push_back(warnings_from_trace());