update for changes to loop expressions #66

Author: leafo

Makefile

@@ -11,5 +11,9 @@ global:
 compile:
 	bin/moonc moon/ moonscript/
 
+
+compile_global:
+	moonc moon/ moonscript/
+
 watch:
 	moonc -w moon/ moonscript/

moonscript/compile.lua

@@ -356,25 +356,33 @@ do
         local _len_0 = 1
         local _list_0 = names
         for _index_0 = 1, #_list_0 do
-          local name = _list_0[_index_0]
-          local is_local = false
-          local real_name
-          local _exp_0 = mtype(name)
-          if LocalName == _exp_0 then
-            is_local = true
-            real_name = name:get_name(self)
-          elseif NameProxy == _exp_0 then
-            real_name = name:get_name(self)
-          elseif "string" == _exp_0 then
-            real_name = name
-          end
-          local _value_0
-          if is_local or real_name and not self:has_name(real_name) then
-            _value_0 = real_name
-          end
-          if _value_0 ~= nil then
-            _accum_0[_len_0] = _value_0
-            _len_0 = _len_0 + 1
+          local _continue_0 = false
+          repeat
+            local name = _list_0[_index_0]
+            local is_local = false
+            local real_name
+            local _exp_0 = mtype(name)
+            if LocalName == _exp_0 then
+              is_local = true
+              real_name = name:get_name(self)
+            elseif NameProxy == _exp_0 then
+              real_name = name:get_name(self)
+            elseif "string" == _exp_0 then
+              real_name = name
+            end
+            if not (is_local or real_name and not self:has_name(real_name)) then
+              _continue_0 = true
+              break
+            end
+            local _value_0 = real_name
+            if _value_0 ~= nil then
+              _accum_0[_len_0] = _value_0
+              _len_0 = _len_0 + 1
+            end
+            _continue_0 = true
+          until true
+          if not _continue_0 then
+            break
           end
         end
         return _accum_0

moonscript/compile.moon

@@ -216,7 +216,8 @@ class Block
         when NameProxy then name\get_name self
         when "string" then name
 
-      real_name if is_local or real_name and not @has_name real_name
+      continue unless is_local or real_name and not @has_name real_name
+      real_name
 
     @put_name name for name in *undeclared
     undeclared

moonscript/compile/value.lua

@@ -209,11 +209,8 @@ local value_compilers = {
           local _list_2 = args
           for _index_0 = 1, #_list_2 do
             local arg = _list_2[_index_0]
-            local _value_0 = arg[1]
-            if _value_0 ~= nil then
-              _accum_0[_len_0] = _value_0
-              _len_0 = _len_0 + 1
-            end
+            _accum_0[_len_0] = arg[1]
+            _len_0 = _len_0 + 1
           end
           return _accum_0
         end)()

moonscript/compile/value.moon

@@ -112,9 +112,9 @@ value_compilers =
       \stms block
 
       -- inject more args if the block manipulated arguments
+      -- only varargs bubbling does this currently
       if #args > #arg_names -- will only work for simple adjustments
-        arg_names = for arg in *args
-          arg[1]
+        arg_names = [arg[1] for arg in *args]
 
       .header = "function("..concat(arg_names, ", ")..")"
 

moonscript/transform.lua

@@ -875,18 +875,26 @@ local Statement = Transformer({
       local _len_0 = 1
       local _list_1 = properties
       for _index_0 = 1, #_list_1 do
-        local tuple = _list_1[_index_0]
-        local key = tuple[1]
-        local _value_0
-        if key[1] == "key_literal" and key[2] == constructor_name then
-          constructor = tuple[2]
-          _value_0 = nil
-        else
-          _value_0 = tuple
-        end
-        if _value_0 ~= nil then
-          _accum_0[_len_0] = _value_0
-          _len_0 = _len_0 + 1
+        local _continue_0 = false
+        repeat
+          local tuple = _list_1[_index_0]
+          local key = tuple[1]
+          local _value_0
+          if key[1] == "key_literal" and key[2] == constructor_name then
+            constructor = tuple[2]
+            _continue_0 = true
+            break
+          else
+            _value_0 = tuple
+          end
+          if _value_0 ~= nil then
+            _accum_0[_len_0] = _value_0
+            _len_0 = _len_0 + 1
+          end
+          _continue_0 = true
+        until true
+        if not _continue_0 then
+          break
         end
       end
       return _accum_0

moonscript/transform.moon

@@ -486,7 +486,7 @@ Statement = Transformer {
       key = tuple[1]
       if key[1] == "key_literal" and key[2] == constructor_name
         constructor = tuple[2]
-        nil
+        continue
       else
         tuple