simplify macro syntax. fix issue #38 again.

5 files changed, 99 insertions, 43 deletions

diff --git a/spec/inputs/ambiguous.mp b/spec/inputs/ambiguous.mp
index a5980db..d147e8e 100644
--- a/spec/inputs/ambiguous.mp
+++ b/spec/inputs/ambiguous.mp
@@ -10,7 +10,7 @@ import c from d
 a, b = c, d
 (d a) c
 
-macro block f = (func,arg)-> "(#{func}) #{arg}"
+macro f = (func,arg)-> "(#{func}) #{arg}"
 for i = 1, 10
         a = ->
         $f print, 1
diff --git a/spec/inputs/attrib.mp b/spec/inputs/attrib.mp
index bc1e67e..7e9a42c 100644
--- a/spec/inputs/attrib.mp
+++ b/spec/inputs/attrib.mp
@@ -14,8 +14,8 @@ do
         close f = with io.open "file.txt"
                 \write "Hello"
 
-macro block defer = (item)-> "close _ = #{item}"
-macro block defer_f = (func)-> "close _ = setmetatable {},__close:#{func}"
+macro defer = (item)-> "close _ = #{item}"
+macro defer_f = (func)-> "close _ = setmetatable {},__close:#{func}"
 
 do
         $defer with io.open "file.txt"
