fix issue #52, add until statement.

author: Li Jin <dragon-fly@qq.com> 2021-05-13 10:38:31 +0800
committer: Li Jin <dragon-fly@qq.com> 2021-05-13 10:38:31 +0800
commit: 4d61a00ebc5b956da72525de0e180de28a1e8ac6 (patch)
tree: 02c6967a1966078563f5fcfdca8cdcc1b58e9864
parent: 4c9209b131936ad97c73a7c0e71042fe24369a8e (diff)
download: yuescript-4d61a00ebc5b956da72525de0e180de28a1e8ac6.tar.gz
yuescript-4d61a00ebc5b956da72525de0e180de28a1e8ac6.tar.bz2
yuescript-4d61a00ebc5b956da72525de0e180de28a1e8ac6.zip
5 files changed, 79 insertions, 56 deletions
diff --git a/spec/inputs/loops.yue b/spec/inputs/loops.yue
index 5708809..3191000 100644
--- a/spec/inputs/loops.yue
+++ b/spec/inputs/loops.yue
@@ -109,6 +109,22 @@ repeat
        print a
 until a == 10
+a = 3
+until a == 0
+        a -= 1
+done = false
+until done do done = true
+repeat
+        print "hello"
+until true
+until done
+        x = 10
+        repeat
+                x -= 1
+        until x == 0
+until cond
+        print "okay"
 for x=1,10
        continue if x > 3 and x < 7
        print x
diff --git a/src/yuescript/yue_ast.h b/src/yuescript/yue_ast.h
index 1e95d11..695fbe1 100644
--- a/src/yuescript/yue_ast.h
+++ b/src/yuescript/yue_ast.h
@@ -256,22 +256,23 @@ AST_NODE(IfCond)
        AST_MEMBER(IfCond, &condition, &assign)
 AST_END(IfCond)
+AST_LEAF(IfType)
+AST_END(IfType)
 AST_NODE(If)
-        ast_ptr<true, Seperator_t> sep;
+        ast_ptr<true, IfType_t> type;
        ast_sel_list<true, IfCond_t, Block_t, Statement_t> nodes;
-        AST_MEMBER(If, &sep, &nodes)
+        AST_MEMBER(If, &type, &nodes)
 AST_END(If)
-AST_NODE(Unless)
+AST_LEAF(WhileType)
-        ast_ptr<true, Seperator_t> sep;
+AST_END(WhileType)
-        ast_sel_list<true, IfCond_t, Block_t, Statement_t> nodes;
-        AST_MEMBER(Unless, &sep, &nodes)
-AST_END(Unless)
 AST_NODE(While)
+        ast_ptr<true, WhileType_t> type;
        ast_ptr<true, Exp_t> condition;
        ast_sel<true, Block_t, Statement_t> body;
-        AST_MEMBER(While, &condition, &body)
+        AST_MEMBER(While, &type, &condition, &body)
 AST_END(While)
 class Body_t;
@@ -451,7 +452,7 @@ class FunLit_t;
 AST_NODE(SimpleValue)
        ast_sel<true, const_value_t,
-        If_t, Unless_t, Switch_t, With_t, ClassDecl_t,
+        If_t, Switch_t, With_t, ClassDecl_t,
        ForEach_t, For_t, While_t, Do_t,
        unary_value_t,
        TblComprehension_t, TableLit_t, Comprehension_t,
diff --git a/src/yuescript/yue_compiler.cpp b/src/yuescript/yue_compiler.cpp
index 4646288..0c71806 100644
--- a/src/yuescript/yue_compiler.cpp
+++ b/src/yuescript/yue_compiler.cpp
@@ -59,7 +59,7 @@ inline std::string s(std::string_view sv) {
        return std::string(sv);
 }
-const std::string_view version = "0.7.13"sv;
+const std::string_view version = "0.7.14"sv;
 const std::string_view extension = "yue"sv;
 class YueCompilerImpl {
@@ -401,6 +401,22 @@ private:
                return newName;
        }
