@mojir/lits 2.0.14 → 2.0.16

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.14";
+var version = "2.0.16";
 
 var AstNodeType;
 (function (AstNodeType) {
@@ -243,6 +243,12 @@ var UndefinedSymbolError = /** @class */ (function (_super) {
     return UndefinedSymbolError;
 }(LitsError));
 
+function getSourceCodeInfo(anyValue, sourceCodeInfo) {
+    var _a;
+    // eslint-disable-next-line ts/no-unsafe-return, ts/no-unsafe-member-access
+    return (_a = anyValue === null || anyValue === void 0 ? void 0 : anyValue.sourceCodeInfo) !== null && _a !== void 0 ? _a : sourceCodeInfo;
+}
+
 function isTokenDebugData(tokenDebugData) {
     return (typeof tokenDebugData === 'object'
         && tokenDebugData !== null
@@ -261,8 +267,12 @@ function addTokenDebugData(token, debugData) {
     }
     token.push(debugData);
 }
-function throwUnexpectedToken(expected, actual) {
-    throw new LitsError("Unexpected token: ".concat(actual, ", expected ").concat(expected), undefined);
+function throwUnexpectedToken(expected, expectedValue, actual) {
+    if (actual === undefined) {
+        throw new LitsError("Unexpected end of input, expected ".concat(expected).concat(expectedValue ? " '".concat(expectedValue, "'") : ''), undefined);
+    }
+    var actualOutput = "".concat(actual[0]).concat(actual[1] ? " '".concat(actual[1], "'") : '');
+    throw new LitsError("Unexpected token: ".concat(actualOutput, ", expected ").concat(expected).concat(expectedValue ? " '".concat(expectedValue, "'") : ''), getSourceCodeInfo(actual));
 }
 
 var commonSimpleTokenTypes = [
@@ -284,7 +294,7 @@ function isLParenToken(token) {
 }
 function assertLParenToken(token) {
     if (!isLParenToken(token)) {
-        throwUnexpectedToken('LParen', token);
+        throwUnexpectedToken('LParen', undefined, token);
     }
 }
 function asLParenToken(token) {
@@ -296,7 +306,7 @@ function isRParenToken(token) {
 }
 function assertRParenToken(token) {
     if (!isRParenToken(token)) {
-        throwUnexpectedToken('RParen', token);
+        throwUnexpectedToken('RParen', undefined, token);
     }
 }
 function isLBracketToken(token) {
@@ -304,7 +314,7 @@ function isLBracketToken(token) {
 }
 function assertLBracketToken(token) {
     if (!isLBracketToken(token)) {
-        throwUnexpectedToken('LBracket', token);
+        throwUnexpectedToken('LBracket', undefined, token);
     }
 }
 function asLBracketToken(token) {
@@ -316,7 +326,7 @@ function isRBracketToken(token) {
 }
 function assertRBracketToken(token) {
     if (!isRBracketToken(token)) {
-        throwUnexpectedToken('RBracket', token);
+        throwUnexpectedToken('RBracket', undefined, token);
     }
 }
 function isLBraceToken(token) {
@@ -324,7 +334,7 @@ function isLBraceToken(token) {
 }
 function assertLBraceToken(token) {
     if (!isLBraceToken(token)) {
-        throwUnexpectedToken('LBrace', token);
+        throwUnexpectedToken('LBrace', undefined, token);
     }
 }
 function asLBraceToken(token) {
@@ -336,7 +346,7 @@ function isRBraceToken(token) {
 }
 function assertRBraceToken(token) {
     if (!isRBraceToken(token)) {
-        throwUnexpectedToken('RBrace', token);
+        throwUnexpectedToken('RBrace', undefined, token);
     }
 }
 function isStringToken(token) {
@@ -344,7 +354,7 @@ function isStringToken(token) {
 }
 function assertStringToken(token) {
     if (!isStringToken(token)) {
-        throwUnexpectedToken('String', token);
+        throwUnexpectedToken('String', undefined, token);
     }
 }
 function asStringToken(token) {
@@ -362,7 +372,7 @@ function isEndNotationToken(token) {
 }
 function assertEndNotationToken(token) {
     if (!isEndNotationToken(token)) {
-        throwUnexpectedToken('EndNotation', token);
+        throwUnexpectedToken('EndNotation', undefined, token);
     }
 }
 
@@ -420,24 +430,18 @@ var otherSymbolicOperators = [
 var symbolicOperators = __spreadArray(__spreadArray(__spreadArray([], __read(symbolicUnaryOperators), false), __read(symbolicBinaryOperators), false), __read(otherSymbolicOperators), false);
 var nonFunctionOperators = [
     '??',
-    'and',
+    '&&',
     'comment',
     'cond',
-    'declared?',
+    'defined?',
     'if',
-    'if-not',
-    'or',
-    'when',
-    'when-not',
+    'unless',
+    '||',
     'do',
-    'time!',
     'throw',
     'let',
     'def',
     'defs',
-    'if-let',
-    'when-let',
-    'when-first',
     'fn',
     'defn',
     'defns',
@@ -463,23 +467,40 @@ var symbolicOperatorSet = new Set(symbolicOperators);
 function isSymbolicOperator(operator) {
     return symbolicOperatorSet.has(operator);
 }
-function isA_SymbolToken(token) {
-    return (token === null || token === void 0 ? void 0 : token[0]) === 'A_Symbol';
+function isA_SymbolToken(token, symbolName) {
+    if ((token === null || token === void 0 ? void 0 : token[0]) !== 'A_Symbol') {
+        return false;
+    }
+    if (symbolName && token[1] !== symbolName) {
+        return false;
+    }
+    return true;
 }
-function assertA_SymbolToken(token) {
-    if (!isA_SymbolToken(token)) {
-        throwUnexpectedToken('A_Symbol', token);
+function assertA_SymbolToken(token, symbolName) {
+    if (!isA_SymbolToken(token, symbolName)) {
+        throwUnexpectedToken('A_Symbol', undefined, token);
     }
 }
-function asA_SymbolToken(token) {
-    assertA_SymbolToken(token);
+function asA_SymbolToken(token, symbolName) {
+    assertA_SymbolToken(token, symbolName);
     return token;
 }
 function isA_BinaryOperatorToken(token) {
     return (token === null || token === void 0 ? void 0 : token[0]) === 'A_Operator' && isSymbolicBinaryOperator(token[1]);
 }
-function isA_ReservedSymbolToken(token) {
-    return (token === null || token === void 0 ? void 0 : token[0]) === 'A_ReservedSymbol';
+function isA_ReservedSymbolToken(token, symbolName) {
+    if ((token === null || token === void 0 ? void 0 : token[0]) !== 'A_ReservedSymbol') {
+        return false;
+    }
+    if (symbolName && token[1] !== symbolName) {
+        return false;
+    }
+    return true;
+}
+function assertA_ReservedSymbolToken(token, symbolName) {
+    if (!isA_ReservedSymbolToken(token, symbolName)) {
+        throwUnexpectedToken('A_ReservedSymbol', symbolName, token);
+    }
 }
 function isA_CommentToken(token) {
     return (token === null || token === void 0 ? void 0 : token[0]) === 'A_SingleLineComment';
@@ -498,10 +519,9 @@ function isA_OperatorToken(token, operatorName) {
 }
 function assertA_OperatorToken(token, operatorName) {
     if (!isA_OperatorToken(token, operatorName)) {
-        if (operatorName) {
+        {
             throw new LitsError("Unexpected token: ".concat(token, ", expected operator ").concat(operatorName), undefined);
         }
-        throwUnexpectedToken('A_Operator', token);
     }
 }
 function isA_WhitespaceToken(token) {
@@ -514,7 +534,7 @@ function isA_BasePrefixedNumberToken(token) {
     return (token === null || token === void 0 ? void 0 : token[0]) === 'A_BasePrefixedNumber';
 }
 
-var modifierNames = ['&', '&let', '&when', '&while'];
+var modifierNames = ['&rest', '&let', '&when', '&while'];
 var polishOnlySimpleTokenTypes = [
     'P_FnShorthand',
 ];
@@ -537,7 +557,7 @@ function isP_StringShorthandToken(token) {
 }
 function assertP_StringShorthandToken(token) {
     if (!isP_StringShorthandToken(token)) {
-        throwUnexpectedToken('P_StringShorthand', token);
+        throwUnexpectedToken('P_StringShorthand', undefined, token);
     }
 }
 function asP_StringShorthandToken(token) {
@@ -549,7 +569,7 @@ function isP_SymbolToken(token) {
 }
 function assertP_SymbolToken(token) {
     if (!isP_SymbolToken(token)) {
-        throwUnexpectedToken('P_Symbol', token);
+        throwUnexpectedToken('P_Symbol', undefined, token);
     }
 }
 function asP_SymbolToken(token) {
@@ -567,7 +587,7 @@ function isP_RegexpShorthandToken(token) {
 }
 function assertP_RegexpShorthandToken(token) {
     if (!isP_RegexpShorthandToken(token)) {
-        throwUnexpectedToken('P_RegexpShorthand', token);
+        throwUnexpectedToken('P_RegexpShorthand', undefined, token);
     }
 }
 function asP_RegexpShorthandToken(token) {
@@ -582,7 +602,7 @@ function isP_CollectionAccessorToken(token) {
 }
 function assertP_CollectionAccessorToken(token) {
     if (!isP_CollectionAccessorToken(token)) {
-        throwUnexpectedToken('P_CollectionAccessor', token);
+        throwUnexpectedToken('P_CollectionAccessor', undefined, token);
     }
 }
 function asP_CollectionAccessorToken(token) {
@@ -594,7 +614,7 @@ function isP_CommentToken(token) {
 }
 function assertP_CommentToken(token) {
     if (!isP_CommentToken(token)) {
-        throwUnexpectedToken('P_Comment', token);
+        throwUnexpectedToken('P_Comment', undefined, token);
     }
 }
 function asP_CommentToken(token) {
@@ -609,7 +629,7 @@ function isP_NumberToken(token) {
 }
 function assertP_NumberToken(token) {
     if (!isP_NumberToken(token)) {
-        throwUnexpectedToken('P_Number', token);
+        throwUnexpectedToken('P_Number', undefined, token);
     }
 }
 
@@ -677,12 +697,6 @@ function valueToString(value) {
     return JSON.stringify(value);
 }
 
-function getSourceCodeInfo(anyValue, sourceCodeInfo) {
-    var _a;
-    // eslint-disable-next-line ts/no-unsafe-return, ts/no-unsafe-member-access
-    return (_a = anyValue === null || anyValue === void 0 ? void 0 : anyValue.sourceCodeInfo) !== null && _a !== void 0 ? _a : sourceCodeInfo;
-}
-
 function getAssertionError(typeName, value, sourceCodeInfo) {
     return new LitsError("Expected ".concat(typeName, ", got ").concat(valueToString(value), "."), getSourceCodeInfo(value, sourceCodeInfo));
 }
@@ -735,7 +749,7 @@ function isExpressionNode(value) {
 }
 
 var specialExpressionCommentRemovers = {
-    'and': function (node, removeOptions) {
+    '&&': function (node, removeOptions) {
         removeOptions.removeCommenNodesFromArray(node.p);
         node.p.forEach(removeOptions.recursivelyRemoveCommentNodes);
     },
@@ -747,7 +761,11 @@ var specialExpressionCommentRemovers = {
         removeOptions.removeCommenNodesFromArray(node.p);
         node.p.forEach(removeOptions.recursivelyRemoveCommentNodes);
     },
-    'declared?': function (node, removeOptions) {
+    'switch': function (node, removeOptions) {
+        removeOptions.removeCommenNodesFromArray(node.p);
+        node.p.forEach(removeOptions.recursivelyRemoveCommentNodes);
+    },
+    'defined?': function (node, removeOptions) {
         removeOptions.removeCommenNodesFromArray(node.p);
         node.p.forEach(removeOptions.recursivelyRemoveCommentNodes);
     },
@@ -768,12 +786,11 @@ var specialExpressionCommentRemovers = {
     'doseq': function (_node, _removeOptions) { },
     'fn': function (_node, _removeOptions) { },
     'for': function (_node, _removeOptions) { },
-    'if-let': function (_node, _removeOptions) { },
     'if': function (node, removeOptions) {
         removeOptions.removeCommenNodesFromArray(node.p);
         node.p.forEach(removeOptions.recursivelyRemoveCommentNodes);
     },
-    'if-not': function (node, removeOptions) {
+    'unless': function (node, removeOptions) {
         removeOptions.removeCommenNodesFromArray(node.p);
         node.p.forEach(removeOptions.recursivelyRemoveCommentNodes);
     },
@@ -785,7 +802,7 @@ var specialExpressionCommentRemovers = {
         });
     },
     'loop': function (_node, _removeOptions) { },
-    'or': function (node, removeOptions) {
+    '||': function (node, removeOptions) {
         removeOptions.removeCommenNodesFromArray(node.p);
         node.p.forEach(removeOptions.recursivelyRemoveCommentNodes);
     },
@@ -797,19 +814,11 @@ var specialExpressionCommentRemovers = {
         removeOptions.removeCommenNodesFromArray(node.p);
         node.p.forEach(removeOptions.recursivelyRemoveCommentNodes);
     },
-    'time!': function (node, removeOptions) {
-        removeOptions.removeCommenNodesFromArray(node.p);
-        node.p.forEach(removeOptions.recursivelyRemoveCommentNodes);
-    },
     'throw': function (node, removeOptions) {
         removeOptions.removeCommenNodesFromArray(node.p);
         node.p.forEach(removeOptions.recursivelyRemoveCommentNodes);
     },
     'try': function (_node, _removeOptions) { },
-    'when-first': function (_node, _removeOptions) { },
-    'when-let': function (_node, _removeOptions) { },
-    'when': function (_node, _removeOptions) { },
-    'when-not': function (_node, _removeOptions) { },
 };
 function removeCommentNodesFromSpecialExpression(node, removeOptions) {
     var uncommenter = specialExpressionCommentRemovers[node.n];
@@ -851,6 +860,13 @@ function assertEvenNumberOfParams(node) {
         throw new LitsError("Wrong number of arguments, expected an even number, got ".concat(valueToString(length), "."), (_a = getTokenDebugData(node.token)) === null || _a === void 0 ? void 0 : _a.sourceCodeInfo);
     }
 }
+function assertOddNumberOfParams(node) {
+    var _a;
+    var length = withoutCommentNodes(node.p).length;
+    if (length % 2 !== 1) {
+        throw new LitsError("Wrong number of arguments, expected an odd number, got ".concat(valueToString(length), "."), (_a = getTokenDebugData(node.token)) === null || _a === void 0 ? void 0 : _a.sourceCodeInfo);
+    }
+}
 function assertNumberOfParams(count, node) {
     var _a, _b;
     assertCount({
@@ -988,7 +1004,7 @@ function asNumber(value, sourceCodeInfo, options) {
 }
 
 var bitwiseNormalExpression = {
-    'bit-shift-left': {
+    '<<': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 2), num = _b[0], count = _b[1];
             assertNumber(num, sourceCodeInfo, { integer: true });
@@ -997,7 +1013,7 @@ var bitwiseNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(2, node); },
     },
-    'bit-shift-right': {
+    '>>': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 2), num = _b[0], count = _b[1];
             assertNumber(num, sourceCodeInfo, { integer: true });
@@ -1006,7 +1022,7 @@ var bitwiseNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(2, node); },
     },
-    'unsigned-bit-shift-right': {
+    '>>>': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 2), num = _b[0], count = _b[1];
             assertNumber(num, sourceCodeInfo, { integer: true });
@@ -1015,7 +1031,7 @@ var bitwiseNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(2, node); },
     },
-    'bit-not': {
+    '~': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 1), num = _b[0];
             assertNumber(num, sourceCodeInfo, { integer: true });
@@ -1023,7 +1039,7 @@ var bitwiseNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(1, node); },
     },
-    'bit-and': {
+    '&': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a), first = _b[0], rest = _b.slice(1);
             assertNumber(first, sourceCodeInfo, { integer: true });
@@ -1034,7 +1050,7 @@ var bitwiseNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams({ min: 2 }, node); },
     },
-    'bit-and-not': {
+    '&!': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a), first = _b[0], rest = _b.slice(1);
             assertNumber(first, sourceCodeInfo, { integer: true });
@@ -1045,7 +1061,7 @@ var bitwiseNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams({ min: 2 }, node); },
     },
-    'bit-or': {
+    '|': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a), first = _b[0], rest = _b.slice(1);
             assertNumber(first, sourceCodeInfo, { integer: true });
@@ -1056,7 +1072,7 @@ var bitwiseNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams({ min: 2 }, node); },
     },
-    'bit-xor': {
+    '^': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a), first = _b[0], rest = _b.slice(1);
             assertNumber(first, sourceCodeInfo, { integer: true });
@@ -1067,7 +1083,7 @@ var bitwiseNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams({ min: 2 }, node); },
     },
-    'bit-flip': {
+    'bit_flip': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 2), num = _b[0], index = _b[1];
             assertNumber(num, sourceCodeInfo, { integer: true });
@@ -1077,7 +1093,7 @@ var bitwiseNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(2, node); },
     },
-    'bit-set': {
+    'bit_set': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 2), num = _b[0], index = _b[1];
             assertNumber(num, sourceCodeInfo, { integer: true });
@@ -1087,7 +1103,7 @@ var bitwiseNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(2, node); },
     },
-    'bit-clear': {
+    'bit_clear': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 2), num = _b[0], index = _b[1];
             assertNumber(num, sourceCodeInfo, { integer: true });
@@ -1097,7 +1113,7 @@ var bitwiseNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(2, node); },
     },
-    'bit-test': {
+    'bit_test': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 2), num = _b[0], index = _b[1];
             assertNumber(num, sourceCodeInfo, { integer: true });
@@ -2785,7 +2801,7 @@ var mathNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(2, node); },
     },
-    'rem': {
+    '%': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 2), dividend = _b[0], divisor = _b[1];
             assertNumber(dividend, sourceCodeInfo);
@@ -2811,7 +2827,7 @@ var mathNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(1, node); },
     },
-    'pow': {
+    '**': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 2), first = _b[0], second = _b[1];
             assertNumber(first, sourceCodeInfo);
@@ -3088,8 +3104,6 @@ var mathNormalExpression = {
     },
 };
 
-var uuidTemplate = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx';
-var xyRegexp = /[xy]/g;
 var miscNormalExpression = {
     '!=': {
         evaluate: function (params) {
@@ -3103,7 +3117,7 @@ var miscNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams({ min: 1 }, node); },
     },
-    '=': {
+    '==': {
         evaluate: function (_a) {
             var e_1, _b;
             var _c = __read(_a), first = _c[0], rest = _c.slice(1);
@@ -3228,20 +3242,14 @@ var miscNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams({ min: 1 }, node); },
     },
-    'not': {
+    '!': {
         evaluate: function (_a) {
             var _b = __read(_a, 1), first = _b[0];
             return !first;
         },
         validate: function (node) { return assertNumberOfParams(1, node); },
     },
-    'inst-ms!': {
-        evaluate: function () {
-            return Date.now();
-        },
-        validate: function (node) { return assertNumberOfParams(0, node); },
-    },
-    'inst-ms->iso-date-time': {
+    'epoch>iso_date': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 1), ms = _b[0];
             assertNumber(ms, sourceCodeInfo);
@@ -3249,7 +3257,7 @@ var miscNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(1, node); },
     },
-    'iso-date-time->inst-ms': {
+    'iso_date>epoch': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 1), dateTime = _b[0];
             assertString(dateTime, sourceCodeInfo);
@@ -3282,23 +3290,7 @@ var miscNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(2, node); },
     },
-    'uuid!': {
-        evaluate: function () {
-            return uuidTemplate.replace(xyRegexp, function (character) {
-                var randomNbr = Math.floor(Math.random() * 16);
-                var newValue = character === 'x' ? randomNbr : (randomNbr & 0x3) | 0x8;
-                return newValue.toString(16);
-            });
-        },
-        validate: function (node) { return assertNumberOfParams(0, node); },
-    },
-    'lits-version!': {
-        evaluate: function () {
-            return version;
-        },
-        validate: function (node) { return assertNumberOfParams(0, node); },
-    },
-    'json-parse': {
+    'json_parse': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 1), first = _b[0];
             assertString(first, sourceCodeInfo);
@@ -3307,7 +3299,7 @@ var miscNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(1, node); },
     },
-    'json-stringify': {
+    'json_stringify': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 2), first = _b[0], second = _b[1];
             assertAny(first, sourceCodeInfo);
@@ -3520,7 +3512,7 @@ var assertNormalExpression = {
 };
 
 var objectNormalExpression = {
-    'object': {
+    object: {
         evaluate: function (params, sourceCodeInfo) {
             var result = {};
             for (var i = 0; i < params.length; i += 2) {
@@ -3533,7 +3525,7 @@ var objectNormalExpression = {
         },
         validate: function (node) { return assertEvenNumberOfParams(node); },
     },
-    'keys': {
+    keys: {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 1), obj = _b[0];
             assertObj(obj, sourceCodeInfo);
@@ -3541,7 +3533,7 @@ var objectNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(1, node); },
     },
-    'vals': {
+    vals: {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 1), obj = _b[0];
             assertObj(obj, sourceCodeInfo);
@@ -3549,7 +3541,7 @@ var objectNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(1, node); },
     },
-    'entries': {
+    entries: {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 1), obj = _b[0];
             assertObj(obj, sourceCodeInfo);
@@ -3557,7 +3549,7 @@ var objectNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(1, node); },
     },
-    'find': {
+    find: {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 2), obj = _b[0], key = _b[1];
             assertObj(obj, sourceCodeInfo);
@@ -3568,7 +3560,7 @@ var objectNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(2, node); },
     },
-    'dissoc': {
+    dissoc: {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 2), obj = _b[0], key = _b[1];
             assertObj(obj, sourceCodeInfo);
@@ -3579,7 +3571,7 @@ var objectNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(2, node); },
     },
-    'merge': {
+    merge: {
         evaluate: function (params, sourceCodeInfo) {
             if (params.length === 0)
                 return null;
@@ -3592,7 +3584,7 @@ var objectNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams({ min: 0 }, node); },
     },
-    'merge-with': {
+    merge_with: {
         evaluate: function (params, sourceCodeInfo, contextStack, _a) {
             var executeFunction = _a.executeFunction;
             var first = params[0];
@@ -3615,7 +3607,7 @@ var objectNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams({ min: 2 }, node); },
     },
-    'zipmap': {
+    zipmap: {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 2), keys = _b[0], values = _b[1];
             assertStringArray(keys, sourceCodeInfo);
@@ -3630,7 +3622,7 @@ var objectNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(2, node); },
     },
-    'select-keys': {
+    select_keys: {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 2), obj = _b[0], keys = _b[1];
             assertStringArray(keys, sourceCodeInfo);
@@ -3896,7 +3888,7 @@ var stringNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams({ min: 2, max: 3 }, node); },
     },
-    'string-repeat': {
+    'string_repeat': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 2), str = _b[0], count = _b[1];
             assertString(str, sourceCodeInfo);
@@ -3930,27 +3922,7 @@ var stringNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(1, node); },
     },
-    'number-to-string': {
-        evaluate: function (params, sourceCodeInfo) {
-            var _a = __read(params, 2), num = _a[0], base = _a[1];
-            assertNumber(num, sourceCodeInfo, { finite: true });
-            if (params.length === 1) {
-                return "".concat(num);
-            }
-            else {
-                assertNumber(base, sourceCodeInfo, { finite: true });
-                if (base !== 2 && base !== 8 && base !== 10 && base !== 16) {
-                    throw new LitsError("Expected \"number-to-string\" base argument to be 2, 8, 10 or 16, got: ".concat(base), sourceCodeInfo);
-                }
-                if (base === 10)
-                    return "".concat(num);
-                assertNumber(num, sourceCodeInfo, { integer: true, nonNegative: true });
-                return Number(num).toString(base);
-            }
-        },
-        validate: function (node) { return assertNumberOfParams({ min: 1, max: 2 }, node); },
-    },
-    'from-char-code': {
+    'from_char_code': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 1), num = _b[0];
             assertNumber(num, sourceCodeInfo, { finite: true });
@@ -3964,7 +3936,7 @@ var stringNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(1, node); },
     },
