diff options
Diffstat (limited to '022boolean.cc')
-rw-r--r-- | 022boolean.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/022boolean.cc b/022boolean.cc index 9334ed6a..20571734 100644 --- a/022boolean.cc +++ b/022boolean.cc @@ -7,8 +7,8 @@ Recipe_number["and"] = AND; :(before "End Primitive Recipe Implementations") case AND: { bool result = true; - for (index_t i = 0; i < ingredients.size(); ++i) { - assert(ingredients.at(i).size() == 1); // scalar + for (long long int i = 0; i < SIZE(ingredients); ++i) { + assert(scalar(ingredients.at(i))); result = result && ingredients.at(i).at(0); } products.resize(1); @@ -55,8 +55,8 @@ Recipe_number["or"] = OR; :(before "End Primitive Recipe Implementations") case OR: { bool result = false; - for (index_t i = 0; i < ingredients.size(); ++i) { - assert(ingredients.at(i).size() == 1); // scalar + for (long long int i = 0; i < SIZE(ingredients); ++i) { + assert(scalar(ingredients.at(i))); result = result || ingredients.at(i).at(0); } products.resize(1); @@ -103,8 +103,8 @@ Recipe_number["not"] = NOT; :(before "End Primitive Recipe Implementations") case NOT: { products.resize(ingredients.size()); - for (index_t i = 0; i < ingredients.size(); ++i) { - assert(ingredients.at(i).size() == 1); // scalar + for (long long int i = 0; i < SIZE(ingredients); ++i) { + assert(scalar(ingredients.at(i))); products.at(i).push_back(!ingredients.at(i).at(0)); } break; |