diff options
| -rw-r--r-- | 021check_instruction.cc | 8 | ||||
| -rw-r--r-- | 030container.cc | 2 | ||||
| -rw-r--r-- | 060recipe.cc | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/021check_instruction.cc b/021check_instruction.cc index 2bf0d97a..97d16fe8 100644 --- a/021check_instruction.cc +++ b/021check_instruction.cc @@ -27,7 +27,7 @@ void check_instruction(const recipe_ordinal r) { } for (int i = 0; i < SIZE(inst.ingredients); ++i) { if (!types_coercible(inst.products.at(i), inst.ingredients.at(i))) { - raise << maybe(get(Recipe, r).name) << "can't copy " << inst.ingredients.at(i).original_string << " to " << inst.products.at(i).original_string << "; types don't match\n" << end(); + raise << maybe(get(Recipe, r).name) << "can't copy '" << inst.ingredients.at(i).original_string << "' to '" << inst.products.at(i).original_string << "'; types don't match\n" << end(); goto finish_checking_instruction; } } @@ -55,21 +55,21 @@ def main [ def main [ 1:array:number <- copy 34 ] -+error: main: can't copy 34 to 1:array:number; types don't match ++error: main: can't copy '34' to '1:array:number'; types don't match :(scenario write_scalar_to_array_disallowed_2) % Hide_errors = true; def main [ 1:number, 2:array:number <- copy 34, 35 ] -+error: main: can't copy 35 to 2:array:number; types don't match ++error: main: can't copy '35' to '2:array:number'; types don't match :(scenario write_scalar_to_address_disallowed) % Hide_errors = true; def main [ 1:address:number <- copy 34 ] -+error: main: can't copy 34 to 1:address:number; types don't match ++error: main: can't copy '34' to '1:address:number'; types don't match :(scenario write_address_to_number_allowed) def main [ diff --git a/030container.cc b/030container.cc index 6187e815..6bf8bbdc 100644 --- a/030container.cc +++ b/030container.cc @@ -30,7 +30,7 @@ def main [ def main [ 2:point <- copy 1:number ] -+error: main: can't copy 1:number to 2:point; types don't match ++error: main: can't copy '1:number' to '2:point'; types don't match :(before "End Mu Types Initialization") // A more complex container, containing another container as one of its diff --git a/060recipe.cc b/060recipe.cc index 5d20572b..c1904eb8 100644 --- a/060recipe.cc +++ b/060recipe.cc @@ -163,7 +163,7 @@ def f x:number -> y:number [ load-ingredients y <- copy x ] -+error: main: can't copy {1: (recipe number -> number)} to {2: (recipe boolean -> boolean)}; types don't match ++error: main: can't copy '{1: (recipe number -> number)}' to '{2: (recipe boolean -> boolean)}'; types don't match :(scenario copy_typecheck_recipe_variable_2) % Hide_errors = true; @@ -175,7 +175,7 @@ def f x:boolean -> y:boolean [ load-ingredients y <- copy x ] -+error: main: can't copy f to {1: (recipe number -> number)}; types don't match ++error: main: can't copy 'f' to '{1: (recipe number -> number)}'; types don't match :(before "End Matching Types For Literal(to)") if (is_mu_recipe(to)) { |