fix issue #133.

9 files changed, 43 insertions, 30 deletions

diff --git a/spec/inputs/export.yue b/spec/inputs/export.yue
index 15ffbcb..66e6736 100644
--- a/spec/inputs/export.yue
+++ b/spec/inputs/export.yue
@@ -29,7 +29,7 @@ export cbVal = do
         (x)<- f
         return x h
 
-export y = ->
+export yy = ->
         h = 100
         k = 100
 
@@ -84,3 +84,7 @@ export v2 = 2
 export v3 = class v4
 v5 = 5
 
+export.<"abc"> = 1
+export.<name> = "export"
+export.<call> = => {}
+export["a-b-c-x"] = 123
diff --git a/spec/inputs/syntax.yue b/spec/inputs/syntax.yue
index 4f693d4..d60a145 100644
--- a/spec/inputs/syntax.yue
+++ b/spec/inputs/syntax.yue
@@ -214,7 +214,7 @@ tb[] = 2
 tb[] = 3
 
 x = 0
-_ = (if ntype(v) == "fndef" then x += 1) for v in *values
+_ = (if ntype(v) == "fndef" then x + 1) for v in *values
 
 
 hello =
diff --git a/spec/inputs/try-catch.yue b/spec/inputs/try-catch.yue
index 7287c33..e38cbef 100644
--- a/spec/inputs/try-catch.yue
+++ b/spec/inputs/try-catch.yue
@@ -23,6 +23,7 @@ try tb.func
 try tb.func!
 try tb.func()
 try (tb.func!)
+try (tb\func(1, 2, 3))
 
 try tb.func 1
 try tb.func(1)
@@ -32,7 +33,7 @@ catch err
         print err)
         print "OK"
 
-if try func 1
+if try (func 1)
 catch err
                 print err
         print "OK"
diff --git a/spec/outputs/assign.lua b/spec/outputs/assign.lua
index d939769..228e859 100644
--- a/spec/outputs/assign.lua
+++ b/spec/outputs/assign.lua
@@ -36,10 +36,10 @@ local x
 do
         local f = getHandler()
         if f then
-                x = ((function()
+                do
                         f()
-                        return 123
-                end)())
+                        x = 123
+                end
         end
 end
 return _(function()
diff --git a/spec/outputs/attrib.lua b/spec/outputs/attrib.lua
index aed549d..fbac28e 100644
--- a/spec/outputs/attrib.lua
+++ b/spec/outputs/attrib.lua
@@ -32,21 +32,17 @@ do
         end)()
         local b <close> = (function()
                 if not false then
-                        return ((function()
-                                if x then
-                                        return 1
-                                end
-                        end)())
+                        if x then
+                                return 1
+                        end
                 end
         end)()
         local c <const> = (function()
                 if true then
-                        return ((function()
-                                local _exp_0 = x
-                                if "abc" == _exp_0 then
-                                        return 998
-                                end
-                        end)())
+                        local _exp_0 = x
+                        if "abc" == _exp_0 then
+                                return 998
+                        end
                 end
         end)()
         local d <close> = (function()
diff --git a/spec/outputs/do.lua b/spec/outputs/do.lua
index 96d1022..6473e03 100644
--- a/spec/outputs/do.lua
+++ b/spec/outputs/do.lua
@@ -32,10 +32,10 @@ local t = {
 }
 return function(y, k)
         if y == nil then
-                y = ((function()
+                do
                         x = 10 + 2
-                        return x
-                end)())
+                        y = x
+                end
         end
         if k == nil then
                 do
diff --git a/spec/outputs/export.lua b/spec/outputs/export.lua
index 962f18c..f1beeee 100644
--- a/spec/outputs/export.lua
+++ b/spec/outputs/export.lua
@@ -1,4 +1,4 @@
-local _module_0 = { }
+local _module_0 = setmetatable({ }, { })
 local a, b, c = 223, 343, 123
 _module_0["a"], _module_0["b"], _module_0["c"] = a, b, c
 local cool = "dad"
@@ -62,11 +62,12 @@ do
         end)
 end
 _module_0["cbVal"] = cbVal
-y = function()
+local yy
+yy = function()
         local h = 100
         local k = 100
 end
-_module_0["y"] = y
+_module_0["yy"] = yy
 do
         local _exp_0 = h
         if 100 == _exp_0 or 150 == _exp_0 then
@@ -322,4 +323,10 @@ do
 end
 _module_0["v3"] = v3
 v5 = 5
+getmetatable(_module_0)["abc"] = 1
+getmetatable(_module_0).__name = "export"
+getmetatable(_module_0).__call = function(self)
+        return { }
+end
+_module_0["a-b-c-x"] = 123
 return _module_0
diff --git a/spec/outputs/syntax.lua b/spec/outputs/syntax.lua
index 990083f..2afadbb 100644
--- a/spec/outputs/syntax.lua
+++ b/spec/outputs/syntax.lua
@@ -239,11 +239,9 @@ x = 0
 local _list_0 = values
 for _index_0 = 1, #_list_0 do
         local v = _list_0[_index_0]
-        _ = ((function()
-                if ntype(v) == "fndef" then
-                        x = x + 1
-                end
-        end)())
+        if ntype(v) == "fndef" then
+                _ = x + 1
+        end
 end
 hello = {
         something = world,
diff --git a/spec/outputs/try-catch.lua b/spec/outputs/try-catch.lua
index 692905e..129d412 100644
--- a/spec/outputs/try-catch.lua
+++ b/spec/outputs/try-catch.lua
@@ -21,7 +21,14 @@ end
 pcall(tb.func)
 pcall(tb.func)
 pcall(tb.func)
-pcall((tb.func()))
+pcall((tb.func))
+pcall(((function()
+        local _base_0 = tb
+        local _fn_0 = _base_0.func
+        return _fn_0 and function(...)
+                return _fn_0(_base_0, ...)
+        end
+end)()), 1, 2, 3)
 pcall(tb.func, 1)
 pcall(tb.func, 1)
 if (xpcall(func, function(err)
@@ -29,7 +36,7 @@ if (xpcall(func, function(err)
 end, 1)) then
         print("OK")
 end
-if xpcall(func, function(err)
+if xpcall((func), function(err)
         return print(err)
 end, 1) then
         print("OK")