4 files changed, 53 insertions, 12 deletions

diff --git a/src/MoonP/moon_ast.h b/src/MoonP/moon_ast.h
index 0725bda..3f9ce79 100644
--- a/src/MoonP/moon_ast.h
+++ b/src/MoonP/moon_ast.h
@@ -46,6 +46,11 @@ AST_NODE(Variable)
         AST_MEMBER(Variable, &name)
 AST_END(Variable)
 
+AST_NODE(LabelName)
+        ast_ptr<true, Name_t> name;
+        AST_MEMBER(LabelName, &name)
+AST_END(LabelName)
+
 AST_NODE(LuaKeyword)
         ast_ptr<true, Name_t> name;
         AST_MEMBER(LuaKeyword, &name)
@@ -142,6 +147,16 @@ AST_NODE(Import)
         AST_MEMBER(Import, &content)
 AST_END(Import)
 
+AST_NODE(Label)
+        ast_ptr<true, LabelName_t> label;
+        AST_MEMBER(Label, &label)
+AST_END(Label)
+
+AST_NODE(Goto)
+        ast_ptr<true, LabelName_t> label;
+        AST_MEMBER(Goto, &label)
+AST_END(Goto)
+
 class FnArgsDef_t;
 
 AST_LEAF(fn_arrow_back)
@@ -650,7 +665,7 @@ AST_END(BreakLoop)
 AST_NODE(Statement)
         ast_sel<true, Import_t, While_t, For_t, ForEach_t,
                 Return_t, Local_t, Global_t, Export_t, Macro_t, BreakLoop_t,
-                Backcall_t, ExpListAssign_t> content;
+                Label_t, Goto_t, Backcall_t, ExpListAssign_t> content;
         ast_ptr<false, statement_appendix_t> appendix;
         AST_MEMBER(Statement, &content, &appendix)
 AST_END(Statement)
diff --git a/src/MoonP/moon_compiler.cpp b/src/MoonP/moon_compiler.cpp
index c176c01..b89f6d1 100644
--- a/src/MoonP/moon_compiler.cpp
+++ b/src/MoonP/moon_compiler.cpp
@@ -43,7 +43,7 @@ inline std::string s(std::string_view sv) {
 }
 
 const char* moonScriptVersion() {
-        return "0.5.0-r0.3.4";
+        return "0.5.0-r0.3.5";
 }
 
 // name of table stored in lua registry
@@ -750,6 +750,8 @@ private:
                         case id<Export_t>(): transformExport(static_cast<Export_t*>(content), out); break;
                         case id<Macro_t>(): transformMacro(static_cast<Macro_t*>(content), out, false); break;
                         case id<BreakLoop_t>(): transformBreakLoop(static_cast<BreakLoop_t*>(content), out); break;
+                        case id<Label_t>(): transformLabel(static_cast<Label_t*>(content), out); break;
+                        case id<Goto_t>(): transformGoto(static_cast<Goto_t*>(content), out); break;
                         case id<ExpListAssign_t>(): {
                                 auto expListAssign = static_cast<ExpListAssign_t*>(content);
                                 if (expListAssign->action) {
@@ -4997,6 +4999,14 @@ private:
                 _buf << indent() << "break"sv << nll(breakLoop);
                 out.push_back(clearBuf());
         }
+
+        void transformLabel(Label_t* label, str_list& out) {
+                out.push_back(indent() + s("::"sv) + _parser.toString(label->label) + s("::"sv) + nll(label));
+        }
+
+        void transformGoto(Goto_t* gotoNode, str_list& out) {
+                out.push_back(indent() + s("goto "sv) + _parser.toString(gotoNode->label) + nll(gotoNode));
+        }
 };
 
 const std::string MoonCompilerImpl::Empty;
diff --git a/src/MoonP/moon_parser.cpp b/src/MoonP/moon_parser.cpp
index c8a3a23..872e30e 100644
--- a/src/MoonP/moon_parser.cpp
+++ b/src/MoonP/moon_parser.cpp
@@ -15,18 +15,18 @@ using namespace std::string_view_literals;
 
 std::unordered_set<std::string> LuaKeywords = {
         "and", "break", "do", "else", "elseif",
-        "end", "false", "for", "function", "if",
-        "in", "local", "nil", "not", "or",
-        "repeat", "return", "then", "true", "until",
-        "while"
+        "end", "false", "for", "function", "goto",
+        "if", "in", "local", "nil", "not",
+        "or", "repeat", "return", "then", "true",
+        "until", "while"
 };
 
 std::unordered_set<std::string> Keywords = {
         "and", "break", "do", "else", "elseif",
-        "end", "false", "for", "function", "if",
-        "in", "local", "nil", "not", "or",
-        "repeat", "return", "then", "true", "until",
-        "while", // Lua keywords
+        "end", "false", "for", "function", "goto",
+        "if", "in", "local", "nil", "not",
+        "or", "repeat", "return", "then", "true",
+        "until", "while", // Lua keywords
         "as", "class", "continue", "export", "extends",
         "from", "global", "import", "macro", "switch",
         "unless", "using", "when", "with" // Moon keywords
@@ -85,6 +85,14 @@ MoonParser::MoonParser() {
                 return isValid;
         });
 
+        LabelName = pl::user(Name, [](const item_t& item) {
+                State* st = reinterpret_cast<State*>(item.user_data);
+                for (auto it = item.begin; it != item.end; ++it) st->buffer += static_cast<char>(*it);
+                auto isValid = LuaKeywords.find(st->buffer) == LuaKeywords.end();
+                st->buffer.clear();
+                return isValid;
+        });
+
         LuaKeyword = pl::user(Name, [](const item_t& item) {
                 State* st = reinterpret_cast<State*>(item.user_data);
                 for (auto it = item.begin; it != item.end; ++it) st->buffer += static_cast<char>(*it);
@@ -191,9 +199,14 @@ MoonParser::MoonParser() {
 
         Import = key("import") >> (ImportAs | ImportFrom);
 
+        Label = Space >> expr("::") >> LabelName >> expr("::");
+
+        Goto = key("goto") >> Space >> LabelName;
+
         BreakLoop = (expr("break") | expr("continue")) >> not_(AlphaNum);
 
         Return = key("return") >> -ExpListLow;
+
         WithExp = ExpList >> -Assign;
 
         With = key("with") >> DisableDo >> ensure(WithExp, PopDo) >> -key("do") >> Body;
@@ -527,8 +540,8 @@ MoonParser::MoonParser() {
         Statement = (
                 Import | While | For | ForEach |
                 Return | Local | Global | Export |
-                Macro | Space >> BreakLoop |
-                Backcall | ExpListAssign
+                Macro | Space >> BreakLoop | Label |
+                Goto | Backcall | ExpListAssign
         ) >> Space >>
         -statement_appendix;
 
diff --git a/src/MoonP/moon_parser.h b/src/MoonP/moon_parser.h
index 4d67696..cea14fa 100644
--- a/src/MoonP/moon_parser.h
+++ b/src/MoonP/moon_parser.h
@@ -182,6 +182,7 @@ private:
         AST_RULE(Num)
         AST_RULE(Name)
         AST_RULE(Variable)
+        AST_RULE(LabelName)
         AST_RULE(LuaKeyword)
         AST_RULE(self)
         AST_RULE(self_name)
@@ -201,6 +202,8 @@ private:
         AST_RULE(ImportFrom)
         AST_RULE(ImportAs)
         AST_RULE(Import)
+        AST_RULE(Label)
+        AST_RULE(Goto)
         AST_RULE(fn_arrow_back)
         AST_RULE(Backcall)
         AST_RULE(ExpListLow)