fixing issue #77. change table appending syntax to: tb[] = 1

6 files changed, 147 insertions, 109 deletions

diff --git a/spec/inputs/syntax.yue b/spec/inputs/syntax.yue
index 67d3a27..e7f0a8d 100644
--- a/spec/inputs/syntax.yue
+++ b/spec/inputs/syntax.yue
@@ -188,16 +188,25 @@ a.b[1].c[2 + 3] += 1
 with tb
         .a.c += 1
 
-tb #= 10
-a.b.c #= 1
-x #= if v
+tb[] = 10
+a.b.c[] = 1
+x[] = if v
         1
 else
         2
 with tb
-        .b.c #= with vec
+        .b.c[] = with vec
                 .x = 1
                 .y = 2
+a
+        .b.c
+        .d\f!
+        .g[] = 1
+
+tb = {}
+tb[] = 1
+tb[] = 2
+tb[] = 3
 
 x = 0
 _ = (if ntype(v) == "fndef" then x += 1) for v in *values
diff --git a/spec/outputs/syntax.lua b/spec/outputs/syntax.lua
index 457f1e1..701361e 100644
--- a/spec/outputs/syntax.lua
+++ b/spec/outputs/syntax.lua
@@ -195,10 +195,14 @@ do
         local _obj_2 = _with_0.a
         _obj_2.c = _obj_2.c + 1
 end
