From 3ffeaf1f5dbf3e225dc536066d0fedda3f38ac70 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Tue, 15 May 2018 20:32:22 -0700 Subject: Removed "for all"-style iteration and changed "for % from 1 to 10"-style to "for % in 1 to 10" for consistency. --- core/math.nom | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'core/math.nom') diff --git a/core/math.nom b/core/math.nom index e79c8c3..c507b87 100644 --- a/core/math.nom +++ b/core/math.nom @@ -42,27 +42,31 @@ compile [all of %items, all %items] to unless: (%items' "type") is "List" return: Lua value "utils.all(\(%items as lua expr))" %clauses <- [] - for all (%items' "value"): lua> "table.insert(\%clauses, \(% as lua expr));" + for % in (%items' "value") + lua> "table.insert(\%clauses, \(% as lua expr));" return: Lua value "(\(%clauses joined with " and "))" parse [not all of %items, not all %items] as: not (all of %items) compile [any of %items, any %items] to unless: (%items' "type") is "List" return: Lua value "utils.any(\(%items as lua expr))" %clauses <- [] - for all (%items' "value"): lua> "table.insert(\%clauses, \(% as lua expr));" + for % in (%items' "value") + lua> "table.insert(\%clauses, \(% as lua expr));" return: Lua value "(\(%clauses joined with " or "))" parse [none of %items, none %items] as: not (any of %items) compile [sum of %items, sum %items] to unless: (%items' "type") is "List" return: Lua value "utils.sum(\(%items as lua expr))" %clauses <- [] - for all (%items' "value"): lua> "table.insert(\%clauses, \(% as lua expr));" + for % in (%items' "value") + lua> "table.insert(\%clauses, \(% as lua expr));" return: Lua value "(\(%clauses joined with " + "))" compile [product of %items, product %items] to unless: (%items' "type") is "List" return: Lua value "utils.product(\(%items as lua expr))" %clauses <- [] - for all (%items' "value"): lua> "table.insert(\%clauses, \(% as lua expr));" + for % in (%items' "value") + lua> "table.insert(\%clauses, \(% as lua expr));" return: Lua value "(\(%clauses joined with " * "))" action [avg of %items, average of %items] =lua "(utils.sum(\%items)/#\%items)" -- cgit v1.2.3