@@ -29,7 +29,7 @@ _defers = setmetatable {},__close:=>
         @[#@]!
         @[#@] = nil
 
-macro block defer_i = (item)-> "
+macro defer_i = (item)-> "
 _defers[#_defers + 1] = #{item}
 close _ = _defers"
 
diff --git a/spec/inputs/macro-export.mp b/spec/inputs/macro-export.mp
index b6079ca..d669975 100644
--- a/spec/inputs/macro-export.mp
+++ b/spec/inputs/macro-export.mp
@@ -1,9 +1,9 @@
-export macro block config = (debugging = true)->
+export macro config = (debugging = true)->
         global debugMode = debugging == "true"
         global debugMacro = true
         ""
 
-export macro expr showMacro = (name,res)->
+export macro showMacro = (name,res)->
         if debugMacro
                 "do
                 txt = #{res}
@@ -13,16 +13,17 @@ export macro expr showMacro = (name,res)->
         else
                 res
 
-export macro block asserts = (cond)->
+export macro asserts = (cond)->
         if debugMode
                 $showMacro "assert", "assert #{cond}"
         else
                 ""
 
-export macro expr assert = (cond)->
+export macro assert = (cond)->
         if debugMode
                 $showMacro "assert", "assert #{cond}"
         else
                 "#{cond}"
 
 $config!
+
diff --git a/spec/inputs/macro-teal.mp b/spec/inputs/macro-teal.mp
index 9ce1bcd..37cde1c 100644
--- a/spec/inputs/macro-teal.mp
+++ b/spec/inputs/macro-teal.mp
@@ -4,24 +4,29 @@ $ ->
                 options.target_extension = "tl"
         package.path ..= "?.lua;./spec/lib/?.lua"
 
-macro expr to_lua = (codes)->
+macro to_lua = (codes)->
         "require('moonp').to_lua(#{codes}, reserve_line_number:false, same_module:true)"
 
-macro expr trim = (name)->
+macro trim = (name)->
         "if result = #{name}\\match '[\\'\"](.*)[\\'\"]' then result else #{name}"
 
-export macro text local = (decl, value = nil)->
+export macro 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}
+        codes = if tl_enabled
+                "local #{name}:#{$trim type} = #{value}"
         else
-                "local #{name} = #{value}", {name}
+                "local #{name} = #{value}"
+        {
+                :codes
+                type: "text"
+                locals: {name}
+        }
 
-export macro text function = (decl, value)->
+export macro function = (decl, value)->
         import "moonp" as {options:{:tl_enabled}}
         import "tl"
         decl = $trim decl
@@ -32,23 +37,33 @@ export macro text function = (decl, value)->
         _, node = tl.parse_program tokens,{},"macro-function"
         args = table.concat [arg.tk for arg in *node[1].args],", "
         value = "(#{args})#{value}"
-        if tl_enabled
+        codes = if tl_enabled
                 value = $to_lua(value)\match "function%([^\n]*%)(.*)end"
-                "local function #{name}#{type}\n#{value}\nend", {name}
+                "local function #{name}#{type}\n#{value}\nend"
         else
                 value = $to_lua(value)\gsub "^return ", ""
-                "local #{name} = #{value}", {name}
+                "local #{name} = #{value}"
+        {
+                :codes
+                type: "text"
+                locals: {name}
+        }
 
-export macro text record = (name, decl)->
+export macro record = (name, decl)->
         import "moonp" as {options:{:tl_enabled}}
-        if tl_enabled
+        codes = if tl_enabled
                 "local record #{name}
         #{decl}
-end", {name}
+end"
         else
-                "local #{name} = {}", {name}
+                "local #{name} = {}"
+        {
+                :codes
+                type: "text"
+                locals: {name}
+        }
 
-export macro text method = (decl, value)->
+export macro method = (decl, value)->
         import "moonp" as {options:{:tl_enabled}}
         import "tl"
         decl = $trim decl
@@ -59,10 +74,14 @@ export macro text method = (decl, value)->
         _, 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
+        codes = if tl_enabled
                 value = $to_lua(value)\match "^return function%(.-%)\n(.*)end"
                 "function #{tab}#{sym}#{func}#{type}\n#{value}\nend"
         else
                 value = $to_lua(value)\gsub "^return ", ""
                 "#{tab}.#{func} = #{value}"
+        {
+                :codes
+                type: "text"
+        }
 
diff --git a/spec/inputs/macro.mp b/spec/inputs/macro.mp
index da696bd..f0292c7 100644
--- a/spec/inputs/macro.mp
+++ b/spec/inputs/macro.mp
@@ -12,7 +12,7 @@ $myconfig false
 
 v = $assert item == nil
 
-macro expr and = (...)->
+macro and = (...)->
         values = [value for value in *{...}]
         $showMacro "and", "#{ table.concat values, " and " }"
 
@@ -22,20 +22,20 @@ if $and f1!
 if $and f1!, f2!, f3!
         print "OK"
 
-macro expr in = (target, ...)->
+macro in = (target, ...)->
         values = [value for value in *{...}]
         $showMacro "in", table.concat ["#{target} == #{item}" for item in *values], " or "
 
 if x |> $in "Apple", "Pig", "Dog"
         print "exist"
 
-macro expr map = (items, action)->
+macro map = (items, action)->
         $showMacro "map", "[#{action} for _ in *#{items}]"
 
-macro expr filter = (items, action)->
+macro filter = (items, action)->
         $showMacro "filter", "[_ for _ in *#{items} when #{action}]"
 
-macro expr reduce = (items, def, action)->
+macro reduce = (items, def, action)->
         $showMacro "reduce", "if ##{items} == 0
         #{def}
 else
@@ -44,11 +44,11 @@ else
                 _1 = #{action}
         _1"
 
-macro block foreach = (items, action)->
+macro foreach = (items, action)->
         $showMacro "foreach", "for _ in *#{items}
         #{action}"
 
-macro expr pipe = (...)->
+macro pipe = (...)->
         switch select "#", ...
                 when 0 then return ""
                 when 1 then return ...
@@ -74,13 +74,13 @@ val = $pipe(
         $reduce(0, _1 + _2)
 )
 
-macro expr plus = (a, b)-> "#{a} + #{b}"
+macro plus = (a, b)-> "#{a} + #{b}"
 
 $plus(1,2)\call 123
 
 res = 1 |> $plus 2
 
-macro expr curry = (...)->
+macro curry = (...)->
         args = {...}
         len = #args
         body = args[len]
@@ -90,11 +90,11 @@ macro expr curry = (...)->
 f = $curry x,y,z,do
         print x,y,z
 
-macro expr get_inner = (var)-> "do
+macro get_inner = (var)-> "do
         a = 1
         a + 1"
 
-macro expr get_inner_hygienic = (var)-> "(->
+macro get_inner_hygienic = (var)-> "(->
         local a = 1
         a + 1)!"
 
@@ -110,7 +110,10 @@ do
         a += $get_inner_hygienic!
         print a
 
-macro lua lua = (codes)-> codes
+macro lua = (codes)-> {
+        :codes
+        type: "lua"
+}
 
 x = 0
 
@@ -129,12 +132,15 @@ end
 
 print x
 
-macro lua def = (fname, ...)->
+macro def = (fname, ...)->
         args = {...}
         last = table.remove args
-        $showMacro "def", "local function #{fname}(#{table.concat args, ', '})
+        {
+                codes: $showMacro "def", "local function #{fname}(#{table.concat args, ', '})
         #{last}
 end"
+                type: "lua"
+        }
 
 sel = (a, b, c)-> if a then b else c
 
@@ -148,13 +154,16 @@ $def sel, a, b, c, [[
 
 $def dummy,[[]]
 
-macro lua insertComment = (text)-> "-- #{text\match '[\'"](.*)[\'"]'}"
+macro insertComment = (text)-> {
+        codes: "-- #{text\match '[\'"](.*)[\'"]'}"
+        type: "lua"
+}
 
 $insertComment "a comment here"
 
 import 'underscore' as _
 
-macro expr chain = (...)->
+macro chain = (...)->
         callable = nil
         for item in *{...}
                 callable = callable? and "(#{callable})\\#{item}" or item
@@ -186,7 +195,7 @@ result = $chain(
         Destroy!
 )
 
-macro block chainB = (...)->
+macro chainB = (...)->
         switch select "#", ...
                 when 0 then return ""
                 when 1 then return ...
@@ -216,7 +225,34 @@ $chainB(
         Destroy!
 )
 
-macro block implicitReturnblockMacroIsAllowed = -> "123"
+macro chainC = (...)->
+        import "moonp" as {:to_lua}
+        callable = nil
+        config = {
+                implicit_return_root: false
+                reserve_line_number: false
+        }
+        for item in *{...}
+                if callable?
+                        callable = "#{callable}:#{to_lua(item,config)\gsub '%s*$',''}"
+                else
+                        callable = to_lua(item,config)\gsub '%s*$',''
+        {
+                codes: $showMacro "chainC", callable
+                type: "lua"
+        }
+
+$chainC(
+        origin.transform.root.gameObject\Parents!
+        Descendants!
+        SelectEnable!
+        SelectVisible!
+        TagEqual "fx"
+        Where (x) -> x.name\EndsWith "(Clone)"
+        Destroy!
+)
+
+macro implicitReturnMacroIsAllowed = -> "print 'abc'\n123"
 
-$implicitReturnblockMacroIsAllowed!
+$implicitReturnMacroIsAllowed!