From be45c431146bc0740a30c77ebd559840104c1140 Mon Sep 17 00:00:00 2001
From: "Kartik K. Agaram" <vc@akkartik.com>
Date: Mon, 22 Feb 2016 15:40:44 -0800
Subject: 2685

---
 040brace.cc                 | 2 +-
 050scenario.cc              | 3 +--
 054dilated_reagent.cc       | 4 ++--
 059shape_shifting_recipe.cc | 2 +-
 077hash.cc                  | 2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/040brace.cc b/040brace.cc
index 6458e8ef..735cdab3 100644
--- a/040brace.cc
+++ b/040brace.cc
@@ -61,7 +61,7 @@ void transform_braces(const recipe_ordinal r) {
     }
     if (inst.label == "}") {
       if (open_braces.empty()) {
-        raise << "missing '{' in " << get(Recipe, r).name << '\n';
+        raise << "missing '{' in " << get(Recipe, r).name << '\n' << end();
         return;
       }
       open_braces.pop();
diff --git a/050scenario.cc b/050scenario.cc
index b02fe95e..506bced6 100644
--- a/050scenario.cc
+++ b/050scenario.cc
@@ -615,9 +615,8 @@ case CHECK_TRACE_COUNT_FOR_LABEL: {
   if (count != expected_count) {
     if (Current_scenario && !Scenario_testing_scenario) {
       // genuine test in a mu file
-      raise_error << "\nF - " << Current_scenario->name << ": " << maybe(current_recipe_name()) << "expected " << expected_count << " lines in trace with label " << label << " in trace: ";
+      raise_error << "\nF - " << Current_scenario->name << ": " << maybe(current_recipe_name()) << "expected " << expected_count << " lines in trace with label " << label << " in trace: " << end();
       DUMP(label);
-      raise_error;
     }
     else {
       // just testing scenario support
diff --git a/054dilated_reagent.cc b/054dilated_reagent.cc
index f7b772a3..4ea6abc1 100644
--- a/054dilated_reagent.cc
+++ b/054dilated_reagent.cc
@@ -99,11 +99,11 @@ if (s.at(0) == '{') {
   in.get();  // skip '{'
   name = slurp_key(in);
   if (name.empty()) {
-    raise_error << "invalid reagent " << s << " without a name\n";
+    raise_error << "invalid reagent " << s << " without a name\n" << end();
     return;
   }
   if (name == "}") {
-    raise_error << "invalid empty reagent " << s << '\n';
+    raise_error << "invalid empty reagent " << s << '\n' << end();
     return;
   }
   {
diff --git a/059shape_shifting_recipe.cc b/059shape_shifting_recipe.cc
index ba48226c..6e65e344 100644
--- a/059shape_shifting_recipe.cc
+++ b/059shape_shifting_recipe.cc
@@ -285,7 +285,7 @@ void compute_type_names(recipe& variant) {
 void save_or_deduce_type_name(reagent& x, map<string, type_tree*>& type, const recipe& variant) {
   trace(9994, "transform") << "    checking " << to_string(x) << ": " << names_to_string(x.type) << end();
   if (!x.type && contains_key(type, x.name)) {
-    x.type = new type_tree(*get(type, x.name));
+    x.type = new type_tree(*get(type, x.name)); //TODO
     trace(9994, "transform") << "    deducing type to " << names_to_string(x.type) << end();
     return;
   }
diff --git a/077hash.cc b/077hash.cc
index 8c72779d..d483b235 100644
--- a/077hash.cc
+++ b/077hash.cc
@@ -122,7 +122,7 @@ size_t hash_mu_exclusive_container(size_t h, const reagent& r) {
   reagent variant = variant_type(r, tag);
   // todo: move this warning to container definition time
   if (has_property(variant, "ignore-for-hash"))
-    raise << get(Type, r.type->value).name << ": /ignore-for-hash won't work in exclusive containers\n";
+    raise << get(Type, r.type->value).name << ": /ignore-for-hash won't work in exclusive containers\n" << end();
   variant.set_value(r.value + /*skip tag*/1);
   h = hash(h, variant);
   return h;
-- 
cgit 1.4.1-2-gfad0