@mojir/lits 2.1.33 → 2.1.34

package/dist/cli/cli.js

@@ -92,7 +92,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
     return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
 };
 
-var version = "2.1.33";
+var version = "2.1.34";
 
 function getCodeMarker(sourceCodeInfo) {
     if (!sourceCodeInfo.position || !sourceCodeInfo.code)
@@ -14533,6 +14533,48 @@ var Parser = /** @class */ (function () {
             docString,
         ];
     };
+    Parser.prototype.parseImplicitBlock = function (ends) {
+        var nodes = [];
+        while (!this.isAtEnd() && !this.isImplicitBlockEnd(ends)) {
+            if (isOperatorToken(this.peek(), ';')) {
+                this.advance();
+            }
+            else {
+                nodes.push(this.parseExpression());
+            }
+        }
+        this.assertImplicitBlockEnd(ends);
+        if (nodes.length === 0) {
+            throw new LitsError('Expected expression', this.peekSourceCodeInfo());
+        }
+        return nodes.length === 1
+            ? nodes[0]
+            : withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes.block, nodes]], this.peekSourceCodeInfo());
+    };
+    Parser.prototype.assertImplicitBlockEnd = function (ends) {
+        if (!this.isImplicitBlockEnd(ends)) {
+            throw new LitsError("Expected ".concat(ends.map(function (e) { return e[1]; }).join(' or ')), this.peekSourceCodeInfo());
+        }
+    };
+    Parser.prototype.isImplicitBlockEnd = function (ends) {
+        var e_1, _a;
+        try {
+            for (var ends_1 = __values(ends), ends_1_1 = ends_1.next(); !ends_1_1.done; ends_1_1 = ends_1.next()) {
+                var end = ends_1_1.value;
+                if (isReservedSymbolToken(this.peek(), end)) {
+                    return true;
+                }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (ends_1_1 && !ends_1_1.done && (_a = ends_1.return)) _a.call(ends_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        return false;
+    };
     Parser.prototype.parseLoop = function (firstToken) {
         this.advance();
         assertLParenToken(this.peek());
@@ -14662,7 +14704,7 @@ var Parser = /** @class */ (function () {
         }
     };
     Parser.prototype.isInternalLoopBindingDelimiter = function (token, symbols) {
-        var e_1, _a;
+        var e_2, _a;
         // end of loop binding
         if (isOperatorToken(token, ',') || isRParenToken(token)) {
             return true;
@@ -14678,12 +14720,12 @@ var Parser = /** @class */ (function () {
                 }
             }
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
         finally {
             try {
                 if (symbols_1_1 && !symbols_1_1.done && (_a = symbols_1.return)) _a.call(symbols_1);
             }
-            finally { if (e_1) throw e_1.error; }
+            finally { if (e_2) throw e_2.error; }
         }
         return false;
     };
@@ -14708,12 +14750,13 @@ var Parser = /** @class */ (function () {
         var condition = this.parseExpression();
         assertReservedSymbolToken(this.peek(), 'then');
         this.advance();
-        var thenExpression = this.parseExpression();
+        var thenExpression = this.parseImplicitBlock(['else', 'end']);
         var elseExpression;
         if (isReservedSymbolToken(this.peek(), 'else')) {
             this.advance();
-            elseExpression = this.parseExpression();
+            elseExpression = this.parseImplicitBlock(['end']);
         }
+        this.advance();
         return isUnless
             ? withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes.unless, [condition, thenExpression, elseExpression]]], token[2])
             : withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes.if, [condition, thenExpression, elseExpression]]], token[2]);
@@ -14727,26 +14770,11 @@ var Parser = /** @class */ (function () {
             var caseExpression = this.parseExpression();
             assertReservedSymbolToken(this.peek(), 'then');
             this.advance();
-            var expressions = [];
-            while (!this.isAtEnd()
-                && !isReservedSymbolToken(this.peek(), 'case')
-                && !isReservedSymbolToken(this.peek(), 'end')) {
-                expressions.push(this.parseExpression());
-                if (isOperatorToken(this.peek(), ';')) {
-                    this.advance();
-                }
-                else if (!isReservedSymbolToken(this.peek(), 'case') && !isReservedSymbolToken(this.peek(), 'end')) {
-                    throw new LitsError('Expected case or end', this.peekSourceCodeInfo());
-                }
-            }
-            var thenExpression = expressions.length === 1
-                ? expressions[0]
-                : withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes.block, expressions]], token[2]);
+            var thenExpression = this.parseImplicitBlock(['case', 'end']);
             params.push([caseExpression, thenExpression]);
             if (isReservedSymbolToken(this.peek(), 'end')) {
                 break;
             }
