expands aliases in parameters of global functions, closes issue #58

examples/issues/issue58.lua

@@ -0,0 +1,10 @@
+typealias Cmd = string|{string}
+
+function f(cmd:Cmd) -- if I change to cmd:string|{string}, it works
+   local c: {string} = {}
+   if type(cmd) == "string" then
+      table.insert(c, cmd)
+   else
+      c = cmd
+   end
+end

examples/issues/tlc.lua

@@ -0,0 +1,12 @@
+
+
+f = function (cmd) 
+  local c = {}
+  if type(cmd) == "string" then 
+    table.insert(c,cmd)
+  else 
+    c = cmd
+  end
+end
+
+

typedlua/tlchecker.lua

@@ -58,37 +58,49 @@ local function get_interface (env, name, pos)
   end
 end
 
-local function replace_names (env, t, pos)
-  if tltype.isLiteral(t) or
+local function replace_names (env, t, pos, ignore)
+  ignore = ignore or {}
+  if tltype.isRecursive(t) then
+    local link = ignore[t[1]]
+    ignore[t[1]] = true
+    local r = tltype.Recursive(t[1], replace_names(env, t[2], pos, ignore))
+    r.name = t.name
+    ignore[t[1]] = link
+  elseif tltype.isLiteral(t) or
      tltype.isBase(t) or
      tltype.isNil(t) or
      tltype.isValue(t) or
      tltype.isAny(t) or
      tltype.isSelf(t) or
-     tltype.isVoid(t) or
-     tltype.isRecursive(t) then
+     tltype.isVoid(t) then
     return t
   elseif tltype.isUnion(t) or
          tltype.isUnionlist(t) or
          tltype.isTuple(t) then
-    local r = { tag = t.tag }
+    local r = { tag = t.tag, name = t.name }
     for k, v in ipairs(t) do
-      r[k] = replace_names(env, t[k], pos)
+      r[k] = replace_names(env, t[k], pos, ignore)
     end
     return r
   elseif tltype.isFunction(t) then
-    t[1] = replace_names(env, t[1], pos)
-    t[2] = replace_names(env, t[2], pos)
+    t[1] = replace_names(env, t[1], pos, ignore)
+    t[2] = replace_names(env, t[2], pos, ignore)
     return t
   elseif tltype.isTable(t) then
     for k, v in ipairs(t) do
-      t[k][2] = replace_names(env, t[k][2], pos)
+      t[k][2] = replace_names(env, t[k][2], pos, ignore)
     end
     return t
   elseif tltype.isVariable(t) then
-    return replace_names(env, get_interface(env, t[1], pos), pos)
+    if not ignore[t[1]] then
+      local r = replace_names(env, get_interface(env, t[1], pos), pos, ignore)
+      r.name = t[1]
+      return r
+    else
+      return t
+    end
   elseif tltype.isVararg(t) then
-    t[1] = replace_names(env, t[1], pos)
+    t[1] = replace_names(env, t[1], pos, ignore)
     return t
   else
     return t
@@ -189,6 +201,8 @@ local function check_interface (env, stm)
     msg = string.format(msg, name)
     typeerror(env, "alias", msg, stm.pos)
   else
+    local t = replace_names(env, t, stm.pos)
+    t.name = name
     tlst.set_interface(env, name, t, is_local)
   end
   return false
@@ -541,7 +555,7 @@ local function check_paren (env, exp)
   set_type(exp, tltype.first(t1))
 end
 
-local function check_parameters (env, parlist)
+local function check_parameters (env, parlist, pos)
   local len = #parlist
   if len == 0 then
     if env.strict then
@@ -556,7 +570,7 @@ local function check_parameters (env, parlist)
     end
     for i = 1, len do
       if not parlist[i][2] then parlist[i][2] = Any end
-      l[i] = parlist[i][2]
+      l[i] = replace_names(env, parlist[i][2], pos)
     end
     if parlist[len].tag == "Dots" then
       local t = parlist[len][1] or Any
@@ -607,12 +621,13 @@ local function check_function (env, exp)
   end
   tlst.begin_function(env)
   tlst.begin_scope(env)
-  local input_type = check_parameters(env, idlist)
+  local input_type = check_parameters(env, idlist, exp.pos)
   local t = tltype.Function(input_type, ret_type)
   local len = #idlist
   if len > 0 and idlist[len].tag == "Dots" then len = len - 1 end
   for k = 1, len do
     local v = idlist[k]
+    v[2] = replace_names(env, v[2], exp.pos)
     set_type(v, v[2])
     check_masking(env, v[1], v.pos)
     tlst.set_local(env, v)
@@ -974,7 +989,7 @@ local function check_localrec (env, id, exp)
     infer_return = true
   end
   tlst.begin_function(env)
-  local input_type = check_parameters(env, idlist)
+  local input_type = check_parameters(env, idlist, exp.pos)
   local t = tltype.Function(input_type, ret_type)
   t = replace_names(env, t, exp.pos)
   id[2] = t

typedlua/tltype.lua

@@ -10,7 +10,7 @@ tltype.integer = false
 
 -- literal types
 
--- Literal : (boolean|number|string) -> (type) 
+-- Literal : (boolean|number|string) -> (type)
 function tltype.Literal (l)
   return { tag = "TLiteral", [1] = l }
 end
@@ -1004,8 +1004,10 @@ end
 -- tostring
 
 -- type2str (type) -> (string)
-local function type2str (t)
-  if tltype.isLiteral(t) then
+local function type2str (t, full)
+  if not full and t.name then
+    return t.name
+  elseif tltype.isLiteral(t) then
     return tostring(t[1])
   elseif tltype.isBase(t) then
     return t[1]
@@ -1056,8 +1058,8 @@ local function type2str (t)
 end
 
 -- tostring : (type) -> (string)
-function tltype.tostring (t)
-  return type2str(t)
+function tltype.tostring (t, full)
+  return type2str(t, full)
 end
 
 return tltype