From e46306432ddb75a89f69d92ccc175a23f0b72072 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sat, 25 Jul 2015 14:19:28 -0700 Subject: 1848 - core instructions now check for ingredients Also standardized warnings. --- 064random.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to '064random.cc') diff --git a/064random.cc b/064random.cc index 6fadeb40..bd171132 100644 --- a/064random.cc +++ b/064random.cc @@ -27,7 +27,14 @@ ROUND, Recipe_ordinal["round"] = ROUND; :(before "End Primitive Recipe Implementations") case ROUND: { - assert(scalar(ingredients.at(0))); + if (SIZE(ingredients) != 1) { + raise << current_recipe_name() << ": 'round' requires exactly one ingredient, but got " << current_instruction().to_string() << '\n' << end(); + break; + } + if (!scalar(ingredients.at(0))) { + raise << current_recipe_name() << ": first ingredient of 'round' should be a number, but got " << current_instruction().ingredients.at(0).original_string << '\n' << end(); + break; + } products.resize(1); products.at(0).push_back(rint(ingredients.at(0).at(0))); break; -- cgit 1.4.1-2-gfad0