From a3a0574f17424cb67c1be120b01d6b57771bbbfe Mon Sep 17 00:00:00 2001
From: "Kartik K. Agaram" <vc@akkartik.com>
Date: Thu, 25 Feb 2016 22:08:27 -0800
Subject: 2709

Only Hide_errors when strictly necessary. In other places let test
failures directly show the unexpected error.
---
 011load.cc                     | 1 -
 021check_instruction.cc        | 2 --
 030container.cc                | 4 ----
 032array.cc                    | 1 -
 033exclusive_container.cc      | 5 -----
 036call_reply.cc               | 1 -
 042name.cc                     | 2 --
 046global.cc                   | 1 -
 050scenario.cc                 | 3 +--
 054dilated_reagent.cc          | 2 --
 057static_dispatch.cc          | 3 ---
 058shape_shifting_container.cc | 6 ------
 059shape_shifting_recipe.cc    | 1 -
 060immutable.cc                | 6 ------
 082scenario_screen.cc          | 1 -
 15 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/011load.cc b/011load.cc
index 97af75f7..361c4bd6 100644
--- a/011load.cc
+++ b/011load.cc
@@ -374,7 +374,6 @@ recipe main [
 +error: redefining recipe main
 
 :(scenario permit_forcibly_redefining_recipes)
-% Hide_errors = true;
 recipe main [
   1:number <- copy 23
 ]
diff --git a/021check_instruction.cc b/021check_instruction.cc
index 67dd800b..f65dd398 100644
--- a/021check_instruction.cc
+++ b/021check_instruction.cc
@@ -73,7 +73,6 @@ recipe main [
 +error: main: can't copy 34 to 1:address:number; types don't match
 
 :(scenario write_address_to_number_allowed)
-% Hide_errors = true;
 recipe main [
   1:address:number <- copy 12/unsafe
   2:number <- copy 1:address:number
@@ -82,7 +81,6 @@ recipe main [
 $error: 0
 
 :(scenario write_boolean_to_number_allowed)
-% Hide_errors = true;
 recipe main [
   1:boolean <- copy 1/true
   2:number <- copy 1:boolean
diff --git a/030container.cc b/030container.cc
index 6b7f3dc0..1e5f40ee 100644
--- a/030container.cc
+++ b/030container.cc
@@ -522,7 +522,6 @@ recipe main [
 +error: main: unknown type integer in '1:integer <- copy 0'
 
 :(scenario run_allows_type_definition_after_use)
-% Hide_errors = true;
 recipe main [
   1:bar <- copy 0/unsafe
 ]
@@ -644,7 +643,6 @@ case MERGE: {
 //: type-check 'merge' to avoid interpreting numbers as addresses
 
 :(scenario merge_check)
-% Hide_errors = true;
 recipe main [
   1:point <- merge 3, 4
 ]
@@ -670,7 +668,6 @@ recipe main [
 //: container fields.
 
 :(scenario merge_check_recursive_containers)
-% Hide_errors = true;
 recipe main [
   1:point <- merge 3, 4
   1:point-number <- merge 1:point, 5
@@ -686,7 +683,6 @@ recipe main [
 +error: main: too few ingredients in '2:point-number <- merge 1:point'
 
 :(scenario merge_check_recursive_containers_3)
-% Hide_errors = true;
 recipe main [
   1:point-number <- merge 3, 4, 5
 ]
diff --git a/032array.cc b/032array.cc
index 0edf5b2b..cd63aa49 100644
--- a/032array.cc
+++ b/032array.cc
@@ -119,7 +119,6 @@ if (r.type && r.type->value == get(Type_ordinal, "array")) {
 //: advance
 
 :(scenario container_contains_array)
-% Hide_errors = true;
 container foo [
   x:array:number:3
 ]
diff --git a/033exclusive_container.cc b/033exclusive_container.cc
index 9c300e29..273c5c0c 100644
--- a/033exclusive_container.cc
+++ b/033exclusive_container.cc
@@ -175,7 +175,6 @@ else if (command == "exclusive-container") {
 //: fixed in advance
 
 :(scenario exclusive_container_contains_array)
-% Hide_errors = true;
 exclusive-container foo [
   x:array:number:3
 ]
@@ -208,7 +207,6 @@ recipe main [
 //: type-checking for 'merge' on exclusive containers
 
 :(scenario merge_handles_exclusive_container)
-% Hide_errors = true;
 exclusive-container foo [
   x:number
   y:bar
@@ -263,7 +261,6 @@ case EXCLUSIVE_CONTAINER: {
 }
 
 :(scenario merge_check_container_containing_exclusive_container)
-% Hide_errors = true;
 container foo [
   x:number
   y:bar
@@ -296,7 +293,6 @@ recipe main [
 +error: main: too many ingredients in '1:foo <- merge 23, 1/y, 34, 35'
 
 :(scenario merge_check_exclusive_container_containing_container)
-% Hide_errors = true;
 exclusive-container foo [
   x:number
   y:bar
@@ -314,7 +310,6 @@ recipe main [
 $error: 0
 
 :(scenario merge_check_exclusive_container_containing_container_2)
-% Hide_errors = true;
 exclusive-container foo [
   x:number
   y:bar
diff --git a/036call_reply.cc b/036call_reply.cc
index ab9cebbb..4385e628 100644
--- a/036call_reply.cc
+++ b/036call_reply.cc
@@ -146,7 +146,6 @@ recipe test1 [
 +error: main: '2:number <- test1 1:number' should write to 1:number rather than 2:number
 
 :(scenario reply_same_as_ingredient_dummy)
-# % Hide_errors = true;
 recipe main [
   1:number <- copy 0
   _ <- test1 1:number  # call with different ingredient and product
diff --git a/042name.cc b/042name.cc
index 733a8359..1cbf0d7a 100644
--- a/042name.cc
+++ b/042name.cc
@@ -166,7 +166,6 @@ recipe main [
 +error: main: mixing variable names and numeric addresses
 
 :(scenario transform_names_does_not_fail_when_mixing_names_and_raw_locations)
-% Hide_errors = true;
 recipe main [
   x:number <- copy 1:number/raw
 ]
@@ -174,7 +173,6 @@ recipe main [
 $error: 0
 
 :(scenario transform_names_does_not_fail_when_mixing_names_and_literals)
-% Hide_errors = true;
 recipe main [
   x:number <- copy 1
 ]
diff --git a/046global.cc b/046global.cc
index ca04741e..3e74c9f5 100644
--- a/046global.cc
+++ b/046global.cc
@@ -66,7 +66,6 @@ global_space = 0;
 //: don't want to make them too comfortable to use.
 
 :(scenario global_space_with_names)
-% Hide_errors = true;
 recipe main [
   global-space:address:shared:array:location <- new location:type, 10
   x:number <- copy 23
diff --git a/050scenario.cc b/050scenario.cc
index cce79260..a163b0d1 100644
--- a/050scenario.cc
+++ b/050scenario.cc
@@ -445,6 +445,7 @@ recipe main [
   ]
 ]
 -error: location 1 can't contain non-number 34  # comment
+# but there'll be an error signalled by memory-should-contain
 
 :(code)
 //: 'trace-should-contain' is like the '+' lines in our scenarios so far
@@ -527,7 +528,6 @@ recipe main [
 
 :(scenario trace_check_passes_silently)
 % Scenario_testing_scenario = true;
-% Hide_errors = true;
 recipe main [
   run [
     trace 1, [a], [b]
@@ -589,7 +589,6 @@ bool check_trace_missing(const string& in) {
 
 :(scenario trace_negative_check_passes_silently)
 % Scenario_testing_scenario = true;
-% Hide_errors = true;
 recipe main [
   trace-should-not-contain [
     a: b
diff --git a/054dilated_reagent.cc b/054dilated_reagent.cc
index 4ea6abc1..8f9be99a 100644
--- a/054dilated_reagent.cc
+++ b/054dilated_reagent.cc
@@ -18,7 +18,6 @@ recipe main [
 
 :(scenarios run)
 :(scenario dilated_reagent_with_comment)
-% Hide_errors = true;
 recipe main [
   {1: number, foo: bar} <- copy 34  # test comment
 ]
@@ -26,7 +25,6 @@ recipe main [
 $error: 0
 
 :(scenario dilated_reagent_with_comment_immediately_following)
-% Hide_errors = true;
 recipe main [
   1:number <- copy {34: literal}  # test comment
 ]
diff --git a/057static_dispatch.cc b/057static_dispatch.cc
index 3d2246b7..20babf15 100644
--- a/057static_dispatch.cc
+++ b/057static_dispatch.cc
@@ -387,7 +387,6 @@ recipe equal x:number, y:number -> z:boolean [
 +mem: storing 1 in location 6
 
 :(scenario static_dispatch_works_with_dummy_results_for_containers)
-% Hide_errors = true;
 recipe main [
   _ <- test 3, 4
 ]
@@ -404,7 +403,6 @@ recipe test a:number, b:number -> z:point [
 $error: 0
 
 :(scenario static_dispatch_works_with_compound_type_containing_container_defined_after_first_use)
-% Hide_errors = true;
 recipe main [
   x:address:shared:foo <- new foo:type
   test x
@@ -420,7 +418,6 @@ recipe test a:address:shared:foo -> z:number [
 $error: 0
 
 :(scenario static_dispatch_works_with_compound_type_containing_container_defined_after_second_use)
-% Hide_errors = true;
 recipe main [
   x:address:shared:foo <- new foo:type
   test x
diff --git a/058shape_shifting_container.cc b/058shape_shifting_container.cc
index 5bfd8e11..732a7ce1 100644
--- a/058shape_shifting_container.cc
+++ b/058shape_shifting_container.cc
@@ -16,7 +16,6 @@ recipe main [
 +mem: storing 16 in location 5
 
 :(scenario size_of_shape_shifting_container_2)
-% Hide_errors = true;
 # multiple type ingredients
 container foo:_a:_b [
   x:_a
@@ -28,7 +27,6 @@ recipe main [
 $error: 0
 
 :(scenario size_of_shape_shifting_container_3)
-% Hide_errors = true;
 container foo:_a:_b [
   x:_a
   y:_b
@@ -41,7 +39,6 @@ recipe main [
 $error: 0
 
 :(scenario size_of_shape_shifting_container_4)
-% Hide_errors = true;
 container foo:_a:_b [
   x:_a
   y:_b
@@ -473,7 +470,6 @@ if (type->value >= START_TYPE_INGREDIENTS) {
 //: 'merge' on shape-shifting containers
 
 :(scenario merge_check_shape_shifting_container_containing_exclusive_container)
-% Hide_errors = true;
 container foo:_elem [
   x:number
   y:_elem
@@ -506,7 +502,6 @@ recipe main [
 +error: main: too many ingredients in '1:foo:bar <- merge 23, 1/y, 34, 35'
 
 :(scenario merge_check_shape_shifting_exclusive_container_containing_container)
-% Hide_errors = true;
 exclusive-container foo:_elem [
   x:number
   y:_elem
@@ -524,7 +519,6 @@ recipe main [
 $error: 0
 
 :(scenario merge_check_shape_shifting_exclusive_container_containing_container_2)
-% Hide_errors = true;
 exclusive-container foo:_elem [
   x:number
   y:_elem
diff --git a/059shape_shifting_recipe.cc b/059shape_shifting_recipe.cc
index dbaa8503..d1ccb2c3 100644
--- a/059shape_shifting_recipe.cc
+++ b/059shape_shifting_recipe.cc
@@ -681,7 +681,6 @@ recipe foo x:_elem -> y:_elem [
 +mem: storing 4 in location 1
 
 :(scenario specialize_with_literal_3)
-% Hide_errors = true;
 recipe main [
   local-scope
   # permit '0' to map to address to shape-shifting type-ingredient
diff --git a/060immutable.cc b/060immutable.cc
index 2ac5d835..db0f9d4e 100644
--- a/060immutable.cc
+++ b/060immutable.cc
@@ -2,7 +2,6 @@
 //: also products. This layer will start enforcing this check.
 
 :(scenario can_modify_value_ingredients)
-% Hide_errors = true;
 recipe main [
   local-scope
   p:address:shared:point <- new point:type
@@ -17,7 +16,6 @@ recipe foo p:point [
 $error: 0
 
 :(scenario can_modify_ingredients_that_are_also_products)
-% Hide_errors = true;
 recipe main [
   local-scope
   p:address:shared:point <- new point:type
@@ -32,7 +30,6 @@ recipe foo p:address:shared:point -> p:address:shared:point [
 $error: 0
 
 :(scenario ignore_literal_ingredients_for_immutability_checks)
-% Hide_errors = true;
 recipe main [
   local-scope
   p:address:shared:d1 <- new d1:type
@@ -102,7 +99,6 @@ recipe foo p:address:shared:point [
 +error: foo: cannot modify q after instruction 'x:address:number <- get-address *q, x:offset' because that would modify ingredient p which is not also a product of foo
 
 :(scenario can_traverse_immutable_ingredients)
-% Hide_errors = true;
 container test-list [
   next:address:shared:test-list
 ]
@@ -124,7 +120,6 @@ recipe bar x:address:shared:test-list -> y:address:shared:test-list [
 $error: 0
 
 :(scenario handle_optional_ingredients_in_immutability_checks)
-% Hide_errors = true;
 recipe main [
   k:address:shared:number <- new number:type
   test k
@@ -310,7 +305,6 @@ set<long long int> ingredient_indices(const instruction& inst, const set<string>
 
 :(scenarios transform)
 :(scenario can_modify_contained_in_addresses)
-% Hide_errors = true;
 container test-list [
   next:address:shared:test-list
 ]
diff --git a/082scenario_screen.cc b/082scenario_screen.cc
index 1847cdaf..0b606331 100644
--- a/082scenario_screen.cc
+++ b/082scenario_screen.cc
@@ -115,7 +115,6 @@ if (s == "screen") return true;
 :(scenarios run)
 :(scenario convert_names_does_not_fail_when_mixing_special_names_and_numeric_locations)
 % Scenario_testing_scenario = true;
-% Hide_errors = true;
 recipe main [
   screen:number <- copy 1:number
 ]
-- 
cgit 1.4.1-2-gfad0