Fixed obnoxious bug where List was getting used instead of a Dict,

causing havoc when .first and .pop were being accessed.

compatibility/3.6.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.6.5.6
+#!/usr/bin/env nomsu -V3.7
 #
     This file defines upgrades from Nomsu <3.6 to 3.6
 

compatibility/3.7.nom

@@ -1,10 +1,9 @@
-#!/usr/bin/env nomsu -V3.6.5.6
+#!/usr/bin/env nomsu -V3.7
 #
     This file defines upgrades from Nomsu <3.7 to 3.7
 
 use "compatibility/compatibility.nom"
 
-# Indexing
 upgrade action [%index st to last in %list] to "3.7" as (%list::%index st to last)
 upgrade action [%index nd to last in %list] to "3.7" as (%list::%index nd to last)
 upgrade action [%index rd to last in %list] to "3.7" as (%list::%index rd to last)

compatibility/compatibility.nom

@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V3.6.5.6
+#!/usr/bin/env nomsu -V3.7
 #
     This file contains code for defining ways to upgrade code between different versions
     of Nomsu.
@@ -9,7 +9,7 @@ use "lib/os.nom"
 action [upgrade to %version via %upgrade_fn]:
     %UPGRADES.%version = %upgrade_fn
 
-%ACTION_UPGRADES = ({} with fallback % -> [])
+%ACTION_UPGRADES = ({} with fallback % -> {})
 action [upgrade action %stub to %version via %upgrade_fn]:
     %ACTION_UPGRADES.%version.%stub = %upgrade_fn
 
@@ -18,43 +18,48 @@ parse [upgrade %tree to %version as %body] as (..)
 
 compile [upgrade action %actions to %version as %body] to:
     if (%actions is "Action" syntax tree):
-        %actions = [%actions]
+        %actions = \[%actions]
     %lua = (Lua "")
     for %action in %actions:
         %replacements = {}
-        for %i in 1 to (length of %action):
+        for %i in 1 to (size of %action):
             if (%action.%i.type is "Var"):
                 %replacements.(%action.%i.1) = "\(\%tree as lua id)[\%i]"
         
+        %needs_mangle = (no)
         local action [make tree %t]:
             when:
                 (%t is "Var" syntax tree):
                     if %replacements.(%t.1):
                         return %replacements.(%t.1)
                     ..else:
+                        external %needs_mangle = (yes)
                         return ".."
                             \(%t.type){source=\(quote "\(%t.source)"), \(..)
                                 quote "\(%t.1) \000\(=lua "string.format('%X', __MANGLE_INDEX)")"
                             ..}
                 
                 (%t is syntax tree):
-                    %args = ((make tree %) for % in %t)
+                    %args = []
-                    %args::add "source=\(\%tree as lua id).source"
+                    for %k = %v in %t:
-                    if %t.target:
+                        if ((type of %k) == "number"):
-                        %args::add "target=\(make tree %t.target)"
+                            %args::add (make tree %v)
+                        ..else:
+                            %args::add "\%k=\(make tree %v)"
                     return "\(%t.type){\(%args joined with ", ")}"
                 
                 else:
-                    return (quote "\%t")
+                    return (quote %t)
         
         unless ("\%lua" == ""): %lua::append "\n"
+        %retval = (make tree %body)
         %lua::append (..)
             Lua ".."
                 A_upgrade_action_1_to_2_via_3(\(quote %action.stub), \(%version as lua expr), function(\(..)
                     \%tree as lua id
                 ..)
-                    __MANGLE_INDEX = (__MANGLE_INDEX or 0) + 1
+                    \("__MANGLE_INDEX = (__MANGLE_INDEX or 0) + 1\n    " if (%needs_mangle) else "")\
-                    return \(make tree %body)
+                ..return \%retval
                 end)
     
     return %lua

syntax_tree.lua

@@ -70,6 +70,12 @@ for _index_0 = 1, #types do
               unpack(self.comments)
             }
           end
+          do
+            local init = replacement.__init
+            if init then
+              init(replacement)
+            end
+          end
         end
       else
         replacement = {
@@ -102,6 +108,12 @@ for _index_0 = 1, #types do
           return self
         end
         replacement = setmetatable(replacement, getmetatable(self))
+        do
+          local init = replacement.__init
+          if init then
+            init(replacement)
+          end
+        end
       end
       return replacement
     end
@@ -131,13 +143,24 @@ for _index_0 = 1, #types do
         assert(Source:is_instance(t.source))
       end
       setmetatable(t, self)
-      if t.__init then
+      do
-        t:__init()
+        local init = t.__init
+        if init then
+          init(t)
+        end
       end
       return t
     end
   })
 end
+AST.Block.__init = function(self)
+  for _index_0 = 1, #self do
+    local a = self[_index_0]
+    if not AST.is_syntax_tree(a) then
+      require('ldt').breakpoint()
+    end
+  end
+end
 AST.Action.__init = function(self)
   local stub_bits = { }
   local arg_i = 1

syntax_tree.moon

@@ -30,6 +30,7 @@ for name in *types
                     replacement = setmetatable {k,v for k,v in pairs replacement}, getmetatable(replacement)
                     replacement.source = @source
                     replacement.comments = {unpack(@comments)} if @comments
+                    if init = replacement.__init then init(replacement)
             else
                 replacement = {source:@source, comments:@comments and {unpack(@comments)}}
                 changes = false
@@ -42,6 +43,7 @@ for name in *types
                         replacement[k] = r
                 return @ unless changes
                 replacement = setmetatable replacement, getmetatable(@)
+                if init = replacement.__init then init(replacement)
             return replacement
         .__eq = (other)=>
             return false if type(@) != type(other) or #@ != #other or getmetatable(@) != getmetatable(other)
@@ -58,7 +60,7 @@ for name in *types
             else
                 assert(Source\is_instance(t.source))
             setmetatable(t, @)
-            if t.__init then t\__init!
+            if init = t.__init then init(t)
             return t
 
 AST.Action.__init = =>

tools/parse.nom

@@ -9,6 +9,9 @@ action [print tree %t at indent %indent]:
     if %t.type is:
         "Action":
             say "\(%indent)Action (\(%t.stub)):"
+            if %t.target:
+                say "\(%indent)  Target:"
+                print tree %t.target at indent "\%indent    "
             for %arg in %t:
                 if (%arg is syntax tree):
                     print tree %arg at indent "\%indent  "