From 7c6047254e5aa7ce5a0667b14676b22a7447f956 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Mon, 10 Sep 2018 16:26:08 -0700 Subject: Upgraded to 3.8 (text method changes) and fixed some bugs in tree_to_nomsu. --- core/math.nom | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'core/math.nom') diff --git a/core/math.nom b/core/math.nom index 6a205b6..439b698 100644 --- a/core/math.nom +++ b/core/math.nom @@ -1,4 +1,4 @@ -#!/usr/bin/env nomsu -V3.7.5.6 +#!/usr/bin/env nomsu -V3.8.7.6 # This file defines some common math literals and functions @@ -73,27 +73,27 @@ compile [all of %items, all %items] to: unless (%items.type is "List"): return (Lua value "utils.all(\(%items as lua expr))") %clauses = ((% as lua expr) for % in %items) - return (Lua value "(\(%clauses joined with " and "))") + 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 = ((% as lua expr) for % in %items) - return (Lua value "(\(%clauses joined with " or "))") + 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 = ((% as lua expr) for % in %items) - return (Lua value "(\(%clauses joined with " + "))") + 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 = ((% as lua expr) for % in %items) - return (Lua value "(\(%clauses joined with " * "))") + return (Lua value "(\(%clauses::joined with " * "))") action [avg of %items, average of %items] (=lua "(utils.sum(\%items)/#\%items)") compile [min of %items, smallest of %items, lowest of %items] to (..) -- cgit v1.2.3