3 files changed, 59 insertions, 46 deletions

diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp
index e7fe0c0..a2a1864 100644
--- a/src/yuescript/yue_compiler.cpp
+++ b/src/yuescript/yue_compiler.cpp
@@ -75,7 +75,7 @@ static std::unordered_set<std::string> Metamethods = {
         "close"s // Lua 5.4
 };
 
-const std::string_view version = "0.27.0"sv;
+const std::string_view version = "0.27.3"sv;
 const std::string_view extension = "yue"sv;
 
 class CompileError : public std::logic_error {
@@ -437,7 +437,6 @@ private:
 #endif
                 std::unique_ptr<std::unordered_map<std::string, VarType>> vars;
                 std::unique_ptr<std::unordered_set<std::string>> allows;
-                std::unique_ptr<std::unordered_set<std::string>> globals;
         };
         std::list<Scope> _scopes;
         static const std::string Empty;
@@ -516,10 +515,8 @@ private:
                 int mode = int(std::isupper(name[0]) ? GlobalMode::Capital : GlobalMode::Any);
                 const auto& current = _scopes.back();
                 if (int(current.mode) >= mode) {
-                        if (!current.globals) {
-                                isDefined = true;
-                                current.vars->insert_or_assign(name, VarType::Global);
-                        }
+                        isDefined = true;
+                        current.vars->insert_or_assign(name, VarType::Global);
                 }
                 decltype(_scopes.back().allows.get()) allows = nullptr;
                 for (auto it = _scopes.rbegin(); it != _scopes.rend(); ++it) {
@@ -892,10 +889,6 @@ private:
         void addGlobalVar(const std::string& name, ast_node* x) {
                 if (isLocal(name)) throw CompileError("can not declare a local variable to be global"sv, x);
                 auto& scope = _scopes.back();
-                if (!scope.globals) {
-                        scope.globals = std::make_unique<std::unordered_set<std::string>>();
-                }
-                scope.globals->insert(name);
                 scope.vars->insert_or_assign(name, VarType::Global);
         }
 
@@ -1486,7 +1479,7 @@ private:
                 }
         }
 
-        bool isPureBackcall(Exp_t* exp) const {
+        bool isPurePipeChain(Exp_t* exp) const {
                 return exp->opValues.empty() && exp->pipeExprs.size() > 1;
         }
 
@@ -1869,7 +1862,7 @@ private:
                                                 }
                                         } else if (expList->exprs.size() == 1) {
                                                 auto exp = static_cast<Exp_t*>(expList->exprs.back());
-                                                if (isPureBackcall(exp)) {
+                                                if (isPurePipeChain(exp)) {
                                                         transformExp(exp, out, ExpUsage::Common);
                                                         break;
                                                 }
@@ -2061,7 +2054,7 @@ private:
                 }
         }
 
-        void transformAssignment(ExpListAssign_t* assignment, str_list& out, bool optionalDestruct = false) {
+        bool transformAssignment(ExpListAssign_t* assignment, str_list& out, bool optionalDestruct = false) {
                 checkAssignable(assignment->expList);
                 BLOCK_START
                 auto assign = ast_cast<Assign_t>(assignment->action);
@@ -2176,7 +2169,7 @@ private:
                                 temp.push_back(indent() + "end"s + nll(assignment));
                         }
                         out.push_back(join(temp));
-                        return;
+                        return false;
                         BLOCK_END
                 }
                 {
@@ -2248,7 +2241,7 @@ private:
                                                 transformAssignment(afterAssignment, temp);
                                         }
                                         out.push_back(join(temp));
-                                        return;
+                                        return false;
                                 } else if (ast_is<TableAppendingOp_t>(chainValue->items.back())) {
                                         str_list temp;
                                         auto [beforeAssignment, afterAssignment] = splitAssignment();
@@ -2300,7 +2293,7 @@ private:
                                                 transformAssignment(afterAssignment, temp);
                                         }
                                         out.push_back(join(temp));