-    'to-char-code': {
+    'to_char_code': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 1), str = _b[0];
             assertString(str, sourceCodeInfo, { nonEmpty: true });
@@ -3972,7 +3944,7 @@ var stringNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(1, node); },
     },
-    'lower-case': {
+    'lower_case': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 1), str = _b[0];
             assertString(str, sourceCodeInfo);
@@ -3980,7 +3952,7 @@ var stringNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(1, node); },
     },
-    'upper-case': {
+    'upper_case': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 1), str = _b[0];
             assertString(str, sourceCodeInfo);
@@ -3996,7 +3968,7 @@ var stringNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(1, node); },
     },
-    'trim-left': {
+    'trim_left': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 1), str = _b[0];
             assertString(str, sourceCodeInfo);
@@ -4004,7 +3976,7 @@ var stringNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(1, node); },
     },
-    'trim-right': {
+    'trim_right': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 1), str = _b[0];
             assertString(str, sourceCodeInfo);
@@ -4012,6 +3984,30 @@ var stringNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(1, node); },
     },
+    '++': {
+        evaluate: function (params, sourceCodeInfo) {
+            if (params.length === 0) {
+                return '';
+            }
+            var first = params[0];
+            if (first !== null) {
+                assertStringOrNumber(first, sourceCodeInfo);
+            }
+            if (params.length === 1) {
+                return first === null ? '' : "".concat(first);
+            }
+            return params.slice(1).reduce(function (acc, str) {
+                if (str !== null) {
+                    assertStringOrNumber(str, sourceCodeInfo);
+                }
+                if (str === null) {
+                    return acc;
+                }
+                return "".concat(acc).concat(str);
+            }, first === null ? '' : "".concat(first));
+        },
+        validate: function () { return undefined; },
+    },
     'join': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 2), stringList = _b[0], delimiter = _b[1];
@@ -4036,7 +4032,7 @@ var stringNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams({ min: 2, max: 3 }, node); },
     },
-    'pad-left': {
+    'pad_left': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 3), str = _b[0], length = _b[1], padString = _b[2];
             assertString(str, sourceCodeInfo);
@@ -4047,7 +4043,7 @@ var stringNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams({ min: 2, max: 3 }, node); },
     },
-    'pad-right': {
+    'pad_right': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 3), str = _b[0], length = _b[1], padString = _b[2];
             assertString(str, sourceCodeInfo);
@@ -4089,7 +4085,7 @@ var stringNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams({ min: 1, max: 10 }, node); },
     },
-    'encode-base64': {
+    'encode_base64': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 1), value = _b[0];
             assertString(value, sourceCodeInfo);
@@ -4100,7 +4096,7 @@ var stringNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(1, node); },
     },
-    'decode-base64': {
+    'decode_base64': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 1), value = _b[0];
             assertString(value, sourceCodeInfo);
@@ -4118,7 +4114,7 @@ var stringNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(1, node); },
     },
-    'encode-uri-component': {
+    'encode_uri_component': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 1), value = _b[0];
             assertString(value, sourceCodeInfo);
@@ -4126,7 +4122,7 @@ var stringNormalExpression = {
         },
         validate: function (node) { return assertNumberOfParams(1, node); },
     },
