3 files changed, 35 insertions, 16 deletions

diff --git a/src/yuescript/yue_ast.h b/src/yuescript/yue_ast.h
index b1a369b..0008fd6 100644
--- a/src/yuescript/yue_ast.h
+++ b/src/yuescript/yue_ast.h
@@ -443,7 +443,7 @@ AST_END(CompInner)
 
 AST_NODE(Assign)
         ast_ptr<true, Seperator_t> sep;
-        ast_sel_list<true, With_t, If_t, Switch_t, TableBlock_t, Exp_t> values;
+        ast_sel_list<true, With_t, If_t, Switch_t, TableBlock_t, Exp_t, SpreadListExp_t> values;
         AST_MEMBER(Assign, &sep, &values)
 AST_END(Assign)
 
diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp
index ed0a587..8c28e61 100644
--- a/src/yuescript/yue_compiler.cpp
+++ b/src/yuescript/yue_compiler.cpp
@@ -78,7 +78,7 @@ static std::unordered_set<std::string> Metamethods = {
         "close"s // Lua 5.4
 };
 
-const std::string_view version = "0.29.7"sv;
+const std::string_view version = "0.29.8"sv;
 const std::string_view extension = "yue"sv;
 
 class CompileError : public std::logic_error {
@@ -2321,15 +2321,27 @@ private:
                                                 transformAssignment(newAssignment, temp);
                                                 varName = objVar;
                                         }
-                                        auto newAssignment = x->new_ptr<ExpListAssign_t>();
-                                        newAssignment->expList.set(toAst<ExpList_t>(varName + "[#"s + varName + "+1]"s, x));
-                                        auto assign = x->new_ptr<Assign_t>();
-                                        if (vit == values.end()) {
-                                                throw CompileError("right value missing"sv, values.front());
+                                        if (auto spread = ast_cast<SpreadListExp_t>(*vit)) {
+                                                auto lenVar = getUnusedName("_len_"sv);
+                                                forceAddToScope(lenVar);
+                                                temp.push_back(indent() + "local "s + lenVar + " = #"s + varName + " + 1"s + nll(spread));
+                                                auto elmVar = getUnusedName("_elm_"sv);
+                                                _buf << varName << '[' << lenVar << "],"s << lenVar << "="s << elmVar << ',' << lenVar << "+1 for "s << elmVar << " in *nil"s;
+                                                auto stmt = toAst<Statement_t>(clearBuf(), spread);
+                                                auto comp = stmt->appendix->item.to<CompInner_t>();
+                                                ast_to<CompForEach_t>(comp->items.front())->loopValue.to<StarExp_t>()->value.set(spread->exp);
+                                                transformStatement(stmt, temp);
+                                        } else {
+                                                auto newAssignment = x->new_ptr<ExpListAssign_t>();
+                                                newAssignment->expList.set(toAst<ExpList_t>(varName + "[#"s + varName + "+1]"s, x));
+                                                auto assign = x->new_ptr<Assign_t>();
+                                                if (vit == values.end()) {
+                                                        throw CompileError("right value missing"sv, values.front());
+                                                }
+                                                assign->values.push_back(*vit);
+                                                newAssignment->action.set(assign);
+                                                transformAssignment(newAssignment, temp);
                                         }
-                                        assign->values.push_back(*vit);
-                                        newAssignment->action.set(assign);
-                                        transformAssignment(newAssignment, temp);
                                         if (extraScoped) {
                                                 popScope();
                                                 temp.push_back(indent() + "end"s + nlr(x));
@@ -2848,6 +2860,7 @@ private:
                         case id<Switch_t>(): transformSwitch(static_cast<Switch_t*>(value), out, ExpUsage::Closure); break;
                         case id<TableBlock_t>(): transformTableBlock(static_cast<TableBlock_t*>(value), out); break;
                         case id<Exp_t>(): transformExp(static_cast<Exp_t*>(value), out, ExpUsage::Closure); break;
+                        case id<SpreadListExp_t>(): throw CompileError("can only be used for ranged table append assignments"sv, value); break;
                         default: YUEE("AST node mismatch", value); break;
                 }
         }
@@ -8268,9 +8281,16 @@ private:
                         }
                         return;
                 }
-                auto def = ast_cast<NormalDef_t>(comp->items.front());
-                if (!def || def->defVal) {
-                        throw CompileError("invalid comprehension expression", comp->items.front());
+                ast_node* value = nullptr;
+                bool isSpread = ast_is<SpreadListExp_t>(comp->items.front());
+                if (isSpread) {
+                        value = comp->items.front();
+                } else {
+                        auto def = ast_cast<NormalDef_t>(comp->items.front());
+                        if (!def || def->defVal) {
+                                throw CompileError("invalid comprehension expression", comp->items.front());
+                        }
+                        value = def->item.get();
                 }
                 bool extraScope = false;
                 switch (usage) {
@@ -8294,7 +8314,6 @@ private:
                         default:
                                 break;
                 }
-                auto value = def->item.get();
                 auto compInner = static_cast<CompInner_t*>(comp->items.back());
                 str_list temp;
                 std::string accumVar = getUnusedName("_accum_"sv);
@@ -8318,7 +8337,7 @@ private:
                         }
                 }
                 {
-                        auto assignLeft = toAst<ExpList_t>(accumVar + '[' + lenVar + ']', x);
+                        auto assignLeft = toAst<ExpList_t>(accumVar + '[' + lenVar + (isSpread ? "][]"s : "]"s), x);
                         auto assign = x->new_ptr<Assign_t>();
                         assign->values.push_back(value);
                         auto assignment = x->new_ptr<ExpListAssign_t>();
diff --git a/src/yuescript/yue_parser.cpp b/src/yuescript/yue_parser.cpp
index 44baced..fccb6fb 100644
--- a/src/yuescript/yue_parser.cpp
+++ b/src/yuescript/yue_parser.cpp
@@ -547,7 +547,7 @@ YueParser::YueParser() {
 
         Assign = '=' >> space >> Seperator >> (
                 With | If | Switch | TableBlock |
-                Exp >> *(space >> set(",;") >> space >> Exp)
+                (SpreadListExp | Exp) >> *(space >> set(",;") >> space >> (SpreadListExp | Exp))
         );
 
         UpdateOp =