From ce9b2b0515eaf92a9c68c8608fd9bf392c941d50 Mon Sep 17 00:00:00 2001 From: Kartik Agaram Date: Fri, 15 Jun 2018 22:16:09 -0700 Subject: 4258 - undo 4257 --- 023boolean.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '023boolean.cc') diff --git a/023boolean.cc b/023boolean.cc index 976cbff9..3d51fd7a 100644 --- a/023boolean.cc +++ b/023boolean.cc @@ -26,7 +26,7 @@ case AND: { case AND: { bool result = true; for (int i = 0; i < SIZE(ingredients); ++i) - result = result && scalar_ingredient(ingredients, i); + result = result && ingredients.at(i).at(0); products.resize(1); products.at(0).push_back(result); break; @@ -84,7 +84,7 @@ case OR: { case OR: { bool result = false; for (int i = 0; i < SIZE(ingredients); ++i) - result = result || scalar_ingredient(ingredients, i); + result = result || ingredients.at(i).at(0); products.resize(1); products.at(0).push_back(result); break; @@ -127,8 +127,8 @@ case NOT: { break; } for (int i = 0; i < SIZE(inst.ingredients); ++i) { - if (!is_mu_scalar(inst.ingredients.at(i)) && !is_mu_address(inst.ingredients.at(i))) { - raise << maybe(get(Recipe, r).name) << "'not' requires ingredients that can be interpreted as boolean, but got '" << inst.ingredients.at(i).original_string << "'\n" << end(); + if (!is_mu_scalar(inst.ingredients.at(i))) { + raise << maybe(get(Recipe, r).name) << "'not' requires boolean ingredients, but got '" << inst.ingredients.at(i).original_string << "'\n" << end(); goto finish_checking_instruction; } } @@ -145,7 +145,7 @@ case NOT: { case NOT: { products.resize(SIZE(ingredients)); for (int i = 0; i < SIZE(ingredients); ++i) { - products.at(i).push_back(!scalar_ingredient(ingredients, i)); + products.at(i).push_back(!ingredients.at(i).at(0)); } break; } -- cgit 1.4.1-2-gfad0