1 files changed, 28 insertions, 6 deletions

diff --git a/spec/inputs/macro-teal.mp b/spec/inputs/macro-teal.mp
index 20444e1..9ce1bcd 100644
--- a/spec/inputs/macro-teal.mp
+++ b/spec/inputs/macro-teal.mp
@@ -2,6 +2,7 @@ $ ->
         import "moonp" as {:options}
         if options.tl_enabled
                 options.target_extension = "tl"
+        package.path ..= "?.lua;./spec/lib/?.lua"
 
 macro expr to_lua = (codes)->
         "require('moonp').to_lua(#{codes}, reserve_line_number:false, same_module:true)"
@@ -9,19 +10,31 @@ macro expr to_lua = (codes)->
 macro expr trim = (name)->
         "if result = #{name}\\match '[\\'\"](.*)[\\'\"]' then result else #{name}"
 
-export macro text var = (name, type, value = nil)->
+export macro text local = (decl, value = nil)->
         import "moonp" as {options:{:tl_enabled}}
+        name, type = ($trim decl)\match "(.-):(.*)"
+        if not (name and type)
+                error "invalid local varaible declaration for \"#{decl}\""
         value = $to_lua(value)\gsub "^return ", ""
         if tl_enabled
                 "local #{name}:#{$trim type} = #{value}", {name}
         else
                 "local #{name} = #{value}", {name}
 
-export macro text def = (name, type, value)->
+export macro text function = (decl, value)->
         import "moonp" as {options:{:tl_enabled}}
+        import "tl"
+        decl = $trim decl
+        name, type = decl\match "(.-)(%(.*)"
+        if not (name and type)
+                error "invalid function declaration for \"#{decl}\""
+        tokens = tl.lex "function #{decl}"
+        _, node = tl.parse_program tokens,{},"macro-function"
+        args = table.concat [arg.tk for arg in *node[1].args],", "
+        value = "(#{args})#{value}"
         if tl_enabled
-                value = $to_lua(value)\match "function%(.*%)(.*)end"
-                "local function #{name}#{$trim type}\n#{value}\nend", {name}
+                value = $to_lua(value)\match "function%([^\n]*%)(.*)end"
+                "local function #{name}#{type}\n#{value}\nend", {name}
         else
                 value = $to_lua(value)\gsub "^return ", ""
                 "local #{name} = #{value}", {name}
@@ -35,11 +48,20 @@ end", {name}
         else
                 "local #{name} = {}", {name}
 
-export macro text field = (tab, sym, func, type, value)->
+export macro text method = (decl, value)->
         import "moonp" as {options:{:tl_enabled}}
+        import "tl"
+        decl = $trim decl
+        tab, sym, func, type = decl\match "(.-)([%.:])(.-)(%(.*)"
+        if not (tab and sym and func and type)
+                error "invalid method declaration for \"#{decl}\""
+        tokens = tl.lex "function #{decl}"
+        _, node = tl.parse_program tokens,{},"macro-function"
+        args = table.concat [arg.tk for arg in *node[1].args],", "
+        value = "(#{args})->#{value\match "[%-=]>(.*)"}"
         if tl_enabled
                 value = $to_lua(value)\match "^return function%(.-%)\n(.*)end"
-                "function #{tab}#{$trim sym}#{func}#{$trim type}\n#{value}\nend"
+                "function #{tab}#{sym}#{func}#{type}\n#{value}\nend"
         else
                 value = $to_lua(value)\gsub "^return ", ""
                 "#{tab}.#{func} = #{value}"