mevento 1.4.0 → 1.8.0

package/fesm2020/mevento.mjs

@@ -77,6 +77,7 @@ TokenType.with = 39;
 TokenType.in = 40;
 TokenType.TILL = 41;
 TokenType.BREAK = 42;
+TokenType.CONTINUE = 43;
 class Token {
     constructor(type, value, line = 1, col = 1) {
         this.type = type;
@@ -488,6 +489,7 @@ Lexer._defaultLanguage = new LexerDictionary("en", {
     "till": "till",
     "in": "in",
     "break": "break",
+    "continue": "continue",
 });
 Lexer.languages = [
     Lexer._defaultLanguage,
@@ -500,11 +502,12 @@ Lexer.languages = [
         "tanque": "while",
         "pour": "for",
         "avec": "with",
-        "mon": "up",
+        "mont": "up",
         "desc": "down",
         "jusqua": "till",
         "dans": "in",
         "couper": "break",
+        "continuer": "continue",
     }),
     new LexerDictionary("bm", {
         "nii": "if",
@@ -520,6 +523,7 @@ Lexer.languages = [
         "kata": "till",
         "kono": "in",
         "tike": "break",
+        "ipan": "continue",
     }),
 ];
 Lexer.RESERVED = {
@@ -536,6 +540,7 @@ Lexer.RESERVED = {
     "till": Token.from(TokenType.TILL, "till"),
     "in": Token.from(TokenType.in, "in"),
     "break": Token.from(TokenType.BREAK, "break"),
+    "continue": Token.from(TokenType.CONTINUE, "continue"),
 };
 /**
  * Parser
@@ -742,6 +747,11 @@ class BreakAST extends AST {
         super(line, col);
     }
 }
+class ContinueAST extends AST {
+    constructor(line, col) {
+        super(line, col);
+    }
+}
 class Parser {
     constructor(lexer) {
         this.currentToken = lexer.nextToken();
@@ -976,8 +986,7 @@ class Parser {
         }
         // const body = _statements();
         const body = [this._statement()];
-        while (this.currentToken.type === TokenType.eol ||
-            this.currentToken.type === TokenType.semi) {
+        while (true) {
             this._eatSemiOrEOL();
             if (this.currentToken.type === TokenType.rbrace || this.currentToken.type === TokenType.eof) {
                 // _eat(this.currentToken!.type);
@@ -1041,7 +1050,6 @@ class Parser {
         return new WhileLoopStatement(test, body, token, this.currentToken);
     }
     _forOfIdentifier() {
-        let node;
         switch (this.currentToken.type) {
             case TokenType.lparen: {
                 // probable tuple
@@ -1121,6 +1129,9 @@ class Parser {
             case TokenType.BREAK:
                 this._eat(TokenType.BREAK);
                 return new BreakAST(this.currentToken?.line, this.currentToken?.col);
+            case TokenType.CONTINUE:
+                this._eat(TokenType.CONTINUE);
+                return new ContinueAST(this.currentToken?.line, this.currentToken?.col);
             case TokenType.semi:
                 this._eatSemi();
                 return this._statement();
@@ -1152,7 +1163,12 @@ class Parser {
                 this._eat(TokenType.eof);
                 break;
             }
-            results.push(this._statement());
+            if (this.currentToken.type === TokenType.lbrace) {
+                results.push(this._blockStatement());
+            }
+            else {
+                results.push(this._statement());
+            }
             // if (this.currentToken!.type !== TokenType.eol &&
             //     this.currentToken!.type !== TokenType.semi &&
             //     this.currentToken!.type !== TokenType.eof) {
@@ -1184,7 +1200,11 @@ Parser._binopPrecdences = {
     [TokenType.div]: 40,
     [TokenType.mod]: 40,
 };
-class BreakBranch {
+class LoopControl {
+}
+class BreakBranch extends LoopControl {
+}
+class ContinueBranch extends LoopControl {
 }
 // AST Wallker
 class ANodeVisitor {
@@ -1219,6 +1239,7 @@ class NodeVisitor extends ANodeVisitor {
         this.registerVisitor(ForLoopStatement, this.visitForLoopStatement);
         this.registerVisitor(ForOfStatement, this.visitForOfStatement);
         this.registerVisitor(BreakAST, this.visitBreakAST);
+        this.registerVisitor(ContinueAST, this.visitContinueAST);
     }
     visit(node) {
         const methodName = `visit${node.constructor.name}`;
@@ -1262,6 +1283,9 @@ class MEvento extends NodeVisitor {
         let last;
         for (const n of list) {
             last = this.visit(n);
+            if (last instanceof LoopControl) {
+                return last;
+            }
         }
         return last;
     }
@@ -1455,6 +1479,9 @@ class MEvento extends NodeVisitor {
             if (ret instanceof BreakBranch) {
                 break;
             }
+            if (ret instanceof ContinueAST) {
+                continue;
+            }
             retainer?.push(ret);
         }
         return retainer || null;
@@ -1480,6 +1507,9 @@ class MEvento extends NodeVisitor {
             if (ret instanceof BreakBranch) {
                 break;
             }
+            if (ret instanceof ContinueAST) {
+                continue;
+            }
             retainer?.push(ret);
             // update
             if (node.update instanceof LiteralAST && isNum(node.update.value)) {
@@ -1507,10 +1537,16 @@ class MEvento extends NodeVisitor {
             if (ret instanceof BreakBranch) {
                 break;
             }
+            if (ret instanceof ContinueAST) {
+                continue;
+            }
             retainer?.push(ret);
         }
         return retainer || null;
     }
+    visitContinueAST(node) {
+        return new ContinueBranch();
+    }
     _declareForIdentifier(node, value) {
         if (node instanceof TupleExpression) {
             if (!Array.isArray(value)) {
@@ -1601,6 +1637,9 @@ class MEventoAsync extends MEvento {
         let last;
         for (const n of list) {
             last = await this.visit(n);
+            if (last instanceof LoopControl) {
+                return last;
+            }
         }
         return last;
     }
@@ -1788,6 +1827,9 @@ class MEventoAsync extends MEvento {
             if (ret instanceof BreakBranch) {
                 break;
             }
+            if (ret instanceof ContinueAST) {
+                continue;
+            }
             retainer?.push(ret);
         }
         return retainer;
@@ -1813,6 +1855,9 @@ class MEventoAsync extends MEvento {
             if (ret instanceof BreakBranch) {
                 break;
             }
+            if (ret instanceof ContinueAST) {
+                continue;
+            }
             retainer?.push(ret);
             // update
             if (node.update instanceof LiteralAST && isNum(node.update.value)) {
@@ -1840,6 +1885,9 @@ class MEventoAsync extends MEvento {
             if (ret instanceof BreakBranch) {
                 break;
             }
+            if (ret instanceof ContinueAST) {
+                continue;
+            }
             retainer?.push(ret);
         }
         return retainer;
@@ -1883,5 +1931,5 @@ class MEventoAsync extends MEvento {
  * Generated bundle index. Do not edit.
  */
 
-export { AST, ArrayExpression, AssignmentExpressionAST, BinaryExpressionAST, BlockStatementAST, BreakAST, BreakBranch, CallExpressionAST, ExpressionStatementAST, ForLoopStatement, ForOfStatement, IdentifierAST, IfStatementAST, IndexAccessorAST, LexerDictionary, LiteralAST, LogicalExpressionAST, MEvento, MEventoAsync, NodeVisitor, ObjectExpression, ObjectProperty, RootAST, Token, TokenType, TupleExpression, UnaryExpressionAST, WhileLoopStatement };
+export { AST, ArrayExpression, AssignmentExpressionAST, BinaryExpressionAST, BlockStatementAST, BreakAST, BreakBranch, CallExpressionAST, ContinueAST, ContinueBranch, ExpressionStatementAST, ForLoopStatement, ForOfStatement, IdentifierAST, IfStatementAST, IndexAccessorAST, LexerDictionary, LiteralAST, LogicalExpressionAST, LoopControl, MEvento, MEventoAsync, NodeVisitor, ObjectExpression, ObjectProperty, RootAST, Token, TokenType, TupleExpression, UnaryExpressionAST, WhileLoopStatement };
 //# sourceMappingURL=mevento.mjs.map