+        std::string transformCondExp(Exp_t* cond, bool unless) {
+                str_list tmp;
+                if (unless) {
+                        if (auto value = singleValueFrom(cond)) {
+                                transformValue(value, tmp);
+                        } else {
+                                transformExp(cond, tmp, ExpUsage::Closure);
+                                tmp.back() = s("("sv) + tmp.back() + s(")"sv);
+                        }
+                        return s("not "sv) + tmp.back();
+                } else {
+                        transformExp(cond, tmp, ExpUsage::Closure);
+                        return tmp.back();
+                }
+        }
        const std::string nll(ast_node* node) const {
                if (_config.reserveLineNumber) {
                        return s(" -- "sv) + std::to_string(node->m_begin.m_line + _config.lineOffset) + _newLine;
@@ -874,8 +890,10 @@ private:
                        auto appendix = statement->appendix.get();
                        switch (appendix->item->getId()) {
                                case id<if_line_t>(): {
-                                        auto if_line = appendix->item.to<if_line_t>();
+                                        auto if_line = static_cast<if_line_t*>(appendix->item.get());
                                        auto ifNode = x->new_ptr<If_t>();
+                                        auto ifType = toAst<IfType_t>("if"sv, x);
+                                        ifNode->type.set(ifType);
                                        auto ifCond = x->new_ptr<IfCond_t>();
                                        ifCond->condition.set(if_line->condition);
@@ -900,20 +918,22 @@ private:
                                        break;
                                }
                                case id<unless_line_t>(): {
-                                        auto unless_line = appendix->item.to<unless_line_t>();
+                                        auto unless_line = static_cast<unless_line_t*>(appendix->item.get());
-                                        auto unless = x->new_ptr<Unless_t>();
+                                        auto ifNode = x->new_ptr<If_t>();
+                                        auto ifType = toAst<IfType_t>("unless"sv, x);
+                                        ifNode->type.set(ifType);
                                        auto ifCond = x->new_ptr<IfCond_t>();
                                        ifCond->condition.set(unless_line->condition);
-                                        unless->nodes.push_back(ifCond);
+                                        ifNode->nodes.push_back(ifCond);
                                        auto stmt = x->new_ptr<Statement_t>();
                                        stmt->content.set(statement->content);
-                                        unless->nodes.push_back(stmt);
+                                        ifNode->nodes.push_back(stmt);
                                        statement->appendix.set(nullptr);
                                        auto simpleValue = x->new_ptr<SimpleValue_t>();
-                                        simpleValue->value.set(unless);
+                                        simpleValue->value.set(ifNode);
                                        auto value = x->new_ptr<Value_t>();
                                        value->item.set(simpleValue);
                                        auto exp = newExp(value, x);
@@ -985,7 +1005,6 @@ private:
                                                        switch (value->getId()) {
                                                                case id<If_t>(): transformIf(static_cast<If_t*>(value), out, ExpUsage::Common); break;
                                                                case id<ClassDecl_t>(): transformClassDecl(static_cast<ClassDecl_t*>(value), out, ExpUsage::Common); break;
-                                                                case id<Unless_t>(): transformUnless(static_cast<Unless_t*>(value), out, ExpUsage::Common); break;
                                                                case id<Switch_t>(): transformSwitch(static_cast<Switch_t*>(value), out, ExpUsage::Common); break;
                                                                case id<With_t>(): transformWith(static_cast<With_t*>(value), out); break;
                                                                case id<ForEach_t>(): transformForEach(static_cast<ForEach_t*>(value), out); break;
@@ -1208,16 +1227,12 @@ private:
                        }
                }
                switch (value->getId()) {
-                        case id<If_t>():
+                        case id<If_t>(): {
-                        case id<Unless_t>(): {
                                auto expList = assignment->expList.get();
                                str_list temp;
                                auto defs = transformAssignDefs(expList, DefOp::Mark);
                                if (!defs.empty()) temp.push_back(getPredefine(defs) + nll(expList));
-                                switch (value->getId()) {
+                                transformIf(static_cast<If_t*>(value), temp, ExpUsage::Assignment, expList);
-                                        case id<If_t>(): transformIf(static_cast<If_t*>(value), temp, ExpUsage::Assignment, expList); break;
-                                        case id<Unless_t>(): transformUnless(static_cast<Unless_t*>(value), temp, ExpUsage::Assignment, expList); break;
-                                }
                                out.push_back(join(temp));
                                return;
                        }
@@ -1806,6 +1821,7 @@ private:
                                if (*it != nodes.front() && cond->assign) {
                                        auto x = *it;
                                        auto newIf = x->new_ptr<If_t>();
+                                        newIf->type.set(toAst<IfType_t>("if"sv, x));
                                        for (auto j = ns.rbegin(); j != ns.rend(); ++j) {
                                                newIf->nodes.push_back(*j);
                                        }
@@ -1828,6 +1844,7 @@ private:
                if (nodes.size() != ns.size()) {
                        auto x = ns.back();
                        auto newIf = x->new_ptr<If_t>();
+                        newIf->type.set(toAst<IfType_t>("if"sv, x));
                        for (auto j = ns.rbegin(); j != ns.rend(); ++j) {
                                newIf->nodes.push_back(*j);
                        }
@@ -1918,23 +1935,13 @@ private:
                        if (pair.first) {
                                str_list tmp;
                                auto condition = pair.first->condition.get();
-                                if (unless) {
+                                auto condStr = transformCondExp(condition, unless);
-                                        if (auto value = singleValueFrom(condition)) {
+                                if (unless) unless = false;
-                                                transformValue(value, tmp);
-                                        } else {
-                                                transformExp(condition, tmp, ExpUsage::Closure);
-                                                tmp.back() = s("("sv) + tmp.back() + s(")"sv);
-                                        }
-                                        tmp.back().insert(0, s("not "sv));
-                                        unless = false;
-                                } else {
-                                        transformExp(condition, tmp, ExpUsage::Closure);
-                                }
                                _buf << indent();
                                if (pair != ifCondPairs.front()) {
                                        _buf << "else"sv;
                                }
-                                _buf << "if "sv << tmp.back() << " then"sv << nll(condition);
+                                _buf << "if "sv << condStr << " then"sv << nll(condition);
                                temp.push_back(clearBuf());
                        }
                        if (pair.second) {
@@ -1966,11 +1973,8 @@ private:
        }
        void transformIf(If_t* ifNode, str_list& out, ExpUsage usage, ExpList_t* assignList = nullptr) {
-                transformCond(ifNode->nodes.objects(), out, usage, false, assignList);
+                bool unless = _parser.toString(ifNode->type) == "unless"sv;
-        }
+                transformCond(ifNode->nodes.objects(), out, usage, unless, assignList);
-        void transformUnless(Unless_t* unless, str_list& out, ExpUsage usage, ExpList_t* assignList = nullptr) {
-                transformCond(unless->nodes.objects(), out, usage, true, assignList);
        }
        void transformExpList(ExpList_t* expList, str_list& out) {
@@ -2146,7 +2150,6 @@ private:
                switch (value->getId()) {
                        case id<const_value_t>(): transform_const_value(static_cast<const_value_t*>(value), out); break;
                        case id<If_t>(): transformIf(static_cast<If_t*>(value), out, ExpUsage::Closure); break;
-                        case id<Unless_t>(): transformUnless(static_cast<Unless_t*>(value), out, ExpUsage::Closure); break;
                        case id<Switch_t>(): transformSwitch(static_cast<Switch_t*>(value), out, ExpUsage::Closure); break;
                        case id<With_t>(): transformWithClosure(static_cast<With_t*>(value), out); break;
                        case id<ClassDecl_t>(): transformClassDeclClosure(static_cast<ClassDecl_t*>(value), out); break;
@@ -2757,9 +2760,6 @@ private:
                                                case id<If_t>():
                                                        transformIf(static_cast<If_t*>(value), out, ExpUsage::Return);
                                                        return;
-                                                case id<Unless_t>():
-                                                        transformUnless(static_cast<Unless_t*>(value), out, ExpUsage::Return);
-                                                        return;
                                        }
                                } else if (auto chainValue = singleValue->item.as<ChainValue_t>()) {
                                        if (specialChainValue(chainValue) != ChainType::Common) {
@@ -5054,6 +5054,7 @@ private:
                _withVars.push(withVar);
                if (with->eop) {
                        auto ifNode = x->new_ptr<If_t>();
+                        ifNode->type.set(toAst<IfType_t>("if"sv, x));
                        ifNode->nodes.push_back(toAst<IfCond_t>(withVar + s("~=nil"sv), x));
                        ifNode->nodes.push_back(with->body);
                        transformIf(ifNode, temp, ExpUsage::Common);
@@ -5733,8 +5734,9 @@ private:
                addToScope(lenVar);
                temp.push_back(indent() + s("local "sv) + accumVar + s(" = { }"sv) + nll(whileNode));
                temp.push_back(indent() + s("local "sv) + lenVar + s(" = 1"sv) + nll(whileNode));
-                transformExp(whileNode->condition, temp, ExpUsage::Closure);
+                bool isUntil = _parser.toString(whileNode->type) == "until"sv;
-                temp.back() = indent() + s("while "sv) + temp.back() + s(" do"sv) + nll(whileNode);
+                auto condStr = transformCondExp(whileNode->condition, isUntil);
+                temp.push_back(indent() + s("while "sv) + condStr + s(" do"sv) + nll(whileNode));
                pushScope();
                auto assignLeft = toAst<ExpList_t>(accumVar + s("["sv) + lenVar + s("]"sv), x);
                auto lenLine = lenVar + s(" = "sv) + lenVar + s(" + 1"sv) + nlr(whileNode);
@@ -5770,8 +5772,9 @@ private:
                addToScope(lenVar);
                temp.push_back(indent() + s("local "sv) + accumVar + s(" = { }"sv) + nll(whileNode));
                temp.push_back(indent() + s("local "sv) + lenVar + s(" = 1"sv) + nll(whileNode));
-                transformExp(whileNode->condition, temp, ExpUsage::Closure);
+                bool isUntil = _parser.toString(whileNode->type) == "until"sv;
-                temp.back() = indent() + s("while "sv) + temp.back() + s(" do"sv) + nll(whileNode);
+                auto condStr = transformCondExp(whileNode->condition, isUntil);
+                temp.push_back(indent() + s("while "sv) + condStr + s(" do"sv) + nll(whileNode));
                pushScope();
                auto assignLeft = toAst<ExpList_t>(accumVar + s("["sv) + lenVar + s("]"sv), x);
                auto lenLine = lenVar + s(" = "sv) + lenVar + s(" + 1"sv) + nlr(whileNode);
@@ -5788,10 +5791,11 @@ private:
        void transformWhile(While_t* whileNode, str_list& out) {
                str_list temp;
                pushScope();
-                transformExp(whileNode->condition, temp, ExpUsage::Closure);
+                bool isUntil = _parser.toString(whileNode->type) == "until"sv;
+                auto condStr = transformCondExp(whileNode->condition, isUntil);
                transformLoopBody(whileNode->body, temp, Empty, ExpUsage::Common);
                popScope();
-                _buf << indent() << "while "sv << temp.front() << " do"sv << nll(whileNode);
+                _buf << indent() << "while "sv << condStr << " do"sv << nll(whileNode);
                _buf << temp.back();
                _buf << indent() << "end"sv << nlr(whileNode);
                out.push_back(clearBuf());
diff --git a/src/yuescript/yue_parser.cpp b/src/yuescript/yue_parser.cpp
index 607edc9..255469d 100644
--- a/src/yuescript/yue_parser.cpp
+++ b/src/yuescript/yue_parser.cpp
@@ -244,10 +244,11 @@ YueParser::YueParser() {
        IfCond = disable_chain(Exp >> -Assign);
        IfElseIf = -(Break >> *EmptyLine >> CheckIndent) >> key("elseif") >> IfCond >> plain_body_with("then");
        IfElse = -(Break >> *EmptyLine >> CheckIndent) >> key("else") >> plain_body;
-        If = key("if") >> Seperator >> IfCond >> plain_body_with("then") >> *IfElseIf >> -IfElse;
+        IfType = (expr("if") | expr("unless")) >> not_(AlphaNum);
-        Unless = key("unless") >> Seperator >> IfCond >> plain_body_with("then") >> *IfElseIf >> -IfElse;
+        If = Space >> IfType >> IfCond >> plain_body_with("then") >> *IfElseIf >> -IfElse;
-        While = key("while") >> disable_do_chain(Exp) >> plain_body_with("do");
+        WhileType = (expr("while") | expr("until")) >> not_(AlphaNum);
+        While = Space >> WhileType >> disable_do_chain(Exp) >> plain_body_with("do");
        Repeat = key("repeat") >> Body >> Break >> *EmptyLine >> CheckIndent >> key("until") >> Exp;
        for_step_value = sym(',') >> Exp;
@@ -607,7 +608,7 @@ YueParser::YueParser() {
        SimpleValue =
                (Space >> const_value) |
-                If | Unless | Switch | With | ClassDecl | ForEach | For | While | Do |
+                If | Switch | With | ClassDecl | ForEach | For | While | Do |
                (Space >> unary_value) |
                TblComprehension | TableLit | Comprehension | FunLit |
                (Space >> Num);
diff --git a/src/yuescript/yue_parser.h b/src/yuescript/yue_parser.h
index b3c311a..2a3c1e4 100644
--- a/src/yuescript/yue_parser.h
+++ b/src/yuescript/yue_parser.h
@@ -228,8 +228,9 @@ private:
        AST_RULE(SwitchCase)
        AST_RULE(Switch)
        AST_RULE(IfCond)
+        AST_RULE(IfType)
        AST_RULE(If)
-        AST_RULE(Unless)
+        AST_RULE(WhileType)
        AST_RULE(While)
        AST_RULE(Repeat)
        AST_RULE(for_step_value)
author	Li Jin <dragon-fly@qq.com>	2021-05-13 10:38:31 +0800
committer	Li Jin <dragon-fly@qq.com>	2021-05-13 10:38:31 +0800
commit	4d61a00ebc5b956da72525de0e180de28a1e8ac6 (patch)
tree	02c6967a1966078563f5fcfdca8cdcc1b58e9864
parent	4c9209b131936ad97c73a7c0e71042fe24369a8e (diff)
download	yuescript-4d61a00ebc5b956da72525de0e180de28a1e8ac6.tar.gz yuescript-4d61a00ebc5b956da72525de0e180de28a1e8ac6.tar.bz2 yuescript-4d61a00ebc5b956da72525de0e180de28a1e8ac6.zip