-local _obj_2 = tb
-_obj_2[#_obj_2 + 1] = 10
-local _obj_3 = a.b.c
-_obj_3[#_obj_3 + 1] = 1
+do
+        local _obj_2 = tb
+        _obj_2[#_obj_2 + 1] = 10
+end
+do
+        local _obj_2 = a.b.c
+        _obj_2[#_obj_2 + 1] = 1
+end
 if v then
         x[#x + 1] = 1
 else
@@ -206,14 +210,24 @@ else
 end
 do
         local _with_0 = tb
-        local _obj_4 = _with_0.b.c
         do
-                local _with_1 = vec
-                _with_1.x = 1
-                _with_1.y = 2
-                _obj_4[#_obj_4 + 1] = _with_1
+                local _obj_2 = _with_0.b.c
+                do
+                        local _with_1 = vec
+                        _with_1.x = 1
+                        _with_1.y = 2
+                        _obj_2[#_obj_2 + 1] = _with_1
+                end
         end
 end
+do
+        local _obj_2 = a.b.c.d:f().g
+        _obj_2[#_obj_2 + 1] = 1
+end
+local tb = { }
+tb[#tb + 1] = 1
+tb[#tb + 1] = 2
+tb[#tb + 1] = 3
 x = 0
 local _list_0 = values
 for _index_0 = 1, #_list_0 do
@@ -231,7 +245,7 @@ hello = {
         ["function"] = "okay",
         good = 230203
 }
-local tb = {
+tb = {
         ["do"] = b,
         (function()
                 return {
diff --git a/src/yuescript/yue_ast.h b/src/yuescript/yue_ast.h
index 7762c91..79e35a5 100755
--- a/src/yuescript/yue_ast.h
+++ b/src/yuescript/yue_ast.h
@@ -561,11 +561,14 @@ AST_END(Invoke)
 AST_LEAF(existential_op)
 AST_END(existential_op)
 
+AST_LEAF(table_appending_op)
+AST_END(table_appending_op)
+
 class InvokeArgs_t;
 
 AST_NODE(ChainValue)
         ast_ptr<true, Seperator_t> sep;
-        ast_sel_list<true, Callable_t, Invoke_t, DotChainItem_t, ColonChainItem_t, Slice_t, Exp_t, String_t, InvokeArgs_t, existential_op_t> items;
+        ast_sel_list<true, Callable_t, Invoke_t, DotChainItem_t, ColonChainItem_t, Slice_t, Exp_t, String_t, InvokeArgs_t, existential_op_t, table_appending_op_t> items;
         AST_MEMBER(ChainValue, &sep, &items)
 AST_END(ChainValue)
 
diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp
index 6617ec5..6bc9fe8 100755
--- a/src/yuescript/yue_compiler.cpp
+++ b/src/yuescript/yue_compiler.cpp
@@ -60,7 +60,7 @@ using namespace parserlib;
 
 typedef std::list<std::string> str_list;
 
-const std::string_view version = "0.9.9"sv;
+const std::string_view version = "0.9.10"sv;
 const std::string_view extension = "yue"sv;
 
 class YueCompilerImpl {
@@ -809,6 +809,7 @@ private:
                         switch (lastItem->getId()) {
                                 case id<DotChainItem_t>():
                                 case id<Exp_t>():
+                                case id<table_appending_op_t>():
                                         return true;
                         }
                 }
@@ -1212,25 +1213,52 @@ private:
                         BREAK_IF(!value);
                         auto chainValue = value->item.as<ChainValue_t>();
                         BREAK_IF(!chainValue);
-                        auto dot = ast_cast<DotChainItem_t>(chainValue->items.back());
-                        BREAK_IF(!dot);
-                        BREAK_IF(!dot->name.is<Metatable_t>());
-                        str_list args;
-                        chainValue->items.pop_back();
-                        if (chainValue->items.empty()) {
-                                if (_withVars.empty()) {
-                                        throw std::logic_error(_info.errorMessage("short dot/colon syntax must be called within a with block"sv, x));
+                        str_list temp;
+                        if (auto dot = ast_cast<DotChainItem_t>(chainValue->items.back())) {
+                                BREAK_IF(!dot->name.is<Metatable_t>());
+                                str_list args;
+                                chainValue->items.pop_back();
+                                if (chainValue->items.empty()) {
+                                        if (_withVars.empty()) {
+                                                throw std::logic_error(_info.errorMessage("short dot/colon syntax must be called within a with block"sv, x));
+                                        } else {
+                                                args.push_back(_withVars.top());
+                                        }
                                 } else {
-                                        args.push_back(_withVars.top());
+                                        transformExp(static_cast<Exp_t*>(*it), args, ExpUsage::Closure);
                                 }
-                        } else {
-                                transformExp(static_cast<Exp_t*>(*it), args, ExpUsage::Closure);
-                        }
-                        if (vit != values.end()) transformAssignItem(*vit, args);
-                        else args.push_back("nil"s);
-                        _buf << indent() << globalVar("setmetatable"sv, x) << '(' << join(args, ", "sv) << ')' << nll(x);
-                        str_list temp;
-                        temp.push_back(clearBuf());
+                                if (vit != values.end()) transformAssignItem(*vit, args);
+                                else args.push_back("nil"s);
+                                _buf << indent() << globalVar("setmetatable"sv, x) << '(' << join(args, ", "sv) << ')' << nll(x);
+                                temp.push_back(clearBuf());
+                        } else if (ast_is<table_appending_op_t>(chainValue->items.back())) {
+                                chainValue->items.pop_back();
+                                auto varName = singleVariableFrom(chainValue);
+                                bool isScoped = false;
+                                if (varName.empty() || !isLocal(varName)) {
+                                        isScoped = true;
+                                        temp.push_back(indent() + "do"s + nll(x));
+                                        pushScope();
+                                        auto objVar = getUnusedName("_obj_"sv);
+                                        auto newAssignment = x->new_ptr<ExpListAssign_t>();
+                                        newAssignment->expList.set(toAst<ExpList_t>(objVar, x));
+                                        auto assign = x->new_ptr<Assign_t>();
+                                        assign->values.push_back(*it);
+                                        newAssignment->action.set(assign);
+                                        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>();
+                                assign->values.push_back(*vit);
+                                newAssignment->action.set(assign);
+                                transformAssignment(newAssignment, temp);
+                                if (isScoped) {
+                                        popScope();
+                                        temp.push_back(indent() + "end"s + nlr(x));
+                                }
+                        } else break;
                         auto newExpList = x->new_ptr<ExpList_t>();
                         auto newAssign = x->new_ptr<Assign_t>();
                         auto newAssignment = x->new_ptr<ExpListAssign_t>();
@@ -1243,7 +1271,7 @@ private:
                                 if (value != *vit) newAssign->values.push_back(value);
                         }
                         if (newExpList->exprs.empty() && newAssign->values.empty()) {
-                                out.push_back(temp.back());
+                                out.push_back(join(temp));
                                 return;
                         }
                         if (newExpList->exprs.size() < newAssign->values.size()) {
@@ -2016,81 +2044,67 @@ private:
                                 if (!leftValue) throw std::logic_error(_info.errorMessage("left hand expression is not assignable"sv, leftExp));
                                 auto chain = leftValue->item.as<ChainValue_t>();
                                 if (!chain) throw std::logic_error(_info.errorMessage("left hand expression is not assignable"sv, chain));
-                                auto op = _parser.toString(update->op);
+                                BLOCK_START
                                 {
                                         auto dot = ast_cast<DotChainItem_t>(chain->items.back());
                                         if (dot && dot->name.is<Metatable_t>()) {
                                                 throw std::logic_error(_info.errorMessage("can not apply update to a metatable"sv, leftExp));
                                         }
-                                        BLOCK_START
-                                        if (op == "#"sv) {
-                                                auto varName = singleVariableFrom(chain);
-                                                BREAK_IF(!varName.empty() && isLocal(varName));
-                                                auto objVar = getUnusedName("_obj_"sv);
-                                                auto newAssignment = x->new_ptr<ExpListAssign_t>();
-                                                newAssignment->expList.set(toAst<ExpList_t>(objVar, x));
-                                                auto assign = x->new_ptr<Assign_t>();
-                                                assign->values.push_back(leftExp);
-                                                newAssignment->action.set(assign);
-                                                transformAssignment(newAssignment, temp);
-                                                chain->items.clear();
-                                                chain->items.push_back(toAst<Callable_t>(objVar, x));
-                                        } else {
-                                                BREAK_IF(chain->items.size() < 2);
-                                                if (chain->items.size() == 2) {
-                                                        if (auto callable = ast_cast<Callable_t>(chain->items.front())) {
-                                                                ast_node* var = callable->item.as<Variable_t>();
-                                                                if (auto self = callable->item.as<SelfName_t>()) {
-                                                                        var = self->name.as<self_t>();
-                                                                }
-                                                                BREAK_IF(var && isLocal(_parser.toString(var)));
+                                        BREAK_IF(chain->items.size() < 2);
+                                        if (chain->items.size() == 2) {
+                                                if (auto callable = ast_cast<Callable_t>(chain->items.front())) {
+                                                        ast_node* var = callable->item.as<Variable_t>();
+                                                        if (auto self = callable->item.as<SelfName_t>()) {
+                                                                var = self->name.as<self_t>();
                                                         }
+                                                        BREAK_IF(var && isLocal(_parser.toString(var)));
                                                 }
-                                                auto tmpChain = x->new_ptr<ChainValue_t>();
-                                                ast_ptr<false, ast_node> ptr(chain->items.back());
-                                                for (auto item : chain->items.objects()) {
-                                                        if (item != ptr) {
-                                                                tmpChain->items.push_back(item);
-                                                        }
-                                                }
-                                                auto value = x->new_ptr<Value_t>();
-                                                value->item.set(tmpChain);
-                                                auto exp = newExp(value, x);
-                                                auto objVar = getUnusedName("_obj_"sv);
-                                                auto newAssignment = x->new_ptr<ExpListAssign_t>();
-                                                newAssignment->expList.set(toAst<ExpList_t>(objVar, x));
-                                                auto assign = x->new_ptr<Assign_t>();
-                                                assign->values.push_back(exp);
-                                                newAssignment->action.set(assign);
-                                                transformAssignment(newAssignment, temp);
-                                                chain->items.clear();
-                                                chain->items.push_back(toAst<Callable_t>(objVar, x));
-                                                chain->items.push_back(ptr);
                                         }
-                                        BLOCK_END
                                         auto tmpChain = x->new_ptr<ChainValue_t>();
+                                        ast_ptr<false, ast_node> ptr(chain->items.back());
                                         for (auto item : chain->items.objects()) {
-                                                bool itemAdded = false;
-                                                BLOCK_START
-                                                auto exp = ast_cast<Exp_t>(item);
-                                                BREAK_IF(!exp);
-                                                auto var = singleVariableFrom(exp);
-                                                BREAK_IF(!var.empty());
-                                                auto upVar = getUnusedName("_update_"sv);
-                                                auto newAssignment = x->new_ptr<ExpListAssign_t>();
-                                                newAssignment->expList.set(toAst<ExpList_t>(upVar, x));
-                                                auto assign = x->new_ptr<Assign_t>();
-                                                assign->values.push_back(exp);
-                                                newAssignment->action.set(assign);
-                                                transformAssignment(newAssignment, temp);
-                                                tmpChain->items.push_back(toAst<Exp_t>(upVar, x));
-                                                itemAdded = true;
-                                                BLOCK_END
-                                                if (!itemAdded) tmpChain->items.push_back(item);
+                                                if (item != ptr) {
+                                                        tmpChain->items.push_back(item);
+                                                }
                                         }
+                                        auto value = x->new_ptr<Value_t>();
+                                        value->item.set(tmpChain);
+                                        auto exp = newExp(value, x);
+                                        auto objVar = getUnusedName("_obj_"sv);
+                                        auto newAssignment = x->new_ptr<ExpListAssign_t>();
+                                        newAssignment->expList.set(toAst<ExpList_t>(objVar, x));
+                                        auto assign = x->new_ptr<Assign_t>();
+                                        assign->values.push_back(exp);
+                                        newAssignment->action.set(assign);
+                                        transformAssignment(newAssignment, temp);
                                         chain->items.clear();
-                                        chain->items.dup(tmpChain->items);
+                                        chain->items.push_back(toAst<Callable_t>(objVar, x));
+                                        chain->items.push_back(ptr);
                                 }
+                                BLOCK_END
+                                auto tmpChain = x->new_ptr<ChainValue_t>();
+                                for (auto item : chain->items.objects()) {
+                                        bool itemAdded = false;
+                                        BLOCK_START
+                                        auto exp = ast_cast<Exp_t>(item);
+                                        BREAK_IF(!exp);
+                                        auto var = singleVariableFrom(exp);
+                                        BREAK_IF(!var.empty());
+                                        auto upVar = getUnusedName("_update_"sv);
+                                        auto newAssignment = x->new_ptr<ExpListAssign_t>();
+                                        newAssignment->expList.set(toAst<ExpList_t>(upVar, x));
+                                        auto assign = x->new_ptr<Assign_t>();
+                                        assign->values.push_back(exp);
+                                        newAssignment->action.set(assign);
+                                        transformAssignment(newAssignment, temp);
+                                        tmpChain->items.push_back(toAst<Exp_t>(upVar, x));
+                                        itemAdded = true;
+                                        BLOCK_END
+                                        if (!itemAdded) tmpChain->items.push_back(item);
+                                }
+                                chain->items.clear();
+                                chain->items.dup(tmpChain->items);
+                                auto op = _parser.toString(update->op);
                                 if (op == "??"sv) {
                                         auto defs = getPredefine(assignment);
                                         auto rightExp = x->new_ptr<Exp_t>();
@@ -2101,16 +2115,6 @@ private:
                                         if (!defs.empty()) temp.back().insert(0, defs + nll(x));
                                         out.push_back(join(temp));
                                         return;
-                                } else if (op == "#"sv) {
-                                        auto left = _parser.toString(chain->items.front());
-                                        auto newAssignment = x->new_ptr<ExpListAssign_t>();
-                                        newAssignment->expList.set(toAst<ExpList_t>(left + "[#"s + left + "+1]"s, x));
-                                        auto assign = x->new_ptr<Assign_t>();
-                                        assign->values.push_back(update->value);
-                                        newAssignment->action.set(assign);
-                                        transformAssignment(newAssignment, temp);
-                                        out.push_back(join(temp));
-                                        return;
                                 }
                                 auto defs = getPredefine(assignment);
                                 transformValue(leftValue, temp);
@@ -3970,6 +3974,9 @@ private:
                                         temp.back() = (temp.back().front() == '[' ? "[ "s : "["s) + temp.back() + ']';
                                         break;
                                 case id<InvokeArgs_t>(): transformInvokeArgs(static_cast<InvokeArgs_t*>(item), temp); break;
+                                case id<table_appending_op_t>():
+                                        transform_table_appending_op(static_cast<table_appending_op_t*>(item), temp);
+                                        break;
                                 default: YUEE("AST node mismatch", item); break;
                         }
                 }
@@ -4391,6 +4398,10 @@ private:
                 throw std::logic_error(_info.errorMessage("slice syntax not supported here"sv, slice));
         }
 
+        void transform_table_appending_op(table_appending_op_t* op, str_list&) {
+                throw std::logic_error(_info.errorMessage("table appending syntax not supported here"sv, op));
+        }
+
         void transformInvoke(Invoke_t* invoke, str_list& out) {
                 str_list temp;
                 for (auto arg : invoke->args.objects()) {
diff --git a/src/yuescript/yue_parser.cpp b/src/yuescript/yue_parser.cpp
index 772ae08..3d12190 100755
--- a/src/yuescript/yue_parser.cpp
+++ b/src/yuescript/yue_parser.cpp
@@ -324,8 +324,7 @@ YueParser::YueParser() {
                 expr("|") |
                 expr(">>") |
                 expr("<<") |
-                expr("??") |
-                expr("#");
+                expr("??");
 
         Update = Space >> update_op >> expr("=") >> Exp;
 
@@ -382,7 +381,7 @@ YueParser::YueParser() {
                 return st->chainBlockStack.empty() || st->chainBlockStack.top();
         }) >> +SpaceBreak >> Advance >> ensure(
                 chain_line >> *(+SpaceBreak >> chain_line), PopIndent);
-        ChainValue = Seperator >> (Chain | Callable) >> -existential_op >> -(InvokeArgs | chain_block);
+        ChainValue = Seperator >> (Chain | Callable) >> -existential_op >> -(InvokeArgs | chain_block) >> -table_appending_op;
 
         simple_table = Seperator >> KeyValue >> *(sym(',') >> KeyValue);
         Value = SimpleValue | simple_table | ChainValue | String;
@@ -427,6 +426,7 @@ YueParser::YueParser() {
         Metamethod = Name >> expr('#');
 
         existential_op = expr('?') >> not_(expr('?'));
+        table_appending_op = expr("[]");
         chain_call = (Callable | String) >> -existential_op >> ChainItems;
         chain_item = and_(set(".\\")) >> ChainItems;
         chain_dot_chain = DotChainItem >> -existential_op >> -ChainItems;
diff --git a/src/yuescript/yue_parser.h b/src/yuescript/yue_parser.h
index e128e82..7dea126 100755
--- a/src/yuescript/yue_parser.h
+++ b/src/yuescript/yue_parser.h
@@ -277,6 +277,7 @@ private:
         AST_RULE(Slice)
         AST_RULE(Invoke)
         AST_RULE(existential_op)
+        AST_RULE(table_appending_op)
         AST_RULE(TableLit)
         AST_RULE(TableBlock)
         AST_RULE(TableBlockIndent)