greybel-interpreter 1.4.4 → 1.4.6

package/dist/operations/evaluate.js

@@ -1,19 +1,4 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -23,216 +8,162 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _b, _c, _d, _e, _f, _g, _h, _j;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handle = exports.handleFunction = exports.handleNil = exports.handleInterface = exports.handleMap = exports.handleList = exports.handleString = exports.handleNumber = exports.FunctionProcessorHandler = exports.NilProcessorHandler = exports.InterfaceProcessorHandler = exports.MapProcessorHandler = exports.ListProcessorHandler = exports.StringProcessorHandler = exports.multiplyString = exports.NumberProcessorHandler = exports.GenericProcessorHandler = void 0;
-var greyscript_core_1 = require("greyscript-core");
-var boolean_1 = __importDefault(require("../types/boolean"));
-var default_1 = __importDefault(require("../types/default"));
-var function_1 = __importDefault(require("../types/function"));
-var interface_1 = __importDefault(require("../types/interface"));
-var list_1 = __importDefault(require("../types/list"));
-var map_1 = __importDefault(require("../types/map"));
-var nil_1 = __importDefault(require("../types/nil"));
-var number_1 = __importDefault(require("../types/number"));
-var string_1 = __importDefault(require("../types/string"));
-var deep_equal_1 = __importDefault(require("../utils/deep-equal"));
-var operation_1 = __importDefault(require("./operation"));
-exports.GenericProcessorHandler = (_b = {},
-    _b[greyscript_core_1.Operator.And] = function (a, b) { return new boolean_1.default(a.toTruthy() && b.toTruthy()); },
-    _b[greyscript_core_1.Operator.Or] = function (a, b) { return new boolean_1.default(a.toTruthy() || b.toTruthy()); },
-    _b);
-exports.NumberProcessorHandler = (_c = {},
-    _c[greyscript_core_1.Operator.Plus] = function (a, b) { return new number_1.default(a.toNumber() + b.toNumber()); },
-    _c[greyscript_core_1.Operator.Minus] = function (a, b) { return new number_1.default(a.toNumber() - b.toNumber()); },
-    _c[greyscript_core_1.Operator.Slash] = function (a, b) { return new number_1.default(a.toNumber() / b.toNumber()); },
-    _c[greyscript_core_1.Operator.Asterik] = function (a, b) { return new number_1.default(a.toNumber() * b.toNumber()); },
-    _c[greyscript_core_1.Operator.Xor] = function (a, b) { return new number_1.default(a.toInt() ^ b.toInt()); },
-    _c[greyscript_core_1.Operator.BitwiseOr] = function (a, b) { return new number_1.default(a.toInt() | b.toInt()); },
-    _c[greyscript_core_1.Operator.LessThan] = function (a, b) { return new boolean_1.default(a.toNumber() < b.toNumber()); },
-    _c[greyscript_core_1.Operator.GreaterThan] = function (a, b) {
-        return new boolean_1.default(a.toNumber() > b.toNumber());
-    },
-    _c[greyscript_core_1.Operator.LeftShift] = function (a, b) { return new number_1.default(a.toInt() << b.toInt()); },
-    _c[greyscript_core_1.Operator.RightShift] = function (a, b) { return new number_1.default(a.toInt() >> b.toInt()); },
-    _c[greyscript_core_1.Operator.UnsignedRightShift] = function (a, b) {
-        return new number_1.default(a.toInt() >> b.toInt());
-    },
-    _c[greyscript_core_1.Operator.BitwiseAnd] = function (a, b) { return new number_1.default(a.toInt() & b.toInt()); },
-    _c[greyscript_core_1.Operator.PercentSign] = function (a, b) {
-        return new number_1.default(a.toNumber() % b.toNumber());
-    },
-    _c[greyscript_core_1.Operator.GreaterThanOrEqual] = function (a, b) {
-        return new boolean_1.default(a.toNumber() >= b.toNumber());
-    },
-    _c[greyscript_core_1.Operator.Equal] = function (a, b) { return new boolean_1.default(a.toNumber() === b.toNumber()); },
-    _c[greyscript_core_1.Operator.LessThanOrEqual] = function (a, b) {
-        return new boolean_1.default(a.toNumber() <= b.toNumber());
-    },
-    _c[greyscript_core_1.Operator.NotEqual] = function (a, b) {
-        return new boolean_1.default(a.toNumber() !== b.toNumber());
-    },
-    _c);
-var multiplyString = function (a, b) {
-    var multiStr = new Array(b.toNumber()).fill(a.toString()).join('');
+const greyscript_core_1 = require("greyscript-core");
+const boolean_1 = __importDefault(require("../types/boolean"));
+const default_1 = __importDefault(require("../types/default"));
+const function_1 = __importDefault(require("../types/function"));
+const interface_1 = __importDefault(require("../types/interface"));
+const list_1 = __importDefault(require("../types/list"));
+const map_1 = __importDefault(require("../types/map"));
+const nil_1 = __importDefault(require("../types/nil"));
+const number_1 = __importDefault(require("../types/number"));
+const string_1 = __importDefault(require("../types/string"));
+const deep_equal_1 = __importDefault(require("../utils/deep-equal"));
+const operation_1 = __importDefault(require("./operation"));
+exports.GenericProcessorHandler = {
+    [greyscript_core_1.Operator.And]: (a, b) => new boolean_1.default(a.toTruthy() && b.toTruthy()),
+    [greyscript_core_1.Operator.Or]: (a, b) => new boolean_1.default(a.toTruthy() || b.toTruthy())
+};
+exports.NumberProcessorHandler = {
+    [greyscript_core_1.Operator.Plus]: (a, b) => new number_1.default(a.toNumber() + b.toNumber()),
+    [greyscript_core_1.Operator.Minus]: (a, b) => new number_1.default(a.toNumber() - b.toNumber()),
+    [greyscript_core_1.Operator.Slash]: (a, b) => new number_1.default(a.toNumber() / b.toNumber()),
+    [greyscript_core_1.Operator.Asterik]: (a, b) => new number_1.default(a.toNumber() * b.toNumber()),
+    [greyscript_core_1.Operator.Xor]: (a, b) => new number_1.default(a.toInt() ^ b.toInt()),
+    [greyscript_core_1.Operator.BitwiseOr]: (a, b) => new number_1.default(a.toInt() | b.toInt()),
+    [greyscript_core_1.Operator.LessThan]: (a, b) => new boolean_1.default(a.toNumber() < b.toNumber()),
+    [greyscript_core_1.Operator.GreaterThan]: (a, b) => new boolean_1.default(a.toNumber() > b.toNumber()),
+    [greyscript_core_1.Operator.LeftShift]: (a, b) => new number_1.default(a.toInt() << b.toInt()),
+    [greyscript_core_1.Operator.RightShift]: (a, b) => new number_1.default(a.toInt() >> b.toInt()),
+    [greyscript_core_1.Operator.UnsignedRightShift]: (a, b) => new number_1.default(a.toInt() >> b.toInt()),
+    [greyscript_core_1.Operator.BitwiseAnd]: (a, b) => new number_1.default(a.toInt() & b.toInt()),
+    [greyscript_core_1.Operator.PercentSign]: (a, b) => new number_1.default(a.toNumber() % b.toNumber()),
+    [greyscript_core_1.Operator.GreaterThanOrEqual]: (a, b) => new boolean_1.default(a.toNumber() >= b.toNumber()),
+    [greyscript_core_1.Operator.Equal]: (a, b) => new boolean_1.default(a.toNumber() === b.toNumber()),
+    [greyscript_core_1.Operator.LessThanOrEqual]: (a, b) => new boolean_1.default(a.toNumber() <= b.toNumber()),
+    [greyscript_core_1.Operator.NotEqual]: (a, b) => new boolean_1.default(a.toNumber() !== b.toNumber())
+};
+const multiplyString = (a, b) => {
+    const multiStr = new Array(b.toNumber()).fill(a.toString()).join('');
     return new string_1.default(multiStr);
 };
 exports.multiplyString = multiplyString;
-exports.StringProcessorHandler = (_d = {},
-    _d[greyscript_core_1.Operator.Plus] = function (a, b) { return new string_1.default(a.toString() + b.toString()); },
-    _d[greyscript_core_1.Operator.Asterik] = function (a, b) { return (0, exports.multiplyString)(a, b); },
-    _d[greyscript_core_1.Operator.LessThan] = function (a, b) {
-        return new boolean_1.default(a.toString().length < b.toString().length);
-    },
-    _d[greyscript_core_1.Operator.GreaterThan] = function (a, b) {
-        return new boolean_1.default(a.toString().length > b.toString().length);
-    },
-    _d[greyscript_core_1.Operator.GreaterThanOrEqual] = function (a, b) {
-        return new boolean_1.default(a.toString().length >= b.toString().length);
-    },
-    _d[greyscript_core_1.Operator.Equal] = function (a, b) { return new boolean_1.default(a.toString() === b.toString()); },
-    _d[greyscript_core_1.Operator.LessThanOrEqual] = function (a, b) {
-        return new boolean_1.default(a.toString().length <= b.toString().length);
-    },
-    _d[greyscript_core_1.Operator.NotEqual] = function (a, b) {
-        return new boolean_1.default(a.toString() !== b.toString());
-    },
-    _d);
-exports.ListProcessorHandler = (_e = {},
-    _e[greyscript_core_1.Operator.Plus] = function (left, right) {
+exports.StringProcessorHandler = {
+    [greyscript_core_1.Operator.Plus]: (a, b) => new string_1.default(a.toString() + b.toString()),
+    [greyscript_core_1.Operator.Asterik]: (a, b) => (0, exports.multiplyString)(a, b),
+    [greyscript_core_1.Operator.LessThan]: (a, b) => new boolean_1.default(a.toString().length < b.toString().length),
+    [greyscript_core_1.Operator.GreaterThan]: (a, b) => new boolean_1.default(a.toString().length > b.toString().length),
+    [greyscript_core_1.Operator.GreaterThanOrEqual]: (a, b) => new boolean_1.default(a.toString().length >= b.toString().length),
+    [greyscript_core_1.Operator.Equal]: (a, b) => new boolean_1.default(a.toString() === b.toString()),
+    [greyscript_core_1.Operator.LessThanOrEqual]: (a, b) => new boolean_1.default(a.toString().length <= b.toString().length),
+    [greyscript_core_1.Operator.NotEqual]: (a, b) => new boolean_1.default(a.toString() !== b.toString())
+};
+exports.ListProcessorHandler = {
+    [greyscript_core_1.Operator.Plus]: (left, right) => {
         if (right instanceof list_1.default) {
             return left.fork().extend(right);
         }
         return left;
     },
-    _e[greyscript_core_1.Operator.LessThan] = function (left, right) {
+    [greyscript_core_1.Operator.LessThan]: (left, right) => {
         if (right instanceof list_1.default) {
             return new boolean_1.default(left.value.length < right.value.length);
         }
         return default_1.default.Void;
     },
-    _e[greyscript_core_1.Operator.GreaterThan] = function (left, right) {
+    [greyscript_core_1.Operator.GreaterThan]: (left, right) => {
         if (right instanceof list_1.default) {
             return new boolean_1.default(left.value.length > right.value.length);
         }
         return default_1.default.Void;
     },
-    _e[greyscript_core_1.Operator.GreaterThanOrEqual] = function (left, right) {
+    [greyscript_core_1.Operator.GreaterThanOrEqual]: (left, right) => {
         if (right instanceof list_1.default) {
             return new boolean_1.default(left.value.length >= right.value.length);
         }
         return default_1.default.Void;
     },
-    _e[greyscript_core_1.Operator.Equal] = function (left, right) {
+    [greyscript_core_1.Operator.Equal]: (left, right) => {
         if (right instanceof list_1.default) {
             return new boolean_1.default((0, deep_equal_1.default)(left, right));
         }
         return default_1.default.Void;
     },
-    _e[greyscript_core_1.Operator.LessThanOrEqual] = function (left, right) {
+    [greyscript_core_1.Operator.LessThanOrEqual]: (left, right) => {
         if (right instanceof list_1.default) {
             return new boolean_1.default(left.value.length <= right.value.length);
         }
         return default_1.default.Void;
     },
-    _e[greyscript_core_1.Operator.NotEqual] = function (left, right) {
+    [greyscript_core_1.Operator.NotEqual]: (left, right) => {
         if (right instanceof list_1.default) {
             return new boolean_1.default(!(0, deep_equal_1.default)(left, right));
         }
         return default_1.default.Void;
-    },
-    _e);
-exports.MapProcessorHandler = (_f = {},
-    _f[greyscript_core_1.Operator.Plus] = function (left, right) {
+    }
+};
+exports.MapProcessorHandler = {
+    [greyscript_core_1.Operator.Plus]: (left, right) => {
         if (right instanceof map_1.default) {
             return left.fork().extend(right);
         }
         return left;
     },
-    _f[greyscript_core_1.Operator.LessThan] = function (left, right) {
+    [greyscript_core_1.Operator.LessThan]: (left, right) => {
         if (right instanceof map_1.default) {
             return new boolean_1.default(left.value.size < right.value.size);
         }
         return default_1.default.Void;
     },
-    _f[greyscript_core_1.Operator.GreaterThan] = function (left, right) {
+    [greyscript_core_1.Operator.GreaterThan]: (left, right) => {
         if (right instanceof map_1.default) {
             return new boolean_1.default(left.value.size > right.value.size);
         }
         return default_1.default.Void;
     },
-    _f[greyscript_core_1.Operator.GreaterThanOrEqual] = function (left, right) {
+    [greyscript_core_1.Operator.GreaterThanOrEqual]: (left, right) => {
         if (right instanceof map_1.default) {
             return new boolean_1.default(left.value.size >= right.value.size);
         }
         return default_1.default.Void;
     },
-    _f[greyscript_core_1.Operator.Equal] = function (left, right) {
+    [greyscript_core_1.Operator.Equal]: (left, right) => {
         if (right instanceof map_1.default) {
             return new boolean_1.default((0, deep_equal_1.default)(left, right));
         }
         return default_1.default.Void;
     },
-    _f[greyscript_core_1.Operator.LessThanOrEqual] = function (left, right) {
+    [greyscript_core_1.Operator.LessThanOrEqual]: (left, right) => {
         if (right instanceof map_1.default) {
             return new boolean_1.default(left.value.size <= right.value.size);
         }
         return default_1.default.Void;
     },
-    _f[greyscript_core_1.Operator.NotEqual] = function (left, right) {
+    [greyscript_core_1.Operator.NotEqual]: (left, right) => {
         if (right instanceof map_1.default) {
             return new boolean_1.default(!(0, deep_equal_1.default)(left, right));
         }
         return default_1.default.Void;
-    },
-    _f);
-exports.InterfaceProcessorHandler = (_g = {},
-    _g[greyscript_core_1.Operator.Equal] = function (left, right) {
-        return new boolean_1.default(left.value === right.value);
-    },
-    _g[greyscript_core_1.Operator.NotEqual] = function (left, right) {
-        return new boolean_1.default(left.value !== right.value);
-    },
-    _g);
-exports.NilProcessorHandler = (_h = {},
-    _h[greyscript_core_1.Operator.Equal] = function (_a, b) { return new boolean_1.default(b instanceof nil_1.default); },
-    _h[greyscript_core_1.Operator.NotEqual] = function (_a, b) { return new boolean_1.default(!(b instanceof nil_1.default)); },
-    _h);
-exports.FunctionProcessorHandler = (_j = {},
-    _j[greyscript_core_1.Operator.Equal] = function (a, b) { return new boolean_1.default(a === b); },
-    _j[greyscript_core_1.Operator.NotEqual] = function (a, b) { return new boolean_1.default(a !== b); },
-    _j);
-var handleNumber = function (op, a, b) {
+    }
+};
+exports.InterfaceProcessorHandler = {
+    [greyscript_core_1.Operator.Equal]: (left, right) => new boolean_1.default(left.value === right.value),
+    [greyscript_core_1.Operator.NotEqual]: (left, right) => new boolean_1.default(left.value !== right.value)
+};
+exports.NilProcessorHandler = {
+    [greyscript_core_1.Operator.Equal]: (_a, b) => new boolean_1.default(b instanceof nil_1.default),
+    [greyscript_core_1.Operator.NotEqual]: (_a, b) => new boolean_1.default(!(b instanceof nil_1.default))
+};
+exports.FunctionProcessorHandler = {
+    [greyscript_core_1.Operator.Equal]: (a, b) => new boolean_1.default(a === b),
+    [greyscript_core_1.Operator.NotEqual]: (a, b) => new boolean_1.default(a !== b)
+};
+const handleNumber = (op, a, b) => {
     if (op in exports.NumberProcessorHandler) {
         return exports.NumberProcessorHandler[op](a, b);
     }
@@ -242,7 +173,7 @@ var handleNumber = function (op, a, b) {
     return default_1.default.Void;
 };
 exports.handleNumber = handleNumber;
-var handleString = function (op, a, b) {
+const handleString = (op, a, b) => {
     if (op in exports.StringProcessorHandler) {
         return exports.StringProcessorHandler[op](a, b);
     }
@@ -252,9 +183,9 @@ var handleString = function (op, a, b) {
     return default_1.default.Void;
 };
 exports.handleString = handleString;
-var handleList = function (op, a, b) {
-    var left = a;
-    var right = b;
+const handleList = (op, a, b) => {
+    const left = a;
+    const right = b;
     if (op in exports.ListProcessorHandler) {
         return exports.ListProcessorHandler[op](left, right);
     }
@@ -264,9 +195,9 @@ var handleList = function (op, a, b) {
     return default_1.default.Void;
 };
 exports.handleList = handleList;
-var handleMap = function (op, a, b) {
-    var left = a;
-    var right = b;
+const handleMap = (op, a, b) => {
+    const left = a;
+    const right = b;
     if (op in exports.MapProcessorHandler) {
         return exports.MapProcessorHandler[op](left, right);
     }
@@ -276,9 +207,9 @@ var handleMap = function (op, a, b) {
     return default_1.default.Void;
 };
 exports.handleMap = handleMap;
-var handleInterface = function (op, a, b) {
-    var left = a;
-    var right = b;
+const handleInterface = (op, a, b) => {
+    const left = a;
+    const right = b;
     if (op in exports.InterfaceProcessorHandler) {
         return exports.InterfaceProcessorHandler[op](left, right);
     }
@@ -288,7 +219,7 @@ var handleInterface = function (op, a, b) {
     return default_1.default.Void;
 };
 exports.handleInterface = handleInterface;
-var handleNil = function (op, a, b) {
+const handleNil = (op, a, b) => {
     if (op in exports.NilProcessorHandler) {
         return exports.NilProcessorHandler[op](a, b);
     }
@@ -298,7 +229,7 @@ var handleNil = function (op, a, b) {
     return default_1.default.Void;
 };
 exports.handleNil = handleNil;
-var handleFunction = function (op, a, b) {
+const handleFunction = (op, a, b) => {
     if (op in exports.FunctionProcessorHandler) {
         return exports.FunctionProcessorHandler[op](a, b);
     }
@@ -308,7 +239,7 @@ var handleFunction = function (op, a, b) {
     return default_1.default.Void;
 };
 exports.handleFunction = handleFunction;
-var handle = function (op, a, b) {
+const handle = (op, a, b) => {
     if (a instanceof boolean_1.default) {
         a = new number_1.default(a.toInt());
     }
@@ -318,7 +249,8 @@ var handle = function (op, a, b) {
     if (op === greyscript_core_1.Operator.Equal && a.getCustomType() !== b.getCustomType()) {
         return default_1.default.False;
     }
-    else if (op === greyscript_core_1.Operator.NotEqual && a.getCustomType() !== b.getCustomType()) {
+    else if (op === greyscript_core_1.Operator.NotEqual &&
+        a.getCustomType() !== b.getCustomType()) {
         return default_1.default.True;
     }
     if (a instanceof string_1.default || b instanceof string_1.default) {
@@ -345,94 +277,58 @@ var handle = function (op, a, b) {
     return default_1.default.Void;
 };
 exports.handle = handle;
-var Evaluate = /** @class */ (function (_super) {
-    __extends(Evaluate, _super);
-    function Evaluate(item, target) {
-        var _this = _super.call(this, null, target) || this;
-        _this.item = item;
-        return _this;
-    }
-    Evaluate.prototype.build = function (visit) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _b, _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        this.type = this.item.type;
-                        this.op = this.item.operator;
-                        _b = this;
-                        return [4 /*yield*/, visit(this.item.left)];
-                    case 1:
-                        _b.left = _d.sent();
-                        _c = this;
-                        return [4 /*yield*/, visit(this.item.right)];
-                    case 2:
-                        _c.right = _d.sent();
-                        return [2 /*return*/, this];
-                }
-            });
+class Evaluate extends operation_1.default {
+    constructor(item, target) {
+        super(null, target);
+        this.item = item;
+    }
+    build(visit) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.type = this.item.type;
+            this.op = this.item.operator;
+            this.left = yield visit(this.item.left);
+            this.right = yield visit(this.item.right);
+            return this;
         });
-    };
-    Evaluate.prototype.resolveBinaryExpression = function (ctx, expr) {
-        return __awaiter(this, void 0, void 0, function () {
-            var left, right;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, this.resolve(ctx, expr.left)];
-                    case 1:
-                        left = _b.sent();
-                        return [4 /*yield*/, this.resolve(ctx, expr.right)];
-                    case 2:
-                        right = _b.sent();
-                        return [2 /*return*/, (0, exports.handle)(expr.op, left, right)];
-                }
-            });
+    }
+    resolveBinaryExpression(ctx, expr) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const left = yield this.resolve(ctx, expr.left);
+            const right = yield this.resolve(ctx, expr.right);
+            return (0, exports.handle)(expr.op, left, right);
         });
-    };
-    Evaluate.prototype.resolveLogicalExpression = function (ctx, expr) {
-        return __awaiter(this, void 0, void 0, function () {
-            var left, right;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, this.resolve(ctx, expr.left)];
-                    case 1:
-                        left = _b.sent();
-                        if (expr.op === greyscript_core_1.Operator.And && !left.toTruthy()) {
-                            return [2 /*return*/, new boolean_1.default(false)];
-                        }
-                        else if (expr.op === greyscript_core_1.Operator.Or && left.toTruthy()) {
-                            return [2 /*return*/, new boolean_1.default(true)];
-                        }
-                        return [4 /*yield*/, this.resolve(ctx, expr.right)];
-                    case 2:
-                        right = _b.sent();
-                        return [2 /*return*/, (0, exports.handle)(expr.op, left, right)];
-                }
-            });
+    }
+    resolveLogicalExpression(ctx, expr) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const left = yield this.resolve(ctx, expr.left);
+            if (expr.op === greyscript_core_1.Operator.And && !left.toTruthy()) {
+                return new boolean_1.default(false);
+            }
+            else if (expr.op === greyscript_core_1.Operator.Or && left.toTruthy()) {
+                return new boolean_1.default(true);
+            }
+            const right = yield this.resolve(ctx, expr.right);
+            return (0, exports.handle)(expr.op, left, right);
         });
-    };
-    Evaluate.prototype.resolve = function (ctx, op) {
-        return __awaiter(this, void 0, void 0, function () {
-            var expr;
-            return __generator(this, function (_b) {
-                if (op instanceof Evaluate) {
-                    expr = op;
-                    switch (expr.type) {
-                        case greyscript_core_1.ASTType.BinaryExpression:
-                            return [2 /*return*/, this.resolveBinaryExpression(ctx, expr)];
-                        case greyscript_core_1.ASTType.LogicalExpression:
-                            return [2 /*return*/, this.resolveLogicalExpression(ctx, expr)];
-                        default:
-                            break;
-                    }
+    }
+    resolve(ctx, op) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (op instanceof Evaluate) {
+                const expr = op;
+                switch (expr.type) {
+                    case greyscript_core_1.ASTType.BinaryExpression:
+                        return this.resolveBinaryExpression(ctx, expr);
+                    case greyscript_core_1.ASTType.LogicalExpression:
+                        return this.resolveLogicalExpression(ctx, expr);
+                    default:
+                        break;
                 }
-                return [2 /*return*/, op.handle(ctx)];
-            });
+            }
+            return op.handle(ctx);
         });
-    };
-    Evaluate.prototype.handle = function (ctx) {
+    }
+    handle(ctx) {
         return this.resolve(ctx, this);
-    };
-    return Evaluate;
-}(operation_1.default));
+    }
+}
 exports.default = Evaluate;

package/dist/operations/for.d.ts

@@ -1,6 +1,6 @@
 import { ASTForGenericStatement, ASTIdentifier } from 'greyscript-core';
 import context from '../context';
-import { CustomValue } from '../types/generics';
+import CustomValue from '../types/base';
 import Block from './block';
 import Operation, { CPSVisit } from './operation';
 export default class For extends Operation {