Preserve non compile time types on lazy functions

edubart · Jan 31, 2020 · 0a36b73 · 0a36b73
1 parent 9b76066
commit 0a36b73
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/nelua/analyzer.lua b/nelua/analyzer.lua
@@ -888,7 +888,7 @@ local function visitor_Call(context, node, argnodes, calleetype, calleesym, call
         node:raisef("in call of function '%s': expected at most %d arguments but got %d",
           calleetype:prettyname(), #pseudoargtypes, #argnodes)
       end
-      local args = {}
+      local lazyargs = {}
       local knownallargs = true
       for i,funcargtype,argnode,argtype in izipargnodes(pseudoargtypes, argnodes) do
         local arg
@@ -902,6 +902,15 @@ local function visitor_Call(context, node, argnodes, calleetype, calleesym, call
         else
           arg = argtype
         end
+
+        if calleetype:is_lazyfunction() then
+          if funcargtype.lazyable then
+            lazyargs[i] = arg
+          else
+            lazyargs[i] = funcargtype
+          end
+        end
+
         if argtype and argtype:is_nil() and not funcargtype:is_nilable() then
           node:raisef("in call of function '%s': expected an argument at index %d but got nothing",
             calleetype:prettyname(), i)
@@ -914,7 +923,6 @@ local function visitor_Call(context, node, argnodes, calleetype, calleesym, call
                 calleetype:prettyname(), i, err)
             end
           end
-          args[i] = arg
         else
           knownallargs = false
         end
@@ -923,14 +931,14 @@ local function visitor_Call(context, node, argnodes, calleetype, calleesym, call
         end
       end
       if calleeobjnode then
-        tabler.insert(args, 1, funcargtypes[1])
+        tabler.insert(lazyargs, 1, funcargtypes[1])
       end
       if calleetype:is_lazyfunction() then
         local lazycalleetype = calleetype
         calleetype = nil
         calleesym = nil
         if knownallargs then
-          local lazyeval = lazycalleetype:eval_lazy_for_args(args)
+          local lazyeval = lazycalleetype:eval_lazy_for_args(lazyargs)
           if lazyeval and lazyeval.node and lazyeval.node.attr.type then
             calleesym = lazyeval.node.attr
             calleetype = lazyeval.node.attr.type
@@ -1384,7 +1392,7 @@ local function resolve_function_argtypes(symbol, varnode, argnodes, scope, check
     local argattr = argnode.attr
     -- function arguments types must be known ahead, fallbacks to any if untyped
     local argtype = argattr.type or primtypes.any
-    if checklazy and (argtype.lazyable or argattr.comptime) then
+    if checklazy and argtype.lazyable then
       islazyparent = true
     end
     argtypes[i] = argtype

diff --git a/spec/06-preprocessor_spec.lua b/spec/06-preprocessor_spec.lua
@@ -406,6 +406,14 @@ it("lazy function", function()
     end
     f(1)
   ]])
+  assert.analyze_ast([[
+    local function f(T: type, x: usize)
+       ## assert(x.type == primtypes.usize and T.value == primtypes.integer)
+       return x
+    end
+
+    f(@integer, 1)
+  ]])
   assert.analyze_ast([[
     local function f(x: auto)
       local r = 1.0 + x