From 9dcbec398c5aedf27757365cc1f4c7c36e138539 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Fri, 20 May 2016 22:09:06 -0700 Subject: 2990 Standardize quotes around reagents in error messages. I'm still sure there's issues. For example, the messages when type-checking 'copy'. I'm not putting quotes around them because in layer 60 I end up creating dilated reagents, and then it's a bit much to have quotes and (two kinds of) brackets. But I'm sure I'm doing that somewhere.. --- 053recipe_header.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to '053recipe_header.cc') diff --git a/053recipe_header.cc b/053recipe_header.cc index c58962a0..aebd9193 100644 --- a/053recipe_header.cc +++ b/053recipe_header.cc @@ -83,7 +83,7 @@ def foo a:number <- b:number [ % Hide_errors = true; def main ] -+error: recipe body must begin with '[' ++error: main: recipe body must begin with '[' :(scenario recipe_handles_missing_bracket_2) % Hide_errors = true; @@ -94,7 +94,7 @@ def main ] # doesn't overflow line when reading header -parse: header ingredient: local-scope -+error: recipe body must begin with '[' ++error: main: recipe body must begin with '[' :(scenario recipe_handles_missing_bracket_3) % Hide_errors = true; @@ -105,7 +105,7 @@ def main # comment ] # doesn't overflow line when reading header -parse: header ingredient: local-scope -+error: recipe body must begin with '[' ++error: main: recipe body must begin with '[' :(after "Begin debug_string(recipe x)") out << "ingredients:\n"; @@ -290,7 +290,7 @@ def add2 x:number, x:number -> z:number [ load-ingredients return z ] -+error: add2: x can't repeat in the ingredients ++error: add2: 'x' can't repeat in the ingredients :(before "End recipe Fields") map ingredient_index; @@ -306,7 +306,7 @@ void check_header_ingredients(const recipe_ordinal r) { trace(9991, "transform") << "--- checking reply instructions against header for " << caller_recipe.name << end(); for (int i = 0; i < SIZE(caller_recipe.ingredients); ++i) { if (contains_key(caller_recipe.ingredient_index, caller_recipe.ingredients.at(i).name)) - raise << maybe(caller_recipe.name) << caller_recipe.ingredients.at(i).name << " can't repeat in the ingredients\n" << end(); + raise << maybe(caller_recipe.name) << "'" << caller_recipe.ingredients.at(i).name << "' can't repeat in the ingredients\n" << end(); put(caller_recipe.ingredient_index, caller_recipe.ingredients.at(i).name, i); } } @@ -485,7 +485,7 @@ def add2 x:number, y:number -> x:number [ local-scope load-ingredients ] -+error: main: '3:number <- add2 1:number, 2:number' should write to 1:number rather than 3:number ++error: main: '3:number <- add2 1:number, 2:number' should write to '1:number' rather than '3:number' :(before "End Includes") using std::min; -- cgit 1.4.1-2-gfad0