-                                        return;
+                                        return false;
                                 } else {
                                         break;
                                 }
@@ -2322,7 +2315,7 @@ private:
                                 std::string preDefine = getPreDefineLine(assignment);
                                 transformIf(ifNode, out, ExpUsage::Assignment, assignList);
                                 out.back().insert(0, preDefine);
-                                return;
+                                return false;
                         }
                         case id<Switch_t>(): {
                                 auto switchNode = static_cast<Switch_t*>(value);
@@ -2330,7 +2323,7 @@ private:
                                 std::string preDefine = getPreDefineLine(assignment);
                                 transformSwitch(switchNode, out, ExpUsage::Assignment, assignList);
                                 out.back().insert(0, preDefine);
-                                return;
+                                return false;
                         }
                         case id<With_t>(): {
                                 auto withNode = static_cast<With_t*>(value);
@@ -2338,7 +2331,7 @@ private:
                                 std::string preDefine = getPreDefineLine(assignment);
                                 transformWith(withNode, out, expList);
                                 out.back().insert(0, preDefine);
-                                return;
+                                return false;
                         }
                         case id<Do_t>(): {
                                 auto expList = assignment->expList.get();
@@ -2346,7 +2339,7 @@ private:
                                 std::string preDefine = getPreDefineLine(assignment);
                                 transformDo(doNode, out, ExpUsage::Assignment, expList);
                                 out.back().insert(0, preDefine);
-                                return;
+                                return false;
                         }
                         case id<Comprehension_t>(): {
                                 auto comp = static_cast<Comprehension_t*>(value);
@@ -2358,42 +2351,42 @@ private:
                                 } else {
                                         transformComprehension(comp, out, ExpUsage::Assignment, expList);
                                 }
-                                return;
+                                return false;
                         }
                         case id<TblComprehension_t>(): {
                                 auto expList = assignment->expList.get();
                                 std::string preDefine = getPreDefineLine(assignment);
                                 transformTblComprehension(static_cast<TblComprehension_t*>(value), out, ExpUsage::Assignment, expList);
                                 out.back().insert(0, preDefine);
-                                return;
+                                return false;
                         }
                         case id<For_t>(): {
                                 auto expList = assignment->expList.get();
                                 std::string preDefine = getPreDefineLine(assignment);
                                 transformForInPlace(static_cast<For_t*>(value), out, expList);
                                 out.back().insert(0, preDefine);
-                                return;
+                                return false;
                         }
                         case id<ForEach_t>(): {
                                 auto expList = assignment->expList.get();
                                 std::string preDefine = getPreDefineLine(assignment);
                                 transformForEachInPlace(static_cast<ForEach_t*>(value), out, expList);
                                 out.back().insert(0, preDefine);
-                                return;
+                                return false;
                         }
                         case id<ClassDecl_t>(): {
                                 auto expList = assignment->expList.get();
                                 std::string preDefine = getPreDefineLine(assignment);
                                 transformClassDecl(static_cast<ClassDecl_t*>(value), out, ExpUsage::Assignment, expList);
                                 out.back().insert(0, preDefine);
-                                return;
+                                return false;
                         }
                         case id<While_t>(): {
                                 auto expList = assignment->expList.get();
                                 std::string preDefine = getPreDefineLine(assignment);
                                 transformWhileInPlace(static_cast<While_t*>(value), out, expList);
                                 out.back().insert(0, preDefine);
-                                return;
+                                return false;
                         }
                         case id<TableLit_t>(): {
                                 auto tableLit = static_cast<TableLit_t*>(value);
@@ -2402,7 +2395,7 @@ private:
                                         std::string preDefine = getPreDefineLine(assignment);
                                         transformSpreadTable(tableLit->values.objects(), out, ExpUsage::Assignment, expList, false);
                                         out.back().insert(0, preDefine);
-                                        return;
+                                        return false;
                                 }
                                 break;
                         }
@@ -2413,31 +2406,31 @@ private:
                                         std::string preDefine = getPreDefineLine(assignment);
                                         transformSpreadTable(tableBlock->values.objects(), out, ExpUsage::Assignment, expList, false);
                                         out.back().insert(0, preDefine);
-                                        return;
+                                        return false;
                                 }
                                 break;
                         }
                 }
                 auto exp = ast_cast<Exp_t>(value);
                 BREAK_IF(!exp);
-                if (isPureBackcall(exp)) {
+                if (isPurePipeChain(exp)) {
                         auto expList = assignment->expList.get();
                         transformExp(exp, out, ExpUsage::Assignment, expList);
-                        return;
+                        return false;
                 } else if (isPureNilCoalesed(exp)) {
                         auto expList = assignment->expList.get();
                         transformNilCoalesedExp(exp, out, ExpUsage::Assignment, expList);
-                        return;
+                        return false;
                 } else if (auto unary = unaryGeneratingAnonFunc(exp)) {
                         std::string preDefine = getPreDefineLine(assignment);
                         auto expList = assignment->expList.get();
                         transformUnaryExp(unary, out, ExpUsage::Assignment, expList);
                         out.back().insert(0, preDefine);
-                        return;
+                        return false;
                 } else if (isConditionChaining(exp)) {
                         auto expList = assignment->expList.get();
                         transformExp(exp, out, ExpUsage::Assignment, expList);
-                        return;
+                        return false;
                 }
                 auto singleVal = singleValueFrom(exp);
                 BREAK_IF(!singleVal);
@@ -2451,13 +2444,13 @@ private:
                                         std::string preDefine = getPreDefineLine(assignment);
                                         transformChainValue(chainValue, out, ExpUsage::Assignment, expList, false, optionalDestruct);
                                         out.back().insert(0, preDefine);
-                                        return;
+                                        return false;
                                 }
                                 case ChainType::HasKeyword:
                                 case ChainType::HasUnicode:
                                 case ChainType::Macro:
                                         transformChainValue(chainValue, out, ExpUsage::Assignment, expList);
-                                        return;
+                                        return false;
                                 case ChainType::Common:
                                 case ChainType::EndWithEOP:
                                 case ChainType::Metatable:
@@ -2468,6 +2461,7 @@ private:
                 auto info = extractDestructureInfo(assignment, false, optionalDestruct);
                 if (info.destructures.empty()) {
                         transformAssignmentCommon(assignment, out);
+                        return true;
                 } else {
                         auto x = assignment;
                         str_list temp;
@@ -2733,6 +2727,7 @@ private:
                         }
                         out.push_back(join(temp));
                 }
+                return false;
         }
 
         void transformAssignItem(ast_node* value, str_list& out) {
@@ -4800,8 +4795,8 @@ private:
                                         auto varName = variableToString(ast_to<Variable_t>(var));
                                         auto closeVar = getUnusedName("_close_"sv);
                                         addToScope(closeVar);
-                                        getCloses.push_back(closeVar + "=assert "s + varName + ".<close>"s);
-                                        doCloses.push_front(closeVar + ' ' + varName);
+                                        getCloses.push_back(closeVar + "=if type("s + varName + ") in ['table', 'userdata'] then assert "s + varName + ".<> and "s + varName +".<close>, \""s + "variable '"s + varName + "' got a non-closable value\" elseif "s + varName + " == nil then nil else error \""s + "variable '"s + varName + "' got a non-closable value\"");
+                                        doCloses.push_front(closeVar + "? "s + varName);
                                 }
                                 popScope();
                                 auto okVar = getUnusedName("_ok_"sv);
@@ -5313,7 +5308,7 @@ private:
                 if (auto valueList = returnNode->valueList.as<ExpListLow_t>()) {
                         if (valueList->exprs.size() == 1) {
                                 auto exp = static_cast<Exp_t*>(valueList->exprs.back());
-                                if (isPureBackcall(exp)) {
+                                if (isPurePipeChain(exp)) {
                                         transformExp(exp, out, ExpUsage::Return);
                                         return;
                                 } else if (isPureNilCoalesed(exp)) {
@@ -9399,7 +9394,6 @@ private:
                                 auto classDecl = static_cast<ClassDecl_t*>(item);
                                 if (classDecl->name) {
                                         if (auto var = classDecl->name->item.as<Variable_t>()) {
-                                                markVarsGlobal(GlobalMode::Any);
                                                 addGlobalVar(variableToString(var), classDecl->name->item);
                                         }
                                 }
@@ -9414,7 +9408,6 @@ private:
                                 }
                                 break;
                         case id<GlobalValues_t>(): {
-                                markVarsGlobal(GlobalMode::Any);
                                 auto values = global->item.to<GlobalValues_t>();
                                 if (values->valueList) {
                                         auto expList = x->new_ptr<ExpList_t>();
@@ -10676,6 +10669,7 @@ private:
 
         void transformLocal(Local_t* local, str_list& out) {
                 str_list temp;
+                bool defined = local->defined;
                 if (!local->defined) {
                         local->defined = true;
                         transformLocalDef(local, temp);
@@ -10704,7 +10698,26 @@ private:
                                                 assign->values.push_back(tableBlock);
                                         }
                                         assignment->action.set(assign);
-                                        transformAssignment(assignment, temp);
+                                        bool oneLined = transformAssignment(assignment, temp);
+                                        for (auto val : assign->values.objects()) {
+                                                if (auto value = singleValueFrom(val)) {
+                                                        if (auto spValue = value->item.as<SimpleValue_t>()) {
+                                                                if (auto funLit = spValue->value.as<FunLit_t>()) {
+                                                                        if (!funLit->noRecursion) {
+                                                                                oneLined = false;
+                                                                        }
+                                                                        break;
+                                                                }
+                                                        }
+                                                }
+                                        }
+                                        if (!defined && oneLined && temp.size() == 2) {
+                                                auto pos = temp.back().find_first_not_of(" \t"sv);
+                                                if (pos != std::string::npos) {
+                                                        temp.back().insert(pos, "local ");
+                                                        temp.pop_front();
+                                                }
+                                        }
                                 }
                                 break;
                         }
diff --git a/src/yuescript/yue_parser.cpp b/src/yuescript/yue_parser.cpp
index 5993ed5..ceb1f7c 100644
--- a/src/yuescript/yue_parser.cpp
+++ b/src/yuescript/yue_parser.cpp
@@ -519,7 +519,7 @@ YueParser::YueParser() {
         UpdateOp =
                 expr("..") | "//" | "or" | "and" |
                 ">>" | "<<" | "??" |
-                set("+-*/%&|");
+                set("+-*/%&|^");
 
         Update = UpdateOp >> '=' >> space >> Exp;
 
diff --git a/src/yuescript/yuescript.h b/src/yuescript/yuescript.h
index ebe90cb..83a4350 100644
--- a/src/yuescript/yuescript.h
+++ b/src/yuescript/yuescript.h
@@ -187,10 +187,10 @@ local function dump(what)
                 depth = depth or 0
                 local t = type(what)
                 if "string" == t then
-                        return "\"" .. tostring(what) .. "\"\n"
+                        return "\"" .. tostring(what) .. "\""
                 elseif "table" == t then
                         if seen[what] then
-                                return "recursion(" .. tostring(what) .. ")...\n"
+                                return "recursion(" .. tostring(what) .. ")..."
                         end
                         seen[what] = true
                         depth = depth + 1
@@ -199,9 +199,9 @@ local function dump(what)
                                 insert(lines, ('\t'):rep(depth) .. "[" .. tostring(k) .. "] = " .. _dump(v, depth))
                         end
                         seen[what] = false
-                        return "{\n" .. concat(lines) .. ('\t'):rep(depth - 1) .. "}\n"
+                        return "{\n" .. concat(lines, "\n") .. "\n" .. ('\t'):rep(depth - 1) .. "}"
                 else
-                        return tostring(what) .. "\n"
+                        return tostring(what)
                 end
         end
         return _dump(what)