-            assertReservedSymbolToken(this.peek(), 'case');
         }
         assertReservedSymbolToken(this.peek());
         this.advance();
@@ -14762,26 +14790,11 @@ var Parser = /** @class */ (function () {
             var caseExpression = this.parseExpression();
             assertReservedSymbolToken(this.peek(), 'then');
             this.advance();
-            var expressions = [];
-            while (!this.isAtEnd()
-                && !isReservedSymbolToken(this.peek(), 'case')
-                && !isReservedSymbolToken(this.peek(), 'end')) {
-                expressions.push(this.parseExpression());
-                if (isOperatorToken(this.peek(), ';')) {
-                    this.advance();
-                }
-                else if (!isReservedSymbolToken(this.peek(), 'case') && !isReservedSymbolToken(this.peek(), 'end')) {
-                    throw new LitsError('Expected case or end', this.peekSourceCodeInfo());
-                }
-            }
-            var thenExpression = expressions.length === 1
-                ? expressions[0]
-                : withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes.block, expressions]], token[2]);
+            var thenExpression = this.parseImplicitBlock(['case', 'end']);
             params.push([caseExpression, thenExpression]);
             if (isReservedSymbolToken(this.peek(), 'end')) {
                 break;
             }
-            assertReservedSymbolToken(this.peek(), 'case');
         }
         assertReservedSymbolToken(this.peek(), 'end');
         this.advance();
@@ -26788,10 +26801,10 @@ var specialExpressionsReference = {
         ],
         description: 'Either `true-expr` or `false-expr` branch is taken. `true-expr` is selected when $test is truthy. If $test is falsy `false-expr` is executed, if no `false-expr` exists, `null` is returned.',
         examples: [
-            "\nif true then {\n  write!(\"TRUE\")\n} else {\n  write!(\"FALSE\")\n}",
-            'if false then write!("TRUE") else write!("FALSE")',
-            'if true then write!("TRUE")',
-            'if false then write!("TRUE")',
+            "\nif true then\n  write!(\"TRUE\")\nelse\n  write!(\"FALSE\")\nend",
+            'if false then write!("TRUE") else write!("FALSE") end',
+            'if true then write!("TRUE") end',
+            'if false then write!("TRUE") end',
         ],
     },
     'unless': {
@@ -26805,10 +26818,10 @@ var specialExpressionsReference = {
         ],
         description: 'Either `true-expr` or `false-expr` branch is taken. `true-expr` is selected when $test is falsy. If $test is truthy `false-expr` is executed, if no `false-expr` exists, `null` is returned.',
         examples: [
-            "\nunless true then {\n  write!(\"TRUE\")\n} else {\n  write!(\"FALSE\")\n}",
-            'unless false then write!("TRUE") else write!("FALSE")',
-            'unless true then write!("TRUE")',
-            'unless false then write!("TRUE")',
+            "\nunless true then\n  write!(\"TRUE\")\nelse\n  write!(\"FALSE\")\nend",
+            'unless false then write!("TRUE") else write!("FALSE") end',
+            'unless true then write!("TRUE") end',
+            'unless false then write!("TRUE") end',
         ],
     },
     'cond': {
@@ -26862,9 +26875,9 @@ var specialExpressionsReference = {
         customVariants: ['recur(...recur-args)'],
         description: 'Recursevly calls enclosing function or loop with its evaluated `recur-args`.',
         examples: [
-            "\nlet foo = (n) -> {\n  write!(n);\n  if !(zero?(n)) then {\n    recur(n - 1)\n  }\n};\nfoo(3)",
-            "\n(n -> {\n  write!(n);\n  if !(zero?(n)) then {\n    recur(n - 1)\n  }\n})(3)",
-            "\nloop (n = 3) -> {\n  write!(n);\n  if !(zero?(n)) then {\n    recur(n - 1)\n  }\n}",
+            "\nlet foo = (n) -> {\n  write!(n);\n  if !(zero?(n)) then\n    recur(n - 1)\n  end\n};\nfoo(3)",
+            "\n(n -> {\n  write!(n);\n  if !(zero?(n)) then\n    recur(n - 1)\n  end\n})(3)",
+            "\nloop (n = 3) -> {\n  write!(n);\n  if !(zero?(n)) then\n    recur(n - 1)\n  end\n}",
         ],
     },
 };
