All tests passing (except object)

1 files changed, 45 insertions, 45 deletions

diff --git a/core/math.nom b/core/math.nom
index 31be658..0df8f16 100644
--- a/core/math.nom
+++ b/core/math.nom
@@ -7,77 +7,77 @@ use "core/operators.nom"
 use "core/control_flow.nom"
 
 # Literals:
-compile [infinity, inf] to {expr:"math.huge"}
-compile [not a number, NaN, nan] to {expr:"(0/0)"}
-compile [pi, Pi, PI] to {expr:"math.pi"}
-compile [tau, Tau, TAU] to {expr:"(2*math.pi)"}
-compile [golden ratio] to {expr:"((1+math.sqrt(5))/2)"}
-compile [e] to {expr:"math.exp(1)"}
+compile [infinity, inf] to: Lua value "math.huge"
+compile [not a number, NaN, nan] to: Lua value "(0/0)"
+compile [pi, Pi, PI] to: Lua value "math.pi"
+compile [tau, Tau, TAU] to: Lua value "(2*math.pi)"
+compile [golden ratio] to: Lua value "((1+math.sqrt(5))/2)"
+compile [e] to: Lua value "math.exp(1)"
 
 # Functions:
-compile [% as a number] to {expr:"tonumber(\(% as lua expr))"}
-compile [absolute value %, | % |, abs %] to {expr:"math.abs(\(% as lua expr))"}
-compile [square root %, square root of %, √%, sqrt %] to {expr:"math.sqrt(\(% as lua expr))"}
-compile [sine %, sin %] to {expr:"math.sin(\(% as lua expr))"}
-compile [cosine %, cos %] to {expr:"math.cos(\(% as lua expr))"}
-compile [tangent %, tan %] to {expr:"math.tan(\(% as lua expr))"}
-compile [arc sine %, asin %] to {expr:"math.asin(\(% as lua expr))"}
-compile [arc cosine %, acos %] to {expr:"math.acos(\(% as lua expr))"}
-compile [arc tangent %, atan %] to {expr:"math.atan(\(% as lua expr))"}
-compile [arc tangent %y/%x, atan2 %y %x] to {expr:"math.atan2(\(%y as lua expr), \(%x as lua expr))"}
-compile [hyperbolic sine %, sinh %] to {expr:"math.sinh(\(% as lua expr))"}
-compile [hyperbolic cosine %, cosh %] to {expr:"math.cosh(\(% as lua expr))"}
-compile [hyperbolic tangent %, tanh %] to {expr:"math.tanh(\(% as lua expr))"}
-compile [e^%, exp %] to {expr:"math.exp(\(% as lua expr))"}
-compile [natural log %, ln %, log %] to {expr:"math.log(\(% as lua expr))"}
-compile [log % base %base, log_%base %, log base %base %] to {expr:"math.log(\(% as lua expr), \(%base as lua expr))"}
-compile [floor %] to {expr:"math.floor(\(% as lua expr))"}
-compile [ceiling %, ceil %] to {expr:"math.ceil(\(% as lua expr))"}
-compile [round %, % rounded] to {expr:"math.floor(\(% as lua expr) + .5)"}
+compile [% as a number] to: Lua value "tonumber(\(% as lua expr))"
+compile [absolute value %, | % |, abs %] to: Lua value "math.abs(\(% as lua expr))"
+compile [square root %, square root of %, √%, sqrt %] to: Lua value "math.sqrt(\(% as lua expr))"
+compile [sine %, sin %] to: Lua value "math.sin(\(% as lua expr))"
+compile [cosine %, cos %] to: Lua value "math.cos(\(% as lua expr))"
+compile [tangent %, tan %] to: Lua value "math.tan(\(% as lua expr))"
+compile [arc sine %, asin %] to: Lua value "math.asin(\(% as lua expr))"
+compile [arc cosine %, acos %] to: Lua value "math.acos(\(% as lua expr))"
+compile [arc tangent %, atan %] to: Lua value "math.atan(\(% as lua expr))"
+compile [arc tangent %y/%x, atan2 %y %x] to: Lua value "math.atan2(\(%y as lua expr), \(%x as lua expr))"
+compile [hyperbolic sine %, sinh %] to: Lua value "math.sinh(\(% as lua expr))"
+compile [hyperbolic cosine %, cosh %] to: Lua value "math.cosh(\(% as lua expr))"
+compile [hyperbolic tangent %, tanh %] to: Lua value "math.tanh(\(% as lua expr))"
+compile [e^%, exp %] to: Lua value "math.exp(\(% as lua expr))"
+compile [natural log %, ln %, log %] to: Lua value "math.log(\(% as lua expr))"
+compile [log % base %base, log_%base %, log base %base %] to: Lua value "math.log(\(% as lua expr), \(%base as lua expr))"
+compile [floor %] to: Lua value "math.floor(\(% as lua expr))"
+compile [ceiling %, ceil %] to: Lua value "math.ceil(\(% as lua expr))"
+compile [round %, % rounded] to: Lua value "math.floor(\(% as lua expr) + .5)"
 action [%n to the nearest %rounder]:
     =lua "(\%rounder)*math.floor((\%n / \%rounder) + .5)"
 
 # Any/all/none
 compile [all of %items, all %items] to:
     unless: (%items' "type") is "List"
-        return {expr:"utils.all(\(%items as lua expr))"}
+        return: Lua value "utils.all(\(%items as lua expr))"
     %clauses <- []
     for all (%items' "value"): lua> "table.insert(\%clauses, \(% as lua expr));"
-    return {expr:"(\(%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 {expr:"utils.any(\(%items as lua expr))"}
+        return: Lua value "utils.any(\(%items as lua expr))"
     %clauses <- []
     for all (%items' "value"): lua> "table.insert(\%clauses, \(% as lua expr));"
-    return {expr:"(\(%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 {expr:"utils.sum(\(%items as lua expr))"}
+        return: Lua value "utils.sum(\(%items as lua expr))"
     %clauses <- []
     for all (%items' "value"): lua> "table.insert(\%clauses, \(% as lua expr));"
-    return {expr:"(\(%clauses joined with " + "))"}
+    return: Lua value "(\(%clauses joined with " + "))"
 compile [product of %items, product %items] to:
     unless: (%items' "type") is "List"
-        return {expr:"utils.product(\(%items as lua expr))"}
+        return: Lua value "utils.product(\(%items as lua expr))"
     %clauses <- []
     for all (%items' "value"): lua> "table.insert(\%clauses, \(% as lua expr));"
-    return {expr:"(\(%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 {..}
-    expr:"utils.min(\(%items as lua expr))"
-compile [max of %items, biggest of %items, largest of %items, highest of %items] to {..}
-    expr:"utils.max(\(%items as lua expr))"
-compile [min of %items by %value_expr] to {..}
-    expr: ".."
-        utils.min(\(%items as lua expr), function(\(\% as lua expr))
+compile [min of %items, smallest of %items, lowest of %items] to
+    Lua value "utils.min(\(%items as lua expr))"
+compile [max of %items, biggest of %items, largest of %items, highest of %items] to
+    Lua value "utils.max(\(%items as lua expr))"
+compile [min of %items by %value_expr] to
+    Lua value ".."
+        utils.min(\(%items as lua expr), function(_)
             return \(%value_expr as lua expr)
         end)
-compile [max of %items by %value_expr] to {..}
-    expr: ".."
-        utils.max(\(%items as lua expr), function(\(\% as lua expr))
+compile [max of %items by %value_expr] to
+    Lua value ".."
+        utils.max(\(%items as lua expr), function(_)
             return \(%value_expr as lua expr)
         end)
 
@@ -87,8 +87,8 @@ action [seed random with %]:
         math.randomseed(\%);
         for i=1,20 do math.random(); end
 parse [seed random] as: seed random with (=lua "os.time()")
-compile [random number, random, rand] to {expr:"math.random()"}
-compile [random int %n, random integer %n, randint %n] to {expr:"math.random(\(%n as lua expr))"}
+compile [random number, random, rand] to: Lua value "math.random()"
+compile [random int %n, random integer %n, randint %n] to: Lua value "math.random(\(%n as lua expr))"
 compile [random from %low to %high, random number from %low to %high, rand %low %high] to
     "math.random(\(%low as lua expr), \(%high as lua expr))"
 action [random choice from %elements, random choice %elements, random %elements]: