From 28bae6517f43c384a828df62b727517e26b3af9b Mon Sep 17 00:00:00 2001 From: Li Jin Date: Wed, 19 Mar 2025 14:52:54 +0800 Subject: Fixed issue #194, #195. --- src/yuescript/yue_compiler.cpp | 78 +++++++++++++++++++++++++++--------------- src/yuescript/yue_parser.cpp | 2 +- src/yuescript/yuescript.h | 8 ++--- 3 files changed, 55 insertions(+), 33 deletions(-) (limited to 'src') diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp index e7fe0c0..3d98fbc 100644 --- a/src/yuescript/yue_compiler.cpp +++ b/src/yuescript/yue_compiler.cpp @@ -75,7 +75,7 @@ static std::unordered_set Metamethods = { "close"s // Lua 5.4 }; -const std::string_view version = "0.27.0"sv; +const std::string_view version = "0.27.1"sv; const std::string_view extension = "yue"sv; class CompileError : public std::logic_error { @@ -1486,7 +1486,7 @@ private: } } - bool isPureBackcall(Exp_t* exp) const { + bool isPurePipeChain(Exp_t* exp) const { return exp->opValues.empty() && exp->pipeExprs.size() > 1; } @@ -1869,7 +1869,7 @@ private: } } else if (expList->exprs.size() == 1) { auto exp = static_cast(expList->exprs.back()); - if (isPureBackcall(exp)) { + if (isPurePipeChain(exp)) { transformExp(exp, out, ExpUsage::Common); break; } @@ -2061,7 +2061,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(assignment->action); @@ -2176,7 +2176,7 @@ private: temp.push_back(indent() + "end"s + nll(assignment)); } out.push_back(join(temp)); - return; + return false; BLOCK_END } { @@ -2248,7 +2248,7 @@ private: transformAssignment(afterAssignment, temp); } out.push_back(join(temp)); - return; + return false; } else if (ast_is(chainValue->items.back())) { str_list temp; auto [beforeAssignment, afterAssignment] = splitAssignment(); @@ -2300,7 +2300,7 @@ private: transformAssignment(afterAssignment, temp); } out.push_back(join(temp)); - return; + return false; } else { break; } @@ -2322,7 +2322,7 @@ private: std::string preDefine = getPreDefineLine(assignment); transformIf(ifNode, out, ExpUsage::Assignment, assignList); out.back().insert(0, preDefine); - return; + return false; } case id(): { auto switchNode = static_cast(value); @@ -2330,7 +2330,7 @@ private: std::string preDefine = getPreDefineLine(assignment); transformSwitch(switchNode, out, ExpUsage::Assignment, assignList); out.back().insert(0, preDefine); - return; + return false; } case id(): { auto withNode = static_cast(value); @@ -2338,7 +2338,7 @@ private: std::string preDefine = getPreDefineLine(assignment); transformWith(withNode, out, expList); out.back().insert(0, preDefine); - return; + return false; } case id(): { auto expList = assignment->expList.get(); @@ -2346,7 +2346,7 @@ private: std::string preDefine = getPreDefineLine(assignment); transformDo(doNode, out, ExpUsage::Assignment, expList); out.back().insert(0, preDefine); - return; + return false; } case id(): { auto comp = static_cast(value); @@ -2358,42 +2358,42 @@ private: } else { transformComprehension(comp, out, ExpUsage::Assignment, expList); } - return; + return false; } case id(): { auto expList = assignment->expList.get(); std::string preDefine = getPreDefineLine(assignment); transformTblComprehension(static_cast(value), out, ExpUsage::Assignment, expList); out.back().insert(0, preDefine); - return; + return false; } case id(): { auto expList = assignment->expList.get(); std::string preDefine = getPreDefineLine(assignment); transformForInPlace(static_cast(value), out, expList); out.back().insert(0, preDefine); - return; + return false; } case id(): { auto expList = assignment->expList.get(); std::string preDefine = getPreDefineLine(assignment); transformForEachInPlace(static_cast(value), out, expList); out.back().insert(0, preDefine); - return; + return false; } case id(): { auto expList = assignment->expList.get(); std::string preDefine = getPreDefineLine(assignment); transformClassDecl(static_cast(value), out, ExpUsage::Assignment, expList); out.back().insert(0, preDefine); - return; + return false; } case id(): { auto expList = assignment->expList.get(); std::string preDefine = getPreDefineLine(assignment); transformWhileInPlace(static_cast(value), out, expList); out.back().insert(0, preDefine); - return; + return false; } case id(): { auto tableLit = static_cast(value); @@ -2402,7 +2402,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 +2413,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(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 +2451,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 +2468,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 +2734,7 @@ private: } out.push_back(join(temp)); } + return false; } void transformAssignItem(ast_node* value, str_list& out) { @@ -5313,7 +5315,7 @@ private: if (auto valueList = returnNode->valueList.as()) { if (valueList->exprs.size() == 1) { auto exp = static_cast(valueList->exprs.back()); - if (isPureBackcall(exp)) { + if (isPurePipeChain(exp)) { transformExp(exp, out, ExpUsage::Return); return; } else if (isPureNilCoalesed(exp)) { @@ -10676,6 +10678,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 +10707,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()) { + if (auto funLit = spValue->value.as()) { + 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) -- cgit v1.2.3-55-g6feb