1848 - core instructions now check for ingredients

Also standardized warnings.

1 files changed, 8 insertions, 1 deletions

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;