"declare" no longer shadows, introduce "declare_with_shadows" for local keyword

Author: leafo

moonscript/compile/statement.lua

@@ -15,15 +15,15 @@ line_compile = {
     return self:add(text)
   end,
   declare = function(self, node)
-    local _, names = unpack(node)
+    local names = node[2]
     local undeclared = self:declare(names)
     if #undeclared > 0 then
       do
         local _with_0 = self:line("local ")
         _with_0:append_list((function()
           local _accum_0 = { }
           local _len_0 = 0
-          local _list_0 = names
+          local _list_0 = undeclared
           for _index_0 = 1, #_list_0 do
             local name = _list_0[_index_0]
             _len_0 = _len_0 + 1
@@ -35,6 +35,25 @@ line_compile = {
       end
     end
   end,
+  declare_with_shadows = function(self, node)
+    local names = node[2]
+    self:declare(names)
+    do
+      local _with_0 = self:line("local ")
+      _with_0:append_list((function()
+        local _accum_0 = { }
+        local _len_0 = 0
+        local _list_0 = names
+        for _index_0 = 1, #_list_0 do
+          local name = _list_0[_index_0]
+          _len_0 = _len_0 + 1
+          _accum_0[_len_0] = self:name(name)
+        end
+        return _accum_0
+      end)(), ", ")
+      return _with_0
+    end
+  end,
   assign = function(self, node)
     local _, names, values = unpack(node)
     local undeclared = self:declare(names)

moonscript/compile/statement.moon

@@ -17,11 +17,18 @@ line_compile =
     @add text
 
   declare: (node) =>
-    _, names = unpack node
+    names = node[2]
     undeclared = @declare names
     if #undeclared > 0
       with @line "local "
-        \append_list [@name name for name in *names], ", "
+        \append_list [@name name for name in *undeclared], ", "
+
+  -- this overrides the existing names with new locals, used for local keyword
+  declare_with_shadows: (node) =>
+    names = node[2]
+    @declare names
+    with @line "local "
+      \append_list [@name name for name in *names], ", "
 
   assign: (node) =>
     _, names, values = unpack node

moonscript/parse.lua

@@ -360,7 +360,7 @@ local build_grammar = wrap_env(function()
 		PopIndent = Cmt("", pop_indent),
 		InBlock = Advance * Block * PopIndent,
 
-		Local = key"local" * Ct(NameList) / mark"declare",
+		Local = key"local" * Ct(NameList) / mark"declare_with_shadows",
 
 		Import = key"import" *  Ct(ImportNameList) * key"from" * Exp / mark"import",
 		ImportName = (sym"\\" * Ct(Cc"colon_stub" * Name) + Name),

tests/inputs/local.moon

@@ -3,3 +3,9 @@ local a
 local a,b,c
 
 
+x = 1212
+something = ->
+  local x
+  x = 1212
+
+

tests/outputs/import.lua

@@ -1,5 +1,5 @@
 local hello = yeah.hello
-local hello, world
+local world
 do
   local _table_0 = table["cool"]
   hello, world = _table_0.hello, _table_0.world

tests/outputs/local.lua

@@ -1,2 +1,8 @@
 local a
-local a, b, c
+local a, b, c
+local x = 1212
+local something
+something = function()
+  local x
+  x = 1212
+end