@mojir/lits 2.0.9 → 2.0.10

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.0.9";
+var version = "2.0.10";
 
 var AstNodeType;
 (function (AstNodeType) {
@@ -4344,6 +4344,7 @@ var andSpecialExpression = {
         };
         return node;
     },
+    validateParameterCount: function () { return undefined; },
     evaluate: function (node, contextStack, _a) {
         var e_1, _b;
         var evaluateAstNode = _a.evaluateAstNode;
@@ -4371,42 +4372,30 @@ var andSpecialExpression = {
     },
 };
 
-var commentSpecialExpression = {
-    parse: function (tokenStream, parseState, firstToken, _a) {
-        var parseToken = _a.parseToken;
-        var node = {
-            t: AstNodeType.SpecialExpression,
-            n: 'comment',
-            p: [],
-            token: undefined,
-        };
-        var tkn = asToken(tokenStream.tokens[parseState.position]);
-        while (!isRParenToken(tkn)) {
-            node.p.push(parseToken(tokenStream, parseState));
-            tkn = asToken(tokenStream.tokens[parseState.position]);
-        }
-        parseState.position += 1;
-        node.token = getTokenDebugData(firstToken) && firstToken;
-        return node;
-    },
-    evaluate: function () { return null; },
-    findUnresolvedIdentifiers: function () { return new Set(); },
-};
-
-var condSpecialExpression = {
-    parse: function (tokenStream, parseState, firstToken, _a) {
+function getCommonParser(name) {
+    return function (tokenStream, parseState, firstToken, _a) {
         var parseTokensUntilClosingBracket = _a.parseTokensUntilClosingBracket;
         var params = parseTokensUntilClosingBracket(tokenStream, parseState);
         assertRParenToken(tokenStream.tokens[parseState.position++]);
-        var node = {
+        return {
             t: AstNodeType.SpecialExpression,
-            n: 'cond',
+            n: name,
             p: params,
             token: getTokenDebugData(firstToken) && firstToken,
         };
-        assertEvenNumberOfParams(node);
-        return node;
-    },
+    };
+}
+
+var commentSpecialExpression = {
+    parse: getCommonParser('comment'),
+    validateParameterCount: function () { return undefined; },
+    evaluate: function () { return null; },
+    findUnresolvedIdentifiers: function () { return new Set(); },
+};
+
+var condSpecialExpression = {
+    parse: getCommonParser('cond'),
+    validateParameterCount: function (node) { return assertEvenNumberOfParams(node); },
     evaluate: function (node, contextStack, _a) {
         var e_1, _b;
         var evaluateAstNode = _a.evaluateAstNode;
@@ -4435,19 +4424,8 @@ var condSpecialExpression = {
 };
 
 var declaredSpecialExpression = {
-    parse: function (tokenStream, parseState, firstToken, _a) {
-        var parseTokensUntilClosingBracket = _a.parseTokensUntilClosingBracket;
-        var params = parseTokensUntilClosingBracket(tokenStream, parseState);
-        assertRParenToken(tokenStream.tokens[parseState.position++]);
-        var node = {
-            t: AstNodeType.SpecialExpression,
-            n: 'declared?',
-            p: params,
-            token: getTokenDebugData(firstToken) && firstToken,
-        };
-        assertNumberOfParams(1, node);
-        return node;
-    },
+    parse: getCommonParser('declared?'),
+    validateParameterCount: function (node) { return assertNumberOfParams(1, node); },
     evaluate: function (node, contextStack) {
         var lookUpResult = contextStack.lookUp(node.p[0]);
         return lookUpResult !== null;
@@ -4493,9 +4471,9 @@ var defSpecialExpression = {
             token: getTokenDebugData(firstToken) && firstToken,
         };
         assertSymbolNode(node.p[0], (_b = getTokenDebugData(node.token)) === null || _b === void 0 ? void 0 : _b.sourceCodeInfo);
-        assertNumberOfParams(2, node);
         return node;
     },
+    validateParameterCount: function (node) { return assertNumberOfParams(2, node); },
     evaluate: function (node, contextStack, _a) {
         var _b;
         var evaluateAstNode = _a.evaluateAstNode, builtin = _a.builtin;
@@ -4531,9 +4509,9 @@ var defsSpecialExpression = {
             p: params,
             token: getTokenDebugData(firstToken) && firstToken,
         };
-        assertNumberOfParams(2, node);
         return node;
     },
+    validateParameterCount: function (node) { return assertNumberOfParams(2, node); },
     evaluate: function (node, contextStack, _a) {
         var _b, _c;
         var evaluateAstNode = _a.evaluateAstNode, builtin = _a.builtin;
@@ -4561,23 +4539,8 @@ var defsSpecialExpression = {
 };
 
 var doSpecialExpression = {
-    parse: function (tokenStream, parseState, firstToken, _a) {
-        var parseToken = _a.parseToken;
-        var node = {
-            t: AstNodeType.SpecialExpression,
-            n: 'do',
-            p: [],
-            token: undefined,
-        };
-        var tkn = asToken(tokenStream.tokens[parseState.position]);
-        while (!isRParenToken(tkn)) {
-            node.p.push(parseToken(tokenStream, parseState));
-            tkn = asToken(tokenStream.tokens[parseState.position]);
-        }
-        parseState.position += 1;
-        node.token = getTokenDebugData(firstToken) && firstToken;
-        return node;
-    },
+    parse: getCommonParser('do'),
+    validateParameterCount: function () { return undefined; },
     evaluate: function (node, contextStack, _a) {
         var e_1, _b;
         var evaluateAstNode = _a.evaluateAstNode;
@@ -4654,6 +4617,7 @@ var defnSpecialExpression = {
         };
         return node;
     },
+    validateParameterCount: function () { return undefined; },
     evaluate: function (node, contextStack, _a) {
         var _b;
         var _c, _d;
@@ -4695,6 +4659,7 @@ var defnsSpecialExpression = {
         };
         return node;
     },
+    validateParameterCount: function () { return undefined; },
     evaluate: function (node, contextStack, _a) {
         var _b;
         var _c, _d;
@@ -4738,6 +4703,7 @@ var fnSpecialExpression = {
         };
         return node;
     },
+    validateParameterCount: function () { return undefined; },
     evaluate: function (node, contextStack, _a) {
         var _b;
         var _c;
@@ -4969,19 +4935,8 @@ function parseFunctionArguments(tokenStream, parseState, parsers) {
 }
 
 var ifSpecialExpression = {
-    parse: function (tokenStream, parseState, firstToken, _a) {
-        var parseTokensUntilClosingBracket = _a.parseTokensUntilClosingBracket;
-        var params = parseTokensUntilClosingBracket(tokenStream, parseState);
-        assertRParenToken(tokenStream.tokens[parseState.position++]);
-        var node = {
-            t: AstNodeType.SpecialExpression,
-            n: 'if',
-            p: params,
-            token: getTokenDebugData(firstToken) && firstToken,
-        };
-        assertNumberOfParams({ min: 2, max: 3 }, node);
-        return node;
-    },
+    parse: getCommonParser('if'),
+    validateParameterCount: function (node) { return assertNumberOfParams({ min: 2, max: 3 }, node); },
     evaluate: function (node, contextStack, _a) {
         var _b;
         var evaluateAstNode = _a.evaluateAstNode;
@@ -5020,9 +4975,9 @@ var ifLetSpecialExpression = {
             p: params,
             token: getTokenDebugData(firstToken) && firstToken,
         };
-        assertNumberOfParams({ min: 1, max: 2 }, node);
         return node;
     },
+    validateParameterCount: function (node) { return assertNumberOfParams({ min: 1, max: 2 }, node); },
     evaluate: function (node, contextStack, _a) {
         var _b;
         var evaluateAstNode = _a.evaluateAstNode;
@@ -5052,19 +5007,8 @@ var ifLetSpecialExpression = {
 };
 
 var ifNotSpecialExpression = {
-    parse: function (tokenStream, parseState, firstToken, _a) {
-        var parseTokensUntilClosingBracket = _a.parseTokensUntilClosingBracket;
-        var params = parseTokensUntilClosingBracket(tokenStream, parseState);
-        assertRParenToken(tokenStream.tokens[parseState.position++]);
-        var node = {
-            t: AstNodeType.SpecialExpression,
-            n: 'if-not',
-            p: params,
-            token: getTokenDebugData(firstToken) && firstToken,
-        };
-        assertNumberOfParams({ min: 2, max: 3 }, node);
-        return node;
-    },
+    parse: getCommonParser('if-not'),
+    validateParameterCount: function (node) { return assertNumberOfParams({ min: 2, max: 3 }, node); },
     evaluate: function (node, contextStack, _a) {
         var _b;
         var evaluateAstNode = _a.evaluateAstNode;
@@ -5101,6 +5045,7 @@ var letSpecialExpression = {
         };
         return node;
     },
+    validateParameterCount: function () { return undefined; },
     evaluate: function (node, contextStack, _a) {
         var e_1, _b, e_2, _c;
         var evaluateAstNode = _a.evaluateAstNode;
@@ -5172,6 +5117,7 @@ var loopSpecialExpression = {
         };
         return node;
     },
+    validateParameterCount: function () { return undefined; },
     evaluate: function (node, contextStack, _a) {
         var _b;
         var evaluateAstNode = _a.evaluateAstNode;
@@ -5435,9 +5381,9 @@ var forSpecialExpression = {
             p: params,
             token: getTokenDebugData(firstToken) && firstToken,
         };
-        assertNumberOfParams(1, node);
         return node;
     },
+    validateParameterCount: function (node) { return assertNumberOfParams(1, node); },
     evaluate: function (node, contextStack, helpers) { return evaluateLoop(true, node, contextStack, helpers.evaluateAstNode); },
     findUnresolvedIdentifiers: function (node, contextStack, _a) {
         var findUnresolvedIdentifiers = _a.findUnresolvedIdentifiers, builtin = _a.builtin;
@@ -5457,9 +5403,9 @@ var doseqSpecialExpression = {
             p: params,
             token: getTokenDebugData(firstToken) && firstToken,
         };
-        assertNumberOfParams(1, node);
         return node;
     },
+    validateParameterCount: function (node) { return assertNumberOfParams(1, node); },
     evaluate: function (node, contextStack, helpers) {
         evaluateLoop(false, node, contextStack, helpers.evaluateAstNode);
         return null;
@@ -5471,18 +5417,8 @@ var doseqSpecialExpression = {
 };
 
 var orSpecialExpression = {
-    parse: function (tokenStream, parseState, firstToken, _a) {
-        var parseTokensUntilClosingBracket = _a.parseTokensUntilClosingBracket;
-        var params = parseTokensUntilClosingBracket(tokenStream, parseState);
-        assertRParenToken(tokenStream.tokens[parseState.position++]);
-        var node = {
-            t: AstNodeType.SpecialExpression,
-            n: 'or',
-            p: params,
-            token: getTokenDebugData(firstToken) && firstToken,
-        };
-        return node;
-    },
+    parse: getCommonParser('or'),
+    validateParameterCount: function () { return undefined; },
     evaluate: function (node, contextStack, _a) {
         var e_1, _b;
         var evaluateAstNode = _a.evaluateAstNode;
@@ -5511,19 +5447,8 @@ var orSpecialExpression = {
 };
 
 var qqSpecialExpression = {
-    parse: function (tokenStream, parseState, firstToken, _a) {
-        var parseTokensUntilClosingBracket = _a.parseTokensUntilClosingBracket;
-        var params = parseTokensUntilClosingBracket(tokenStream, parseState);
-        assertRParenToken(tokenStream.tokens[parseState.position++]);
-        var node = {
-            t: AstNodeType.SpecialExpression,
-            n: '??',
-            p: params,
-            token: getTokenDebugData(firstToken) && firstToken,
-        };
-        assertNumberOfParams({ min: 1, max: 2 }, node);
-        return node;
-    },
+    parse: getCommonParser('??'),
+    validateParameterCount: function (node) { return assertNumberOfParams({ min: 1, max: 2 }, node); },
     evaluate: function (node, contextStack, _a) {
         var _b;
         var evaluateAstNode = _a.evaluateAstNode;
@@ -5555,6 +5480,7 @@ var recurSpecialExpression = {
         };
         return node;
     },
+    validateParameterCount: function () { return undefined; },
     evaluate: function (node, contextStack, _a) {
         var evaluateAstNode = _a.evaluateAstNode;
         var params = node.p.map(function (paramNode) { return evaluateAstNode(paramNode, contextStack); });
@@ -5567,19 +5493,8 @@ var recurSpecialExpression = {
 };
 
 var throwSpecialExpression = {
-    parse: function (tokenStream, parseState, firstToken, _a) {
-        var parseTokensUntilClosingBracket = _a.parseTokensUntilClosingBracket;
-        var params = parseTokensUntilClosingBracket(tokenStream, parseState);
-        assertRParenToken(tokenStream.tokens[parseState.position++]);
-        var node = {
-            t: AstNodeType.SpecialExpression,
-            n: 'throw',
-            p: params,
-            token: getTokenDebugData(firstToken) && firstToken,
-        };
-        assertNumberOfParams(1, node);
-        return node;
-    },
+    parse: getCommonParser('throw'),
+    validateParameterCount: function (node) { return assertNumberOfParams(1, node); },
     evaluate: function (node, contextStack, _a) {
         var _b, _c;
         var evaluateAstNode = _a.evaluateAstNode;
@@ -5595,19 +5510,8 @@ var throwSpecialExpression = {
 };
 
 var timeSpecialExpression = {
-    parse: function (tokenStream, parseState, firstToken, _a) {
-        var parseTokensUntilClosingBracket = _a.parseTokensUntilClosingBracket;
-        var params = parseTokensUntilClosingBracket(tokenStream, parseState);
-        assertRParenToken(tokenStream.tokens[parseState.position++]);
-        var node = {
-            t: AstNodeType.SpecialExpression,
-            n: 'time!',
-            p: params,
-            token: getTokenDebugData(firstToken) && firstToken,
-        };
-        assertNumberOfParams(1, node);
-        return node;
-    },
+    parse: getCommonParser('time!'),
+    validateParameterCount: function (node) { return assertNumberOfParams(1, node); },
     evaluate: function (node, contextStack, _a) {
         var evaluateAstNode = _a.evaluateAstNode;
         var param = node.p[0];
@@ -5648,9 +5552,9 @@ var trySpecialExpression = {
             e: error,
             token: getTokenDebugData(firstToken) && firstToken,
         };
-        assertNumberOfParams(1, node);
         return node;
     },
+    validateParameterCount: function (node) { return assertNumberOfParams(1, node); },
     evaluate: function (node, contextStack, _a) {
         var _b;
         var _c;
@@ -5680,19 +5584,8 @@ var trySpecialExpression = {
 };
 
 var whenSpecialExpression = {
-    parse: function (tokenStream, parseState, firstToken, _a) {
-        var parseTokensUntilClosingBracket = _a.parseTokensUntilClosingBracket;
-        var params = parseTokensUntilClosingBracket(tokenStream, parseState);
-        assertRParenToken(tokenStream.tokens[parseState.position++]);
-        var node = {
-            t: AstNodeType.SpecialExpression,
-            n: 'when',
-            p: params,
-            token: getTokenDebugData(firstToken) && firstToken,
-        };
-        assertNumberOfParams({ min: 1 }, node);
-        return node;
-    },
+    parse: getCommonParser('when'),
+    validateParameterCount: function (node) { return assertNumberOfParams({ min: 1 }, node); },
     evaluate: function (node, contextStack, _a) {
         var e_1, _b;
         var _c;
@@ -5742,6 +5635,7 @@ var whenFirstSpecialExpression = {
         };
         return node;
     },
+    validateParameterCount: function () { return undefined; },
     evaluate: function (node, contextStack, _a) {
         var e_1, _b;
         var _c;
@@ -5803,6 +5697,7 @@ var whenLetSpecialExpression = {
         };
         return node;
     },
+    validateParameterCount: function () { return undefined; },
     evaluate: function (node, contextStack, _a) {
         var e_1, _b;
         var evaluateAstNode = _a.evaluateAstNode;
@@ -5841,19 +5736,8 @@ var whenLetSpecialExpression = {
 };
 
 var whenNotSpecialExpression = {
-    parse: function (tokenStream, parseState, firstToken, _a) {
-        var parseTokensUntilClosingBracket = _a.parseTokensUntilClosingBracket;
-        var params = parseTokensUntilClosingBracket(tokenStream, parseState);
-        assertRParenToken(tokenStream.tokens[parseState.position++]);
-        var node = {
-            t: AstNodeType.SpecialExpression,
-            n: 'when-not',
-            p: params,
-            token: getTokenDebugData(firstToken) && firstToken,
-        };
-        assertNumberOfParams({ min: 1 }, node);
-        return node;
-    },
+    parse: getCommonParser('when-not'),
+    validateParameterCount: function (node) { return assertNumberOfParams({ min: 1 }, node); },
     evaluate: function (node, contextStack, _a) {
         var e_1, _b;
         var _c;
@@ -7453,7 +7337,7 @@ var AlgebraicParser = /** @class */ (function () {
         };
     };
     AlgebraicParser.prototype.parseFunctionCall = function (symbol) {
-        var _a, _b;
+        var _a, _b, _c;
         var params = [];
         this.advance();
         while (!this.isAtEnd() && !isRParenToken(this.peek())) {
@@ -7485,13 +7369,17 @@ var AlgebraicParser = /** @class */ (function () {
                     case 'when':
                     case 'when-not':
                     case 'do':
-                    case 'throw':
-                        return {
+                    case 'time!':
+                    case 'throw': {
+                        var node_1 = {
                             t: AstNodeType.SpecialExpression,
                             n: name_1,
                             p: params,
                             token: getTokenDebugData(symbol.token) && symbol.token,
                         };
+                        builtin.specialExpressions[node_1.n].validateParameterCount(node_1);
+                        return node_1;
+                    }
                     case 'def':
                     case 'defs':
                     case 'let':
@@ -7504,7 +7392,6 @@ var AlgebraicParser = /** @class */ (function () {
                     case 'try':
                     case 'recur':
                     case 'loop':
-                    case 'time!':
                     case 'doseq':
                     case 'for':
                         throw new Error("Special expression ".concat(name_1, " is not available in algebraic notation"));
@@ -7512,7 +7399,12 @@ var AlgebraicParser = /** @class */ (function () {
                         throw new Error("Unknown special expression: ".concat(name_1));
                 }
             }
-            return createNamedNormalExpressionNode(symbol.v, params, symbol.token);
+            var node = createNamedNormalExpressionNode(symbol.v, params, symbol.token);
+            var builtinExpression = builtin.normalExpressions[node.n];
+            if (builtinExpression) {
+                (_c = builtinExpression.validate) === null || _c === void 0 ? void 0 : _c.call(builtinExpression, __assign(__assign({}, node), { p: withoutCommentNodes(node.p) }));
+            }
+            return node;
         }
         else {
             return {
@@ -7881,7 +7773,7 @@ function parseSpecialExpression(tokenStream, parseState) {
     var firstToken = asLParenToken(tokenStream.tokens[parseState.position++]);
     var nameToken = asP_SymbolToken(tokenStream.tokens[parseState.position++]);
     var expressionName = nameToken[1];
-    var parse = asNonUndefined(builtin.specialExpressions[expressionName], (_a = getTokenDebugData(nameToken)) === null || _a === void 0 ? void 0 : _a.sourceCodeInfo).parse;
+    var _b = asNonUndefined(builtin.specialExpressions[expressionName], (_a = getTokenDebugData(nameToken)) === null || _a === void 0 ? void 0 : _a.sourceCodeInfo), parse = _b.parse, validateParameterCount = _b.validateParameterCount;
     var node = parse(tokenStream, parseState, firstToken, {
         parseExpression: parseExpression,
         parseTokensUntilClosingBracket: parseTokensUntilClosingBracket,
@@ -7890,6 +7782,7 @@ function parseSpecialExpression(tokenStream, parseState) {
         parseBindings: parseBindings,
         parseArgument: parseArgument,
     });
+    validateParameterCount(node);
     return node;
 }
 function parsePolishToken(tokenStream, parseState) {

package/dist/cli/src/builtin/index.d.ts

@@ -29,8 +29,11 @@ declare const specialExpressions: {
     readonly '??': import("./interface").BuiltinSpecialExpression<import("../interface").Any, import("./specialExpressions/qq").QqNode>;
 };
 export type SpecialExpressionName = keyof typeof specialExpressions;
+export type CommonSpecialExpressionName = keyof Pick<typeof specialExpressions, '??' | '??' | 'and' | 'comment' | 'cond' | 'declared?' | 'do' | 'if' | 'if-not' | 'or' | 'time!' | 'when' | 'when-not' | 'throw'>;
 export type BuiltinSpecialExpressions = typeof specialExpressions;
 export type BuiltinSpecialExpression = typeof specialExpressions[SpecialExpressionName];
+export type BuiltinCommonSpecialExpression = typeof specialExpressions[CommonSpecialExpressionName];
+export type GenericCommonSpecialExpressionNode<T extends CommonSpecialExpressionName> = ReturnType<typeof specialExpressions[T]['parse']>;
 export type SpecialExpressionNode = ReturnType<typeof specialExpressions[SpecialExpressionName]['parse']>;
 export declare const builtin: Builtin;
 export declare const normalExpressionKeys: string[];

package/dist/cli/src/builtin/interface.d.ts

@@ -9,10 +9,11 @@ import type { BuiltinSpecialExpressions, SpecialExpressionNode } from '.';
 export type NormalExpressionEvaluator<T> = (params: Arr, sourceCodeInfo: SourceCodeInfo | undefined, contextStack: ContextStack, { executeFunction }: {
     executeFunction: ExecuteFunction;
 }) => T;
-type ValidateNode = (node: NormalExpressionNode) => void;
+type ValidateNormalExpressionNode = (node: NormalExpressionNode) => void;
+type ValidateSpecialExpressionNode = (node: SpecialExpressionNode) => void;
 interface BuiltinNormalExpression<T> {
     evaluate: NormalExpressionEvaluator<T>;
-    validate?: ValidateNode;
+    validate?: ValidateNormalExpressionNode;
 }
 export interface ParserHelpers {
     parseExpression: ParseExpression;
@@ -30,6 +31,7 @@ interface EvaluateHelpers {
 export interface BuiltinSpecialExpression<T, N extends SpecialExpressionNode> {
     parse: (tokenStream: TokenStream, parseState: ParseState, firstToken: Token, parsers: ParserHelpers) => N;
     evaluate: (node: N, contextStack: ContextStack, helpers: EvaluateHelpers) => T;
+    validateParameterCount: ValidateSpecialExpressionNode;
     findUnresolvedIdentifiers: (node: N, contextStack: ContextStack, params: {
         findUnresolvedIdentifiers: FindUnresolvedIdentifiers;
         builtin: Builtin;

package/dist/cli/src/builtin/specialExpressions/commonParser.d.ts

@@ -0,0 +1,4 @@
+import type { CommonSpecialExpressionName, GenericCommonSpecialExpressionNode } from '..';
+import type { Any } from '../../interface';
+import type { BuiltinSpecialExpression } from '../interface';
+export declare function getCommonParser<T extends CommonSpecialExpressionName>(name: T): BuiltinSpecialExpression<Any, GenericCommonSpecialExpressionNode<T>>['parse'];