fix xpcall usages in different Lua version.

13 files changed, 130 insertions, 33 deletions

diff --git a/makefile b/makefile
index 77b3eca..e15494c 100644
--- a/makefile
+++ b/makefile
@@ -284,8 +284,9 @@ test: debug
         @echo "Compiling Yuescript codes..."
         @$(START_TIME)
         @./$(BIN_NAME) $(TEST_INPUT) -t $(TEST_OUTPUT) --tl_enabled
-        @./$(BIN_NAME) $(TEST_INPUT)/teal-lang.yue -o $(TEST_OUTPUT)/teal-lang.lua
+        @./$(BIN_NAME) $(TEST_INPUT)/teal_lang.yue -o $(TEST_OUTPUT)/teal_lang.lua
         @./$(BIN_NAME) $(TEST_INPUT)/loops.yue -o $(TEST_OUTPUT)/5.1/loops.lua --target=5.1
+        @./$(BIN_NAME) $(TEST_INPUT)/try_catch.yue -o $(TEST_OUTPUT)/5.1/try_catch.lua --target=5.1
         @./$(BIN_NAME) $(TEST_INPUT)/test/loops_spec.yue -o $(TEST_OUTPUT)/5.1/test/loops_spec.lua --target=5.1
         @echo -en "Compile time: "
         @$(END_TIME)
@@ -299,8 +300,9 @@ gen: release
         @echo "Compiling Yuescript codes..."
         @$(START_TIME)
         @./$(BIN_NAME) $(TEST_INPUT) -t $(GEN_OUTPUT) --tl_enabled
-        @./$(BIN_NAME) $(TEST_INPUT)/teal-lang.yue -o $(GEN_OUTPUT)/teal-lang.lua
+        @./$(BIN_NAME) $(TEST_INPUT)/teal_lang.yue -o $(GEN_OUTPUT)/teal_lang.lua
         @./$(BIN_NAME) $(TEST_INPUT)/loops.yue -o $(GEN_OUTPUT)/5.1/loops.lua --target=5.1
+        @./$(BIN_NAME) $(TEST_INPUT)/try_catch.yue -o $(TEST_OUTPUT)/5.1/try_catch.lua --target=5.1
         @./$(BIN_NAME) $(TEST_INPUT)/test/loops_spec.yue -o $(GEN_OUTPUT)/5.1/test/loops_spec.lua --target=5.1
         @echo -en "Compile time: "
         @$(END_TIME)
