@mojir/lits 2.0.13 → 2.0.14

package/dist/src/parser/AlgebraicParser.d.ts

@@ -1,3 +1,7 @@
+import type { DefNode } from '../builtin/specialExpressions/def';
+import type { DefnNode } from '../builtin/specialExpressions/functions';
+import type { Arity, FunctionArguments } from '../builtin/utils';
+import type { A_SymbolToken } from '../tokenizer/algebraic/algebraicTokens';
 import type { TokenStream } from '../tokenizer/interface';
 import type { AstNode, ParseState } from './interface';
 export declare class AlgebraicParser {
@@ -5,7 +9,7 @@ export declare class AlgebraicParser {
     private parseState;
     constructor(tokenStream: TokenStream, parseState: ParseState);
     private advance;
-    parse(): AstNode;
+    parse(): AstNode[];
     private parseExpression;
     private parseOperand;
     private parseOperandPart;
@@ -13,11 +17,17 @@ export declare class AlgebraicParser {
     private parseArray;
     private parseFunctionCall;
     parseLambdaFunction(): AstNode | null;
+    parseFunctionArguments(): {
+        functionArguments: FunctionArguments;
+        arity: Arity;
+    };
     private parseShorthandLamdaFunction;
     private parseLet;
     private parseFor;
     private parseForLoopBinding;
     private parseBinding;
+    parseDef(token: A_SymbolToken): DefNode;
+    parseDefn(token: A_SymbolToken): DefnNode;
     private isAtEnd;
     private peek;
     private peekAhead;

package/dist/src/tokenizer/algebraic/algebraicTokens.d.ts

@@ -7,7 +7,7 @@ export declare const algebraicValueTokenTypes: readonly ["String", "A_Whitespace
 export declare const algebraicTokenTypes: readonly ["LBrace", "LBracket", "LParen", "RBrace", "RBracket", "RParen", "AlgNotation", "PolNotation", "EndNotation", "String", "A_Whitespace", "A_Operator", "A_Symbol", "A_ReservedSymbol", "A_SingleLineComment", "A_MultiLineComment", "A_Number", "A_BasePrefixedNumber"];
 declare const symbolicUnaryOperators: readonly ["!", "~", "+", "-"];
 declare const symbolicBinaryOperators: readonly ["**", "*", "/", "%", "+", "-", "<<", ">>", ">>>", "++", "<", "<=", ">", ">=", "==", "!=", "&", "^", "|", "&&", "||", "??"];
-declare const symbolicOperators: readonly ["!", "~", "+", "-", "**", "*", "/", "%", "+", "-", "<<", ">>", ">>>", "++", "<", "<=", ">", ">=", "==", "!=", "&", "^", "|", "&&", "||", "??", "=>", "...", ".", ",", "="];
+declare const symbolicOperators: readonly ["!", "~", "+", "-", "**", "*", "/", "%", "+", "-", "<<", ">>", ">>>", "++", "<", "<=", ">", ">=", "==", "!=", "&", "^", "|", "&&", "||", "??", "=>", "...", ".", ",", "=", ";"];
 export declare function isFunctionOperator(operator: string): boolean;
 export type SymbolicUnaryOperator = typeof symbolicUnaryOperators[number];
 export type SymbolicBinaryOperator = typeof symbolicBinaryOperators[number];

package/dist/testFramework.esm.js

@@ -408,6 +408,7 @@ var otherSymbolicOperators = [
     '.', // property accessor
     ',', // item separator
     '=', // property assignment
+    ';', // statement terminator
 ];
 var symbolicOperators = __spreadArray(__spreadArray(__spreadArray([], __read(symbolicUnaryOperators), false), __read(symbolicBinaryOperators), false), __read(otherSymbolicOperators), false);
 var nonFunctionOperators = [
@@ -3080,7 +3081,7 @@ var mathNormalExpression = {
     },
 };
 
-var version = "2.0.13";
+var version = "2.0.14";
 
 var uuidTemplate = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx';
 var xyRegexp = /[xy]/g;
@@ -7110,6 +7111,7 @@ function fromBinaryOperatorToAstNode(operator, left, right, token) {
                 token: getTokenDebugData(token) && token,
             };
         /* v8 ignore next 8 */
+        case ';':
         case '!':
         case '~':
         case '=':
@@ -7130,14 +7132,33 @@ var AlgebraicParser = /** @class */ (function () {
         this.parseState.position += 1;
     };
     AlgebraicParser.prototype.parse = function () {
-        return this.parseExpression();
+        var nodes = [];
+        while (!this.isAtEnd()) {
+            nodes.push(this.parseExpression());
+            if (!isA_OperatorToken(this.peek(), ';')) {
+                break;
+            }
+            this.advance();
+        }
+        return nodes;
     };
     AlgebraicParser.prototype.parseExpression = function (precedence) {
         var _a;
         if (precedence === void 0) { precedence = 0; }
+        var firstToken = this.peek();
+        if (isA_SymbolToken(firstToken) && firstToken[1] === 'def') {
+            return this.parseDef(firstToken);
+        }
+        if (isA_SymbolToken(firstToken) && firstToken[1] === 'defn') {
+            return this.parseDefn(firstToken);
+        }
         var left = this.parseOperand();
-        while (!this.isAtEnd() && !isA_OperatorToken(this.peek(), ',') && !isRBracketToken(this.peek()) && !isRParenToken(this.peek())) {
-            var operator = this.peek();
+        var operator = this.peek();
+        while (!this.isAtEnd()
+            && !isA_OperatorToken(operator, ',')
+            && !isA_OperatorToken(operator, ';')
+            && !isRBracketToken(operator)
+            && !isRParenToken(operator)) {
             if (isA_BinaryOperatorToken(operator)) {
                 var name_1 = operator[1];
                 var newPrecedece = getPrecedence(name_1);
@@ -7167,6 +7188,7 @@ var AlgebraicParser = /** @class */ (function () {
             else {
                 break;
             }
+            operator = this.peek();
         }
         if (!left) {
             throw new LitsError('Expected operand', (_a = getTokenDebugData(this.peek())) === null || _a === void 0 ? void 0 : _a.sourceCodeInfo);
@@ -7413,13 +7435,11 @@ var AlgebraicParser = /** @class */ (function () {
                     }
                     case 'let':
                         return this.parseLet(symbol, params);
-                    case 'def':
                     case 'defs':
                     case 'if-let':
                     case 'when-let':
                     case 'when-first':
                     case 'fn':
-                    case 'defn':
                     case 'defns':
                     case 'try':
                     case 'recur':
@@ -7442,8 +7462,32 @@ var AlgebraicParser = /** @class */ (function () {
         }
     };
     AlgebraicParser.prototype.parseLambdaFunction = function () {
-        var _a, _b;
         var firstToken = this.peek();
+        try {
+            var _a = this.parseFunctionArguments(), functionArguments = _a.functionArguments, arity = _a.arity;
+            if (!isA_OperatorToken(this.peek(), '=>')) {
+                return null;
+            }
+            this.advance();
+            var body = this.parseExpression();
+            return {
+                t: AstNodeType.SpecialExpression,
+                n: 'fn',
+                p: [],
+                o: [{
+                        as: functionArguments,
+                        b: [body],
+                        a: arity,
+                    }],
+                token: getTokenDebugData(firstToken) && firstToken,
+            };
+        }
+        catch (_b) {
+            return null;
+        }
+    };
+    AlgebraicParser.prototype.parseFunctionArguments = function () {
+        var _a, _b, _c, _d, _e;
         this.advance();
         var rest = false;
         var letBindingObject;
@@ -7466,7 +7510,7 @@ var AlgebraicParser = /** @class */ (function () {
                 }
                 var symbolToken = this.peek();
                 if (!isA_SymbolToken(symbolToken)) {
-                    return null;
+                    throw new LitsError('Expected symbol', (_c = getTokenDebugData(this.peek())) === null || _c === void 0 ? void 0 : _c.sourceCodeInfo);
                 }
                 if (rest) {
                     restArg = symbolToken[1];
@@ -7477,47 +7521,36 @@ var AlgebraicParser = /** @class */ (function () {
                 this.advance();
             }
             if (!isA_OperatorToken(this.peek(), ',') && !isRParenToken(this.peek())) {
-                return null;
+                throw new LitsError('Expected comma or closing parenthesis', (_d = getTokenDebugData(this.peek())) === null || _d === void 0 ? void 0 : _d.sourceCodeInfo);
             }
             if (isA_OperatorToken(this.peek(), ',')) {
                 this.advance();
             }
         }
+        var arity = restArg !== undefined ? { min: args.length } : args.length;
         if (!isRParenToken(this.peek())) {
-            return null;
-        }
-        this.advance();
-        if (!isA_OperatorToken(this.peek(), '=>')) {
-            return null;
+            throw new LitsError('Expected closing parenthesis', (_e = getTokenDebugData(this.peek())) === null || _e === void 0 ? void 0 : _e.sourceCodeInfo);
         }
-        this.advance();
         var letBindings = letBindingObject ? arrayToPairs(letBindingObject.p) : [];
-        var body = this.parseExpression();
-        var arity = restArg !== undefined ? { min: args.length } : args.length;
+        var functionArguments = {
+            m: args,
+            r: restArg,
+            b: letBindings.map(function (pair) {
+                var key = pair[0];
+                var value = pair[1];
+                return {
+                    t: AstNodeType.Binding,
+                    n: key.v,
+                    v: value,
+                    p: [],
+                    token: getTokenDebugData(key.token) && key.token,
+                };
+            }),
+        };
+        this.advance();
         return {
-            t: AstNodeType.SpecialExpression,
-            n: 'fn',
-            p: [],
-            o: [{
-                    as: {
-                        m: args,
-                        r: restArg,
-                        b: letBindings.map(function (pair) {
-                            var key = pair[0];
-                            var value = pair[1];
-                            return {
-                                t: AstNodeType.Binding,
-                                n: key.v,
-                                v: value,
-                                p: [],
-                                token: getTokenDebugData(key.token) && key.token,
-                            };
-                        }),
-                    },
-                    b: [body],
-                    a: arity,
-                }],
-            token: getTokenDebugData(firstToken) && firstToken,
+            functionArguments: functionArguments,
+            arity: arity,
         };
     };
     AlgebraicParser.prototype.parseShorthandLamdaFunction = function () {
@@ -7709,6 +7742,50 @@ var AlgebraicParser = /** @class */ (function () {
         };
         return node;
     };
+    AlgebraicParser.prototype.parseDef = function (token) {
+        this.advance();
+        var symbol = parseSymbol(this.tokenStream, this.parseState);
+        assertA_OperatorToken(this.peek(), '=');
+        this.advance();
+        var value = this.parseExpression();
+        return {
+            t: AstNodeType.SpecialExpression,
+            n: 'def',
+            p: [symbol, value],
+            token: getTokenDebugData(token) && token,
+        };
+    };
+    AlgebraicParser.prototype.parseDefn = function (token) {
+        var _a;
+        this.advance();
+        var symbol = parseSymbol(this.tokenStream, this.parseState);
+        var _b = this.parseFunctionArguments(), functionArguments = _b.functionArguments, arity = _b.arity;
+        assertLBraceToken(this.peek());
+        this.advance();
+        var body = [];
+        while (!this.isAtEnd() && !isRBraceToken(this.peek())) {
+            body.push(this.parseExpression());
+            if (isA_OperatorToken(this.peek(), ';')) {
+                this.advance();
+            }
+        }
+        if (!isRBraceToken(this.peek())) {
+            throw new LitsError('Expected closing brace', (_a = getTokenDebugData(this.peek())) === null || _a === void 0 ? void 0 : _a.sourceCodeInfo);
+        }
+        this.advance();
+        return {
+            t: AstNodeType.SpecialExpression,
+            n: 'defn',
+            f: symbol,
+            p: [],
+            o: [{
+                    as: functionArguments,
+                    b: body,
+                    a: arity,
+                }],
+            token: getTokenDebugData(token) && token,
+        };
+    };
     AlgebraicParser.prototype.isAtEnd = function () {
         return this.parseState.position >= this.tokenStream.tokens.length;
     };
@@ -7998,10 +8075,18 @@ function parsePolishToken(tokenStream, parseState) {
             parseState.position += 1;
             parseState.algebraic = true;
             var algebraicParser = new AlgebraicParser(tokenStream, parseState);
-            var node = algebraicParser.parse();
+            var nodes = algebraicParser.parse();
             assertEndNotationToken(tokenStream.tokens[parseState.position++]);
             parseState.algebraic = false;
-            return node;
+            if (nodes.length === 1) {
+                return nodes[0];
+            }
+            return {
+                t: AstNodeType.SpecialExpression,
+                n: 'do',
+                p: nodes,
+                token: nodes[0].token,
+            };
         }
         case 'PolNotation': {
             var astNodes = [];
@@ -8068,7 +8153,16 @@ function removeUnnecessaryTokens(tokenStream) {
 function parseToken(tokenStream, parseState) {
     if (parseState.algebraic) {
         var algebraicParser = new AlgebraicParser(tokenStream, parseState);
-        return algebraicParser.parse();
+        var nodes = algebraicParser.parse();
+        if (nodes.length === 1) {
+            return nodes[0];
+        }
+        return {
+            t: AstNodeType.SpecialExpression,
+            n: 'do',
+            p: nodes,
+            token: nodes[0].token,
+        };
     }
     return parsePolishToken(tokenStream, parseState);
 }
@@ -8158,13 +8252,10 @@ var algebraicReservedNamesRecord = {
     'false': { value: false },
     'nil': { value: null },
     'null': { value: null },
-    'def': { value: null, forbidden: true },
-    'defs': { value: null, forbidden: true },
     'if-let': { value: null, forbidden: true },
     'when-let': { value: null, forbidden: true },
     'when-first': { value: null, forbidden: true },
     'fn': { value: null, forbidden: true },
-    'defn': { value: null, forbidden: true },
     'defns': { value: null, forbidden: true },
     'try': { value: null, forbidden: true },
     'recur': { value: null, forbidden: true },