-    'decode-uri-component': {
+    'decode_uri_component': {
         evaluate: function (_a, sourceCodeInfo) {
             var _b = __read(_a, 1), value = _b[0];
             assertString(value, sourceCodeInfo);
@@ -4295,7 +4291,7 @@ var andSpecialExpression = {
         assertRParenToken(tokenStream.tokens[parseState.position++]);
         var node = {
             t: AstNodeType.SpecialExpression,
-            n: 'and',
+            n: '&&',
             p: params,
             token: getTokenDebugData(firstToken) && firstToken,
         };
@@ -4380,8 +4376,39 @@ var condSpecialExpression = {
     },
 };
 
+var switchSpecialExpression = {
+    polishParse: getCommonPolishSpecialExpressionParser('switch'),
+    validateParameterCount: function (node) { return assertOddNumberOfParams(node); },
+    evaluate: function (node, contextStack, _a) {
+        var e_1, _b;
+        var evaluateAstNode = _a.evaluateAstNode;
+        var switchValue = evaluateAstNode(node.p[0], contextStack);
+        try {
+            for (var _c = __values(arrayToPairs(node.p.slice(1))), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var _e = __read(_d.value, 2), test = _e[0], form = _e[1];
+                var value = evaluateAstNode(test, contextStack);
+                if (value === switchValue) {
+                    return evaluateAstNode(form, contextStack);
+                }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        return null;
+    },
+    findUnresolvedIdentifiers: function (node, contextStack, _a) {
+        var findUnresolvedIdentifiers = _a.findUnresolvedIdentifiers, builtin = _a.builtin;
+        return findUnresolvedIdentifiers(node.p, contextStack, builtin);
+    },
+};
+
 var declaredSpecialExpression = {
-    polishParse: getCommonPolishSpecialExpressionParser('declared?'),
+    polishParse: getCommonPolishSpecialExpressionParser('defined?'),
     validateParameterCount: function (node) { return assertNumberOfParams(1, node); },
     evaluate: function (node, contextStack) {
         var lookUpResult = contextStack.lookUp(node.p[0]);
@@ -4437,9 +4464,7 @@ var defSpecialExpression = {
         var sourceCodeInfo = (_b = getTokenDebugData(node.token)) === null || _b === void 0 ? void 0 : _b.sourceCodeInfo;
         var name = node.p[0].v;
         assertNameNotDefined(name, contextStack, builtin, sourceCodeInfo);
-        contextStack.globalContext[name] = {
-            value: evaluateAstNode(node.p[1], contextStack),
-        };
+        contextStack.exportValue(name, evaluateAstNode(node.p[1], contextStack));
         return null;
     },
     findUnresolvedIdentifiers: function (node, contextStack, _a) {
@@ -4450,7 +4475,7 @@ var defSpecialExpression = {
         var result = findUnresolvedIdentifiers([subNode], contextStack, builtin);
         var name = asSymbolNode(node.p[0]).v;
         assertNameNotDefined(name, contextStack, builtin, sourceCodeInfo);
-        contextStack.globalContext[name] = { value: true };
+        contextStack.exportValue(name, true);
         return result;
     },
 };
@@ -4476,9 +4501,7 @@ var defsSpecialExpression = {
         var name = evaluateAstNode(node.p[0], contextStack);
         assertString(name, sourceCodeInfo);
         assertNameNotDefined(name, contextStack, builtin, (_c = getTokenDebugData(node.token)) === null || _c === void 0 ? void 0 : _c.sourceCodeInfo);
-        contextStack.globalContext[name] = {
-            value: evaluateAstNode(node.p[1], contextStack),
-        };
+        contextStack.exportValue(name, evaluateAstNode(node.p[1], contextStack));
         return null;
     },
     findUnresolvedIdentifiers: function (node, contextStack, _a) {
@@ -4490,7 +4513,7 @@ var defsSpecialExpression = {
         var name = evaluateAstNode(node.p[0], contextStack);
         assertString(name, sourceCodeInfo);
         assertNameNotDefined(name, contextStack, builtin, sourceCodeInfo);
-        contextStack.globalContext[name] = { value: true };
+        contextStack.exportValue(name, true);
         return result;
     },
 };
@@ -4521,7 +4544,7 @@ var doSpecialExpression = {
     },
     findUnresolvedIdentifiers: function (node, contextStack, _a) {
         var findUnresolvedIdentifiers = _a.findUnresolvedIdentifiers, builtin = _a.builtin;
-        return findUnresolvedIdentifiers(node.p, contextStack, builtin);
+        return findUnresolvedIdentifiers(node.p, contextStack.create({}), builtin);
     },
 };
 
@@ -4550,11 +4573,6 @@ function joinAnalyzeResults() {
 function addAnalyzeResults(target, source) {
     source.forEach(function (symbol) { return target.add(symbol); });
 }
-function combinate(arrays) {
-    return arrays.reduce(function (acc, curr) {
-        return acc.flatMap(function (a) { return curr.map(function (c) { return __spreadArray(__spreadArray([], __read(a), false), [c], false); }); });
-    }, [[]]);
-}
 
 var defnSpecialExpression = {
     polishParse: function (tokenStream, parseState, firstToken, parsers) {
@@ -4589,13 +4607,13 @@ var defnSpecialExpression = {
             _b.n = name,
             _b.o = evaluatedFunctionOverloades,
             _b);
-        contextStack.globalContext[name] = { value: litsFunction };
+        contextStack.exportValue(name, litsFunction);
         return null;
     },
     findUnresolvedIdentifiers: function (node, contextStack, _a) {
         var _b;
         var findUnresolvedIdentifiers = _a.findUnresolvedIdentifiers, builtin = _a.builtin;
-        contextStack.globalContext[node.f.v] = { value: true };
+        contextStack.exportValue(node.f.v, true);
         var newContext = (_b = {}, _b[node.f.v] = { value: true }, _b);
         return addOverloadsUnresolvedIdentifiers(node.o, contextStack, findUnresolvedIdentifiers, builtin, newContext);
     },
@@ -4631,7 +4649,7 @@ var defnsSpecialExpression = {
             _b.n = name,
             _b.o = evaluatedFunctionOverloades,
             _b);
-        contextStack.globalContext[name] = { value: litsFunction };
+        contextStack.exportValue(name, litsFunction);
         return null;
     },
     findUnresolvedIdentifiers: function (node, contextStack, _a) {
@@ -4642,7 +4660,7 @@ var defnsSpecialExpression = {
         var name = evaluateAstNode(asAstNode(node.f, sourceCodeInfo), contextStack);
         assertString(name, sourceCodeInfo);
         assertNameNotDefined(name, contextStack, builtin, sourceCodeInfo);
-        contextStack.globalContext[name] = { value: true };
+        contextStack.exportValue(name, true);
         var newContext = (_b = {}, _b[name] = { value: true }, _b);
         return addOverloadsUnresolvedIdentifiers(node.o, contextStack, findUnresolvedIdentifiers, builtin, newContext);
     },
@@ -4852,7 +4870,7 @@ function parseFunctionArguments(tokenStream, parseState, parsers) {
             tkn = asToken(tokenStream.tokens[parseState.position]);
             if (node.t === AstNodeType.Modifier) {
                 switch (node.v) {
-                    case '&':
+                    case '&rest':
                         if (state === 'rest')
                             throw new LitsError('& can only appear once', (_a = getTokenDebugData(tkn)) === null || _a === void 0 ? void 0 : _a.sourceCodeInfo);
                         state = 'rest';
@@ -4915,56 +4933,8 @@ var ifSpecialExpression = {
     },
 };
 
-var ifLetSpecialExpression = {
-    polishParse: function (tokenStream, parseState, firstToken, _a) {
-        var _b, _c;
-        var parseBindings = _a.parseBindings, parseTokensUntilClosingBracket = _a.parseTokensUntilClosingBracket;
-        var bindings = parseBindings(tokenStream, parseState);
-        if (bindings.length !== 1) {
-            throw new LitsError("Expected exactly one binding, got ".concat(valueToString(bindings.length)), (_b = getTokenDebugData(firstToken)) === null || _b === void 0 ? void 0 : _b.sourceCodeInfo);
-        }
-        var params = parseTokensUntilClosingBracket(tokenStream, parseState);
-        assertRParenToken(tokenStream.tokens[parseState.position++]);
-        var node = {
-            t: AstNodeType.SpecialExpression,
-            n: 'if-let',
-            b: asNonUndefined(bindings[0], (_c = getTokenDebugData(firstToken)) === null || _c === void 0 ? void 0 : _c.sourceCodeInfo),
-            p: params,
-            token: getTokenDebugData(firstToken) && firstToken,
-        };
-        return node;
-    },
-    validateParameterCount: function (node) { return assertNumberOfParams({ min: 1, max: 2 }, node); },
-    evaluate: function (node, contextStack, _a) {
-        var _b;
-        var evaluateAstNode = _a.evaluateAstNode;
-        var sourceCodeInfo = (_b = getTokenDebugData(node.token)) === null || _b === void 0 ? void 0 : _b.sourceCodeInfo;
-        var locals = {};
-        var bindingValue = evaluateAstNode(node.b.v, contextStack);
-        if (bindingValue) {
-            locals[node.b.n] = { value: bindingValue };
-            var newContextStack = contextStack.create(locals);
-            var thenForm = asAstNode(node.p[0], sourceCodeInfo);
-            return evaluateAstNode(thenForm, newContextStack);
-        }
-        if (node.p.length === 2) {
-            var elseForm = asAstNode(node.p[1], sourceCodeInfo);
-            return evaluateAstNode(elseForm, contextStack);
-        }
-        return null;
-    },
-    findUnresolvedIdentifiers: function (node, contextStack, _a) {
-        var _b;
-        var findUnresolvedIdentifiers = _a.findUnresolvedIdentifiers, builtin = _a.builtin;
-        var newContext = (_b = {}, _b[node.b.n] = { value: true }, _b);
-        var bindingResult = findUnresolvedIdentifiers([node.b.v], contextStack, builtin);
-        var paramsResult = findUnresolvedIdentifiers(node.p, contextStack.create(newContext), builtin);
-        return joinAnalyzeResults(bindingResult, paramsResult);
-    },
-};
-
-var ifNotSpecialExpression = {
-    polishParse: getCommonPolishSpecialExpressionParser('if-not'),
+var unlessSpecialExpression = {
+    polishParse: getCommonPolishSpecialExpressionParser('unless'),
     validateParameterCount: function (node) { return assertNumberOfParams({ min: 2, max: 3 }, node); },
     evaluate: function (node, contextStack, _a) {
         var _b;
@@ -4989,55 +4959,39 @@ var ifNotSpecialExpression = {
 
 var letSpecialExpression = {
     polishParse: function (tokenStream, parseState, firstToken, _a) {
-        var parseBindings = _a.parseBindings, parseTokensUntilClosingBracket = _a.parseTokensUntilClosingBracket;
+        var parseBindings = _a.parseBindings;
         var bindings = parseBindings(tokenStream, parseState);
-        var params = parseTokensUntilClosingBracket(tokenStream, parseState);
+        // const params = parseTokensUntilClosingBracket(tokenStream, parseState)
         assertRParenToken(tokenStream.tokens[parseState.position++]);
         var node = {
             t: AstNodeType.SpecialExpression,
             n: 'let',
-            p: params,
+            p: [],
             bs: bindings,
             token: getTokenDebugData(firstToken) && firstToken,
         };
         return node;
     },
-    validateParameterCount: function () { return undefined; },
+    validateParameterCount: function (node) { return assertNumberOfParams(0, node); },
     evaluate: function (node, contextStack, _a) {
-        var e_1, _b, e_2, _c;
+        var e_1, _b;
         var evaluateAstNode = _a.evaluateAstNode;
-        var locals = {};
-        var newContextStack = contextStack.create(locals);
         try {
-            for (var _d = __values(node.bs), _e = _d.next(); !_e.done; _e = _d.next()) {
-                var binding = _e.value;
+            for (var _c = __values(node.bs), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var binding = _d.value;
                 var bindingValueNode = binding.v;
-                var bindingValue = evaluateAstNode(bindingValueNode, newContextStack);
-                locals[binding.n] = { value: bindingValue };
+                var bindingValue = evaluateAstNode(bindingValueNode, contextStack);
+                contextStack.addValue(binding.n, bindingValue);
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (_e && !_e.done && (_b = _d.return)) _b.call(_d);
+                if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
             }
             finally { if (e_1) throw e_1.error; }
         }
-        var result = null;
-        try {
-            for (var _f = __values(node.p), _g = _f.next(); !_g.done; _g = _f.next()) {
-                var astNode = _g.value;
-                result = evaluateAstNode(astNode, newContextStack);
-            }
-        }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-        finally {
-            try {
-                if (_g && !_g.done && (_c = _f.return)) _c.call(_f);
-            }
-            finally { if (e_2) throw e_2.error; }
-        }
-        return result;
+        return null;
     },
     findUnresolvedIdentifiers: function (node, contextStack, _a) {
         var findUnresolvedIdentifiers = _a.findUnresolvedIdentifiers, builtin = _a.builtin;
@@ -5047,11 +5001,10 @@ var letSpecialExpression = {
             context[name] = { value: true };
             return context;
         }, {});
-        var bindingContext = {};
         var bindingResults = node.bs.map(function (bindingNode) {
             var valueNode = bindingNode.v;
-            var bindingsResult = findUnresolvedIdentifiers([valueNode], contextStack.create(bindingContext), builtin);
-            bindingContext[bindingNode.n] = { value: true };
+            var bindingsResult = findUnresolvedIdentifiers([valueNode], contextStack, builtin);
+            contextStack.addValue(bindingNode.n, { value: true });
             return bindingsResult;
         });
         var paramsResult = findUnresolvedIdentifiers(node.p, contextStack.create(newContext), builtin);
@@ -5174,7 +5127,7 @@ function parseLoopBinding(tokenStream, parseState, _a) {
                 loopBinding.we = parseToken(tokenStream, parseState);
                 loopBinding.m.push('&while');
                 break;
-            case '&':
+            case '&rest':
                 throw new LitsError("Illegal modifier: ".concat(modifier), (_e = getTokenDebugData(tkn)) === null || _e === void 0 ? void 0 : _e.sourceCodeInfo);
             default:
                 throw new LitsError("Illegal modifier: ".concat(modifier), (_f = getTokenDebugData(tkn)) === null || _f === void 0 ? void 0 : _f.sourceCodeInfo);
@@ -5374,7 +5327,7 @@ var doseqSpecialExpression = {
 };
 
 var orSpecialExpression = {
-    polishParse: getCommonPolishSpecialExpressionParser('or'),
+    polishParse: getCommonPolishSpecialExpressionParser('||'),
     validateParameterCount: function () { return undefined; },
     evaluate: function (node, contextStack, _a) {
         var e_1, _b;
@@ -5466,25 +5419,6 @@ var throwSpecialExpression = {
     },
 };
 
-var timeSpecialExpression = {
-    polishParse: getCommonPolishSpecialExpressionParser('time!'),
-    validateParameterCount: function (node) { return assertNumberOfParams(1, node); },
-    evaluate: function (node, contextStack, _a) {
-        var evaluateAstNode = _a.evaluateAstNode;
-        var param = node.p[0];
-        var startTime = Date.now();
-        var result = evaluateAstNode(param, contextStack);
-        var totalTime = Date.now() - startTime;
-        // eslint-disable-next-line no-console
-        console.log("Elapsed time: ".concat(totalTime, " ms"));
-        return result;
-    },
-    findUnresolvedIdentifiers: function (node, contextStack, _a) {
-        var findUnresolvedIdentifiers = _a.findUnresolvedIdentifiers, builtin = _a.builtin;
-        return findUnresolvedIdentifiers(node.p, contextStack, builtin);
-    },
-};
-
 var trySpecialExpression = {
     polishParse: function (tokenStream, parseState, firstToken, _a) {
         var _b, _c, _d;
@@ -5521,9 +5455,10 @@ var trySpecialExpression = {
             return evaluateAstNode(tryExpressions[0], contextStack);
         }
         catch (error) {
-            var newContext = (_b = {},
-                _b[errorNode.v] = { value: asAny(error, (_c = getTokenDebugData(node.token)) === null || _c === void 0 ? void 0 : _c.sourceCodeInfo) },
-                _b);
+            var newContext = errorNode
+                ? (_b = {},
+                    _b[errorNode.v] = { value: asAny(error, (_c = getTokenDebugData(node.token)) === null || _c === void 0 ? void 0 : _c.sourceCodeInfo) },
+                    _b) : {};
             return evaluateAstNode(catchExpression, contextStack.create(newContext));
         }
     },
@@ -5532,288 +5467,128 @@ var trySpecialExpression = {
         var findUnresolvedIdentifiers = _a.findUnresolvedIdentifiers, builtin = _a.builtin;
         var tryExpressions = node.p, catchExpression = node.ce, errorNode = node.e;
         var tryResult = findUnresolvedIdentifiers(tryExpressions, contextStack, builtin);
-        var newContext = (_b = {},
-            _b[errorNode.v] = { value: true },
-            _b);
+        var newContext = errorNode
+            ? (_b = {},
+                _b[errorNode.v] = { value: true },
+                _b) : {};
         var catchResult = findUnresolvedIdentifiers([catchExpression], contextStack.create(newContext), builtin);
         return joinAnalyzeResults(tryResult, catchResult);
     },
 };
 
-var whenSpecialExpression = {
-    polishParse: getCommonPolishSpecialExpressionParser('when'),
-    validateParameterCount: function (node) { return assertNumberOfParams({ min: 1 }, node); },
-    evaluate: function (node, contextStack, _a) {
-        var e_1, _b;
-        var _c;
-        var evaluateAstNode = _a.evaluateAstNode;
-        var _d = __read(node.p), whenExpression = _d[0], body = _d.slice(1);
-        assertAstNode(whenExpression, (_c = getTokenDebugData(node.token)) === null || _c === void 0 ? void 0 : _c.sourceCodeInfo);
-        if (!evaluateAstNode(whenExpression, contextStack))
-            return null;
-        var result = null;
+var specialExpressions = {
+    '&&': andSpecialExpression,
+    'comment': commentSpecialExpression,
+    'cond': condSpecialExpression,
+    'switch': switchSpecialExpression,
+    'def': defSpecialExpression,
+    'defn': defnSpecialExpression,
+    'defns': defnsSpecialExpression,
+    'defs': defsSpecialExpression,
+    'do': doSpecialExpression,
+    'doseq': doseqSpecialExpression,
+    'for': forSpecialExpression,
+    'fn': fnSpecialExpression,
+    'if': ifSpecialExpression,
+    'unless': unlessSpecialExpression,
+    'let': letSpecialExpression,
+    'loop': loopSpecialExpression,
+    '||': orSpecialExpression,
+    'recur': recurSpecialExpression,
+    'throw': throwSpecialExpression,
+    'try': trySpecialExpression,
+    'defined?': declaredSpecialExpression,
+    '??': qqSpecialExpression,
+};
+Object.keys(specialExpressions).forEach(function (key) {
+    /* v8 ignore next 2 */
+    if (normalExpressions[key])
+        throw new Error("Expression ".concat(key, " is defined as both a normal expression and a special expression"));
+});
+var builtin = {
+    normalExpressions: normalExpressions,
+    specialExpressions: specialExpressions,
+};
+var normalExpressionKeys = Object.keys(normalExpressions);
+var specialExpressionKeys = Object.keys(specialExpressions);
+
+function isContextEntry(value) {
+    return isUnknownRecord(value) && value.value !== undefined;
+}
+
+var ContextStackImpl = /** @class */ (function () {
+    function ContextStackImpl(_a) {
+        var contexts = _a.contexts, hostValues = _a.values, lazyHostValues = _a.lazyValues, nativeJsFunctions = _a.nativeJsFunctions;
+        this.globalContext = asNonUndefined(contexts[0]);
+        this.contexts = contexts;
+        this.values = hostValues;
+        this.lazyValues = lazyHostValues;
+        this.nativeJsFunctions = nativeJsFunctions;
+    }
+    ContextStackImpl.prototype.create = function (context, extraData) {
+        var globalContext = this.globalContext;
+        var contextStack = new ContextStackImpl({
+            contexts: __spreadArray([context], __read(this.contexts), false),
+            values: this.values,
+            lazyValues: extraData ? __assign(__assign({}, this.lazyValues), extraData) : this.lazyValues,
+            nativeJsFunctions: this.nativeJsFunctions,
+        });
+        contextStack.globalContext = globalContext;
+        return contextStack;
+    };
+    ContextStackImpl.prototype.exportValue = function (name, value) {
+        if (this.globalContext[name]) {
+            throw new Error("Cannot redefine exported value \"".concat(name, "\""));
+        }
+        if (specialExpressionKeys.includes(name)) {
+            throw new Error("Cannot shadow special expression \"".concat(name, "\""));
+        }
+        if (normalExpressionKeys.includes(name)) {
+            throw new Error("Cannot shadow builtin function \"".concat(name, "\""));
+        }
+        this.addValue(name, value);
+        this.globalContext[name] = { value: value };
+    };
+    ContextStackImpl.prototype.addValue = function (name, value) {
+        var currentContext = this.contexts[0];
+        if (!currentContext) {
+            throw new Error('No context to add value to');
+        }
+        if (currentContext[name]) {
+            throw new Error("Cannot redefine value \"".concat(name, "\""));
+        }
+        if (specialExpressionKeys.includes(name)) {
+            throw new Error("Cannot shadow special expression \"".concat(name, "\""));
+        }
+        if (normalExpressionKeys.includes(name)) {
+            throw new Error("Cannot shadow builtin function \"".concat(name, "\""));
+        }
+        currentContext[name] = { value: toAny(value) };
+    };
+    ContextStackImpl.prototype.clone = function () {
+        // eslint-disable-next-line ts/no-unsafe-argument
+        return new ContextStackImpl(JSON.parse(JSON.stringify({
+            contexts: this.contexts,
+            values: this.values,
+            lazyValues: this.lazyValues,
+            nativeJsFunctions: this.nativeJsFunctions,
+        })));
+    };
+    ContextStackImpl.prototype.getValue = function (name) {
+        var e_1, _a;
+        var _b, _c, _d;
         try {
-            for (var body_1 = __values(body), body_1_1 = body_1.next(); !body_1_1.done; body_1_1 = body_1.next()) {
-                var form = body_1_1.value;
-                result = evaluateAstNode(form, contextStack);
+            for (var _e = __values(this.contexts), _f = _e.next(); !_f.done; _f = _e.next()) {
+                var context = _f.value;
+                var contextEntry = context[name];
+                if (contextEntry)
+                    return contextEntry.value;
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (body_1_1 && !body_1_1.done && (_b = body_1.return)) _b.call(body_1);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        return result;
-    },
-    findUnresolvedIdentifiers: function (node, contextStack, _a) {
-        var findUnresolvedIdentifiers = _a.findUnresolvedIdentifiers, builtin = _a.builtin;
-        return findUnresolvedIdentifiers(node.p, contextStack, builtin);
-    },
-};
-
-var whenFirstSpecialExpression = {
-    polishParse: function (tokenStream, parseState, firstToken, _a) {
-        var _b, _c;
-        var parseBindings = _a.parseBindings, parseTokensUntilClosingBracket = _a.parseTokensUntilClosingBracket;
-        var bindings = parseBindings(tokenStream, parseState);
-        if (bindings.length !== 1) {
-            throw new LitsError("Expected exactly one binding, got ".concat(valueToString(bindings.length)), (_b = getTokenDebugData(firstToken)) === null || _b === void 0 ? void 0 : _b.sourceCodeInfo);
-        }
-        var params = parseTokensUntilClosingBracket(tokenStream, parseState);
-        assertRParenToken(tokenStream.tokens[parseState.position++]);
-        var node = {
-            t: AstNodeType.SpecialExpression,
-            n: 'when-first',
-            b: asNonUndefined(bindings[0], (_c = getTokenDebugData(firstToken)) === null || _c === void 0 ? void 0 : _c.sourceCodeInfo),
-            p: params,
-            token: getTokenDebugData(firstToken) && firstToken,
-        };
-        return node;
-    },
-    validateParameterCount: function () { return undefined; },
-    evaluate: function (node, contextStack, _a) {
-        var e_1, _b;
-        var _c;
-        var evaluateAstNode = _a.evaluateAstNode;
-        var locals = {};
-        var binding = node.b;
-        var evaluatedBindingForm = evaluateAstNode(binding.v, contextStack);
-        if (!isSeq(evaluatedBindingForm)) {
-            throw new LitsError("Expected undefined or a sequence, got ".concat(valueToString(evaluatedBindingForm)), (_c = getTokenDebugData(node.token)) === null || _c === void 0 ? void 0 : _c.sourceCodeInfo);
-        }
-        if (evaluatedBindingForm.length === 0)
-            return null;
-        var bindingValue = toAny(evaluatedBindingForm[0]);
-        locals[binding.n] = { value: bindingValue };
-        var newContextStack = contextStack.create(locals);
-        var result = null;
-        try {
-            for (var _d = __values(node.p), _e = _d.next(); !_e.done; _e = _d.next()) {
-                var form = _e.value;
-                result = evaluateAstNode(form, newContextStack);
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (_e && !_e.done && (_b = _d.return)) _b.call(_d);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        return result;
-    },
-    findUnresolvedIdentifiers: function (node, contextStack, _a) {
-        var _b;
-        var findUnresolvedIdentifiers = _a.findUnresolvedIdentifiers, builtin = _a.builtin;
-        var binding = node.b;
-        var newContext = (_b = {}, _b[binding.n] = { value: true }, _b);
-        var bindingResult = findUnresolvedIdentifiers([binding.v], contextStack, builtin);
-        var paramsResult = findUnresolvedIdentifiers(node.p, contextStack.create(newContext), builtin);
-        return joinAnalyzeResults(bindingResult, paramsResult);
-    },
-};
-
-var whenLetSpecialExpression = {
-    polishParse: function (tokenStream, parseState, firstToken, _a) {
-        var _b, _c;
-        var parseBindings = _a.parseBindings, parseTokensUntilClosingBracket = _a.parseTokensUntilClosingBracket;
-        var bindings = parseBindings(tokenStream, parseState);
-        if (bindings.length !== 1) {
-            throw new LitsError("Expected exactly one binding, got ".concat(valueToString(bindings.length)), (_b = getTokenDebugData(firstToken)) === null || _b === void 0 ? void 0 : _b.sourceCodeInfo);
-        }
-        var params = parseTokensUntilClosingBracket(tokenStream, parseState);
-        assertRParenToken(tokenStream.tokens[parseState.position++]);
-        var node = {
-            t: AstNodeType.SpecialExpression,
-            n: 'when-let',
-            b: asNonUndefined(bindings[0], (_c = getTokenDebugData(firstToken)) === null || _c === void 0 ? void 0 : _c.sourceCodeInfo),
-            p: params,
-            token: getTokenDebugData(firstToken) && firstToken,
-        };
-        return node;
-    },
-    validateParameterCount: function () { return undefined; },
-    evaluate: function (node, contextStack, _a) {
-        var e_1, _b;
-        var evaluateAstNode = _a.evaluateAstNode;
-        var binding = node.b;
-        var locals = {};
-        var bindingValue = evaluateAstNode(binding.v, contextStack);
-        if (!bindingValue)
-            return null;
-        locals[binding.n] = { value: bindingValue };
-        var newContextStack = contextStack.create(locals);
-        var result = null;
-        try {
-            for (var _c = __values(node.p), _d = _c.next(); !_d.done; _d = _c.next()) {
-                var form = _d.value;
-                result = evaluateAstNode(form, newContextStack);
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        return result;
-    },
-    findUnresolvedIdentifiers: function (node, contextStack, _a) {
-        var _b;
-        var findUnresolvedIdentifiers = _a.findUnresolvedIdentifiers, builtin = _a.builtin;
-        var binding = node.b;
-        var newContext = (_b = {}, _b[binding.n] = { value: true }, _b);
-        var bindingResult = findUnresolvedIdentifiers([binding.v], contextStack, builtin);
-        var paramsResult = findUnresolvedIdentifiers(node.p, contextStack.create(newContext), builtin);
-        return joinAnalyzeResults(bindingResult, paramsResult);
-    },
-};
-
-var whenNotSpecialExpression = {
-    polishParse: getCommonPolishSpecialExpressionParser('when-not'),
-    validateParameterCount: function (node) { return assertNumberOfParams({ min: 1 }, node); },
-    evaluate: function (node, contextStack, _a) {
-        var e_1, _b;
-        var _c;
-        var evaluateAstNode = _a.evaluateAstNode;
-        var _d = __read(node.p), whenExpression = _d[0], body = _d.slice(1);
-        assertAstNode(whenExpression, (_c = getTokenDebugData(node.token)) === null || _c === void 0 ? void 0 : _c.sourceCodeInfo);
-        if (evaluateAstNode(whenExpression, contextStack))
-            return null;
-        var result = null;
-        try {
-            for (var body_1 = __values(body), body_1_1 = body_1.next(); !body_1_1.done; body_1_1 = body_1.next()) {
-                var form = body_1_1.value;
-                result = evaluateAstNode(form, contextStack);
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (body_1_1 && !body_1_1.done && (_b = body_1.return)) _b.call(body_1);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        return result;
-    },
-    findUnresolvedIdentifiers: function (node, contextStack, _a) {
-        var findUnresolvedIdentifiers = _a.findUnresolvedIdentifiers, builtin = _a.builtin;
-        return findUnresolvedIdentifiers(node.p, contextStack, builtin);
-    },
-};
-
-var specialExpressions = {
-    'and': andSpecialExpression,
-    'comment': commentSpecialExpression,
-    'cond': condSpecialExpression,
-    'def': defSpecialExpression,
-    'defn': defnSpecialExpression,
-    'defns': defnsSpecialExpression,
-    'defs': defsSpecialExpression,
-    'do': doSpecialExpression,
-    'doseq': doseqSpecialExpression,
-    'for': forSpecialExpression,
-    'fn': fnSpecialExpression,
-    'if': ifSpecialExpression,
-    'if-let': ifLetSpecialExpression,
-    'if-not': ifNotSpecialExpression,
-    'let': letSpecialExpression,
-    'loop': loopSpecialExpression,
-    'or': orSpecialExpression,
-    'recur': recurSpecialExpression,
-    'throw': throwSpecialExpression,
-    'time!': timeSpecialExpression,
-    'try': trySpecialExpression,
-    'when': whenSpecialExpression,
-    'when-first': whenFirstSpecialExpression,
-    'when-let': whenLetSpecialExpression,
-    'when-not': whenNotSpecialExpression,
-    'declared?': declaredSpecialExpression,
-    '??': qqSpecialExpression,
-};
-Object.keys(specialExpressions).forEach(function (key) {
-    /* v8 ignore next 2 */
-    if (normalExpressions[key])
-        throw new Error("Expression ".concat(key, " is defined as both a normal expression and a special expression"));
-});
-var builtin = {
-    normalExpressions: normalExpressions,
-    specialExpressions: specialExpressions,
-};
-var normalExpressionKeys = Object.keys(normalExpressions);
-var specialExpressionKeys = Object.keys(specialExpressions);
-
-function isContextEntry(value) {
-    return isUnknownRecord(value) && value.value !== undefined;
-}
-
-var ContextStackImpl = /** @class */ (function () {
-    function ContextStackImpl(_a) {
-        var contexts = _a.contexts, hostValues = _a.values, lazyHostValues = _a.lazyValues, nativeJsFunctions = _a.nativeJsFunctions;
-        this.contexts = contexts;
-        this.globalContext = asNonUndefined(contexts[0]);
-        this.values = hostValues;
-        this.lazyValues = lazyHostValues;
-        this.nativeJsFunctions = nativeJsFunctions;
-    }
-    ContextStackImpl.prototype.create = function (context, extraData) {
-        var globalContext = this.globalContext;
-        var contextStack = new ContextStackImpl({
-            contexts: __spreadArray([context], __read(this.contexts), false),
-            values: this.values,
-            lazyValues: extraData ? __assign(__assign({}, this.lazyValues), extraData) : this.lazyValues,
-            nativeJsFunctions: this.nativeJsFunctions,
-        });
-        contextStack.globalContext = globalContext;
-        return contextStack;
-    };
-    ContextStackImpl.prototype.clone = function () {
-        // eslint-disable-next-line ts/no-unsafe-argument
-        return new ContextStackImpl(JSON.parse(JSON.stringify({
-            contexts: this.contexts,
-            values: this.values,
-            lazyValues: this.lazyValues,
-            nativeJsFunctions: this.nativeJsFunctions,
-        })));
-    };
-    ContextStackImpl.prototype.getValue = function (name) {
-        var e_1, _a;
-        var _b, _c, _d;
-        try {
-            for (var _e = __values(this.contexts), _f = _e.next(); !_f.done; _f = _e.next()) {
-                var context = _f.value;
-                var contextEntry = context[name];
-                if (contextEntry)
-                    return contextEntry.value;
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
+                if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
             }
             finally { if (e_1) throw e_1.error; }
         }
@@ -5919,7 +5694,7 @@ function createContextStack(params) {
                 return acc;
             }, {}),
     });
-    return contextStack;
+    return contextStack.create({});
 }
 
 var _a$2;
@@ -6231,7 +6006,14 @@ function evaluateNumberAsFunction(fn, params, sourceCodeInfo) {
 
 var findUnresolvedIdentifiers = function (ast, contextStack, builtin) {
     var e_1, _a;
-    var astNodes = Array.isArray(ast) ? ast : ast.b;
+    var astNodes = Array.isArray(ast)
+        ? ast
+        : [{
+                t: AstNodeType.SpecialExpression,
+                n: 'do',
+                p: ast.b,
+                token: undefined,
+            }];
     var unresolvedIdentifiers = new Set();
     try {
         for (var astNodes_1 = __values(astNodes), astNodes_1_1 = astNodes_1.next(); !astNodes_1_1.done; astNodes_1_1 = astNodes_1.next()) {
@@ -6296,545 +6078,16 @@ function findUnresolvedIdentifiersInAstNode(astNode, contextStack, builtin) {
             var unresolvedIdentifiers = specialExpression.findUnresolvedIdentifiers(astNode, contextStack, {
                 findUnresolvedIdentifiers: findUnresolvedIdentifiers,
                 builtin: builtin,
-                evaluateAstNode: evaluateAstNode,
-            });
-            return unresolvedIdentifiers;
-        }
-    }
-}
-
-var calculateAndOutcomes = function (_a) {
-    var astNode = _a.astNode, combinateAstNodes = _a.combinateAstNodes;
-    return combinateAstNodes(astNode.p)
-        .map(function (p) { return ({
-        n: 'and',
-        t: AstNodeType.SpecialExpression,
-        p: p,
-        token: astNode.token,
-    }); });
-};
-
-var calculateCondOutcomes = function (_a) {
-    var astNode = _a.astNode, nilNode = _a.nilNode, calculatePossibleAstNodes = _a.calculatePossibleAstNodes, isAstComputable = _a.isAstComputable;
-    var testNodes = arrayToPairs(astNode.p).map(function (_a) {
-        var _b = __read(_a, 1), t = _b[0];
-        return t;
-    });
-    if (isAstComputable(testNodes)) {
-        return combinate(arrayToPairs(astNode.p)
-            // Create a list of ast nodes from the test and form of each condition
-            .reduce(function (acc, _a) {
-            var _b = __read(_a, 2), test = _b[0], form = _b[1];
-            acc.push(calculatePossibleAstNodes(test), calculatePossibleAstNodes(form));
-            return acc;
-        }, []))
-            // Create a new CondNode for each combination of test and form outcomes
-            .map(function (conditionAsts) { return (__assign(__assign({}, astNode), { c: arrayToPairs(conditionAsts).map(function (_a) {
-                var _b = __read(_a, 2), t = _b[0], f = _b[1];
-                return ({ t: t, f: f });
-            }) })); });
-    }
-    return __spreadArray(__spreadArray([], __read(arrayToPairs(astNode.p).flatMap(function (_a) {
-        var _b = __read(_a, 2); _b[0]; var form = _b[1];
-        return calculatePossibleAstNodes(form);
-    })), false), [
-        nilNode,
-    ], false);
-};
-
-var trueNode = { t: AstNodeType.ReservedSymbol, v: 'true', token: undefined, p: [], n: undefined };
-var falseNode = { t: AstNodeType.ReservedSymbol, v: 'false', token: undefined, p: [], n: undefined };
-var calculateDeclaredOutcomes = function (_a) {
-    var astNode = _a.astNode, isAstComputable = _a.isAstComputable;
-    if (isAstComputable(astNode.p))
-        return [trueNode];
-    return [trueNode, falseNode];
-};
-
-var calculateDefOutcomes = function (_a) {
-    var astNode = _a.astNode, calculatePossibleAstNodes = _a.calculatePossibleAstNodes, addGlobalIdentifier = _a.addGlobalIdentifier;
-    var nameNode = asSymbolNode(astNode.p[0]);
-    var valueNode = astNode.p[1];
-    addGlobalIdentifier(nameNode.v);
-    return calculatePossibleAstNodes(valueNode)
-        .map(function (node) { return (__assign(__assign({}, astNode), { p: [nameNode, node] })); });
-};
-
-var calculateDefsOutcomes = function (_a) {
-    var astNode = _a.astNode, combinateAstNodes = _a.combinateAstNodes;
-    return combinateAstNodes(astNode.p)
-        .map(function (p) { return (__assign(__assign({}, astNode), { p: p })); });
-};
-
-var calculateDoOutcomes = function (_a) {
-    var astNode = _a.astNode, combinateAstNodes = _a.combinateAstNodes;
-    return combinateAstNodes(astNode.p).map(function (p) { return (__assign(__assign({}, astNode), { p: p })); });
-};
-
-function calculateFunctionOverloadOutcomes(combinateAstNodes, functionOverloads) {
-    return combinate(functionOverloads
-        // For each overload, calculate the possible outcomes for each parameter
-        .map(function (functionOverload) {
-        var _a;
-        return combinateAstNodes(functionOverload.b, [
-            functionOverload.as.m,
-            functionOverload.as.b.map(function (bindingNode) { return bindingNode.n; }),
-            (_a = functionOverload.as.r) !== null && _a !== void 0 ? _a : [],
-        ].flat())
-            // For each combination of parameter outcomes, create a new overload
-            .map(function (body) { return (__assign(__assign({}, functionOverload), { b: body })); });
-    }));
-}
-var calculateDefnOutcomes = function (_a) {
-    var astNode = _a.astNode, combinateAstNodes = _a.combinateAstNodes, addGlobalIdentifier = _a.addGlobalIdentifier;
-    addGlobalIdentifier(astNode.f.v);
-    // astNode.o is an array of overloads
-    return calculateFunctionOverloadOutcomes(combinateAstNodes, astNode.o).map(function (functionOverloads) { return (__assign(__assign({}, astNode), { o: functionOverloads })); });
-};
-var calculateDefnsOutcomes = function (_a) {
-    var astNode = _a.astNode, calculatePossibleAstNodes = _a.calculatePossibleAstNodes, combinateAstNodes = _a.combinateAstNodes;
-    // astNode.o is an array of overloads
-    return calculatePossibleAstNodes(astNode.f).flatMap(function (functionName) {
-        return calculateFunctionOverloadOutcomes(combinateAstNodes, astNode.o).map(function (functionOverloads) { return (__assign(__assign({}, astNode), { f: functionName, o: functionOverloads })); });
-    });
-};
-var calculateFnOutcomes = function (_a) {
-    var astNode = _a.astNode, combinateAstNodes = _a.combinateAstNodes;
-    // astNode.o is an array of overloads
-    return calculateFunctionOverloadOutcomes(combinateAstNodes, astNode.o).map(function (functionOverloads) { return (__assign(__assign({}, astNode), { o: functionOverloads })); });
-};
-
-var calculateIfLetOutcomes = function (_a) {
-    var _b;
-    var astNode = _a.astNode, nilNode = _a.nilNode, calculatePossibleAstNodes = _a.calculatePossibleAstNodes, combinateAstNodes = _a.combinateAstNodes, isAstComputable = _a.isAstComputable;
-    var bindingNode = astNode.b;
-    var thenBranch = astNode.p[0];
-    var elseBranch = (_b = astNode.p[1]) !== null && _b !== void 0 ? _b : nilNode;
-    if (!isAstComputable(bindingNode.v)) {
-        return __spreadArray(__spreadArray([], __read(calculatePossibleAstNodes(thenBranch)), false), __read(calculatePossibleAstNodes(elseBranch)), false);
-    }
-    var newIdentifier = bindingNode.n;
-    return calculatePossibleAstNodes(bindingNode.v)
-        .map(function (bindingValue) { return (__assign(__assign({}, bindingNode), { v: bindingValue })); })
-        .flatMap(function (b) { return combinateAstNodes(astNode.p, [newIdentifier])
-        .map(function (p) { return (__assign(__assign({}, astNode), { b: b, p: p })); }); });
-};
-
-var calculateIfNotOutcomes = function (_a) {
-    var _b;
-    var astNode = _a.astNode, nilNode = _a.nilNode, calculatePossibleAstNodes = _a.calculatePossibleAstNodes, combinateAstNodes = _a.combinateAstNodes, isAstComputable = _a.isAstComputable;
-    var condition = astNode.p[0];
-    var thenBranch = astNode.p[1];
-    var elseBranch = (_b = astNode.p[2]) !== null && _b !== void 0 ? _b : nilNode;
-    if (isAstComputable(condition)) {
-        return combinateAstNodes(astNode.p)
-            .map(function (p) { return ({
-            n: 'if-not',
-            t: astNode.t,
-            p: p,
-            token: astNode.token,
-        }); });
-    }
-    return __spreadArray(__spreadArray([], __read(calculatePossibleAstNodes(thenBranch)), false), __read(calculatePossibleAstNodes(elseBranch)), false);
-};
-
-var calculateIfOutcomes = function (_a) {
-    var _b;
-    var astNode = _a.astNode, nilNode = _a.nilNode, calculatePossibleAstNodes = _a.calculatePossibleAstNodes, combinateAstNodes = _a.combinateAstNodes, isAstComputable = _a.isAstComputable;
-    var condition = astNode.p[0];
-    var thenBranch = astNode.p[1];
-    var elseBranch = (_b = astNode.p[2]) !== null && _b !== void 0 ? _b : nilNode;
-    if (isAstComputable(condition)) {
-        return combinateAstNodes(astNode.p)
-            .map(function (p) { return ({
-            n: 'if',
-            t: astNode.t,
-            p: p,
-            token: astNode.token,
-        }); });
-    }
-    return __spreadArray(__spreadArray([], __read(calculatePossibleAstNodes(thenBranch)), false), __read(calculatePossibleAstNodes(elseBranch)), false);
-};
-
-var calculateLetOutcomes = function (_a) {
-    var astNode = _a.astNode, calculatePossibleAstNodes = _a.calculatePossibleAstNodes, combinateAstNodes = _a.combinateAstNodes, isAstComputable = _a.isAstComputable;
-    try {
-        // check bindings, if any binding value cannot be calculated, convert the whole let to a do-expression
-        if (!isAstComputable(astNode.bs.map(function (b) { return calculatePossibleAstNodes(b.v); })))
-            throw new Error('Could not calculate binding value');
-    }
-    catch (_b) {
-        var doNodes = combinateAstNodes(astNode.p)
-            .map(function (p) {
-            return {
-                n: 'do',
-                t: AstNodeType.SpecialExpression,
-                p: p,
-                token: astNode.token,
-            };
-        });
-        return doNodes;
-    }
-    var newIdentifiers = astNode.bs.map(function (bindingNode) { return bindingNode.n; });
-    var letNodes = combinate(astNode.bs.map(function (bindingNode) {
-        return calculatePossibleAstNodes(bindingNode.v)
-            .map(function (bindingValues) { return (__assign(__assign({}, bindingNode), { v: bindingValues })); });
-    }))
-        .flatMap(function (bindingNodes) { return combinate(astNode.p.map(function (p) { return calculatePossibleAstNodes(p, newIdentifiers); }))
-        .map(function (p) {
-        return {
-            n: 'let',
-            bs: bindingNodes,
-            t: AstNodeType.SpecialExpression,
-            p: p,
-            token: astNode.token,
-        };
-    }); });
-    return letNodes;
-};
-
-var calculateForOutcomes = function (_a) {
-    var astNode = _a.astNode, calculatePossibleAstNodes = _a.calculatePossibleAstNodes;
-    if (!isDeterministic(calculatePossibleAstNodes, astNode))
-        throw new Error('Could not calculate for loop, not deterministic');
-    return [astNode];
-};
-var calculateDoSeqOutcomes = function (_a) {
-    var astNode = _a.astNode, calculatePossibleAstNodes = _a.calculatePossibleAstNodes;
-    if (!isDeterministic(calculatePossibleAstNodes, astNode))
-        throw new Error('Could not calculate doSeq node, not deterministic');
-    return [astNode];
-};
-function isDeterministic(calculatePossibleAstNodes, astNode) {
-    var e_1, _a;
-    try {
-        for (var _b = __values(astNode.l), _c = _b.next(); !_c.done; _c = _b.next()) {
-            var _d = _c.value, b = _d.b, l = _d.l, wn = _d.wn, we = _d.we;
-            if (l && l.some(function (_a) {
-                var v = _a.v;
-                return !astIsDeterministic(calculatePossibleAstNodes, v);
-            }))
-                return false;
-            if (!astIsDeterministic(calculatePossibleAstNodes, b.v))
-                return false;
-            if (wn && !astIsDeterministic(calculatePossibleAstNodes, wn))
-                return false;
-            if (we && !astIsDeterministic(calculatePossibleAstNodes, we))
-                return false;
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-        }
-        finally { if (e_1) throw e_1.error; }
-    }
-    if (!astIsDeterministic(calculatePossibleAstNodes, astNode.p[0]))
-        return false;
-    return true;
-}
-function astIsDeterministic(calculatePossibleAstNodes, astNode) {
-    return calculatePossibleAstNodes(astNode).length === 1;
-}
-
-var calculateOrOutcomes = function (_a) {
-    var astNode = _a.astNode, combinateAstNodes = _a.combinateAstNodes;
-    return combinateAstNodes(astNode.p)
-        .map(function (p) { return ({
-        n: 'or',
-        t: AstNodeType.SpecialExpression,
-        p: p,
-        token: astNode.token,
-    }); });
-};
-
-var calculateQqOutcomes = function (_a) {
-    var astNode = _a.astNode, combinateAstNodes = _a.combinateAstNodes, isAstComputable = _a.isAstComputable;
-    if (!isAstComputable(astNode.p[0]))
-        throw new Error('First argument of ?? not computable');
-    return combinateAstNodes(astNode.p)
-        .map(function (p) { return (__assign(__assign({}, astNode), { p: p })); });
-};
-
-var calculateThrowOutcomes = function (_a) {
-    var astNode = _a.astNode, calculatePossibleAstNodes = _a.calculatePossibleAstNodes;
-    return calculatePossibleAstNodes(astNode.p[0]).map(function (m) { return (__assign(__assign({}, astNode), { p: [m] })); });
-};
-
-var calculateTimeOutcomes = function (_a) {
-    var astNode = _a.astNode, calculatePossibleAstNodes = _a.calculatePossibleAstNodes;
-    return calculatePossibleAstNodes(astNode.p[0])
-        .map(function (p) { return (__assign(__assign({}, astNode), { n: 'do', p: [p] })); });
-};
-
-var calculateTryOutcomes = function (_a) {
-    var astNode = _a.astNode, calculatePossibleAstNodes = _a.calculatePossibleAstNodes;
-    var _b = calculatePossibleAstNodes(astNode.p[0]).reduce(function (acc, node) {
-        if (node.n === 'throw') {
-            acc.throws.push(node.p[0]);
-        }
-        else {
-            acc.vals.push(node);
-        }
-        return acc;
-    }, { vals: [], throws: [] }), vals = _b.vals, throws = _b.throws;
-    var catches = throws.flatMap(function (throwNode) {
-        var letNode = {
-            t: AstNodeType.SpecialExpression,
-            n: 'let',
-            bs: [{
-                    t: AstNodeType.Binding,
-                    n: astNode.e.v,
-                    v: throwNode,
-                    token: undefined,
-                    p: [],
-                }],
-            p: [astNode.ce],
-            token: undefined,
-        };
-        return calculatePossibleAstNodes(letNode);
-    });
-    return __spreadArray(__spreadArray([], __read(vals), false), __read(catches), false);
-};
-
-var calculateWhenFirstOutcomes = function (_a) {
-    var astNode = _a.astNode, calculatePossibleAstNodes = _a.calculatePossibleAstNodes, combinateAstNodes = _a.combinateAstNodes, isAstComputable = _a.isAstComputable;
-    var bindingNode = astNode.b;
-    if (!isAstComputable(bindingNode.v))
-        throw new Error('Could not calculate binding value');
-    var newIdentifier = bindingNode.n;
-    return calculatePossibleAstNodes(bindingNode.v)
-        .map(function (bindingValue) { return (__assign(__assign({}, bindingNode), { v: bindingValue })); })
-        .flatMap(function (b) {
-        return combinateAstNodes(astNode.p, [newIdentifier])
-            .map(function (p) { return (__assign(__assign({}, astNode), { b: b, p: p })); });
-    });
-};
-
-var calculateWhenLetOutcomes = function (_a) {
-    var astNode = _a.astNode, nilNode = _a.nilNode, calculatePossibleAstNodes = _a.calculatePossibleAstNodes, combinateAstNodes = _a.combinateAstNodes, isAstComputable = _a.isAstComputable;
-    var bindingNode = astNode.b;
-    if (!isAstComputable(bindingNode.v)) {
-        return __spreadArray(__spreadArray([], __read(combinateAstNodes(astNode.p)
-            .map(function (p) { return ({
-            n: 'do',
-            t: astNode.t,
-            p: p,
-            token: astNode.token,
-        }); })), false), [
-            nilNode,
-        ], false);
-    }
-    var newIdentifier = bindingNode.n;
-    return calculatePossibleAstNodes(bindingNode.v)
-        .map(function (bindingValue) { return (__assign(__assign({}, bindingNode), { v: bindingValue })); })
-        .flatMap(function (b) {
-        return combinateAstNodes(astNode.p, [newIdentifier])
-            .map(function (p) { return (__assign(__assign({}, astNode), { b: b, p: p })); });
-    });
-};
-
-var calculateWhenNotOutcomes = function (_a) {
-    var astNode = _a.astNode, combinateAstNodes = _a.combinateAstNodes, nilNode = _a.nilNode, isAstComputable = _a.isAstComputable;
-    var condition = astNode.p[0];
-    if (isAstComputable(condition)) {
-        return combinateAstNodes(astNode.p)
-            .map(function (p) { return ({
-            n: 'when-not',
-            t: astNode.t,
-            p: p,
-            token: astNode.token,
-        }); });
-    }
-    var body = astNode.p.slice(1);
-    return __spreadArray(__spreadArray([], __read(combinateAstNodes(body)
-        .map(function (p) { return ({
-        n: 'do',
-        t: astNode.t,
-        p: p,
-        token: astNode.token,
-    }); })), false), [
-        nilNode,
-    ], false);
-};
-
-var calculateWhenOutcomes = function (_a) {
-    var astNode = _a.astNode, combinateAstNodes = _a.combinateAstNodes, nilNode = _a.nilNode, isAstComputable = _a.isAstComputable;
-    var condition = astNode.p[0];
-    if (isAstComputable(condition)) {
-        return combinateAstNodes(astNode.p)
-            .map(function (p) { return ({
-            n: 'when',
-            t: astNode.t,
-            p: p,
-            token: astNode.token,
-        }); });
-    }
-    var body = astNode.p.slice(1);
-    return __spreadArray(__spreadArray([], __read(combinateAstNodes(body)
-        .map(function (p) { return ({
-        n: 'do',
-        t: astNode.t,
-        p: p,
-        token: astNode.token,
-    }); })), false), [
-        nilNode,
-    ], false);
-};
-
-var calculateRecurOutcomes = function (_a) {
-    var astNode = _a.astNode, combinateAstNodes = _a.combinateAstNodes;
-    return combinateAstNodes(astNode.p)
-        .map(function (p) { return (__assign(__assign({}, astNode), { p: p })); });
-};
-
-var calculateCommentOutcomes = function (_a) {
-    var nilNode = _a.nilNode;
-    return [nilNode];
-};
-
-var calculateLoopOutcomes = function (_a) {
-    var astNode = _a.astNode, combinateAstNodes = _a.combinateAstNodes;
-    return combinateAstNodes(astNode.p, astNode.bs.map(function (bindingNode) { return bindingNode.n; }))
-        .map(function (p) { return (__assign(__assign({}, astNode), { p: p })); });
-};
-
-var specialExpressionCalculator = {
-    'and': function (astNode, helperOptions) { return calculateAndOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'comment': function (astNode, helperOptions) { return calculateCommentOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'cond': function (astNode, helperOptions) { return calculateCondOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'declared?': function (astNode, helperOptions) { return calculateDeclaredOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'defn': function (astNode, helperOptions) { return calculateDefnOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'def': function (astNode, helperOptions) { return calculateDefOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'defns': function (astNode, helperOptions) { return calculateDefnsOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'defs': function (astNode, helperOptions) { return calculateDefsOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'do': function (astNode, helperOptions) { return calculateDoOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'doseq': function (astNode, helperOptions) { return calculateDoSeqOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'fn': function (astNode, helperOptions) { return calculateFnOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'for': function (astNode, helperOptions) { return calculateForOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'if-let': function (astNode, helperOptions) { return calculateIfLetOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'if': function (astNode, helperOptions) { return calculateIfOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'if-not': function (astNode, helperOptions) { return calculateIfNotOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'let': function (astNode, helperOptions) { return calculateLetOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'loop': function (astNode, helperOptions) { return calculateLoopOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'or': function (astNode, helperOptions) { return calculateOrOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    '??': function (astNode, helperOptions) { return calculateQqOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'recur': function (astNode, helperOptions) { return calculateRecurOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'time!': function (astNode, helperOptions) { return calculateTimeOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'throw': function (astNode, helperOptions) { return calculateThrowOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'try': function (astNode, helperOptions) { return calculateTryOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'when-first': function (astNode, helperOptions) { return calculateWhenFirstOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'when-let': function (astNode, helperOptions) { return calculateWhenLetOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'when': function (astNode, helperOptions) { return calculateWhenOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-    'when-not': function (astNode, helperOptions) { return calculateWhenNotOutcomes(__assign({ astNode: astNode }, helperOptions)); },
-};
-
-function isIdempotent(normalExpressionName) {
-    return !normalExpressionName.endsWith('!')
-        || normalExpressionName === 'write!';
-}
-function calculateOutcomes(contextStack, astNodes) {
-    // First, we try to calculate outcomes for the whole astNodes array.
-    // If that fails, we try to calculate outcomes for the array without the first element.
-    // If that fails, we try to calculate outcomes for the array without the first two elements.
-    // And so on.
-    // This makes it possible to calculate outcomes for e.g.
-    // (write! x) x
-    // Problems occur for e.g.
-    // (def x 1) (write! x) x
-    // This should output [1], but since (write! x) fails to calculate outcomes, we get null.
-    // Ok, but not optimal
-    // The contract is that when an array is returned, it must be correct.
-    // But returning null (indicating that the calculation failed) is always a way out.
-    for (var i = 0; i < astNodes.length; i++) {
-        var usingAstNode = astNodes.slice(i);
-        var outcomes = calculateOutcomesInner(contextStack, usingAstNode);
-        if (outcomes !== null)
-            return outcomes;
-    }
-    return null;
-}
-function calculateOutcomesInner(contextStack, astNodes) {
-    var e_1, _a;
-    var possibleAsts = calculatePossibleAsts(contextStack.clone(), astNodes);
-    if (possibleAsts === null)
-        return null;
-    var outcomes = [];
-    try {
-        for (var possibleAsts_1 = __values(possibleAsts), possibleAsts_1_1 = possibleAsts_1.next(); !possibleAsts_1_1.done; possibleAsts_1_1 = possibleAsts_1.next()) {
-            var possibleAst = possibleAsts_1_1.value;
-            var unresolvedIdentifiers = findUnresolvedIdentifiers(possibleAst, contextStack.clone(), builtin);
-            if (unresolvedIdentifiers.size !== 0)
-                return null;
-            var ast = {
-                b: possibleAst,
-                hasDebugData: true,
-            };
-            try {
-                outcomes.push(evaluate(ast, contextStack.clone()));
-            }
-            catch (e) {
-                outcomes.push(e);
-            }
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (possibleAsts_1_1 && !possibleAsts_1_1.done && (_a = possibleAsts_1.return)) _a.call(possibleAsts_1);
+                evaluateAstNode: evaluateAstNode,
+            });
+            return unresolvedIdentifiers;
         }
-        finally { if (e_1) throw e_1.error; }
-    }
-    return outcomes;
-}
-function calculatePossibleAsts(contextStack, astNodes) {
-    var possibleAsts;
-    try {
-        possibleAsts = combinate(astNodes.map(function (astNode) { return calculatePossibleAstNodes(contextStack, astNode); }));
-    }
-    catch (e) {
-        return null;
-    }
-    return possibleAsts;
-}
-var nilNode = { t: AstNodeType.ReservedSymbol, v: 'nil', token: undefined, p: [], n: undefined };
-function calculatePossibleAstNodes(contextStack, astNode, newIndentifiers) {
-    var newContext = newIndentifiers
-        ? newIndentifiers.reduce(function (acc, identity) {
-            acc[identity] = { value: null };
-            return acc;
-        }, {})
-        : undefined;
-    var newContextStack = newContext ? contextStack.create(newContext) : contextStack;
-    if (astNode.t === AstNodeType.NormalExpression) {
-        if (astNode.n && !isIdempotent(astNode.n))
-            throw new Error("NormalExpressionNode with name ".concat(astNode.n, " is not idempotent. Cannot calculate possible ASTs."));
-        return combinate(astNode.p.map(function (n) { return calculatePossibleAstNodes(newContextStack, n); }))
-            .map(function (p) { return (__assign(__assign({}, astNode), { p: p })); });
-    }
-    else if (astNode.t === AstNodeType.SpecialExpression) {
-        var helperOptions = {
-            nilNode: nilNode,
-            calculatePossibleAstNodes: function (node, identifiers) { return calculatePossibleAstNodes(newContextStack.clone(), node, identifiers); },
-            combinateAstNodes: function (nodes, identifiers) {
-                return combinate(nodes.map(function (node) { return calculatePossibleAstNodes(newContextStack.clone(), node, identifiers); }));
-            },
-            isAstComputable: function (node) {
-                return calculateOutcomesInner(newContextStack, Array.isArray(node) ? node.flat() : [node]) !== null;
-            },
-            addGlobalIdentifier: function (name) { return newContextStack.globalContext[name] = { value: null }; },
-        };
-        // eslint-disable-next-line ts/no-unsafe-argument
-        return specialExpressionCalculator[astNode.n](astNode, helperOptions);
     }
-    return [astNode];
 }
 
 function analyze(ast, params) {
     return {
         unresolvedIdentifiers: findUnresolvedIdentifiers(ast, createContextStack(params), builtin),
-        outcomes: calculateOutcomes(createContextStack(params), ast.b),
     };
 }
 
@@ -7036,13 +6289,10 @@ function fromUnaryAlgebraicToAstNode(operator, operand) {
     var operatorName = operator[1];
     switch (operatorName) {
         case '+':
-            return createNamedNormalExpressionNode('+', [operand], token);
         case '-':
-            return createNamedNormalExpressionNode('-', [operand], token);
         case '!':
-            return createNamedNormalExpressionNode('not', [operand], token);
         case '~':
-            return createNamedNormalExpressionNode('bit-not', [operand], token);
+            return createNamedNormalExpressionNode(operatorName, [operand], token);
         /* v8 ignore next 2 */
         default:
             throw new Error("Unknown operator: ".concat(operatorName));
@@ -7055,64 +6305,31 @@ function fromBinaryOperatorToAstNode(operator, left, right, token) {
         case '.':
             return createAccessorNode(left, fromSymbolToStringNode(asSymbolNode(right, (_a = getTokenDebugData(token)) === null || _a === void 0 ? void 0 : _a.sourceCodeInfo)), token);
         case '**': // exponentiation
-            return createNamedNormalExpressionNode('pow', [left, right], token);
         case '*':
-            return createNamedNormalExpressionNode('*', [left, right], token);
         case '/':
-            return createNamedNormalExpressionNode('/', [left, right], token);
         case '%':
-            return createNamedNormalExpressionNode('rem', [left, right], token);
         case '+':
-            return createNamedNormalExpressionNode('+', [left, right], token);
         case '-':
-            return createNamedNormalExpressionNode('-', [left, right], token);
         case '<<':
-            return createNamedNormalExpressionNode('bit-shift-left', [left, right], token);
         case '>>':
-            return createNamedNormalExpressionNode('bit-shift-right', [left, right], token);
         case '>>>':
-            return createNamedNormalExpressionNode('unsigned-bit-shift-right', [left, right], token);
-        case '++': {
-            var leftString = createNamedNormalExpressionNode('str', [left], token);
-            var rightString = createNamedNormalExpressionNode('str', [right], token);
-            return createNamedNormalExpressionNode('str', [leftString, rightString], token);
-        }
+        case '++':
         case '<':
-            return createNamedNormalExpressionNode('<', [left, right], token);
         case '<=':
-            return createNamedNormalExpressionNode('<=', [left, right], token);
         case '>':
-            return createNamedNormalExpressionNode('>', [left, right], token);
         case '>=':
-            return createNamedNormalExpressionNode('>=', [left, right], token);
         case '==':
-            return createNamedNormalExpressionNode('=', [left, right], token);
         case '!=':
-            return createNamedNormalExpressionNode('!=', [left, right], token);
         case '&':
-            return createNamedNormalExpressionNode('bit-and', [left, right], token);
         case '^':
-            return createNamedNormalExpressionNode('bit-xor', [left, right], token);
         case '|':
-            return createNamedNormalExpressionNode('bit-or', [left, right], token);
+            return createNamedNormalExpressionNode(operatorName, [left, right], token);
         case '&&':
-            return {
-                t: AstNodeType.SpecialExpression,
-                n: 'and',
-                p: [left, right],
-                token: getTokenDebugData(token) && token,
-            };
         case '||':
-            return {
-                t: AstNodeType.SpecialExpression,
-                n: 'or',
-                p: [left, right],
-                token: getTokenDebugData(token) && token,
-            };
         case '??':
             return {
                 t: AstNodeType.SpecialExpression,
-                n: '??',
+                n: operatorName,
                 p: [left, right],
                 token: getTokenDebugData(token) && token,
             };
@@ -7152,19 +6369,43 @@ var AlgebraicParser = /** @class */ (function () {
         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;
+        if (isA_SymbolToken(firstToken)) {
+            switch (firstToken[1]) {
+                case 'def':
+                    return this.parseDef(firstToken);
+                case 'defn':
+                    return this.parseDefn(firstToken);
+                case 'let':
+                    return this.parseLet(firstToken);
+                case 'if':
+                case 'unless':
+                    left = this.parseIfOrUnless(firstToken);
+                    break;
+                case 'cond':
+                    left = this.parseCond(firstToken);
+                    break;
+                case 'switch':
+                    left = this.parseSwitch(firstToken);
+                    break;
+                case 'for':
+                case 'doseq':
+                    left = this.parseForOrDoseq(firstToken);
+                    break;
+                case 'do':
+                    left = this.parseDo(firstToken);
+                    break;
+                case 'loop':
+                    left = this.parseLoop(firstToken);
+                    break;
+                case 'try':
+                    left = this.parseTry(firstToken);
+                    break;
+            }
         }
-        var left = this.parseOperand();
+        left || (left = this.parseOperand());
         var operator = this.peek();
-        while (!this.isAtEnd()
-            && !isA_OperatorToken(operator, ',')
-            && !isA_OperatorToken(operator, ';')
-            && !isRBracketToken(operator)
-            && !isRParenToken(operator)) {
+        while (!this.isAtExpressionEnd()) {
             if (isA_BinaryOperatorToken(operator)) {
                 var name_1 = operator[1];
                 var newPrecedece = getPrecedence(name_1);
@@ -7395,9 +6636,6 @@ var AlgebraicParser = /** @class */ (function () {
         var _a, _b;
         var isNamedFunction = symbol.t === AstNodeType.Symbol;
         this.advance();
-        if (isNamedFunction && symbol.v === 'for') {
-            return this.parseFor(symbol);
-        }
         var params = [];
         while (!this.isAtEnd() && !isRParenToken(this.peek())) {
             params.push(this.parseExpression());
@@ -7418,17 +6656,11 @@ var AlgebraicParser = /** @class */ (function () {
                 var name_2 = symbol.v;
                 switch (name_2) {
                     case '??':
-                    case 'and':
+                    case '&&':
                     case 'comment':
-                    case 'cond':
-                    case 'declared?':
-                    case 'if':
-                    case 'if-not':
-                    case 'or':
-                    case 'when':
-                    case 'when-not':
-                    case 'do':
-                    case 'time!':
+                    case 'defined?':
+                    case '||':
+                    case 'recur':
                     case 'throw': {
                         var node = {
                             t: AstNodeType.SpecialExpression,
@@ -7439,17 +6671,10 @@ var AlgebraicParser = /** @class */ (function () {
                         builtin.specialExpressions[node.n].validateParameterCount(node);
                         return node;
                     }
-                    case 'let':
-                        return this.parseLet(symbol, params);
                     case 'defs':
-                    case 'if-let':
-                    case 'when-let':
-                    case 'when-first':
                     case 'fn':
                     case 'defns':
                     case 'try':
-                    case 'recur':
-                    case 'loop':
                     case 'doseq':
                         throw new Error("Special expression ".concat(name_2, " is not available in algebraic notation"));
                     default:
@@ -7612,67 +6837,174 @@ var AlgebraicParser = /** @class */ (function () {
         };
         return node;
     };
-    AlgebraicParser.prototype.parseLet = function (letSymbol, params) {
-        var _a, _b;
-        if (params.length !== 2) {
-            throw new LitsError('let expects two arguments', (_a = getTokenDebugData(letSymbol.token)) === null || _a === void 0 ? void 0 : _a.sourceCodeInfo);
-        }
-        var letObject = params[0];
-        if (letObject.t !== AstNodeType.NormalExpression || letObject.n !== 'object') {
-            throw new LitsError('let expects an object as first argument', (_b = getTokenDebugData(letObject.token)) === null || _b === void 0 ? void 0 : _b.sourceCodeInfo);
-        }
-        var letBindings = arrayToPairs(letObject.p);
-        var expression = params[1];
+    AlgebraicParser.prototype.parseLet = function (token) {
+        this.advance();
+        var letSymbol = parseSymbol(this.tokenStream, this.parseState);
+        assertA_OperatorToken(this.peek(), '=');
+        this.advance();
+        var value = this.parseExpression();
         return {
             t: AstNodeType.SpecialExpression,
             n: 'let',
-            p: [expression],
+            p: [],
             token: getTokenDebugData(letSymbol.token) && letSymbol.token,
-            bs: letBindings.map(function (pair) {
-                var key = pair[0];
-                var value = pair[1];
-                return {
+            bs: [{
                     t: AstNodeType.Binding,
-                    n: key.v,
+                    n: letSymbol.v,
                     v: value,
                     p: [],
-                    token: getTokenDebugData(key.token) && key.token,
-                };
-            }),
+                    token: getTokenDebugData(token) && token,
+                }],
+        };
+    };
+    AlgebraicParser.prototype.parseDo = function (token) {
+        this.advance();
+        var expressions = [];
+        while (!this.isAtEnd() && !isA_ReservedSymbolToken(this.peek(), 'end')) {
+            expressions.push(this.parseExpression());
+            if (isA_OperatorToken(this.peek(), ';')) {
+                this.advance();
+            }
+        }
+        assertA_ReservedSymbolToken(this.peek(), 'end');
+        this.advance();
+        return {
+            t: AstNodeType.SpecialExpression,
+            n: 'do',
+            p: expressions,
+            token: getTokenDebugData(token) && token,
+        };
+    };
+    AlgebraicParser.prototype.parseLoop = function (token) {
+        var _a;
+        this.advance();
+        assertLParenToken(this.peek());
+        this.advance();
+        var bindingNodes = [];
+        while (!this.isAtEnd() && !isRParenToken(this.peek())) {
+            var symbol = parseSymbol(this.tokenStream, this.parseState);
+            assertA_OperatorToken(this.peek(), '=');
+            this.advance();
+            var value = this.parseExpression();
+            bindingNodes.push({
+                t: AstNodeType.Binding,
+                n: symbol.v,
+                v: value,
+                p: [],
+                token: getTokenDebugData(symbol.token) && symbol.token,
+            });
+            if (isA_OperatorToken(this.peek(), ',')) {
+                this.advance();
+            }
+        }
+        if (bindingNodes.length === 0) {
+            throw new LitsError('Expected binding', (_a = getTokenDebugData(this.peek())) === null || _a === void 0 ? void 0 : _a.sourceCodeInfo);
+        }
+        assertRParenToken(this.peek());
+        this.advance();
+        var params = [];
+        while (!this.isAtEnd() && !isA_ReservedSymbolToken(this.peek(), 'end')) {
+            params.push(this.parseExpression());
+            if (isA_OperatorToken(this.peek(), ';')) {
+                this.advance();
+            }
+        }
+        assertA_ReservedSymbolToken(this.peek(), 'end');
+        this.advance();
+        return {
+            t: AstNodeType.SpecialExpression,
+            n: 'loop',
+            p: params,
+            bs: bindingNodes,
+            token: getTokenDebugData(token) && token,
+        };
+    };
+    AlgebraicParser.prototype.parseTry = function (token) {
+        this.advance();
+        var tryExpressions = [];
+        while (!this.isAtEnd() && !isA_SymbolToken(this.peek(), 'catch')) {
+            tryExpressions.push(this.parseExpression());
+            if (isA_OperatorToken(this.peek(), ';')) {
+                this.advance();
+            }
+        }
+        var tryExpression = tryExpressions.length === 1
+            ? tryExpressions[0]
+            : {
+                t: AstNodeType.SpecialExpression,
+                n: 'do',
+                p: tryExpressions,
+                token: getTokenDebugData(token) && token,
+            };
+        assertA_SymbolToken(this.peek(), 'catch');
+        this.advance();
+        var errorSymbol;
+        if (isLParenToken(this.peek())) {
+            this.advance();
+            errorSymbol = parseSymbol(this.tokenStream, this.parseState);
+            assertRParenToken(this.peek());
+            this.advance();
+        }
+        var catchExpressions = [];
+        while (!this.isAtEnd() && !isA_ReservedSymbolToken(this.peek(), 'end')) {
+            catchExpressions.push(this.parseExpression());
+            if (isA_OperatorToken(this.peek(), ';')) {
+                this.advance();
+            }
+        }
+        assertA_ReservedSymbolToken(this.peek(), 'end');
+        this.advance();
+        var catchExpression = catchExpressions.length === 1
+            ? catchExpressions[0]
+            : {
+                t: AstNodeType.SpecialExpression,
+                n: 'do',
+                p: catchExpressions,
+                token: getTokenDebugData(token) && token,
+            };
+        return {
+            t: AstNodeType.SpecialExpression,
+            n: 'try',
+            p: [tryExpression],
+            ce: catchExpression,
+            e: errorSymbol,
+            token: getTokenDebugData(token) && token,
         };
     };
-    AlgebraicParser.prototype.parseFor = function (forSymbol) {
+    AlgebraicParser.prototype.parseForOrDoseq = function (token) {
+        var isDoseq = token[1] === 'doseq';
+        this.advance();
+        assertLParenToken(this.peek());
+        this.advance();
         var forLoopBindings = [
             this.parseForLoopBinding(),
         ];
-        var nextToken = this.peekAhead();
-        while (isA_SymbolToken(nextToken) && nextToken[1] === 'of') {
+        while (!this.isAtEnd() && !isRParenToken(this.peek())) {
             forLoopBindings.push(this.parseForLoopBinding());
-            nextToken = this.peekAhead();
+            if (isA_OperatorToken(this.peek(), ',')) {
+                this.advance();
+            }
         }
-        var expression = this.parseExpression();
         assertRParenToken(this.peek());
         this.advance();
+        var expression = this.parseExpression();
+        assertA_ReservedSymbolToken(this.peek(), 'end');
+        this.advance();
         return {
             t: AstNodeType.SpecialExpression,
-            n: 'for',
+            n: isDoseq ? 'doseq' : 'for',
             p: [expression],
-            token: getTokenDebugData(forSymbol.token) && forSymbol.token,
+            token: getTokenDebugData(token) && token,
             l: forLoopBindings,
         };
     };
-    // export interface LoopBindingNode {
-    //   b: BindingNode // Binding
-    //   m: Array<'&let' | '&when' | '&while'> // Modifiers
-    //   l?: BindingNode[] // Let-Bindings
-    //   wn?: AstNode // When Node
-    //   we?: AstNode // While Node
-    // }
     AlgebraicParser.prototype.parseForLoopBinding = function () {
         var _a;
         var bindingNode = this.parseBinding();
-        if (isA_OperatorToken(this.peek(), ',')) {
-            this.advance();
+        if (isRParenToken(this.peek()) || isA_OperatorToken(this.peek(), ',')) {
+            if (isA_OperatorToken(this.peek(), ',')) {
+                this.advance();
+            }
             return {
                 b: bindingNode,
                 m: [],
@@ -7680,33 +7012,26 @@ var AlgebraicParser = /** @class */ (function () {
         }
         var modifiers = [];
         var token = this.peek();
-        if (!isA_SymbolToken(token)) {
+        if (!isA_SymbolToken(token, 'let')
+            && !isA_ReservedSymbolToken(token, 'when')
+            && !isA_ReservedSymbolToken(token, 'while')) {
             throw new LitsError('Expected symbol let, when or while', (_a = getTokenDebugData(token)) === null || _a === void 0 ? void 0 : _a.sourceCodeInfo);
         }
         var letBindings;
         if (token[1] === 'let') {
             modifiers.push('&let');
             letBindings = [];
-            this.advance();
-            var letObject = this.parseObject();
-            letBindings = arrayToPairs(letObject.p).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,
-                };
-            });
+            while (isA_SymbolToken(token, 'let')) {
+                var letNode = this.parseLet(token);
+                letBindings.push(letNode.bs[0]);
+                token = this.peek();
+            }
         }
         token = this.peek();
         var whenNode;
         var whileNode;
-        while (isA_SymbolToken(token)
-            && ((token[1] === 'when' && !modifiers.includes('&when'))
-                || (token[1] === 'while' && !modifiers.includes('&while')))) {
+        while (isA_ReservedSymbolToken(token, 'when')
+            || isA_ReservedSymbolToken(token, 'while')) {
             this.advance();
             if (token[1] === 'when') {
                 modifiers.push('&when');
@@ -7716,37 +7041,173 @@ var AlgebraicParser = /** @class */ (function () {
                 modifiers.push('&while');
                 whileNode = this.parseExpression();
             }
-            token = this.peek();
+            token = this.peek();
+        }
+        if (isA_OperatorToken(token, ',')) {
+            this.advance();
+        }
+        return {
+            b: bindingNode,
+            m: modifiers,
+            l: letBindings,
+            wn: whenNode,
+            we: whileNode,
+        };
+    };
+    AlgebraicParser.prototype.parseBinding = function () {
+        var _a;
+        var firstToken = asA_SymbolToken(this.peek());
+        var name = firstToken[1];
+        this.advance();
+        var ofSymbol = asA_SymbolToken(this.peek());
+        if (ofSymbol[1] !== 'of') {
+            throw new LitsError('Expected "of"', (_a = getTokenDebugData(this.peek())) === null || _a === void 0 ? void 0 : _a.sourceCodeInfo);
+        }
+        this.advance();
+        var value = this.parseExpression();
+        var node = {
+            t: AstNodeType.Binding,
+            n: name,
+            v: value,
+            p: [],
+            token: getTokenDebugData(firstToken) && firstToken,
+        };
+        return node;
+    };
+    AlgebraicParser.prototype.parseIfOrUnless = function (token) {
+        var isUnless = token[1] === 'unless';
+        this.advance();
+        var condition = this.parseExpression();
+        assertA_ReservedSymbolToken(this.peek(), 'then');
+        this.advance();
+        var thenExpressions = [];
+        while (!this.isAtEnd()
+            && !isA_ReservedSymbolToken(this.peek(), 'else')
+            && !isA_ReservedSymbolToken(this.peek(), 'end')) {
+            thenExpressions.push(this.parseExpression());
+            if (isA_OperatorToken(this.peek(), ';')) {
+                this.advance();
+            }
+        }
+        var thenExpression = thenExpressions.length === 1
+            ? thenExpressions[0]
+            : {
+                t: AstNodeType.SpecialExpression,
+                n: 'do',
+                p: thenExpressions,
+                token: getTokenDebugData(token) && token,
+            };
+        var elseExpression;
+        if (isA_ReservedSymbolToken(this.peek(), 'else')) {
+            this.advance();
+            var elseExpressions = [];
+            while (!this.isAtEnd() && !isA_ReservedSymbolToken(this.peek(), 'end')) {
+                elseExpressions.push(this.parseExpression());
+                if (isA_OperatorToken(this.peek(), ';')) {
+                    this.advance();
+                }
+            }
+            elseExpression = elseExpressions.length === 1
+                ? elseExpressions[0]
+                : {
+                    t: AstNodeType.SpecialExpression,
+                    n: 'do',
+                    p: elseExpressions,
+                    token: getTokenDebugData(token) && token,
+                };
+        }
+        assertA_ReservedSymbolToken(this.peek(), 'end');
+        this.advance();
+        var params = [condition, thenExpression];
+        if (elseExpression) {
+            params.push(elseExpression);
+        }
+        return {
+            t: AstNodeType.SpecialExpression,
+            n: isUnless ? 'unless' : 'if',
+            p: params,
+            token: getTokenDebugData(token) && token,
+        };
+    };
+    AlgebraicParser.prototype.parseCond = function (token) {
+        this.advance();
+        var params = [];
+        while (!this.isAtEnd() && !isA_ReservedSymbolToken(this.peek(), 'end')) {
+            assertA_ReservedSymbolToken(this.peek(), 'case');
+            this.advance();
+            params.push(this.parseExpression());
+            assertA_ReservedSymbolToken(this.peek(), 'then');
+            this.advance();
+            var expressions = [];
+            while (!this.isAtEnd()
+                && !isA_ReservedSymbolToken(this.peek(), 'case')
+                && !isA_ReservedSymbolToken(this.peek(), 'end')) {
+                expressions.push(this.parseExpression());
+                if (isA_OperatorToken(this.peek(), ';')) {
+                    this.advance();
+                }
+            }
+            params.push(expressions.length === 1
+                ? expressions[0]
+                : {
+                    t: AstNodeType.SpecialExpression,
+                    n: 'do',
+                    p: expressions,
+                    token: getTokenDebugData(token) && token,
+                });
+            if (isA_ReservedSymbolToken(this.peek(), 'end')) {
+                break;
+            }
+            assertA_ReservedSymbolToken(this.peek(), 'case');
+        }
+        assertA_ReservedSymbolToken(this.peek(), 'end');
+        this.advance();
+        return {
+            t: AstNodeType.SpecialExpression,
+            n: 'cond',
+            p: params,
+            token: getTokenDebugData(token) && token,
+        };
+    };
+    AlgebraicParser.prototype.parseSwitch = function (token) {
+        this.advance();
+        var params = [this.parseExpression()];
+        while (!this.isAtEnd() && !isA_ReservedSymbolToken(this.peek(), 'end')) {
+            assertA_ReservedSymbolToken(this.peek(), 'case');
+            this.advance();
+            params.push(this.parseExpression());
+            assertA_ReservedSymbolToken(this.peek(), 'then');
+            this.advance();
+            var expressions = [];
+            while (!this.isAtEnd()
+                && !isA_ReservedSymbolToken(this.peek(), 'case')
+                && !isA_ReservedSymbolToken(this.peek(), 'end')) {
+                expressions.push(this.parseExpression());
+                if (isA_OperatorToken(this.peek(), ';')) {
+                    this.advance();
+                }
+            }
+            params.push(expressions.length === 1
+                ? expressions[0]
+                : {
+                    t: AstNodeType.SpecialExpression,
+                    n: 'do',
+                    p: expressions,
+                    token: getTokenDebugData(token) && token,
+                });
+            if (isA_ReservedSymbolToken(this.peek(), 'end')) {
+                break;
+            }
+            assertA_ReservedSymbolToken(this.peek(), 'case');
         }
-        assertA_OperatorToken(token, ',');
+        assertA_ReservedSymbolToken(this.peek(), 'end');
         this.advance();
         return {
-            b: bindingNode,
-            m: modifiers,
-            l: letBindings,
-            wn: whenNode,
-            we: whileNode,
-        };
-    };
-    AlgebraicParser.prototype.parseBinding = function () {
-        var _a;
-        var firstToken = asA_SymbolToken(this.peek());
-        var name = firstToken[1];
-        this.advance();
-        var ofSymbol = asA_SymbolToken(this.peek());
-        if (ofSymbol[1] !== 'of') {
-            throw new LitsError('Expected "of"', (_a = getTokenDebugData(this.peek())) === null || _a === void 0 ? void 0 : _a.sourceCodeInfo);
-        }
-        this.advance();
-        var value = this.parseExpression();
-        var node = {
-            t: AstNodeType.Binding,
-            n: name,
-            v: value,
-            p: [],
-            token: getTokenDebugData(firstToken) && firstToken,
+            t: AstNodeType.SpecialExpression,
+            n: 'switch',
+            p: params,
+            token: getTokenDebugData(token) && token,
         };
-        return node;
     };
     AlgebraicParser.prototype.parseDef = function (token) {
         this.advance();
@@ -7762,22 +7223,17 @@ var AlgebraicParser = /** @class */ (function () {
         };
     };
     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 _a = this.parseFunctionArguments(), functionArguments = _a.functionArguments, arity = _a.arity;
         var body = [];
-        while (!this.isAtEnd() && !isRBraceToken(this.peek())) {
+        while (!this.isAtEnd() && !isA_ReservedSymbolToken(this.peek(), 'end')) {
             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);
-        }
+        assertA_ReservedSymbolToken(this.peek(), 'end');
         this.advance();
         return {
             t: AstNodeType.SpecialExpression,
@@ -7795,12 +7251,25 @@ var AlgebraicParser = /** @class */ (function () {
     AlgebraicParser.prototype.isAtEnd = function () {
         return this.parseState.position >= this.tokenStream.tokens.length;
     };
+    AlgebraicParser.prototype.isAtExpressionEnd = function () {
+        if (this.isAtEnd()) {
+            return true;
+        }
+        var token = this.peek();
+        if (isA_OperatorToken(token)) {
+            return [';', ','].includes(token[1]);
+        }
+        if (isA_SymbolToken(token)) {
+            return ['catch'].includes(token[1]);
+        }
+        if (isA_ReservedSymbolToken(token)) {
+            return ['else', 'when', 'while', 'then', 'end', 'case'].includes(token[1]);
+        }
+        return false;
+    };
     AlgebraicParser.prototype.peek = function () {
         return this.tokenStream.tokens[this.parseState.position];
     };
-    AlgebraicParser.prototype.peekAhead = function () {
-        return this.tokenStream.tokens[this.parseState.position + 1];
-    };
     return AlgebraicParser;
 }());
 
@@ -8173,8 +7642,8 @@ function parseToken(tokenStream, parseState) {
     return parsePolishToken(tokenStream, parseState);
 }
 
-var polishIdentifierCharacterClass = '[\\w@%^?=!$<>+*/:-]';
-var polishIdentifierFirstCharacterClass = '[a-zA-Z_@%^?=!$<>+*/-]';
+var polishIdentifierCharacterClass = '[\\w@%^?=!$<>+*/:&\|~-]';
+var polishIdentifierFirstCharacterClass = '[a-zA-Z_@%^?=!$<>+*/&\|~-]';
 var algebraicIdentifierCharacterClass = '[\\w$:!?]';
 var algebraicIdentifierFirstCharacterClass = '[a-zA-Z_$]';
 
@@ -8254,22 +7723,23 @@ var commonTokenizers = [
     tokenizeString,
 ];
 
-var algebraicReservedNamesRecord = {
-    'true': { value: true },
-    'false': { value: false },
-    'nil': { value: null },
-    'null': { value: null },
-    'if-let': { value: null, forbidden: true },
-    'when-let': { value: null, forbidden: true },
-    'when-first': { value: null, forbidden: true },
-    'fn': { value: null, forbidden: true },
-    'defns': { value: null, forbidden: true },
-    'try': { value: null, forbidden: true },
-    'recur': { value: null, forbidden: true },
-    'loop': { value: null, forbidden: true },
-    'time!': { value: null, forbidden: true },
-    'doseq': { value: null, forbidden: true },
+var validAlgebraicReservedNamesRecord = {
+    true: { value: true, forbidden: false },
+    false: { value: false, forbidden: false },
+    nil: { value: null, forbidden: false },
+    null: { value: null, forbidden: false },
+    then: { value: null, forbidden: false },
+    else: { value: null, forbidden: false },
+    end: { value: null, forbidden: false },
+    case: { value: null, forbidden: false },
+    when: { value: null, forbidden: false },
+    while: { value: null, forbidden: false },
 };
+var forbiddenAlgebraicReservedNamesRecord = {
+    fn: { value: null, forbidden: true },
+    defns: { value: null, forbidden: true },
+};
+var algebraicReservedNamesRecord = __assign(__assign({}, validAlgebraicReservedNamesRecord), forbiddenAlgebraicReservedNamesRecord);
 
 var identifierRegExp = new RegExp(algebraicIdentifierCharacterClass);
 var identifierFirstCharacterRegExp = new RegExp(algebraicIdentifierFirstCharacterClass);
@@ -8341,45 +7811,19 @@ var tokenizeA_BasePrefixedNumber = function (input, position) {
     }
     return [length, ['A_BasePrefixedNumber', input.substring(position, i)]];
 };
-var tokenizeA_ReservedSymbolToken = function (input, position) {
-    var e_1, _a;
-    try {
-        for (var _b = __values(Object.entries(algebraicReservedNamesRecord)), _c = _b.next(); !_c.done; _c = _b.next()) {
-            var _d = __read(_c.value, 2), reservedName = _d[0], forbidden = _d[1].forbidden;
-            var length_1 = reservedName.length;
-            var nextChar = input[position + length_1];
-            if (nextChar && identifierRegExp.test(nextChar))
-                continue;
-            var name_1 = input.substring(position, position + length_1);
-            if (name_1 === reservedName) {
-                if (forbidden)
-                    throw new LitsError("".concat(name_1, " is forbidden!"), undefined);
-                return [length_1, ['A_ReservedSymbol', reservedName]];
-            }
-        }
-    }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-        }
-        finally { if (e_1) throw e_1.error; }
-    }
-    return NO_MATCH;
-};
 var tokenizeA_Symbol = function (input, position) {
     var value = input[position];
     if (!value) {
         return NO_MATCH;
     }
     if (value === '\'') {
-        var length_2 = 1;
-        var char = input[position + length_2];
+        var length_1 = 1;
+        var char = input[position + length_1];
         var escaping = false;
         while (char !== '\'' || escaping) {
             if (char === undefined)
                 throw new LitsError("Unclosed string at position ".concat(position, "."), undefined);
-            length_2 += 1;
+            length_1 += 1;
             if (escaping) {
                 escaping = false;
                 value += char;
@@ -8390,10 +7834,10 @@ var tokenizeA_Symbol = function (input, position) {
                 }
                 value += char;
             }
-            char = input[position + length_2];
+            char = input[position + length_1];
         }
         value += '\''; // closing quote
-        return [length_2 + 1, ['A_Symbol', value]];
+        return [length_1 + 1, ['A_Symbol', value]];
     }
     if (identifierFirstCharacterRegExp.test(value)) {
         var initialPosition = position;
@@ -8408,6 +7852,22 @@ var tokenizeA_Symbol = function (input, position) {
     }
     return NO_MATCH;
 };
+var tokenizeA_ReservedSymbolToken = function (input, position) {
+    var symbolMeta = tokenizeA_Symbol(input, position);
+    if (symbolMeta[0] === 0 || !symbolMeta[1]) {
+        return NO_MATCH;
+    }
+    var symbolName = symbolMeta[1][1];
+    symbolName = symbolName.startsWith('\'') ? symbolName.slice(1, symbolName.length - 1) : symbolName;
+    var info = algebraicReservedNamesRecord[symbolName];
+    if (!info) {
+        return NO_MATCH;
+    }
+    if (info.forbidden) {
+        throw new LitsError("".concat(symbolName, " is forbidden!"), undefined);
+    }
+    return [symbolMeta[0], ['A_ReservedSymbol', symbolName]];
+};
 var tokenizeA_Operator = function (input, position) {
     var _a;
     var threeChars = input.slice(position, position + 3);
@@ -8426,30 +7886,30 @@ var tokenizeA_Operator = function (input, position) {
 };
 var tokenizeA_MultiLineComment = function (input, position) {
     if (input[position] === '/' && input[position + 1] === '*') {
-        var length_3 = 2;
+        var length_2 = 2;
         var value = '/*';
-        while (input[position + length_3] !== '*' && input[position + length_3 + 1] !== '/' && position + length_3 + 1 < input.length) {
-            value += input[position + length_3];
-            length_3 += 1;
+        while (input[position + length_2] !== '*' && input[position + length_2 + 1] !== '/' && position + length_2 + 1 < input.length) {
+            value += input[position + length_2];
+            length_2 += 1;
         }
-        if (position + length_3 + 1 >= input.length) {
+        if (position + length_2 + 1 >= input.length) {
             throw new LitsError('Comment not closed', undefined);
         }
         value += '*/';
-        length_3 += 2;
-        return [length_3, ['A_MultiLineComment', value]];
+        length_2 += 2;
+        return [length_2, ['A_MultiLineComment', value]];
     }
     return NO_MATCH;
 };
 var tokenizeA_SingleLineComment = function (input, position) {
     if (input[position] === '/' && input[position + 1] === '/') {
-        var length_4 = 2;
+        var length_3 = 2;
         var value = '//';
-        while (input[position + length_4] !== '\n' && position + length_4 < input.length) {
-            value += input[position + length_4];
-            length_4 += 1;
+        while (input[position + length_3] !== '\n' && position + length_3 < input.length) {
+            value += input[position + length_3];
+            length_3 += 1;
         }
-        return [length_4, ['A_SingleLineComment', value]];
+        return [length_3, ['A_SingleLineComment', value]];
     }
     return NO_MATCH;
 };
@@ -8609,31 +8069,20 @@ var tokenizeP_FnShorthand = function (input, position) {
     return [1, ['P_FnShorthand']];
 };
 var tokenizeP_ReservedSymbol = function (input, position) {
-    var e_1, _a;
-    try {
-        for (var _b = __values(Object.entries(polishReservedNamesRecord)), _c = _b.next(); !_c.done; _c = _b.next()) {
-            var _d = __read(_c.value, 2), reservedName = _d[0], forbidden = _d[1].forbidden;
-            var length_3 = reservedName.length;
-            var nextChar = input[position + length_3];
-            if (nextChar && P_symbolRegExp.test(nextChar)) {
-                continue;
-            }
-            var symbol = input.substring(position, position + length_3);
-            if (symbol === reservedName) {
-                if (forbidden)
-                    throw new LitsError("".concat(symbol, " is forbidden!"), undefined);
-                return [length_3, ['P_ReservedSymbol', reservedName]];
-            }
-        }
+    var symbolMeta = tokenizeP_Symbol(input, position);
+    if (symbolMeta[0] === 0 || !symbolMeta[1]) {
+        return NO_MATCH;
     }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-        }
-        finally { if (e_1) throw e_1.error; }
+    var symbolName = symbolMeta[1][1];
+    symbolName = symbolName.startsWith('\'') ? symbolName.slice(1, symbolName.length - 1) : symbolName;
+    var info = polishReservedNamesRecord[symbolName];
+    if (!info) {
+        return NO_MATCH;
     }
-    return NO_MATCH;
+    if (info.forbidden) {
+        throw new LitsError("".concat(symbolName, " is forbidden!"), undefined);
+    }
+    return [symbolMeta[0], ['P_ReservedSymbol', symbolName]];
 };
 var tokenizeP_StringShorthand = function (input, position) {
     if (input[position] !== ':')
@@ -8646,24 +8095,24 @@ var tokenizeP_StringShorthand = function (input, position) {
     return [symbolDescription[0] + 1, ['P_StringShorthand', ":".concat(symbolToken[1])]];
 };
 var tokenizeP_Modifier = function (input, position) {
-    var e_2, _a;
+    var e_1, _a;
     try {
         for (var modifierNames_1 = __values(modifierNames), modifierNames_1_1 = modifierNames_1.next(); !modifierNames_1_1.done; modifierNames_1_1 = modifierNames_1.next()) {
             var modifierName = modifierNames_1_1.value;
-            var length_4 = modifierName.length;
-            var charAfterModifier = input[position + length_4];
-            if (input.substring(position, position + length_4) === modifierName && (!charAfterModifier || !P_symbolRegExp.test(charAfterModifier))) {
+            var length_3 = modifierName.length;
+            var charAfterModifier = input[position + length_3];
+            if (input.substring(position, position + length_3) === modifierName && (!charAfterModifier || !P_symbolRegExp.test(charAfterModifier))) {
                 var value = modifierName;
-                return [length_4, ['P_Modifier', value]];
+                return [length_3, ['P_Modifier', value]];
             }
         }
     }
-    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
     finally {
         try {
             if (modifierNames_1_1 && !modifierNames_1_1.done && (_a = modifierNames_1.return)) _a.call(modifierNames_1);
         }
-        finally { if (e_2) throw e_2.error; }
+        finally { if (e_1) throw e_1.error; }
     }
     return NO_MATCH;
 };
@@ -8700,8 +8149,8 @@ var polishTokenizers = __spreadArray(__spreadArray([
     tokenizeP_StringShorthand,
     tokenizeP_Number,
     tokenizeP_ReservedSymbol,
-    tokenizeP_Symbol,
     tokenizeP_Modifier,
+    tokenizeP_Symbol,
     tokenizeP_RegexpShorthand,
     tokenizeP_FnShorthand,
     tokenizeP_CollectionAccessor,
@@ -9109,7 +8558,7 @@ var collectionReference = {
         },
         args: {
             coll: {
-                type: ['collection', 'string', 'nil'],
+                type: ['collection', 'string', 'null'],
             },
         },
         variants: [
@@ -9198,7 +8647,7 @@ var collectionReference = {
         },
         args: {
             coll: {
-                type: ['collection', 'nil'],
+                type: ['collection', 'null'],
             },
             key: {
                 type: ['string', 'number'],
@@ -9226,7 +8675,7 @@ var collectionReference = {
         },
         args: {
             coll: {
-                type: ['collection', 'nil'],
+                type: ['collection', 'null'],
             },
             value: {
                 type: ['any'],
@@ -9429,7 +8878,7 @@ var collectionReference = {
         },
         args: {
             coll: {
-                type: ['collection', 'nil'],
+                type: ['collection', 'null'],
             },
         },
         variants: [
@@ -9987,7 +9436,7 @@ var arrayReference = {
         description: 'Takes a nested array $x and flattens it.',
         examples: [
             '(flatten [1 2 [3 4] 5])',
-            "\n(let [foo :bar]\n  (flatten\n    [1\n     \" 2 A \"\n     [foo [4 [:ABC]]] 6]))",
+            "\n(let [foo :bar])\n(flatten\n  [1\n    \" 2 A \"\n    [foo [4 [:ABC]]] 6])",
             '(flatten 12)',
         ],
     },
@@ -10030,7 +9479,7 @@ var sequenceReference = {
         },
         args: {
             'seq': {
-                type: ['sequence', 'nil'],
+                type: ['sequence', 'null'],
             },
             'n': {
                 type: 'integer',
@@ -10092,7 +9541,7 @@ var sequenceReference = {
         category: 'Sequence',
         linkName: 'pop',
         returns: {
-            type: ['sequence', 'nil'],
+            type: ['sequence', 'null'],
             array: true,
         },
         args: {
@@ -10145,7 +9594,7 @@ var sequenceReference = {
         linkName: 'shift',
         clojureDocs: null,
         returns: {
-            type: ['sequence', 'nil'],
+            type: ['sequence', 'null'],
             array: true,
         },
         args: {
@@ -10342,11 +9791,11 @@ var sequenceReference = {
         linkName: 'position',
         clojureDocs: null,
         returns: {
-            type: ['number', 'nil'],
+            type: ['number', 'null'],
         },
         args: {
             seq: {
-                type: ['sequence', 'nil'],
+                type: ['sequence', 'null'],
             },
             fn: {
                 type: 'function',
@@ -10369,11 +9818,11 @@ var sequenceReference = {
         linkName: 'index_of',
         clojureDocs: null,
         returns: {
-            type: ['number', 'nil'],
+            type: ['number', 'null'],
         },
         args: {
             seq: {
-                type: ['sequence', 'nil'],
+                type: ['sequence', 'null'],
             },
             x: {
                 type: 'any',
@@ -10399,7 +9848,7 @@ var sequenceReference = {
         },
         args: {
             seq: {
-                type: ['sequence', 'nil'],
+                type: ['sequence', 'null'],
             },
             fn: {
                 type: 'function',
@@ -10422,11 +9871,11 @@ var sequenceReference = {
         category: 'Sequence',
         linkName: 'reverse',
         returns: {
-            type: ['sequence', 'nil'],
+            type: ['sequence', 'null'],
         },
         args: {
             seq: {
-                type: ['sequence', 'nil'],
+                type: ['sequence', 'null'],
             },
         },
         variants: [
@@ -10449,7 +9898,7 @@ var sequenceReference = {
         },
         args: {
             seq: {
-                type: ['sequence', 'nil'],
+                type: ['sequence', 'null'],
             },
         },
         variants: [
@@ -10471,7 +9920,7 @@ var sequenceReference = {
         },
         args: {
             seq: {
-                type: ['sequence', 'nil'],
+                type: ['sequence', 'null'],
             },
         },
         variants: [
@@ -10494,7 +9943,7 @@ var sequenceReference = {
         },
         args: {
             seq: {
-                type: ['sequence', 'nil'],
+                type: ['sequence', 'null'],
             },
         },
         variants: [
@@ -10514,7 +9963,7 @@ var sequenceReference = {
         category: 'Sequence',
         linkName: 'rest',
         returns: {
-            type: ['sequence', 'nil'],
+            type: ['sequence', 'null'],
         },
         args: {
             seq: {
@@ -10567,7 +10016,7 @@ var sequenceReference = {
         category: 'Sequence',
         linkName: 'next',
         returns: {
-            type: ['sequence', 'nil'],
+            type: ['sequence', 'null'],
         },
         args: {
             seq: {
@@ -10592,7 +10041,7 @@ var sequenceReference = {
         category: 'Sequence',
         linkName: 'nthnext',
         returns: {
-            type: ['sequence', 'nil'],
+            type: ['sequence', 'null'],
             array: true,
         },
         args: {
@@ -10816,7 +10265,7 @@ var sequenceReference = {
         description: 'Returns a sorted sequence of the items in $seq, where the sort order is determined by comparing `(keyfn item)`. If no $comp is supplied, uses builtin `compare`.',
         examples: [
             '(sort_by ["Albert" "Mojir" "Nina"] count)',
-            '(sort_by "Albert" lower-case #(compare %2 %1))',
+            '(sort_by "Albert" lower_case #(compare %2 %1))',
         ],
     },
     distinct: {
@@ -11081,7 +10530,7 @@ var sequenceReference = {
         ],
         description: 'Applies $fn to each value in $seq, splitting it each time $fn returns a new value. Returns an array of sequences.',
         examples: [
-            '(partition_by [1 2 3 4 5] #(= 3 %1))',
+            '(partition_by [1 2 3 4 5] #(== 3 %1))',
             '(partition_by [1 1 1 2 2 3 3] odd?)',
             '(partition_by "Leeeeeerrroyyy" identity)',
         ],
@@ -11187,10 +10636,11 @@ var mathReference = {
         description: 'Modulus of `dividend` and `divisor`. Truncates toward negative infinity.',
         examples: ['(mod 5 3)', '(mod 5.2 3.1)', '(mod -5 3)', '(mod 5 -3)', '(mod -5 -3)'],
     },
-    'rem': {
-        title: 'rem',
+    '%': {
+        title: '%',
         category: 'Math',
-        linkName: 'rem',
+        linkName: '-percent',
+        clojureDocs: 'rem',
         returns: {
             type: 'number',
         },
@@ -11206,7 +10656,7 @@ var mathReference = {
             { argumentNames: ['a', 'b'] },
         ],
         description: 'Remainder of dividing `dividend` and `divisor`.',
-        examples: ['(rem 5 3)', '(rem 5.2 3.1)', '(rem -5 3)', '(rem 5 -3)', '(rem -5 -3)'],
+        examples: ['(% 5 3)', '(% 5.2 3.1)', '(% -5 3)', '(% 5 -3)', '(% -5 -3)'],
     },
     'quot': {
         title: 'quot',
@@ -11303,10 +10753,10 @@ var mathReference = {
         description: 'Computes cube root of $x.',
         examples: ['(cbrt 0)', '(cbrt 27)', '(cbrt 2)', '(cbrt 1)'],
     },
-    'pow': {
-        title: 'pow',
+    '**': {
+        title: '**',
         category: 'Math',
-        linkName: 'pow',
+        linkName: '-star-star',
         clojureDocs: null,
         returns: {
             type: 'number',
@@ -11323,7 +10773,7 @@ var mathReference = {
             { argumentNames: ['a', 'b'] },
         ],
         description: 'Computes returns $a raised to the power of $b.',
-        examples: ['(pow 2 3)', '(pow 2 0)', '(pow 2 -3)', '(pow -2 3)', '(pow -2 -3)'],
+        examples: ['(** 2 3)', '(** 2 0)', '(** 2 -3)', '(** -2 3)', '(** -2 -3)'],
     },
     'exp': {
         title: 'exp',
@@ -11693,7 +11143,7 @@ var mathReference = {
             { argumentNames: ['x'] },
         ],
         description: 'Returns the base `2` logarithm of a number.',
-        examples: ['(log2 0.01)', '(log2 (pow 2 12))', '(log2 2.5)'],
+        examples: ['(log2 0.01)', '(log2 (** 2 12))', '(log2 2.5)'],
     },
     'log10': {
         title: 'log10',
@@ -11712,7 +11162,7 @@ var mathReference = {
             { argumentNames: ['x'] },
         ],
         description: 'Returns the `10` logarithm of a number.',
-        examples: ['(log10 0.01)', '(log10 (pow 10 12))', '(log10 2.5)'],
+        examples: ['(log10 0.01)', '(log10 (** 10 12))', '(log10 2.5)'],
     },
     'sin': {
         title: 'sin',
@@ -11966,13 +11416,14 @@ var miscReference = {
             { argumentNames: ['x'] },
             { argumentNames: ['x', 'ys'] },
         ],
-        description: 'Result is `true` if no two `values` are equal to each other, otherwise result is `false`. Note that only two argument version result is negation of `=` function, that is `(!= a b)` is same as `(not (= a b))`.',
+        description: 'Result is `true` if no two `values` are equal to each other, otherwise result is `false`. Note that only two argument version result is negation of `=` function, that is `(!= a b)` is same as `(! (== a b))`.',
         examples: ['(!= 3)', '(!= 3 2)', '(!= :3 3)', '(!= 3 3 2)', '(!= :3 :2 :1 :0)', '(!= 0 -0)'],
     },
-    '=': {
-        title: '=',
+    '==': {
+        title: '==',
         category: 'Misc',
-        linkName: '-equal',
+        linkName: '-equal-equal',
+        clojureDocs: '=',
         returns: {
             type: 'boolean',
         },
@@ -11990,7 +11441,7 @@ var miscReference = {
             { argumentNames: ['x', 'ys'] },
         ],
         description: 'Compares `values` according to \'equal\' predicate. Result is `true` if every specified value is equal to each other, otherwise result is `false`.',
-        examples: ['(= 1 1)', '(= 1.01 1)', '(= :1 1)', '(= :2 :2 :2 :2)', '(= 2 2 1 2)'],
+        examples: ['(== 1 1)', '(== 1.01 1)', '(== :1 1)', '(== :2 :2 :2 :2)', '(== 2 2 1 2)'],
     },
     '<': {
         title: '<',
@@ -12084,10 +11535,11 @@ var miscReference = {
         description: 'Returns `true` if the number $x and $ys are in non increasing order, `false` otherwise.',
         examples: ['(>= 1 0)', '(>= 1.01 1)', '(>= 1 1)', '(>= 4 3 2 1)', '(>= 3 2 2 1)'],
     },
-    'not': {
-        title: 'not',
+    '!': {
+        title: '!',
         category: 'Misc',
-        linkName: 'not',
+        linkName: '-exclamation',
+        clojureDocs: 'not',
         returns: {
             type: 'boolean',
         },
@@ -12100,7 +11552,7 @@ var miscReference = {
             { argumentNames: ['x'] },
         ],
         description: 'Computes logical negation. Note that any other $x than `false`, `0`, `nil` and `\'\'` is truthy.',
-        examples: ['(not 3)', '(not true)', '(not "A string")', '(not 0)', '(not false)', '(not nil)', '(not "")'],
+        examples: ['(! 3)', '(! true)', '(! "A string")', '(! 0)', '(! false)', '(! nil)', '(! "")'],
     },
     'write!': {
         title: 'write!',
@@ -12129,25 +11581,10 @@ var miscReference = {
             '(write! nil true false)',
         ],
     },
-    'inst-ms!': {
-        title: 'inst-ms!',
-        category: 'Misc',
-        linkName: 'inst-ms-exclamation',
-        clojureDocs: 'inst-ms',
-        returns: {
-            type: 'number',
-        },
-        args: {},
-        variants: [
-            { argumentNames: [] },
-        ],
-        description: 'Returns milliseconds elapsed since the UNIX epoch.',
-        examples: ['(inst-ms!)'],
-    },
-    'iso-date-time->inst-ms': {
-        title: 'iso-date-time->inst-ms',
+    'iso_date>epoch': {
+        title: 'iso_date>epoch',
         category: 'Misc',
-        linkName: 'iso-date-time--gtinst-ms',
+        linkName: 'iso_date-gtepoch',
         returns: {
             type: 'number',
         },
@@ -12161,14 +11598,14 @@ var miscReference = {
         ],
         description: 'Returns milliseconds elapsed since the UNIX epoch to `iso`.',
         examples: [
-            '(iso-date-time->inst-ms "2022-04-12T09:37:10.899Z")',
-            '(iso-date-time->inst-ms "1980-01-01")',
+            '(iso_date>epoch "2022-04-12T09:37:10.899Z")',
+            '(iso_date>epoch "1980-01-01")',
         ],
     },
-    'inst-ms->iso-date-time': {
-        title: 'inst-ms->iso-date-time',
+    'epoch>iso_date': {
+        title: 'epoch>iso_date',
         category: 'Misc',
-        linkName: 'inst-ms--gtiso-date-time',
+        linkName: 'epoch-gtiso_date',
         returns: {
             type: 'string',
         },
@@ -12182,8 +11619,8 @@ var miscReference = {
         ],
         description: 'Returns IOS date time string from `ms` (milliseconds elapsed since the UNIX epoch).',
         examples: [
-            '(inst-ms->iso-date-time 1649756230899)',
-            '(inst-ms->iso-date-time 0)',
+            '(epoch>iso_date 1649756230899)',
+            '(epoch>iso_date 0)',
         ],
     },
     'boolean': {
@@ -12239,34 +11676,6 @@ var miscReference = {
             '(compare + -)',
         ],
     },
-    'lits-version!': {
-        title: 'lits-version!',
-        category: 'Misc',
-        linkName: 'lits-version-exclamation',
-        returns: {
-            type: 'string',
-        },
-        args: {},
-        variants: [
-            { argumentNames: [] },
-        ],
-        description: 'Returns the lits version.',
-        examples: ['(lits-version!)'],
-    },
-    'uuid!': {
-        title: 'uuid!',
-        category: 'Misc',
-        linkName: 'uuid-exclamation',
-        returns: {
-            type: 'string',
-        },
-        args: {},
-        variants: [
-            { argumentNames: [] },
-        ],
-        description: 'Returns random UUID string.',
-        examples: ['(uuid!)'],
-    },
     'equal?': {
         title: 'equal?',
         category: 'Misc',
@@ -12292,14 +11701,14 @@ var miscReference = {
             '(equal? [1 true nil] [1 true nil])',
             '(equal? {:a 10 :b [1 2 {:b 20}]} {:b [1 2 {:b 20}] :a 10})',
             '(equal? {:a 10 :b [1 2 {:b 20}]} {:b [1 2 {:b 21}] :a 10})',
-            '(= 0.3 (+ 0.1 0.2))',
+            '(== 0.3 (+ 0.1 0.2))',
             '(equal? 0.3 (+ 0.1 0.2))',
         ],
     },
-    'json-parse': {
-        title: 'json-parse',
+    'json_parse': {
+        title: 'json_parse',
         category: 'Misc',
-        linkName: 'json-parse',
+        linkName: 'json_parse',
         clojureDocs: null,
         returns: {
             type: 'any',
@@ -12314,13 +11723,13 @@ var miscReference = {
         ],
         description: 'Returns `JSON.parse(`$x`)`.',
         examples: [
-            '(json-parse "[1, 2, 3]")',
+            '(json_parse "[1, 2, 3]")',
         ],
     },
-    'json-stringify': {
-        title: 'json-stringify',
+    'json_stringify': {
+        title: 'json_stringify',
         category: 'Misc',
-        linkName: 'json-stringify',
+        linkName: 'json_stringify',
         clojureDocs: null,
         returns: {
             type: 'string',
@@ -12340,8 +11749,8 @@ var miscReference = {
         ],
         description: 'Returns `JSON.stringify(`$x`)`. If second argument is provided, returns `JSON.stringify(`$x`, null, `$indent`)`.',
         examples: [
-            '(json-stringify [1, 2, 3])',
-            '(json-stringify {:a {:b 10}} 2)',
+            '(json_stringify [1, 2, 3])',
+            '(json_stringify {:a {:b 10}} 2)',
         ],
     },
 };
@@ -12373,7 +11782,7 @@ var assertReference = { 'assert': {
         linkName: 'assert-equal',
         clojureDocs: null,
         returns: {
-            type: 'nil',
+            type: 'null',
         },
         args: {
             a: {
@@ -12402,7 +11811,7 @@ var assertReference = { 'assert': {
         linkName: 'assert-exclamation-equal',
         clojureDocs: null,
         returns: {
-            type: 'nil',
+            type: 'null',
         },
         args: {
             a: {
@@ -12431,7 +11840,7 @@ var assertReference = { 'assert': {
         linkName: 'assert_equal',
         clojureDocs: null,
         returns: {
-            type: 'nil',
+            type: 'null',
         },
         args: {
             a: {
@@ -12460,7 +11869,7 @@ var assertReference = { 'assert': {
         linkName: 'assert_not_equal',
         clojureDocs: null,
         returns: {
-            type: 'nil',
+            type: 'null',
         },
         args: {
             a: {
@@ -12489,7 +11898,7 @@ var assertReference = { 'assert': {
         linkName: 'assert_gt',
         clojureDocs: null,
         returns: {
-            type: 'nil',
+            type: 'null',
         },
         args: {
             a: {
@@ -12518,7 +11927,7 @@ var assertReference = { 'assert': {
         linkName: 'assert_lt',
         clojureDocs: null,
         returns: {
-            type: 'nil',
+            type: 'null',
         },
         args: {
             a: {
@@ -12547,7 +11956,7 @@ var assertReference = { 'assert': {
         linkName: 'assert_gte',
         clojureDocs: null,
         returns: {
-            type: 'nil',
+            type: 'null',
         },
         args: {
             a: {
@@ -12576,7 +11985,7 @@ var assertReference = { 'assert': {
         linkName: 'assert_lte',
         clojureDocs: null,
         returns: {
-            type: 'nil',
+            type: 'null',
         },
         args: {
             a: {
@@ -12605,7 +12014,7 @@ var assertReference = { 'assert': {
         linkName: 'assert_true',
         clojureDocs: null,
         returns: {
-            type: 'nil',
+            type: 'null',
         },
         args: {
             value: {
@@ -12631,7 +12040,7 @@ var assertReference = { 'assert': {
         linkName: 'assert_false',
         clojureDocs: null,
         returns: {
-            type: 'nil',
+            type: 'null',
         },
         args: {
             value: {
@@ -12657,7 +12066,7 @@ var assertReference = { 'assert': {
         linkName: 'assert_truthy',
         clojureDocs: null,
         returns: {
-            type: 'nil',
+            type: 'null',
         },
         args: {
             value: {
@@ -12690,7 +12099,7 @@ var assertReference = { 'assert': {
         linkName: 'assert_falsy',
         clojureDocs: null,
         returns: {
-            type: 'nil',
+            type: 'null',
         },
         args: {
             value: {
@@ -12722,7 +12131,7 @@ var assertReference = { 'assert': {
         linkName: 'assert_null',
         clojureDocs: null,
         returns: {
-            type: 'nil',
+            type: 'null',
         },
         args: {
             value: {
@@ -12754,7 +12163,7 @@ var assertReference = { 'assert': {
         linkName: 'assert_throws',
         clojureDocs: null,
         returns: {
-            type: 'nil',
+            type: 'null',
         },
         args: {
             fn: {
@@ -12776,7 +12185,7 @@ var assertReference = { 'assert': {
         linkName: 'assert_throws_error',
         clojureDocs: null,
         returns: {
-            type: 'nil',
+            type: 'null',
         },
         args: {
             'fn': {
@@ -12805,7 +12214,7 @@ var assertReference = { 'assert': {
         linkName: 'assert_not_throws',
         clojureDocs: null,
         returns: {
-            type: 'nil',
+            type: 'null',
         },
         args: {
             fn: {
@@ -12824,7 +12233,7 @@ var assertReference = { 'assert': {
     } };
 
 var objectReference = {
-    'dissoc': {
+    dissoc: {
         title: 'dissoc',
         category: 'Object',
         linkName: 'dissoc',
@@ -12849,7 +12258,7 @@ var objectReference = {
             "\n(def o { :a 5 }) (dissoc o :a)\no",
         ],
     },
-    'object': {
+    object: {
         title: 'object',
         category: 'Object',
         linkName: 'object',
@@ -12875,7 +12284,7 @@ var objectReference = {
             '{:a 1 :b 2}',
         ],
     },
-    'keys': {
+    keys: {
         title: 'keys',
         category: 'Object',
         linkName: 'keys',
@@ -12897,7 +12306,7 @@ var objectReference = {
             '(keys (object :x 10 :y true :z "A string"))',
         ],
     },
-    'vals': {
+    vals: {
         title: 'vals',
         category: 'Object',
         linkName: 'vals',
@@ -12919,7 +12328,7 @@ var objectReference = {
             '(vals (object :x 10 :y true :z "A string"))',
         ],
     },
-    'entries': {
+    entries: {
         title: 'entries',
         category: 'Object',
         linkName: 'entries',
@@ -12941,12 +12350,12 @@ var objectReference = {
             '(entries (object :x 10 :y true :z "A string"))',
         ],
     },
-    'find': {
+    find: {
         title: 'find',
         category: 'Object',
         linkName: 'find',
         returns: {
-            type: ['array', 'nil'],
+            type: ['array', 'null'],
         },
         args: {
             obj: {
@@ -12965,7 +12374,7 @@ var objectReference = {
             '(find (object :a 1 :b 2) :c)',
         ],
     },
-    'merge': {
+    merge: {
         title: 'merge',
         category: 'Object',
         linkName: 'merge',
@@ -12987,10 +12396,10 @@ var objectReference = {
             '(merge (object :x 10) (object :x 15 :y 20))',
         ],
     },
-    'merge-with': {
-        title: 'merge-with',
+    merge_with: {
+        title: 'merge_with',
         category: 'Object',
-        linkName: 'merge-with',
+        linkName: 'merge_with',
         returns: {
             type: 'object',
         },
@@ -13008,12 +12417,12 @@ var objectReference = {
         ],
         description: "\nReturns a new object created by merging together all arguments.\nIf two keys appears in more than one object $fn is used to calculate the new value.\n\nIf no arguments are provided `nil` is returned.",
         examples: [
-            '(merge-with (object :x 10) (object :y 20) +)',
-            '(merge-with (object :x 10) (object :x 15 :y 20) +)',
-            '(merge-with (object :x 10) (object :x 20) (object :x 30) (object :x 40) -)',
+            '(merge_with (object :x 10) (object :y 20) +)',
+            '(merge_with (object :x 10) (object :x 15 :y 20) +)',
+            '(merge_with (object :x 10) (object :x 20) (object :x 30) (object :x 40) -)',
         ],
     },
-    'zipmap': {
+    zipmap: {
         title: 'zipmap',
         category: 'Object',
         linkName: 'zipmap',
@@ -13040,10 +12449,10 @@ var objectReference = {
             '(zipmap [] [10 nil [1 2 3]])',
         ],
     },
-    'select-keys': {
-        title: 'select-keys',
+    select_keys: {
+        title: 'select_keys',
         category: 'Object',
-        linkName: 'select-keys',
+        linkName: 'select_keys',
         returns: {
             type: 'object',
         },
@@ -13061,8 +12470,8 @@ var objectReference = {
         ],
         description: 'Returns an object containing only those entries in $obj whose key is in $keys.',
         examples: [
-            '(select-keys {:a 1 :b 2 :c 3} [:a :b])',
-            '(select-keys {:a 1} [:a :b])',
+            '(select_keys {:a 1 :b 2 :c 3} [:a :b])',
+            '(select_keys {:a 1} [:a :b])',
         ],
     },
 };
@@ -13511,7 +12920,7 @@ var predicateReference = {
         variants: [
             { argumentNames: ['x'] },
         ],
-        description: 'Returns `true` if $x is NaN (not a number), otherwise `false`.',
+        description: 'Returns `true` if $x is NaN (! a number), otherwise `false`.',
         examples: [
             '(nan? 1.0)',
             '(nan? (/ 1 0))',
@@ -13622,7 +13031,7 @@ var predicateReference = {
         },
         args: {
             x: {
-                type: ['collection', 'string', 'nil'],
+                type: ['collection', 'string', 'null'],
             },
         },
         variants: [
@@ -13649,7 +13058,7 @@ var predicateReference = {
         },
         args: {
             x: {
-                type: ['collection', 'string', 'nil'],
+                type: ['collection', 'string', 'null'],
             },
         },
         variants: [
@@ -13761,10 +13170,10 @@ var regularExpressionReference = {
 };
 
 var specialExpressionsReference = {
-    'and': {
-        title: 'and',
+    '&&': {
+        title: '&&',
         category: 'Special expression',
-        linkName: 'and',
+        linkName: '-and-and',
         returns: {
             type: 'boolean',
         },
@@ -13777,19 +13186,20 @@ var specialExpressionsReference = {
         variants: [
             { argumentNames: ['expressions'] },
         ],
-        description: "\nComputes logical `and` function. Evaluation of $expressions starts from left.\nAs soon as a `expression` evaluates to a falsy value, the result is returned.\n\nIf all expressions evaluate to truthy values, the value of the last expression is returned.",
+        description: "\nComputes logical `and`. Evaluation of $expressions starts from left.\nAs soon as a `expression` evaluates to a falsy value, the result is returned.\n\nIf all expressions evaluate to truthy values, the value of the last expression is returned.",
         examples: [
-            '(and 1 1)',
-            '(and (> 3 2) "string")',
-            '(and (< 3 2) "string")',
-            '(and true true true true)',
-            '(and true true 0 true)',
+            '(&& 1 1)',
+            '(&& (> 3 2) "string")',
+            '(&& (< 3 2) "string")',
+            '(&& true true true true)',
+            '(&& true true 0 true)',
         ],
     },
-    'or': {
-        title: 'or',
+    '||': {
+        title: '||',
         category: 'Special expression',
-        linkName: 'or',
+        linkName: '-or-or',
+        clojureDocs: 'or',
         returns: {
             type: 'boolean',
         },
@@ -13802,13 +13212,13 @@ var specialExpressionsReference = {
         variants: [
             { argumentNames: ['expressions'] },
         ],
-        description: "\nComputes logical `or` function. Evaluation of $expressions evaluation starts from left.\nAs soon as a `expression` evaluates to a truthy value, the result is returned.\n\nIf all expressions evaluate to falsy values, the value of the last expression is returned.",
+        description: "\nComputes logical `or`. Evaluation of $expressions evaluation starts from left.\nAs soon as a `expression` evaluates to a truthy value, the result is returned.\n\nIf all expressions evaluate to falsy values, the value of the last expression is returned.",
         examples: [
-            '(or 1 1)',
-            '(or (> 3 2) "string")',
-            '(or (< 3 2) "string")',
-            '(or true true true true)',
-            '(or 1 2 3 4)',
+            '(|| 1 1)',
+            '(|| (> 3 2) "string")',
+            '(|| (< 3 2) "string")',
+            '(|| true true true true)',
+            '(|| 1 2 3 4)',
         ],
     },
     'def': {
@@ -13873,97 +13283,12 @@ var specialExpressionsReference = {
                 type: '*binding',
                 rest: true,
             },
-            expressions: {
-                type: '*expression',
-                rest: true,
-            },
-        },
-        variants: [
-            { argumentNames: ['bindings', 'expressions'] },
-        ],
-        description: "\nBinds local variables. The variables lives only within $expressions.\nIt returns evaluation of the last expression in $expressions.",
-        examples: ["\n  (let [a (+ 1 2 3 4) \n        b (* 1 2 3 4)]\n    (write! a b))"],
-    },
-    'if-let': {
-        title: 'if-let',
-        category: 'Special expression',
-        linkName: 'if-let',
-        returns: {
-            type: 'any',
-        },
-        args: {
-            'binding': {
-                type: '*binding',
-            },
-            'then-expr': {
-                type: '*expression',
-            },
-            'else-expr': {
-                type: '*expression',
-            },
-        },
-        variants: [
-            { argumentNames: ['binding', 'then-expr'] },
-            { argumentNames: ['binding', 'then-expr', 'else-expr'] },
-        ],
-        description: "\nBinds one local variable. If it evaluates to a truthy value\n$then-expr is executed with the variable accessable.\nIf the bound variable evaluates to false, the $else-expr is evaluated\n(without variable accessable).",
-        examples: [
-            "\n(if-let [a (> (count \"Albert\") 4)]\n  (write! (str a \", is big enough\"))\n  (write! \"Sorry, not big enough.\"))",
-            "\n(if-let [a (> (count \"Albert\") 10)]\n  (write! (str a \", is big enough\"))\n  (write! \"Sorry, not big enough.\"))",
-        ],
-    },
-    'when-let': {
-        title: 'when-let',
-        category: 'Special expression',
-        linkName: 'when-let',
-        returns: {
-            type: 'any',
-        },
-        args: {
-            binding: {
-                type: '*binding',
-            },
-            expressions: {
-                type: '*expression',
-                rest: true,
-            },
-        },
-        variants: [
-            { argumentNames: ['binding', 'expressions'] },
-        ],
-        description: "\nBinds one local variable. If it evaluates to a truthy value\n$expressions is executed with the variable accessable.\nIf the bound variable evaluates to a falsy value, `nil` is returned.",
-        examples: [
-            "\n(when-let [a (> (count \"Albert\") 4)]\n  (write! a))",
-        ],
-    },
-    'when-first': {
-        title: 'when-first',
-        category: 'Special expression',
-        linkName: 'when-first',
-        returns: {
-            type: 'any',
-        },
-        args: {
-            binding: {
-                type: '*binding',
-                rest: true,
-            },
-            expressions: {
-                type: '*expression',
-                rest: true,
-            },
         },
         variants: [
-            { argumentNames: ['binding', 'expressions'] },
-        ],
-        description: 'When the binding value in $binding is a non empty sequence, the first element of that sequence (instead of the sequence itself) is bound to the variable.',
-        examples: [
-            "\n(when-first [x [1 2 3]]\n  (write! x)\n  x)",
-            "\n(when-first [x \"Albert\"]\n  (write! x)\n  x)",
-            "\n(when-first [x [0]]\n  (write! x)\n  x)",
-            "\n(when-first [x [nil]]\n  (write! x)\n  x)",
-            "\n(when-first [x []]\n  (write! x)\n  x)",
+            { argumentNames: ['bindings'] },
         ],
+        description: "\nBinds local variables.",
+        examples: ["\n(let [a (+ 1 2 3 4) \n      b (* 1 2 3 4)])\n(write! a b)"],
     },
     'fn': {
         title: 'fn',
@@ -14127,10 +13452,11 @@ var specialExpressionsReference = {
             '(if false (write! "TRUE"))',
         ],
     },
-    'if-not': {
-        title: 'if-not',
+    'unless': {
+        title: 'unless',
         category: 'Special expression',
-        linkName: 'if-not',
+        linkName: 'unless',
+        clojureDocs: 'if-not',
         returns: {
             type: 'any',
         },
@@ -14151,10 +13477,10 @@ var specialExpressionsReference = {
         ],
         description: 'Either $then-expr or $else-expr branch is taken. $then-expr is selected when $test is falsy. If $test is truthy $else-expr is executed, if no $else-expr exists, `nil` is returned.',
         examples: [
-            '(if-not true (write! "TRUE") (write! "FALSE"))',
-            '(if-not false (write! "TRUE") (write! "FALSE"))',
-            '(if-not true (write! "TRUE"))',
-            '(if-not false (write! "TRUE"))',
+            '(unless true (write! "TRUE") (write! "FALSE"))',
+            '(unless false (write! "TRUE") (write! "FALSE"))',
+            '(unless true (write! "TRUE"))',
+            '(unless false (write! "TRUE"))',
         ],
     },
     'cond': {
@@ -14179,58 +13505,29 @@ var specialExpressionsReference = {
             "\n(cond\n  false (write! \"FALSE\")\n  nil (write! \"nil\"))",
         ],
     },
-    'when': {
-        title: 'when',
-        category: 'Special expression',
-        linkName: 'when',
-        returns: {
-            type: 'any',
-        },
-        args: {
-            test: {
-                type: '*expression',
-            },
-            expressions: {
-                type: '*expression',
-                rest: true,
-            },
-        },
-        variants: [
-            { argumentNames: ['test', 'expressions'] },
-        ],
-        description: "If $test yields a thruthy value, the expressions are evaluated\nand the value returned by the last expression is returned.\nOtherwise, if $test yields a falsy value, the expressions are not evaluated,\nand `nil` is returned. If no $expressions are provided, `nil` is returned.",
-        examples: [
-            "(when true\n      (write! \"Hi\")\n      (write! \"There\"))",
-            "(when false\n      (write! \"Hi\")\n      (write! \"There\"))",
-            '(when true)',
-            '(when false)',
-        ],
-    },
-    'when-not': {
-        title: 'when-not',
+    'switch': {
+        title: 'switch',
         category: 'Special expression',
-        linkName: 'when-not',
+        linkName: 'switch',
         returns: {
             type: 'any',
         },
         args: {
-            test: {
-                type: '*expression',
+            value: {
+                type: 'any',
             },
-            expressions: {
-                type: '*expression',
-                rest: true,
+            conds: {
+                type: '*conditions',
             },
         },
         variants: [
-            { argumentNames: ['test', 'expressions'] },
+            { argumentNames: ['value', 'conds'] },
         ],
-        description: "If $test yields a falsy value, the expressions are evaluated\nand the value returned by the last `expression` is returned.\nOtherwise, if $test yields a truthy value, the $expressions are not evaluated,\nand `nil` is returned. If no `expression` is provided, `nil` is returned.",
+        description: 'Used for branching. $conds are tested sequentially from the top against $value. If no branch is tested truthy, `nil` is returned.',
         examples: [
-            '(when-not true (write! "Hi") (write! "There"))',
-            '(when-not false (write! "Hi") (write! "There"))',
-            '(when-not true)',
-            '(when-not false)',
+            "\n(switch 1\n  1 (write! \"FALSE\")\n  2 (write! \"nil\"))",
+            "\n(switch 2\n  1 (write! \"FALSE\")\n  2 (write! \"nil\"))",
+            "\n(switch 3\n  1 (write! \"FALSE\")\n  2 (write! \"nil\"))",
         ],
     },
     'comment': {
@@ -14238,7 +13535,7 @@ var specialExpressionsReference = {
         category: 'Special expression',
         linkName: 'comment',
         returns: {
-            type: 'nil',
+            type: 'null',
         },
         args: {
             expressions: {
@@ -14279,7 +13576,7 @@ var specialExpressionsReference = {
         category: 'Special expression',
         linkName: 'recur',
         returns: {
-            type: 'nil',
+            type: 'null',
         },
         args: {
             expressions: {
@@ -14292,9 +13589,9 @@ var specialExpressionsReference = {
         ],
         description: 'Recursevly calls enclosing function or loop with its evaluated $expressions.',
         examples: [
-            "\n(defn foo [n]\n  (write! n)\n  (when (not (zero? n))\n    (recur\n      (dec n))))\n(foo 3)",
-            "\n(\n  (fn [n]\n    (write! n)\n    (when (not (zero? n))\n      (recur\n        (dec n))))\n  3)",
-            "\n(\n  loop [n 3]\n    (write! n)\n    (when\n      (not (zero? n))\n      (recur (dec n))))",
+            "\n(defn foo [n]\n  (write! n)\n  (if (! (zero? n))\n    (recur\n      (dec n))))\n(foo 3)",
+            "\n(\n  (fn [n]\n    (write! n)\n    (if (! (zero? n))\n      (recur\n        (dec n))))\n  3)",
+            "\n(\n  loop [n 3]\n    (write! n)\n    (if\n      (! (zero? n))\n      (recur (dec n))))",
         ],
     },
     'loop': {
@@ -14319,35 +13616,16 @@ var specialExpressionsReference = {
         ],
         description: 'Executes $expressions with initial $bindings. The $bindings will be replaced with the recur parameters for subsequent recursions.',
         examples: [
-            "\n(loop [n 3]\n  (write! n)\n  (when\n    (not (zero? n))\n    (recur (dec n))))",
-            "\n(loop [n 3]\n  (write! n)\n  (if\n    (not (zero? n))\n    (recur (dec n))\n    n))",
-        ],
-    },
-    'time!': {
-        title: 'time!',
-        category: 'Special expression',
-        linkName: 'time-exclamation',
-        clojureDocs: 'time',
-        returns: {
-            type: 'any',
-        },
-        args: {
-            expression: {
-                type: '*expression',
-            },
-        },
-        variants: [
-            { argumentNames: ['expression'] },
+            "\n(loop [n 3]\n  (write! n)\n  (if\n    (! (zero? n))\n    (recur (dec n))))",
+            "\n(loop [n 3]\n  (write! n)\n  (if\n    (! (zero? n))\n    (recur (dec n))\n    n))",
         ],
-        description: 'Prints the time it took to evaluate $expression. Returns $expression evaluated.',
-        examples: ["\n(defn fib [x]\n  (if\n    (<= x 2)\n    1\n    (+ \n      (fib (dec x))\n      (fib (- x 2)))))\n(time! (fib 20))"],
     },
     'doseq': {
         title: 'doseq',
         category: 'Special expression',
         linkName: 'doseq',
         returns: {
-            type: 'nil',
+            type: 'null',
         },
         args: {
             bindings: {
@@ -14397,10 +13675,10 @@ var specialExpressionsReference = {
             "\n(for\n  [x [1 2 3] y [1 2 3] z [1 2 3]\n  &while (<= x y)]\n  \n  [x y z])",
         ],
     },
-    'declared?': {
-        title: 'declared?',
+    'defined?': {
+        title: 'defined?',
         category: 'Special expression',
-        linkName: 'declared-question',
+        linkName: 'defined-question',
         returns: {
             type: 'boolean',
         },
@@ -14414,11 +13692,11 @@ var specialExpressionsReference = {
         ],
         description: 'Returns `true` if $n is a declared variable or a builtin function, otherwise `false`.',
         examples: [
-            '(declared? foo)',
-            "\n(def foo :foo)\n(declared? foo)",
-            '(declared? +)',
-            "\n(def foo nil)\n(declared? foo)",
-            '(declared? if)',
+            '(defined? foo)',
+            "\n(def foo :foo)\n(defined? foo)",
+            '(defined? +)',
+            "\n(def foo nil)\n(defined? foo)",
+            '(defined? if)',
         ],
     },
     '??': {
@@ -14487,10 +13765,10 @@ var stringReference = {
             '(subs "A string" 100)',
         ],
     },
-    'string-repeat': {
-        title: 'string-repeat',
+    'string_repeat': {
+        title: 'string_repeat',
         category: 'String',
-        linkName: 'string-repeat',
+        linkName: 'string_repeat',
         clojureDocs: null,
         returns: {
             type: 'number',
@@ -14508,8 +13786,8 @@ var stringReference = {
         ],
         description: 'Repeates $s $n times.',
         examples: [
-            '(string-repeat "*" 10)',
-            '(string-repeat "***" 0)',
+            '(string_repeat "*" 10)',
+            '(string_repeat "***" 0)',
         ],
     },
     'str': {
@@ -14559,41 +13837,10 @@ var stringReference = {
             '(number "-1.01")',
         ],
     },
-    'number-to-string': {
-        title: 'number-to-string',
+    'lower_case': {
+        title: 'lower_case',
         category: 'String',
-        linkName: 'number-to-string',
-        clojureDocs: null,
-        returns: {
-            type: 'string',
-        },
-        args: {
-            n: {
-                type: 'number',
-            },
-            base: {
-                type: 'number',
-                description: '2, 8, 10 or 16',
-            },
-        },
-        variants: [
-            { argumentNames: ['n'] },
-            { argumentNames: ['n', 'base'] },
-        ],
-        description: 'Converts $n to a string. If $base is not equal to `10`, $n must be a non negative integer.',
-        examples: [
-            '(number-to-string 10)',
-            '(number-to-string -1.01)',
-            '(number-to-string -.01)',
-            '(number-to-string 15 2)',
-            '(number-to-string 15 8)',
-            '(number-to-string 15 16)',
-        ],
-    },
-    'lower-case': {
-        title: 'lower-case',
-        category: 'String',
-        linkName: 'lower-case',
+        linkName: 'lower_case',
         returns: {
             type: 'string',
         },
@@ -14607,14 +13854,14 @@ var stringReference = {
         ],
         description: 'Returns $s converted to lower case.',
         examples: [
-            '(lower-case "Albert")',
-            '(lower-case "")',
+            '(lower_case "Albert")',
+            '(lower_case "")',
         ],
     },
-    'upper-case': {
-        title: 'upper-case',
+    'upper_case': {
+        title: 'upper_case',
         category: 'String',
-        linkName: 'upper-case',
+        linkName: 'upper_case',
         clojureDocs: null,
         returns: {
             type: 'string',
@@ -14629,8 +13876,8 @@ var stringReference = {
         ],
         description: 'Returns $s converted to upper case.',
         examples: [
-            '(upper-case "Albert")',
-            '(upper-case "")',
+            '(upper_case "Albert")',
+            '(upper_case "")',
         ],
     },
     'trim': {
@@ -14656,10 +13903,10 @@ var stringReference = {
             '(trim "")',
         ],
     },
-    'trim-left': {
-        title: 'trim-left',
+    'trim_left': {
+        title: 'trim_left',
         category: 'String',
-        linkName: 'trim-left',
+        linkName: 'trim_left',
         clojureDocs: null,
         returns: {
             type: 'string',
@@ -14674,15 +13921,15 @@ var stringReference = {
         ],
         description: 'Returns a new string with leading whitespaces removed.',
         examples: [
-            '(trim-left "  Albert  ")',
-            '(trim-left "   ")',
-            '(trim-left "")',
+            '(trim_left "  Albert  ")',
+            '(trim_left "   ")',
+            '(trim_left "")',
         ],
     },
-    'trim-right': {
-        title: 'trim-right',
+    'trim_right': {
+        title: 'trim_right',
         category: 'String',
-        linkName: 'trim-right',
+        linkName: 'trim_right',
         clojureDocs: null,
         returns: {
             type: 'string',
@@ -14697,15 +13944,15 @@ var stringReference = {
         ],
         description: 'Returns a new string with trailing whitespaces removed.',
         examples: [
-            '(trim-right "  Albert  ")',
-            '(trim-right "   ")',
-            '(trim-right "")',
+            '(trim_right "  Albert  ")',
+            '(trim_right "   ")',
+            '(trim_right "")',
         ],
     },
-    'pad-left': {
-        title: 'pad-left',
+    'pad_left': {
+        title: 'pad_left',
         category: 'String',
-        linkName: 'pad-left',
+        linkName: 'pad_left',
         clojureDocs: null,
         returns: {
             type: 'string',
@@ -14727,16 +13974,16 @@ var stringReference = {
         ],
         description: 'Pads from the start of $s with `padString` (multiple times, if needed) until the resulting string reaches the given $length.',
         examples: [
-            '(pad-left "Albert" 20)',
-            '(pad-left "Albert" 20 "-*-")',
-            '(pad-left "Albert" 5)',
-            '(pad-left "Albert" -1)',
+            '(pad_left "Albert" 20)',
+            '(pad_left "Albert" 20 "-*-")',
+            '(pad_left "Albert" 5)',
+            '(pad_left "Albert" -1)',
         ],
     },
-    'pad-right': {
-        title: 'pad-right',
+    'pad_right': {
+        title: 'pad_right',
         category: 'String',
-        linkName: 'pad-right',
+        linkName: 'pad_right',
         clojureDocs: null,
         returns: {
             type: 'string',
@@ -14758,10 +14005,10 @@ var stringReference = {
         ],
         description: 'Pads from the start of $s with `padString` (multiple times, if needed) until the resulting string reaches the given `length`.',
         examples: [
-            '(pad-right "Albert" 20)',
-            '(pad-right "Albert" 20 "-*-")',
-            '(pad-right "Albert" 5)',
-            '(pad-right "Albert" -1)',
+            '(pad_right "Albert" 20)',
+            '(pad_right "Albert" 20 "-*-")',
+            '(pad_right "Albert" 5)',
+            '(pad_right "Albert" -1)',
         ],
     },
     'split': {
@@ -14832,10 +14079,10 @@ var stringReference = {
             '(template "No book||||One book||||Two books||||Three books||||$1 books" 4)',
         ],
     },
-    'to-char-code': {
-        title: 'to-char-code',
+    'to_char_code': {
+        title: 'to_char_code',
         category: 'String',
-        linkName: 'to-char-code',
+        linkName: 'to_char_code',
         clojureDocs: null,
         returns: {
             type: 'number',
@@ -14850,14 +14097,14 @@ var stringReference = {
         ],
         description: 'Return code point for first character in $c.',
         examples: [
-            '(to-char-code :A)',
-            '(to-char-code "Albert")',
+            '(to_char_code :A)',
+            '(to_char_code "Albert")',
         ],
     },
-    'from-char-code': {
-        title: 'from-char-code',
+    'from_char_code': {
+        title: 'from_char_code',
         category: 'String',
-        linkName: 'from-char-code',
+        linkName: 'from_char_code',
         clojureDocs: null,
         returns: {
             type: 'string',
@@ -14872,14 +14119,14 @@ var stringReference = {
         ],
         description: 'Return character for code point $code.',
         examples: [
-            '(from-char-code 65)',
-            '(from-char-code 0)',
+            '(from_char_code 65)',
+            '(from_char_code 0)',
         ],
     },
-    'encode-base64': {
-        title: 'encode-base64',
+    'encode_base64': {
+        title: 'encode_base64',
         category: 'String',
-        linkName: 'encode-base64',
+        linkName: 'encode_base64',
         clojureDocs: null,
         returns: {
             type: 'string',
@@ -14894,13 +14141,13 @@ var stringReference = {
         ],
         description: 'Returns a Base64 encoded string from $s.',
         examples: [
-            '(encode-base64 "Albert")',
+            '(encode_base64 "Albert")',
         ],
     },
-    'decode-base64': {
-        title: 'decode-base64',
+    'decode_base64': {
+        title: 'decode_base64',
         category: 'String',
-        linkName: 'decode-base64',
+        linkName: 'decode_base64',
         clojureDocs: null,
         returns: {
             type: 'string',
@@ -14915,13 +14162,13 @@ var stringReference = {
         ],
         description: 'Returns a Base64 decoded string from $base64string.',
         examples: [
-            '(decode-base64 "QWxiZXJ0IPCfkLs=")',
+            '(decode_base64 "QWxiZXJ0IPCfkLs=")',
         ],
     },
-    'encode-uri-component': {
-        title: 'encode-uri-component',
+    'encode_uri_component': {
+        title: 'encode_uri_component',
         category: 'String',
-        linkName: 'encode-uri-component',
+        linkName: 'encode_uri_component',
         clojureDocs: null,
         returns: {
             type: 'string',
@@ -14936,13 +14183,13 @@ var stringReference = {
         ],
         description: 'Returns an escaped `URI` string.',
         examples: [
-            '(encode-uri-component "Hi everyone!?")',
+            '(encode_uri_component "Hi everyone!?")',
         ],
     },
-    'decode-uri-component': {
-        title: 'decode-uri-component',
+    'decode_uri_component': {
+        title: 'decode_uri_component',
         category: 'String',
-        linkName: 'decode-uri-component',
+        linkName: 'decode_uri_component',
         clojureDocs: null,
         returns: {
             type: 'string',
@@ -14957,7 +14204,7 @@ var stringReference = {
         ],
         description: 'Returns an un-escaped `URI` string.',
         examples: [
-            '(decode-uri-component "Hi%20everyone!%3F%20%F0%9F%91%8D")',
+            '(decode_uri_component "Hi%20everyone!%3F%20%F0%9F%91%8D")',
         ],
     },
     'join': {
@@ -14982,15 +14229,42 @@ var stringReference = {
         description: 'Returns a new string by concatenating all of the elements in $arr, separated by $delimiter.',
         examples: [
             '(join ["Albert" "Mojir"] " ")',
-            '(join (map number-to-string [0 1 2 3 4 5 6 7 8 9]) ", ")',
+            '(join (map [0 1 2 3 4 5 6 7 8 9] str) ", ")',
+        ],
+    },
+    '++': {
+        title: '++',
+        category: 'String',
+        linkName: '-plus-plus',
+        clojureDocs: null,
+        returns: {
+            type: 'string',
+        },
+        args: {
+            strings: {
+                type: ['string', 'number', 'null'],
+                rest: true,
+            },
+        },
+        variants: [{
+                argumentNames: ['strings'],
+            }],
+        description: 'Concatenats $strings into one string.',
+        examples: [
+            '(++ "Albert" " " "Mojir")',
+            '(++ "Albert" "Mojir")',
+            '(++ "Albert" null "Mojir")',
+            '(++ "Albert")',
+            '(++)',
         ],
     },
 };
 
-var bitwiseReference = { 'bit-shift-left': {
-        title: 'bit-shift-left',
+var bitwiseReference = { '<<': {
+        title: '<<',
         category: 'Bitwise',
-        linkName: 'bit-shift-left',
+        linkName: '-lt-lt',
+        clojureDocs: 'bit-shift-left',
         returns: {
             type: 'integer',
         },
@@ -15006,11 +14280,12 @@ var bitwiseReference = { 'bit-shift-left': {
             { argumentNames: ['x', 'n'] },
         ],
         description: 'Shifts $x arithmetically left by $n bit positions.',
-        examples: ['(bit-shift-left 1 10)', '(bit-shift-left -4 2)'],
-    }, 'bit-shift-right': {
-        title: 'bit-shift-right',
+        examples: ['(<< 1 10)', '(<< -4 2)'],
+    }, '>>': {
+        title: '>>',
         category: 'Bitwise',
-        linkName: 'bit-shift-right',
+        linkName: '-gt-gt',
+        clojureDocs: 'bit-shift-right',
         returns: {
             type: 'integer',
         },
@@ -15026,11 +14301,12 @@ var bitwiseReference = { 'bit-shift-left': {
             { argumentNames: ['x', 'n'] },
         ],
         description: 'Shifts $x arithmetically right by $n bit positions.',
-        examples: ['(bit-shift-right 2048 10)', '(bit-shift-right 4 10)'],
-    }, 'unsigned-bit-shift-right': {
-        title: 'unsigned-bit-shift-right',
+        examples: ['(>> 2048 10)', '(>> 4 10)'],
+    }, '>>>': {
+        title: '>>>',
         category: 'Bitwise',
-        linkName: 'unsigned-bit-shift-right',
+        linkName: '-gt-gt-gt',
+        clojureDocs: 'unsigned-bit-shift-right',
         returns: {
             type: 'integer',
         },
@@ -15046,11 +14322,12 @@ var bitwiseReference = { 'bit-shift-left': {
             { argumentNames: ['x', 'n'] },
         ],
         description: 'Shifts $x arithmetically right by $n bit positions without sign extension.',
-        examples: ['(unsigned-bit-shift-right 2048 10)', '(unsigned-bit-shift-right 4 10)', '(unsigned-bit-shift-right -1 10)'],
-    }, 'bit-not': {
-        title: 'bit-not',
+        examples: ['(>>> 2048 10)', '(>>> 4 10)', '(>>> -1 10)'],
+    }, '~': {
+        title: '~',
         category: 'Bitwise',
-        linkName: 'bit-not',
+        linkName: '-tilde',
+        clojureDocs: 'bit-not',
         returns: {
             type: 'integer',
         },
@@ -15063,11 +14340,12 @@ var bitwiseReference = { 'bit-shift-left': {
             { argumentNames: ['x'] },
         ],
         description: 'Returns bitwise `not` of $x.',
-        examples: ['(bit-not 0)', '(bit-not 255)'],
-    }, 'bit-and': {
-        title: 'bit-and',
+        examples: ['(~ 0)', '(~ 255)'],
+    }, '&': {
+        title: '&',
         category: 'Bitwise',
-        linkName: 'bit-and',
+        linkName: '-and',
+        clojureDocs: 'bit-and',
         returns: {
             type: 'integer',
         },
@@ -15089,13 +14367,14 @@ var bitwiseReference = { 'bit-shift-left': {
         ],
         description: 'Returns bitwise `and` of all arguments.',
         examples: [
-            '(bit-and 0b0011 0b0110)',
-            '(bit-and 0b0011 0b0110 0b1001)',
+            '(& 0b0011 0b0110)',
+            '(& 0b0011 0b0110 0b1001)',
         ],
-    }, 'bit-and-not': {
-        title: 'bit-and-not',
+    }, '&!': {
+        title: '&!',
         category: 'Bitwise',
-        linkName: 'bit-and-not',
+        linkName: '-and-exclamation',
+        clojureDocs: 'bit-and-not',
         returns: {
             type: 'integer',
         },
@@ -15116,11 +14395,12 @@ var bitwiseReference = { 'bit-shift-left': {
             { argumentNames: ['x', 'y', 'rest'] },
         ],
         description: 'Returns bitwise `and` with complement.',
-        examples: ['(bit-and-not 0b0011 0b0110)', '(bit-and-not 0b0011 0b0110 0b1001)'],
-    }, 'bit-or': {
-        title: 'bit-or',
+        examples: ['(&! 0b0011 0b0110)', '(&! 0b0011 0b0110 0b1001)'],
+    }, '|': {
+        title: '|',
         category: 'Bitwise',
-        linkName: 'bit-or',
+        linkName: '-or',
+        clojureDocs: 'bit-or',
         returns: {
             type: 'integer',
         },
@@ -15141,11 +14421,12 @@ var bitwiseReference = { 'bit-shift-left': {
             { argumentNames: ['x', 'y', 'rest'] },
         ],
         description: 'Returns bitwise `or` of all arguments.',
-        examples: ['(bit-or 0b0011 0b0110)', '(bit-or 0b1000 0b0100 0b0010)'],
-    }, 'bit-xor': {
-        title: 'bit-xor',
+        examples: ['(| 0b0011 0b0110)', '(| 0b1000 0b0100 0b0010)'],
+    }, '^': {
+        title: '^',
         category: 'Bitwise',
-        linkName: 'bit-xor',
+        linkName: '-caret',
+        clojureDocs: 'bit-xor',
         returns: {
             type: 'integer',
         },
@@ -15166,11 +14447,11 @@ var bitwiseReference = { 'bit-shift-left': {
             { argumentNames: ['x', 'y', 'rest'] },
         ],
         description: 'Returns bitwise `xor` of all arguments.',
-        examples: ['(bit-xor 0b0011 0b0110)', '(bit-xor 0b11110000 0b00111100 0b10101010)'],
-    }, 'bit-flip': {
-        title: 'bit-flip',
+        examples: ['(^ 0b0011 0b0110)', '(^ 0b11110000 0b00111100 0b10101010)'],
+    }, 'bit_flip': {
+        title: 'bit_flip',
         category: 'Bitwise',
-        linkName: 'bit-flip',
+        linkName: 'bit_flip',
         returns: {
             type: 'integer',
         },
@@ -15186,11 +14467,11 @@ var bitwiseReference = { 'bit-shift-left': {
             { argumentNames: ['x', 'n'] },
         ],
         description: 'Flips bit number $n.',
-        examples: ['(bit-flip 0b0011 1)', '(bit-flip 0b1100 1)'],
-    }, 'bit-clear': {
-        title: 'bit-clear',
+        examples: ['(bit_flip 0b0011 1)', '(bit_flip 0b1100 1)'],
+    }, 'bit_clear': {
+        title: 'bit_clear',
         category: 'Bitwise',
-        linkName: 'bit-clear',
+        linkName: 'bit_clear',
         returns: {
             type: 'integer',
         },
@@ -15206,11 +14487,11 @@ var bitwiseReference = { 'bit-shift-left': {
             { argumentNames: ['x', 'n'] },
         ],
         description: 'Clears bit number $n.',
-        examples: ['(bit-clear 0b0011 1)', '(bit-clear 0b1100 1)'],
-    }, 'bit-set': {
-        title: 'bit-set',
+        examples: ['(bit_clear 0b0011 1)', '(bit_clear 0b1100 1)'],
+    }, 'bit_set': {
+        title: 'bit_set',
         category: 'Bitwise',
-        linkName: 'bit-set',
+        linkName: 'bit_set',
         returns: {
             type: 'integer',
         },
@@ -15226,11 +14507,11 @@ var bitwiseReference = { 'bit-shift-left': {
             { argumentNames: ['x', 'n'] },
         ],
         description: 'Sets bit number $n.',
-        examples: ['(bit-set 0b0011 1)', '(bit-set 0b1100 1)'],
-    }, 'bit-test': {
-        title: 'bit-test',
+        examples: ['(bit_set 0b0011 1)', '(bit_set 0b1100 1)'],
+    }, 'bit_test': {
+        title: 'bit_test',
         category: 'Bitwise',
-        linkName: 'bit-test',
+        linkName: 'bit_test',
         returns: {
             type: 'boolean',
         },
@@ -15246,7 +14527,7 @@ var bitwiseReference = { 'bit-shift-left': {
             { argumentNames: ['x', 'n'] },
         ],
         description: 'Checks if bit number $n is set.',
-        examples: ['(bit-test 0b0011 1)', '(bit-test 0b1100 1)'],
+        examples: ['(bit_test 0b0011 1)', '(bit_test 0b1100 1)'],
     } };
 
 var shorthand = {
@@ -15562,13 +14843,13 @@ var api = {
         '*',
         '/',
         'mod',
-        'rem',
+        '%',
         'quot',
         'inc',
         'dec',
         'sqrt',
         'cbrt',
-        'pow',
+        '**',
         'exp',
         'round',
         'trunc',
@@ -15618,23 +14899,20 @@ var api = {
     ],
     misc: [
         '!=',
-        '=',
+        '==',
         '<',
         '>',
         '<=',
         '>=',
-        'not',
+        '!',
         'write!',
-        'inst-ms!',
-        'iso-date-time->inst-ms',
-        'inst-ms->iso-date-time',
+        'iso_date>epoch',
+        'epoch>iso_date',
         'boolean',
         'compare',
-        'lits-version!',
-        'uuid!',
         'equal?',
-        'json-parse',
-        'json-stringify',
+        'json_parse',
+        'json_stringify',
     ],
     object: [
         'dissoc',
@@ -15644,9 +14922,9 @@ var api = {
         'entries',
         'find',
         'merge',
-        'merge-with',
+        'merge_with',
         'zipmap',
-        'select-keys',
+        'select_keys',
     ],
     predicate: [
         'boolean?',
@@ -15680,70 +14958,65 @@ var api = {
         'replace',
     ],
     specialExpressions: [
-        'and',
-        'or',
+        '&&',
+        '||',
         'def',
         'defs',
         'let',
-        'if-let',
-        'when-let',
-        'when-first',
         'fn',
         'defn',
         'defns',
         'try',
         'throw',
         'if',
-        'if-not',
+        'unless',
         'cond',
-        'when',
-        'when-not',
+        'switch',
         'comment',
         'do',
         'recur',
         'loop',
-        'time!',
         'doseq',
         'for',
-        'declared?',
+        'defined?',
         '??',
     ],
     string: [
         'subs',
-        'string-repeat',
+        'string_repeat',
         'str',
         'number',
-        'number-to-string',
-        'lower-case',
-        'upper-case',
+        'lower_case',
+        'upper_case',
         'trim',
-        'trim-left',
-        'trim-right',
-        'pad-left',
-        'pad-right',
+        'trim_left',
+        'trim_right',
+        'pad_left',
+        'pad_right',
         'split',
         'template',
-        'to-char-code',
-        'from-char-code',
-        'encode-base64',
-        'decode-base64',
-        'encode-uri-component',
-        'decode-uri-component',
+        'to_char_code',
+        'from_char_code',
+        'encode_base64',
+        'decode_base64',
+        'encode_uri_component',
+        'decode_uri_component',
         'join',
+        '++',
     ],
     bitwise: [
-        'bit-shift-left',
-        'bit-shift-right',
-        'unsigned-bit-shift-right',
-        'bit-not',
-        'bit-and',
-        'bit-and-not',
-        'bit-or',
-        'bit-xor',
-        'bit-flip',
-        'bit-clear',
-        'bit-set',
-        'bit-test',
+        '<<',
+        '>>',
+        '>>>',
+        '~',
+        '&',
+        '&!',
+        '|',
+        '^',
+        'bit_flip',
+        'bit_clear',
+        'bit_set',
+        'bit_test',
     ],
     assert: [
         'assert',