diff --git a/spec/generated/5.1/try_catch.lua b/spec/generated/5.1/try_catch.lua
new file mode 100644
index 0000000..577df16
--- /dev/null
+++ b/spec/generated/5.1/try_catch.lua
@@ -0,0 +1,71 @@
+xpcall(function()
+        return func(1, 2, 3)
+end, function(err)
+        return print(err)
+end)
+xpcall(function()
+        return func(1, 2, 3)
+end, function(err)
+        return print(err)
+end)
+pcall(function()
+        print("trying")
+        return func(1, 2, 3)
+end)
+do
+        local success, result = xpcall(function()
+                return func(1, 2, 3)
+        end, function(err)
+                return print(err)
+        end)
+        success, result = pcall(func, 1, 2, 3)
+end
+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(function()
+        return func(1)
+end, function(err)
+        return print(err)
+end)) then
+        print("OK")
+end
+if xpcall(function()
+        return func(1)
+end, function(err)
+        return print(err)
+end) then
+        print("OK")
+end
+do
+        do
+                local success, result = pcall(func, "abc", 123)
+                if success then
+                        print(result)
+                end
+        end
+        local success, result = xpcall(function()
+                return func("abc", 123)
+        end, function(err)
+                return print(err)
+        end)
+        success, result = xpcall(function()
+                return func("abc", 123)
+        end, function(err)
+                return print(err)
+        end)
+        if success then
+                print(result)
+        end
+end
+return nil
diff --git a/spec/inputs/macro.yue b/spec/inputs/macro.yue
index ac51d85..ae14f53 100644
--- a/spec/inputs/macro.yue
+++ b/spec/inputs/macro.yue
@@ -1,9 +1,9 @@
-import "macro-export" as {
+import "macro_export" as {
         $, -- import all macros
         $config: $myconfig, -- rename macro $config to $myconfig
 }
 
-import "macro-todo" as $
+import "macro_todo" as $
 
 $asserts item == nil
 
diff --git a/spec/inputs/macro-export.yue b/spec/inputs/macro_export.yue
index ff0d273..eec5848 100644
--- a/spec/inputs/macro-export.yue
+++ b/spec/inputs/macro_export.yue
@@ -1,6 +1,6 @@
-import "macro-todo" as $
+import "macro_todo" as $
 
-import "macro-todo" as {$, :$todo}
+import "macro_todo" as {$, :$todo}
 
 export macro config = (debugging = true)->
         global debugMode = debugging == "true"
diff --git a/spec/inputs/macro-teal.yue b/spec/inputs/macro_teal.yue
index a443614..a443614 100644
--- a/spec/inputs/macro-teal.yue
+++ b/spec/inputs/macro_teal.yue
diff --git a/spec/inputs/macro-todo.yue b/spec/inputs/macro_todo.yue
index 752c9cb..752c9cb 100644
--- a/spec/inputs/macro-todo.yue
+++ b/spec/inputs/macro_todo.yue
diff --git a/spec/inputs/teal-lang.yue b/spec/inputs/teal_lang.yue
index b28c915..e01682f 100644
--- a/spec/inputs/teal-lang.yue
+++ b/spec/inputs/teal_lang.yue
@@ -1,4 +1,4 @@
-import "macro-teal" as $
+import "macro_teal" as $
 
 $local "a:{string:number}", {value:123}
 $local "b:number", a.value
diff --git a/spec/inputs/try-catch.yue b/spec/inputs/try_catch.yue
index e38cbef..e38cbef 100644
--- a/spec/inputs/try-catch.yue
+++ b/spec/inputs/try_catch.yue
diff --git a/spec/outputs/teal-lang.lua b/spec/outputs/teal_lang.lua
index 28ba6f8..28ba6f8 100644
--- a/spec/outputs/teal-lang.lua
+++ b/spec/outputs/teal_lang.lua
diff --git a/spec/outputs/teal-lang.tl b/spec/outputs/teal_lang.tl
index 0dc25a1..0dc25a1 100644
--- a/spec/outputs/teal-lang.tl
+++ b/spec/outputs/teal_lang.tl
diff --git a/spec/outputs/try-catch.lua b/spec/outputs/try_catch.lua
index 129d412..129d412 100644
--- a/spec/outputs/try-catch.lua
+++ b/spec/outputs/try_catch.lua
diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp
index 1378436..4d8ed86 100644
--- a/src/yuescript/yue_compiler.cpp
+++ b/src/yuescript/yue_compiler.cpp
@@ -72,7 +72,7 @@ static std::unordered_set<std::string> Metamethods = {
         "close"s // Lua 5.4
 };
 
-const std::string_view version = "0.17.11"sv;
+const std::string_view version = "0.17.12"sv;
 const std::string_view extension = "yue"sv;
 
 class CompileError : public std::logic_error {
@@ -7978,31 +7978,50 @@ private:
                         auto chainValue = value->item.as<ChainValue_t>();
                         BREAK_IF(!chainValue);
                         BREAK_IF(!isChainValueCall(chainValue));
-                        ast_ptr<true, ast_node> last = chainValue->items.back();
-                        chainValue->items.pop_back();
-                        _ast_list* args = nullptr;
-                        if (auto invoke = ast_cast<InvokeArgs_t>(last)) {
-                                args = &invoke->args;
-                        } else {
-                                args = &(ast_to<Invoke_t>(last)->args);
-                        }
-                        if (errHandler) {
+                        if (errHandler && getLuaTarget(x) < 502) {
+                                auto tryExp = toAst<Exp_t>("->"sv, x);
+                                auto funLit = simpleSingleValueFrom(tryExp)->value.to<FunLit_t>();
+                                auto expList = x->new_ptr<ExpList_t>();
+                                expList->exprs.push_back(tryNode->func);
+                                auto expListAssign = x->new_ptr<ExpListAssign_t>();
+                                expListAssign->expList.set(expList);
+                                auto stmt = x->new_ptr<Statement_t>();
+                                stmt->content.set(expListAssign);
+                                auto body = x->new_ptr<Body_t>();
+                                body->content.set(stmt);
+                                funLit->body.set(body);
                                 auto xpcall = toAst<ChainValue_t>("xpcall()", x);
                                 auto invoke = ast_to<Invoke_t>(xpcall->items.back());
-                                invoke->args.push_back(tryNode->func);
+                                invoke->args.push_back(tryExp);
                                 invoke->args.push_back(errHandler);
-                                for (auto arg : args->objects()) {
-                                        invoke->args.push_back(arg);
-                                }
                                 transformChainValue(xpcall, out, ExpUsage::Closure);
                         } else {
-                                auto pcall = toAst<ChainValue_t>("pcall()", x);
-                                auto invoke = ast_to<Invoke_t>(pcall->items.back());
-                                invoke->args.push_back(tryNode->func);
-                                for (auto arg : args->objects()) {
-                                        invoke->args.push_back(arg);
+                                ast_ptr<true, ast_node> last = chainValue->items.back();
+                                chainValue->items.pop_back();
+                                _ast_list* args = nullptr;
+                                if (auto invoke = ast_cast<InvokeArgs_t>(last)) {
+                                        args = &invoke->args;
+                                } else {
+                                        args = &(ast_to<Invoke_t>(last)->args);
+                                }
+                                if (errHandler) {
+                                        auto xpcall = toAst<ChainValue_t>("xpcall()", x);
+                                        auto invoke = ast_to<Invoke_t>(xpcall->items.back());
+                                        invoke->args.push_back(tryNode->func);
+                                        invoke->args.push_back(errHandler);
+                                        for (auto arg : args->objects()) {
+                                                invoke->args.push_back(arg);
+                                        }
+                                        transformChainValue(xpcall, out, ExpUsage::Closure);
+                                } else {
+                                        auto pcall = toAst<ChainValue_t>("pcall()", x);
+                                        auto invoke = ast_to<Invoke_t>(pcall->items.back());
+                                        invoke->args.push_back(tryNode->func);
+                                        for (auto arg : args->objects()) {
+                                                invoke->args.push_back(arg);
+                                        }
+                                        transformChainValue(pcall, out, ExpUsage::Closure);
                                 }
-                                transformChainValue(pcall, out, ExpUsage::Closure);
                         }
                         if (usage == ExpUsage::Common) {
                                 out.back().append(nlr(x));
diff --git a/src/yuescript/yuescript.h b/src/yuescript/yuescript.h
index 3d8d65c..a160f55 100644
--- a/src/yuescript/yuescript.h
+++ b/src/yuescript/yuescript.h
@@ -106,9 +106,12 @@ local function yue_loader(name)
         return concat(tried, "\n\t")
 end
 local function yue_call(f, ...)
-        return xpcall(f, function(err)
-                return yue.traceback(err, 1)
-        end, ...)
+        local args = {...}
+        return xpcall(function()
+                return f(unpack(args))
+        end, function(err)
+                return yue.traceback(err, 2)
+        end)
 end
 yue_loadstring = function(...)
         local options, str, chunk_name, mode, env = get_options(...)
@@ -166,9 +169,11 @@ local function yue_traceback(err, level)
 end
 local function yue_require(name)
         insert_loader()
-        local success, res = xpcall(require, function(err)
-                return yue_traceback(err, 2)
-        end, name)
+        local success, res = xpcall(function()
+                return require(name)
+        end, function(err)
+                return yue_traceback(err, 3)
+        end)
         if success then
                 return res
         else