@@ -32025,13 +32038,13 @@ var helpRegExp = new RegExp("^`help\\s+(".concat(polishSymbolFirstCharacterClass
 var expressions = __spreadArray(__spreadArray([], __read(normalExpressionKeys), false), __read(specialExpressionKeys), false);
 var config = processArguments(process.argv.slice(2));
 if (config.eval) {
-    execute(config.eval);
-    process.exit(0);
+    var success = execute(config.eval);
+    process.exit(success ? 0 : 1);
 }
 else if (config.evalFilename) {
     var content = fs.readFileSync(config.evalFilename, { encoding: 'utf-8' });
-    execute(content);
-    process.exit(0);
+    var success = execute(content);
+    process.exit(success ? 0 : 1);
 }
 else if (config.loadFilename) {
     var content = fs.readFileSync(config.loadFilename, { encoding: 'utf-8' });
@@ -32071,10 +32084,12 @@ function execute(expression) {
             historyResults.length = 9;
         setReplHistoryVariables();
         console.log(formatValue(stringifyValue(result, false)));
+        return true;
     }
     catch (error) {
         printErrorMessage("".concat(error));
         config.context['*e*'] = { value: getErrorMessage(error) };
+        return false;
     }
 }
 function getErrorMessage(error) {

package/dist/cli/src/parser/Parser.d.ts

@@ -6,6 +6,7 @@ import type { UnlessNode } from '../builtin/specialExpressions/unless';
 import type { SymbolToken, Token } from '../tokenizer/token';
 import type { TokenStream } from '../tokenizer/tokenize';
 import { type BindingTarget, type Node, type ParseState } from './types';
+type InternalLoopBindingDelimiter = 'let' | 'when' | 'while';
 export declare class Parser {
     private readonly tokenStream;
     private parseState;
@@ -29,12 +30,15 @@ export declare class Parser {
     private parseBindingTarget;
     private parseLet;
     private parseBlock;
+    private parseImplicitBlock;
+    private assertImplicitBlockEnd;
+    private isImplicitBlockEnd;
     private parseLoop;
     private parseTry;
     private parseForOrDoseq;
     private parseForLoopBinding;
-    assertInternalLoopBindingDelimiter(token: Token, symbols: ('let' | 'when' | 'while')[]): void;
-    isInternalLoopBindingDelimiter(token: Token, symbols: ('let' | 'when' | 'while')[]): boolean;
+    assertInternalLoopBindingDelimiter(token: Token, symbols: InternalLoopBindingDelimiter[]): void;
+    isInternalLoopBindingDelimiter(token: Token, symbols: InternalLoopBindingDelimiter[]): boolean;
     private parseBinding;
     parseIfOrUnless(token: SymbolToken): IfNode | UnlessNode;
     parseCond(token: SymbolToken): CondNode;
@@ -51,3 +55,4 @@ export declare class Parser {
     private parseString;
     private parseRegexpShorthand;
 }
+export {};

package/dist/index.esm.js

@@ -14559,6 +14559,48 @@ var Parser = /** @class */ (function () {
             docString,
         ];
     };
+    Parser.prototype.parseImplicitBlock = function (ends) {
+        var nodes = [];
+        while (!this.isAtEnd() && !this.isImplicitBlockEnd(ends)) {
+            if (isOperatorToken(this.peek(), ';')) {
+                this.advance();
+            }
+            else {
+                nodes.push(this.parseExpression());
+            }
+        }
+        this.assertImplicitBlockEnd(ends);
+        if (nodes.length === 0) {
+            throw new LitsError('Expected expression', this.peekSourceCodeInfo());
+        }
+        return nodes.length === 1
+            ? nodes[0]
+            : withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes.block, nodes]], this.peekSourceCodeInfo());
+    };
+    Parser.prototype.assertImplicitBlockEnd = function (ends) {
+        if (!this.isImplicitBlockEnd(ends)) {
+            throw new LitsError("Expected ".concat(ends.map(function (e) { return e[1]; }).join(' or ')), this.peekSourceCodeInfo());
+        }
+    };
+    Parser.prototype.isImplicitBlockEnd = function (ends) {
+        var e_1, _a;
+        try {
+            for (var ends_1 = __values(ends), ends_1_1 = ends_1.next(); !ends_1_1.done; ends_1_1 = ends_1.next()) {
+                var end = ends_1_1.value;
+                if (isReservedSymbolToken(this.peek(), end)) {
+                    return true;
+                }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (ends_1_1 && !ends_1_1.done && (_a = ends_1.return)) _a.call(ends_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        return false;
+    };
     Parser.prototype.parseLoop = function (firstToken) {
         this.advance();
         assertLParenToken(this.peek());
@@ -14688,7 +14730,7 @@ var Parser = /** @class */ (function () {
         }
     };
     Parser.prototype.isInternalLoopBindingDelimiter = function (token, symbols) {
-        var e_1, _a;
+        var e_2, _a;
         // end of loop binding
         if (isOperatorToken(token, ',') || isRParenToken(token)) {
             return true;
@@ -14704,12 +14746,12 @@ var Parser = /** @class */ (function () {
                 }
             }
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
         finally {
             try {
                 if (symbols_1_1 && !symbols_1_1.done && (_a = symbols_1.return)) _a.call(symbols_1);
             }
-            finally { if (e_1) throw e_1.error; }
+            finally { if (e_2) throw e_2.error; }
         }
         return false;
     };
@@ -14734,12 +14776,13 @@ var Parser = /** @class */ (function () {
         var condition = this.parseExpression();
         assertReservedSymbolToken(this.peek(), 'then');
         this.advance();
-        var thenExpression = this.parseExpression();
+        var thenExpression = this.parseImplicitBlock(['else', 'end']);
         var elseExpression;
         if (isReservedSymbolToken(this.peek(), 'else')) {
             this.advance();
-            elseExpression = this.parseExpression();
+            elseExpression = this.parseImplicitBlock(['end']);
         }
+        this.advance();
         return isUnless
             ? withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes.unless, [condition, thenExpression, elseExpression]]], token[2])
             : withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes.if, [condition, thenExpression, elseExpression]]], token[2]);
@@ -14753,26 +14796,11 @@ var Parser = /** @class */ (function () {
             var caseExpression = this.parseExpression();
             assertReservedSymbolToken(this.peek(), 'then');
             this.advance();
-            var expressions = [];
-            while (!this.isAtEnd()
-                && !isReservedSymbolToken(this.peek(), 'case')
-                && !isReservedSymbolToken(this.peek(), 'end')) {
-                expressions.push(this.parseExpression());
-                if (isOperatorToken(this.peek(), ';')) {
-                    this.advance();
-                }
-                else if (!isReservedSymbolToken(this.peek(), 'case') && !isReservedSymbolToken(this.peek(), 'end')) {
-                    throw new LitsError('Expected case or end', this.peekSourceCodeInfo());
-                }
-            }
-            var thenExpression = expressions.length === 1
-                ? expressions[0]
-                : withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes.block, expressions]], token[2]);
+            var thenExpression = this.parseImplicitBlock(['case', 'end']);
             params.push([caseExpression, thenExpression]);
             if (isReservedSymbolToken(this.peek(), 'end')) {
                 break;
             }
-            assertReservedSymbolToken(this.peek(), 'case');
         }
         assertReservedSymbolToken(this.peek());
         this.advance();
@@ -14788,26 +14816,11 @@ var Parser = /** @class */ (function () {
             var caseExpression = this.parseExpression();
             assertReservedSymbolToken(this.peek(), 'then');
             this.advance();
-            var expressions = [];
-            while (!this.isAtEnd()
-                && !isReservedSymbolToken(this.peek(), 'case')
-                && !isReservedSymbolToken(this.peek(), 'end')) {
-                expressions.push(this.parseExpression());
-                if (isOperatorToken(this.peek(), ';')) {
-                    this.advance();
-                }
-                else if (!isReservedSymbolToken(this.peek(), 'case') && !isReservedSymbolToken(this.peek(), 'end')) {
-                    throw new LitsError('Expected case or end', this.peekSourceCodeInfo());
-                }
-            }
-            var thenExpression = expressions.length === 1
-                ? expressions[0]
-                : withSourceCodeInfo([NodeTypes.SpecialExpression, [specialExpressionTypes.block, expressions]], token[2]);
+            var thenExpression = this.parseImplicitBlock(['case', 'end']);
             params.push([caseExpression, thenExpression]);
             if (isReservedSymbolToken(this.peek(), 'end')) {
                 break;
             }
-            assertReservedSymbolToken(this.peek(), 'case');
         }
         assertReservedSymbolToken(this.peek(), 'end');
         this.advance();
@@ -26835,10 +26848,10 @@ var specialExpressionsReference = {
         ],
         description: 'Either `true-expr` or `false-expr` branch is taken. `true-expr` is selected when $test is truthy. If $test is falsy `false-expr` is executed, if no `false-expr` exists, `null` is returned.',
         examples: [
-            "\nif true then {\n  write!(\"TRUE\")\n} else {\n  write!(\"FALSE\")\n}",
-            'if false then write!("TRUE") else write!("FALSE")',
-            'if true then write!("TRUE")',
-            'if false then write!("TRUE")',
+            "\nif true then\n  write!(\"TRUE\")\nelse\n  write!(\"FALSE\")\nend",
+            'if false then write!("TRUE") else write!("FALSE") end',
+            'if true then write!("TRUE") end',
+            'if false then write!("TRUE") end',
         ],
     },
     'unless': {
@@ -26852,10 +26865,10 @@ var specialExpressionsReference = {
         ],
         description: 'Either `true-expr` or `false-expr` branch is taken. `true-expr` is selected when $test is falsy. If $test is truthy `false-expr` is executed, if no `false-expr` exists, `null` is returned.',
         examples: [
-            "\nunless true then {\n  write!(\"TRUE\")\n} else {\n  write!(\"FALSE\")\n}",
-            'unless false then write!("TRUE") else write!("FALSE")',
-            'unless true then write!("TRUE")',
-            'unless false then write!("TRUE")',
+            "\nunless true then\n  write!(\"TRUE\")\nelse\n  write!(\"FALSE\")\nend",
+            'unless false then write!("TRUE") else write!("FALSE") end',
+            'unless true then write!("TRUE") end',
+            'unless false then write!("TRUE") end',
         ],
     },
     'cond': {
@@ -26909,9 +26922,9 @@ var specialExpressionsReference = {
         customVariants: ['recur(...recur-args)'],
         description: 'Recursevly calls enclosing function or loop with its evaluated `recur-args`.',
         examples: [
-            "\nlet foo = (n) -> {\n  write!(n);\n  if !(zero?(n)) then {\n    recur(n - 1)\n  }\n};\nfoo(3)",
-            "\n(n -> {\n  write!(n);\n  if !(zero?(n)) then {\n    recur(n - 1)\n  }\n})(3)",
-            "\nloop (n = 3) -> {\n  write!(n);\n  if !(zero?(n)) then {\n    recur(n - 1)\n  }\n}",
+            "\nlet foo = (n) -> {\n  write!(n);\n  if !(zero?(n)) then\n    recur(n - 1)\n  end\n};\nfoo(3)",
+            "\n(n -> {\n  write!(n);\n  if !(zero?(n)) then\n    recur(n - 1)\n  end\n})(3)",
+            "\nloop (n = 3) -> {\n  write!(n);\n  if !(zero?(n)) then\n    recur(n - 1)\n  end\n}",
         ],
     },
 };