mevento 1.9.6 → 1.9.8

package/fesm2015/mevento.mjs

@@ -2,7 +2,7 @@ import { __awaiter } from 'tslib';
 
 function error(token, expected) {
     const text = `Invalid token ${token.type}[${token.value}] at ${token.line}, ${token.col} ${expected ? `: expecting ${expected} token` : ''}\n`;
-    throw (text);
+    throw Error(text);
 }
 function isNum(value) {
     return typeof value === 'number';
@@ -14,10 +14,10 @@ function isString(value) {
     return typeof value === 'string';
 }
 function _boolValue(test) {
-    return test !== null &&
-        ((isNum(test) && test !== 0) ||
-            (isString(test) && test.length > 0) ||
-            (isBoolean(test) && test));
+    return (test === null ||
+        (isNum(test) && test === 0) ||
+        (isString(test) && test.length === 0) ||
+        (isBoolean(test) && !test)) ? false : true;
 }
 ;
 function hashCode(str) {
@@ -80,6 +80,8 @@ TokenType.in = 40;
 TokenType.TILL = 41;
 TokenType.BREAK = 42;
 TokenType.CONTINUE = 43;
+TokenType.nullity = 44;
+TokenType.RETURN = 45;
 class Token {
     constructor(type, value, line = 1, col = 1) {
         this.type = type;
@@ -119,6 +121,8 @@ Chars.less = "<".charCodeAt(0);
 Chars.and = "&".charCodeAt(0);
 Chars.pipe = "|".charCodeAt(0);
 Chars.colon = ":".charCodeAt(0);
+Chars.questionMark = "?".charCodeAt(0);
+Chars.shebang = "#".charCodeAt(0);
 class LexerDictionary {
     constructor(lang, keywords) {
         this.keywords = {};
@@ -178,10 +182,10 @@ class Lexer {
         this._col++;
     }
     _pick() {
-        if (this._position >= this._source.length) {
+        if (this._position + 1 >= this._source.length) {
             return -1;
         }
-        return this._source[this._position].charCodeAt(0);
+        return this._source[this._position + 1].charCodeAt(0);
     }
     _isId(code) {
         if (code < 48) {
@@ -344,6 +348,22 @@ class Lexer {
         }
         return new Token(TokenType.stringConst, ret, lastL, lastC);
     }
+    _skipLineComment() {
+        while (!this._isLineEnd(this._currentChar) === true) {
+            this._advance();
+        }
+    }
+    _skipComment() {
+        while (this._currentChar !== -1) {
+            if (this._currentChar === Chars.star && this._pick() === Chars.shebang) {
+                // end of block comment
+                this._advance();
+                this._advance();
+                break;
+            }
+            this._advance();
+        }
+    }
     // f=SUBMIT_FORM(xxx);
     // r = CALL_API(API_ID, f);
     // DISPLAY("MSG #r")
@@ -362,6 +382,18 @@ class Lexer {
                 this._skipWhiteSpace();
                 continue;
             }
+            if (this._currentChar == Chars.shebang) {
+                this._advance();
+                if (this._currentChar === Chars.star) {
+                    // mutli block comment
+                    this._advance();
+                    this._skipComment();
+                }
+                else {
+                    this._skipLineComment();
+                }
+                continue;
+            }
             if (this._isDigit(this._currentChar)) {
                 return this._number();
             }
@@ -466,6 +498,11 @@ class Lexer {
                 this._advance();
                 return new Token(TokenType.or, '||', lastL, lastC);
             }
+            if (this._currentChar === Chars.questionMark && this._pick() === Chars.questionMark) {
+                this._advance();
+                this._advance();
+                return new Token(TokenType.nullity, '??', lastL, lastC);
+            }
             if (this._currentChar === Chars.quote || this._currentChar === Chars.squote) {
                 const startChar = this._currentChar;
                 this._advance();
@@ -493,6 +530,7 @@ Lexer._defaultLanguage = new LexerDictionary("en", {
     "in": "in",
     "break": "break",
     "continue": "continue",
+    "return": "return",
 });
 Lexer.languages = [
     Lexer._defaultLanguage,
@@ -511,6 +549,7 @@ Lexer.languages = [
         "dans": "in",
         "couper": "break",
         "continuer": "continue",
+        "returner": "return",
     }),
     new LexerDictionary("bm", {
         "nii": "if",
@@ -527,6 +566,7 @@ Lexer.languages = [
         "kono": "in",
         "tike": "break",
         "ipan": "continue",
+        "segin": "return",
     }),
 ];
 Lexer.RESERVED = {
@@ -544,6 +584,7 @@ Lexer.RESERVED = {
     "in": Token.from(TokenType.in, "in"),
     "break": Token.from(TokenType.BREAK, "break"),
     "continue": Token.from(TokenType.CONTINUE, "continue"),
+    "return": Token.from(TokenType.RETURN, "return"),
 };
 /**
  * Parser
@@ -750,6 +791,12 @@ class BreakAST extends AST {
         super(line, col);
     }
 }
+class ReturnAST extends AST {
+    constructor(value, line, col) {
+        super(line, col);
+        this.value = value;
+    }
+}
 class ContinueAST extends AST {
     constructor(line, col) {
         super(line, col);
@@ -793,6 +840,14 @@ class Parser {
         this._eat(TokenType.id);
         return node;
     }
+    _return() {
+        const token = this.currentToken;
+        let value = undefined;
+        if (!this._expect(TokenType.eol) && !this._expect(TokenType.semi)) {
+            value = this._expression();
+        }
+        return new ReturnAST(value, token === null || token === void 0 ? void 0 : token.line, token === null || token === void 0 ? void 0 : token.col);
+    }
     _factor() {
         const token = this.currentToken;
         switch (token.type) {
@@ -837,7 +892,7 @@ class Parser {
     _expression() {
         let node = this._term();
         node = this._tryBinaryExpression(0, node);
-        while ([TokenType.and, TokenType.or].includes(this.currentToken.type)) {
+        while ([TokenType.and, TokenType.or, TokenType.nullity].includes(this.currentToken.type)) {
             const token = this.currentToken;
             this._eat(token.type);
             node = new LogicalExpressionAST(node, token, this._expression());
@@ -894,6 +949,7 @@ class Parser {
         if (((_a = this.currentToken) === null || _a === void 0 ? void 0 : _a.type) != TokenType.rbrace) {
             this._eatEOL();
             properties.push(this._property());
+            this._eatEOL();
         }
         while (((_b = this.currentToken) === null || _b === void 0 ? void 0 : _b.type) === TokenType.comma) {
             this._eat(TokenType.comma);
@@ -956,6 +1012,7 @@ class Parser {
         this._eatEOL();
         // if (expect(Lexer.TokenType.RPAREN)) return emptyList()
         let expr = this._expression();
+        this._eatEOL();
         const result = [expr];
         while (((_a = this.currentToken) === null || _a === void 0 ? void 0 : _a.type) === TokenType.comma) {
             this._eat(TokenType.comma);
@@ -965,6 +1022,7 @@ class Parser {
             }
             expr = this._expression();
             result.push(expr);
+            this._eatEOL();
         }
         return result;
     }
@@ -1154,6 +1212,9 @@ class Parser {
             case TokenType.CONTINUE:
                 this._eat(TokenType.CONTINUE);
                 return new ContinueAST((_c = this.currentToken) === null || _c === void 0 ? void 0 : _c.line, (_d = this.currentToken) === null || _d === void 0 ? void 0 : _d.col);
+            case TokenType.RETURN:
+                this._eat(TokenType.RETURN);
+                return this._return();
             case TokenType.semi:
                 this._eatSemi();
                 return this._statement();
@@ -1229,6 +1290,12 @@ class BreakBranch extends LoopControl {
 }
 class ContinueBranch extends LoopControl {
 }
+class ReturnBranch {
+    constructor(value) {
+        this.value = value;
+    }
+}
+;
 // AST Wallker
 class ANodeVisitor {
     constructor() {
@@ -1262,6 +1329,7 @@ class NodeVisitor extends ANodeVisitor {
         this.registerVisitor(ForOfStatement, this.visitForOfStatement);
         this.registerVisitor(BreakAST, this.visitBreakAST);
         this.registerVisitor(ContinueAST, this.visitContinueAST);
+        this.registerVisitor(ReturnAST, this.visitReturnAST);
     }
     visit(node) {
         var _a;
@@ -1351,6 +1419,9 @@ class MEvento extends NodeVisitor {
         let last;
         for (const n of list) {
             last = this.visit(n);
+            if (last instanceof ReturnBranch) {
+                return last.value;
+            }
         }
         return last;
     }
@@ -1363,6 +1434,9 @@ class MEvento extends NodeVisitor {
             if (last instanceof LoopControl) {
                 break;
             }
+            if (last instanceof ReturnBranch) {
+                break;
+            }
         }
         this.popScope();
         return last;
@@ -1507,6 +1581,12 @@ class MEvento extends NodeVisitor {
     visitLogicalExpressionAST(node) {
         const leftNode = node.left;
         let test = this.visit(leftNode);
+        if (node.operator.type === TokenType.nullity) {
+            if (test != null) {
+                return test;
+            }
+            return this.visit(node.right);
+        }
         const testBoolValue = _boolValue(test);
         if (node.operator.type === TokenType.and) {
             if (!testBoolValue) {
@@ -1516,12 +1596,11 @@ class MEvento extends NodeVisitor {
         }
         if (node.operator.type === TokenType.or) {
             if (testBoolValue) {
-                return test;
+                return true;
             }
-            test = this.visit(node.right);
-            return test;
+            return _boolValue(this.visit(node.right));
         }
-        return false;
+        return null;
     }
     visitIndexAccessorAST(node) {
         const ownerNode = node.owner;
@@ -1571,6 +1650,10 @@ class MEvento extends NodeVisitor {
             if (ret instanceof ContinueBranch) {
                 continue;
             }
+            if (ret instanceof ReturnBranch) {
+                this.popScope();
+                return ret;
+            }
             retainer === null || retainer === void 0 ? void 0 : retainer.push(ret);
         }
         return retainer !== null && retainer !== void 0 ? retainer : null;
@@ -1614,6 +1697,10 @@ class MEvento extends NodeVisitor {
                 update();
                 continue;
             }
+            if (ret instanceof ReturnBranch) {
+                this.popScope();
+                return ret;
+            }
             retainer === null || retainer === void 0 ? void 0 : retainer.push(ret);
             // update
             update();
@@ -1637,6 +1724,10 @@ class MEvento extends NodeVisitor {
             if (ret instanceof ContinueBranch) {
                 continue;
             }
+            if (ret instanceof ReturnBranch) {
+                this.popScope();
+                return ret;
+            }
             retainer === null || retainer === void 0 ? void 0 : retainer.push(ret);
         }
         this.popScope();
@@ -1645,6 +1736,9 @@ class MEvento extends NodeVisitor {
     visitContinueAST(node) {
         return new ContinueBranch();
     }
+    visitReturnAST(node) {
+        return new ReturnBranch(node.value != null ? this.visit(node.value) : null);
+    }
     _declareForIdentifier(node, value) {
         if (node instanceof TupleExpression) {
             if (!Array.isArray(value)) {
@@ -1733,6 +1827,9 @@ class MEventoAsync extends MEvento {
             let last;
             for (const n of list) {
                 last = yield this.visit(n);
+                if (last instanceof ReturnBranch) {
+                    return last.value;
+                }
             }
             return last;
         });
@@ -1747,6 +1844,9 @@ class MEventoAsync extends MEvento {
                 if (last instanceof LoopControl) {
                     break;
                 }
+                if (last instanceof ReturnBranch) {
+                    break;
+                }
             }
             this.popScope();
             return last;
@@ -1908,6 +2008,12 @@ class MEventoAsync extends MEvento {
         return __awaiter(this, void 0, void 0, function* () {
             const leftNode = node.left;
             let test = yield this.visit(leftNode);
+            if (node.operator.type === TokenType.nullity) {
+                if (test != null) {
+                    return test;
+                }
+                return yield this.visit(node.right);
+            }
             const testBoolValue = _boolValue(test);
             if (node.operator.type === TokenType.and) {
                 if (!testBoolValue) {
@@ -1917,10 +2023,9 @@ class MEventoAsync extends MEvento {
             }
             if (node.operator.type === TokenType.or) {
                 if (testBoolValue) {
-                    return test;
+                    return true;
                 }
-                test = yield this.visit(node.right);
-                return test;
+                return _boolValue(yield this.visit(node.right));
             }
             return false;
         });
@@ -1979,6 +2084,10 @@ class MEventoAsync extends MEvento {
                 if (ret instanceof ContinueBranch) {
                     continue;
                 }
+                if (ret instanceof ReturnBranch) {
+                    this.popScope();
+                    return ret;
+                }
                 retainer === null || retainer === void 0 ? void 0 : retainer.push(ret);
             }
             return retainer;
@@ -2024,6 +2133,10 @@ class MEventoAsync extends MEvento {
                     yield update();
                     continue;
                 }
+                if (ret instanceof ReturnBranch) {
+                    this.popScope();
+                    return ret;
+                }
                 retainer === null || retainer === void 0 ? void 0 : retainer.push(ret);
                 // update
                 yield update();
@@ -2049,12 +2162,21 @@ class MEventoAsync extends MEvento {
                 if (ret instanceof ContinueBranch) {
                     continue;
                 }
+                if (ret instanceof ReturnBranch) {
+                    this.popScope();
+                    return ret;
+                }
                 retainer === null || retainer === void 0 ? void 0 : retainer.push(ret);
             }
             this.popScope();
             return retainer;
         });
     }
+    visitReturnAST(node) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new ReturnBranch(node.value != null ? yield this.visit(node.value) : null);
+        });
+    }
     resolveArgumentsAsync(args) {
         return __awaiter(this, void 0, void 0, function* () {
             return yield Promise.all(args.map((it) => __awaiter(this, void 0, void 0, function* () {
@@ -2100,5 +2222,5 @@ class MEventoAsync extends MEvento {
  * Generated bundle index. Do not edit.
  */
 
-export { AST, ArrayExpression, AssignmentExpressionAST, BinaryExpressionAST, BlockStatementAST, BreakAST, BreakBranch, CallExpressionAST, ContinueAST, ContinueBranch, ExpressionStatementAST, ForLoopStatement, ForOfStatement, IdentifierAST, IfStatementAST, IndexAccessorAST, LexerDictionary, LiteralAST, LogicalExpressionAST, LoopControl, MEventScope, 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, MEventScope, MEvento, MEventoAsync, NodeVisitor, ObjectExpression, ObjectProperty, ReturnAST, ReturnBranch, RootAST, Token, TokenType, TupleExpression, UnaryExpressionAST, WhileLoopStatement };
 //# sourceMappingURL=mevento.mjs.map