Merge pull request #631 from pallene-lang/optional-arguments

Optional function arguments

benchmarks/binarytrees/lua.lua

@@ -1,4 +1,4 @@
-math.ln = math.log; local m = {}
+local m = {}
 
 function m.BottomUpTree(depth)
     if depth > 0 then

benchmarks/binsearch/lua.lua

@@ -1,4 +1,4 @@
-math.ln = math.log; local m = {}
+local m = {}
 
 function m.binsearch(t, x)
     -- lo <= x <= hi

benchmarks/centroid/lua.lua

@@ -1,4 +1,4 @@
-math.ln = math.log; local m = {}
+local m = {}
 
 function m.new(x, y)
     return { x, y }

benchmarks/conway/lua.lua

@@ -1,4 +1,4 @@
-math.ln = math.log; local m = {}
+local m = {}
 
 local ALIVE = "*"
 local DEAD  = " "

benchmarks/fannkuchredux/lua.lua

@@ -1,4 +1,4 @@
-math.ln = math.log; local m = {}
+local m = {}
 
 function m.fannkuch(N)
 

benchmarks/fasta/lua.lua

@@ -1,4 +1,4 @@
-math.ln = math.log; local m = {}
+local m = {}
 
 local IM   = 139968
 local IA   = 3877

benchmarks/mandelbrot/lua.lua

@@ -1,4 +1,4 @@
-math.ln = math.log; local m = {}
+local m = {}
 
 function m.mandelbrot(N)
     local bits  = 0

benchmarks/matmul/lua.lua

@@ -1,4 +1,4 @@
-math.ln = math.log; local m = {}
+local m = {}
 
 function m.matmul(A, B)
     local C = {}

benchmarks/nbody/lua.lua

@@ -1,4 +1,4 @@
-math.ln = math.log; local m = {}
+local m = {}
 
 
 

benchmarks/objmandelbrot/lua.lua

@@ -1,4 +1,4 @@
-math.ln = math.log; local m = {}
+local m = {}
 
 function m.new(x, y)
     return { x, y }

benchmarks/queen/lua.lua

@@ -1,4 +1,4 @@
-math.ln = math.log; local m = {}
+local m = {}
 
 -- check whether position (n,c) is free from attacks
 local function isplaceok (a, n, c)

benchmarks/sieve/lua.lua

@@ -1,4 +1,4 @@
-math.ln = math.log; local m = {}
+local m = {}
 
 function m.sieve(N)
     local is_prime = {}

benchmarks/spectralnorm/lua.lua

@@ -1,4 +1,4 @@
-math.ln = math.log; local m = {}
+local m = {}
 
 -- Return A[i][j], for the infinite matrix A
 --

doc/manual.md

@@ -484,7 +484,6 @@ The Pallene compiler has builtins for the following math library functions and c
  * math.floor(x)
  * math.fmod(x, y)
  * math.huge
- * math.ln(x)
  * math.log(x, base)
  * math.maxinteger
  * math.mininteger
@@ -495,9 +494,6 @@ The Pallene compiler has builtins for the following math library functions and c
 
 All the functions currently require float arguments. The compiler will reject integer arguments.
 
-At this time, math.log requires two parameters, and the compiler will reject one parameter calls.
-So as a workaround, use math.ln in place of the one parameter math.log.
-
 math.modf returns two values, an integer and a float. One minor difference from Lua is that Lua
 may return a float for the first value if some reason it cannot return an integer, such as if
 the result is NaN (which only exists in floating point). In Pallene, the first value will always be
@@ -610,4 +606,3 @@ As usual, {A} means 0 or more As, and \[A\] means an optional A.
         '&' | '~' | '|' | '>>' | '<<' | '..' |
         '<' | '<=' | '>' | '>=' | '==' | '~=' |
         and | or
-

spec/execution_tests.lua

@@ -424,6 +424,28 @@ function execution_tests.run(compile_file, backend, _ENV, only_compile)
         end)
     end)
 
+    describe("Optional arguments", function()
+        compile([[
+            function m.optarg(x:any, y:any): integer
+                local x:integer = x or (10 as any)
+                local y:integer = y or (20 as any)
+                return x+y
+            end
+
+            function m.call0(): integer
+                return m.optarg()
+            end
+
+            function m.call1(x:integer): integer
+                return m.optarg(x)
+            end
+
+            function m.call2(x:integer, y:integer): integer
+                return m.optarg(x,y)
+            end
+        ]])
+    end)
+
     describe("Unary Operators /", function()
 
         local tests = {
@@ -1616,18 +1638,20 @@ function execution_tests.run(compile_file, backend, _ENV, only_compile)
         end)
     end)
 
-    describe("math.ln builtin", function()
+    describe("math.log 1-arg builtin", function()
         compile([[
             function m.natural_log(x: float): float
-                return math.ln(x)
+                return math.log(x)
             end
         ]])
 
         it("works on positive numbers", function()
             run_test([[
-                assert(0.0 == test.natural_log(1.0))
-                assert(0.693 == tonumber(string.format("%.3f", test.natural_log(2.0))))
-                assert(2.303 == tonumber(string.format("%.3f", test.natural_log(10.0))))
+                local e = math.exp(1)
+                assert("0.000" == string.format("%.3f", test.natural_log(1.0 )))
+                assert("0.693" == string.format("%.3f", test.natural_log(2.0 )))
+                assert("1.000" == string.format("%.3f", test.natural_log(e   )))
+                assert("2.303" == string.format("%.3f", test.natural_log(10.0)))
             ]])
         end)
 
@@ -1646,7 +1670,7 @@ function execution_tests.run(compile_file, backend, _ENV, only_compile)
         end)
     end)
 
-    describe("math.log builtin", function()
+    describe("math.log 2-arg builtin", function()
         compile([[
             function m.math_log(x: float, base: float): float
                 return math.log(x, base)

spec/translator_spec.lua

@@ -35,10 +35,6 @@ end)
 local function assert_translation(pallene_code, expected)
     assert(compile("__translation_test__.pln", pallene_code))
     local contents = assert(util.get_file_contents("__translation_test__.lua"))
-    -- The introduction of math.ln in Pallene to workaround single param math.log requires emitted
-    -- Lua code to handle this as well. The current workaround injects "math.ln = math.log; " at
-    -- the beginning of the emited Lua. This function needs to account for this injection.
-    expected = "math.ln = math.log; " .. expected
     assert.are.same(expected, contents)
 end
 

spec/typechecker_spec.lua

@@ -858,7 +858,7 @@ end)
 
 describe("Table constructor", function()
 
-    describe("for arrrays", function()
+    describe("for arrays", function()
 
         it("must not contain named fields", function()
             assert_error([[

src/pallene/builtins.lua

@@ -28,8 +28,7 @@ builtins.modules = {
         floor = T.Function({ T.Float }, { T.Integer }),
         fmod  = T.Function({ T.Float, T.Float }, { T.Float }),
         exp   = T.Function({ T.Float }, { T.Float }),
-        ln    = T.Function({ T.Float }, { T.Float }),
-        log   = T.Function({ T.Float, T.Float }, { T.Float }),
+        log   = T.Function({ T.Float, T.Any }, { T.Float }),
         modf  = T.Function({ T.Float }, { T.Integer, T.Float }),
         pow   = T.Function({ T.Float, T.Float }, { T.Float }),
         sqrt  = T.Function({ T.Float }, { T.Float }),