greybel-interpreter 0.6.1 → 0.6.2

package/dist/custom-types/boolean.d.ts

@@ -8,4 +8,5 @@ export default class CustomBoolean extends CustomLiteralType {
     fork(): CustomBoolean;
     toNumber(): number;
     toTruthy(): boolean;
+    valueOf(): boolean;
 }

package/dist/custom-types/boolean.js

@@ -38,6 +38,9 @@ var CustomBoolean = /** @class */ (function (_super) {
     CustomBoolean.prototype.toTruthy = function () {
         return this.value;
     };
+    CustomBoolean.prototype.valueOf = function () {
+        return this.value;
+    };
     CustomBoolean.intrinsics = new Map();
     return CustomBoolean;
 }(custom_type_1.CustomLiteralType));

package/dist/custom-types/list.d.ts

@@ -21,5 +21,6 @@ export default class CustomList extends CustomObjectType {
     toString(): string;
     toNumber(): number;
     toTruthy(): boolean;
+    valueOf(): any[];
     fork(): CustomList;
 }

package/dist/custom-types/list.js

@@ -224,6 +224,9 @@ var CustomList = /** @class */ (function (_super) {
     CustomList.prototype.toTruthy = function () {
         return this.value.length > 0;
     };
+    CustomList.prototype.valueOf = function () {
+        return this.value;
+    };
     CustomList.prototype.fork = function () {
         return new CustomList(this.value);
     };

package/dist/custom-types/map.d.ts

@@ -25,5 +25,6 @@ export default class CustomMap extends CustomObjectType implements Iterable<Cust
     toNumber(): number;
     toTruthy(): boolean;
     toString(): string;
+    valueOf(): Map<string, any>;
     fork(): CustomMap;
 }

package/dist/custom-types/map.js

@@ -232,6 +232,9 @@ var CustomMap = /** @class */ (function (_super) {
         });
         return "{".concat(body.join(','), "}");
     };
+    CustomMap.prototype.valueOf = function () {
+        return this.value;
+    };
     CustomMap.prototype.fork = function () {
         return new CustomMap(this.value);
     };

package/dist/custom-types/nil.d.ts

@@ -6,4 +6,5 @@ export default class CustomNil extends CustomLiteralType {
     toNumber(): number;
     toTruthy(): boolean;
     toString(): string;
+    valueOf(): any[];
 }

package/dist/custom-types/nil.js

@@ -35,6 +35,9 @@ var CustomNil = /** @class */ (function (_super) {
     CustomNil.prototype.toString = function () {
         return 'null';
     };
+    CustomNil.prototype.valueOf = function () {
+        return null;
+    };
     CustomNil.intrinsics = new Map();
     return CustomNil;
 }(custom_type_1.CustomLiteralType));

package/dist/custom-types/number.d.ts

@@ -7,5 +7,6 @@ export default class CustomNumber extends CustomLiteralType {
     toString(): string;
     toNumber(): number;
     toTruthy(): boolean;
+    valueOf(): number;
     fork(): CustomNumber;
 }

package/dist/custom-types/number.js

@@ -35,6 +35,9 @@ var CustomNumber = /** @class */ (function (_super) {
     CustomNumber.prototype.toTruthy = function () {
         return Number.isNaN(this.value) ? false : !!this.value;
     };
+    CustomNumber.prototype.valueOf = function () {
+        return this.value;
+    };
     CustomNumber.prototype.fork = function () {
         return new CustomNumber(this.value);
     };

package/dist/custom-types/string.d.ts

@@ -20,5 +20,6 @@ export default class CustomString extends CustomLiteralType {
     toString(): string;
     toNumber(): number;
     toTruthy(): boolean;
+    valueOf(): string;
     fork(): CustomString;
 }

package/dist/custom-types/string.js

@@ -160,6 +160,9 @@ var CustomString = /** @class */ (function (_super) {
     CustomString.prototype.toTruthy = function () {
         return this.value.length > 0;
     };
+    CustomString.prototype.valueOf = function () {
+        return this.value;
+    };
     CustomString.prototype.fork = function () {
         return new CustomString(this.value);
     };

package/dist/expressions/logical-and-binary.js

@@ -98,10 +98,10 @@ exports.OPERATIONS = (_a = {},
     _a[greybel_core_1.Operator.UnsignedRightShift] = function (a, b) { return a.toNumber() >>> b.toNumber(); },
     _a[greybel_core_1.Operator.BitwiseAnd] = function (a, b) { return a.toNumber() & b.toNumber(); },
     _a[greybel_core_1.Operator.PercentSign] = function (a, b) { return a.toNumber() % b.toNumber(); },
-    _a[greybel_core_1.Operator.GreaterThanOrEqual] = function (a, b) { return a.toNumber() >= b.toNumber(); },
-    _a[greybel_core_1.Operator.Equal] = function (a, b) { return a.toNumber() == b.toNumber(); },
-    _a[greybel_core_1.Operator.LessThanOrEqual] = function (a, b) { return a.toNumber() <= b.toNumber(); },
-    _a[greybel_core_1.Operator.NotEqual] = function (a, b) { return a.toNumber() != b.toNumber(); },
+    _a[greybel_core_1.Operator.GreaterThanOrEqual] = function (a, b) { return a.valueOf() >= b.valueOf(); },
+    _a[greybel_core_1.Operator.Equal] = function (a, b) { return a.valueOf() == b.valueOf(); },
+    _a[greybel_core_1.Operator.LessThanOrEqual] = function (a, b) { return a.valueOf() <= b.valueOf(); },
+    _a[greybel_core_1.Operator.NotEqual] = function (a, b) { return a.valueOf() != b.valueOf(); },
     _a[greybel_core_1.Operator.And] = function (a, b) { return a.toTruthy() && b.toTruthy(); },
     _a[greybel_core_1.Operator.Or] = function (a, b) { return a.toTruthy() || b.toTruthy(); },
     _a);

package/dist/operations/function.d.ts

@@ -19,5 +19,6 @@ export default class FunctionOperation extends FunctionOperationBase {
     toString(): string;
     toTruthy(): boolean;
     toNumber(): number;
+    valueOf(): FunctionOperation;
     run(operationContext: OperationContext): Promise<any>;
 }

package/dist/operations/function.js

@@ -89,7 +89,10 @@ var FunctionOperation = /** @class */ (function (_super) {
         return true;
     };
     FunctionOperation.prototype.toNumber = function () {
-        return 0;
+        return Number.NaN;
+    };
+    FunctionOperation.prototype.valueOf = function () {
+        return this;
     };
     FunctionOperation.prototype.run = function (operationContext) {
         return __awaiter(this, void 0, void 0, function () {

package/dist/operations/if-statement.js

@@ -82,102 +82,84 @@ var IfStatementOperation = /** @class */ (function (_super) {
     }
     IfStatementOperation.prototype.run = function (operationContext) {
         return __awaiter(this, void 0, void 0, function () {
-            var me, clauses, _loop_1, clauses_1, clauses_1_1, clause, state_1, e_1_1;
+            var me, clauses, clauses_1, clauses_1_1, clause, condition, resolveCondition, e_1_1;
             var e_1, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         me = this;
                         clauses = me.clauses;
-                        _loop_1 = function (clause) {
-                            var condition, resolveCondition_1;
-                            return __generator(this, function (_c) {
-                                switch (_c.label) {
-                                    case 0:
-                                        if (!(clause instanceof if_1.default || clause instanceof else_if_1.default)) return [3 /*break*/, 4];
-                                        condition = clause.condition;
-                                        resolveCondition_1 = function (item) {
-                                            return __awaiter(this, void 0, void 0, function () {
-                                                var value, value;
-                                                return __generator(this, function (_a) {
-                                                    switch (_a.label) {
-                                                        case 0:
-                                                            if (!(item instanceof expression_1.Expression)) return [3 /*break*/, 2];
-                                                            return [4 /*yield*/, item.get(operationContext)];
-                                                        case 1:
-                                                            value = _a.sent();
-                                                            return [2 /*return*/, resolveCondition_1(value)];
-                                                        case 2:
-                                                            if (!(item instanceof operation_1.Operation)) return [3 /*break*/, 4];
-                                                            return [4 /*yield*/, item.get(operationContext)];
-                                                        case 3:
-                                                            value = _a.sent();
-                                                            return [2 /*return*/, resolveCondition_1(value)];
-                                                        case 4:
-                                                            if ((0, typer_1.isCustomValue)(item)) {
-                                                                return [2 /*return*/, item.toTruthy()];
-                                                            }
-                                                            else if (typeof item === 'boolean') {
-                                                                return [2 /*return*/, item];
-                                                            }
-                                                            _a.label = 5;
-                                                        case 5:
-                                                            operationContext.debugger.raise('Unexpected condition', me, item);
-                                                            return [2 /*return*/];
-                                                    }
-                                                });
-                                            });
-                                        };
-                                        return [4 /*yield*/, resolveCondition_1(condition)];
-                                    case 1:
-                                        if (!_c.sent()) return [3 /*break*/, 3];
-                                        return [4 /*yield*/, clause.body.run(operationContext)];
-                                    case 2:
-                                        _c.sent();
-                                        return [2 /*return*/, "break"];
-                                    case 3: return [3 /*break*/, 7];
-                                    case 4:
-                                        if (!(clause instanceof else_1.default)) return [3 /*break*/, 6];
-                                        return [4 /*yield*/, clause.body.run(operationContext)];
-                                    case 5:
-                                        _c.sent();
-                                        return [2 /*return*/, "break"];
-                                    case 6:
-                                        operationContext.debugger.raise('Invalid operation in if statement.', me, clause);
-                                        _c.label = 7;
-                                    case 7: return [2 /*return*/];
-                                }
-                            });
-                        };
                         _b.label = 1;
                     case 1:
-                        _b.trys.push([1, 6, 7, 8]);
+                        _b.trys.push([1, 11, 12, 13]);
                         clauses_1 = __values(clauses), clauses_1_1 = clauses_1.next();
                         _b.label = 2;
                     case 2:
-                        if (!!clauses_1_1.done) return [3 /*break*/, 5];
+                        if (!!clauses_1_1.done) return [3 /*break*/, 10];
                         clause = clauses_1_1.value;
-                        return [5 /*yield**/, _loop_1(clause)];
+                        if (!(clause instanceof if_1.default || clause instanceof else_if_1.default)) return [3 /*break*/, 6];
+                        condition = clause.condition;
+                        resolveCondition = function (item) {
+                            return __awaiter(this, void 0, void 0, function () {
+                                var value, value;
+                                return __generator(this, function (_a) {
+                                    switch (_a.label) {
+                                        case 0:
+                                            if (!(item instanceof expression_1.Expression)) return [3 /*break*/, 2];
+                                            return [4 /*yield*/, item.get(operationContext)];
+                                        case 1:
+                                            value = _a.sent();
+                                            return [2 /*return*/, value.toTruthy()];
+                                        case 2:
+                                            if (!(item instanceof operation_1.Operation)) return [3 /*break*/, 4];
+                                            return [4 /*yield*/, item.get(operationContext)];
+                                        case 3:
+                                            value = _a.sent();
+                                            return [2 /*return*/, value.toTruthy()];
+                                        case 4:
+                                            if ((0, typer_1.isCustomValue)(item)) {
+                                                return [2 /*return*/, item.toTruthy()];
+                                            }
+                                            _a.label = 5;
+                                        case 5:
+                                            operationContext.debugger.raise('Unexpected condition', me, item);
+                                            return [2 /*return*/];
+                                    }
+                                });
+                            });
+                        };
+                        return [4 /*yield*/, resolveCondition(condition)];
                     case 3:
-                        state_1 = _b.sent();
-                        if (state_1 === "break")
-                            return [3 /*break*/, 5];
-                        _b.label = 4;
+                        if (!_b.sent()) return [3 /*break*/, 5];
+                        return [4 /*yield*/, clause.body.run(operationContext)];
                     case 4:
+                        _b.sent();
+                        return [3 /*break*/, 10];
+                    case 5: return [3 /*break*/, 9];
+                    case 6:
+                        if (!(clause instanceof else_1.default)) return [3 /*break*/, 8];
+                        return [4 /*yield*/, clause.body.run(operationContext)];
+                    case 7:
+                        _b.sent();
+                        return [3 /*break*/, 10];
+                    case 8:
+                        operationContext.debugger.raise('Invalid operation in if statement.', me, clause);
+                        _b.label = 9;
+                    case 9:
                         clauses_1_1 = clauses_1.next();
                         return [3 /*break*/, 2];
-                    case 5: return [3 /*break*/, 8];
-                    case 6:
+                    case 10: return [3 /*break*/, 13];
+                    case 11:
                         e_1_1 = _b.sent();
                         e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 8];
-                    case 7:
+                        return [3 /*break*/, 13];
+                    case 12:
                         try {
                             if (clauses_1_1 && !clauses_1_1.done && (_a = clauses_1.return)) _a.call(clauses_1);
                         }
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];
-                    case 8: return [2 /*return*/];
+                    case 13: return [2 /*return*/];
                 }
             });
         });

package/dist/operations/not.js

@@ -85,7 +85,7 @@ var NotOperation = /** @class */ (function (_super) {
                     case 3:
                         operationContext.debugger.raise('Unexpected not operation', me, me.arg);
                         _a.label = 4;
-                    case 4: return [2 /*return*/, !arg];
+                    case 4: return [2 /*return*/, (0, typer_1.cast)(!arg)];
                 }
             });
         });

package/dist/operations/while.js

@@ -90,20 +90,17 @@ var WhileOperation = /** @class */ (function (_super) {
                                             return [4 /*yield*/, item.get(opc)];
                                         case 1:
                                             value = _a.sent();
-                                            return [2 /*return*/, resolveCondition(value)];
+                                            return [2 /*return*/, value.toTruthy()];
                                         case 2:
                                             if (!(item instanceof operation_1.Operation)) return [3 /*break*/, 4];
                                             return [4 /*yield*/, item.get(opc)];
                                         case 3:
                                             value = _a.sent();
-                                            return [2 /*return*/, resolveCondition(value)];
+                                            return [2 /*return*/, value.toTruthy()];
                                         case 4:
                                             if ((0, typer_1.isCustomValue)(item)) {
                                                 return [2 /*return*/, item.toTruthy()];
                                             }
-                                            else if (typeof item === 'boolean') {
-                                                return [2 /*return*/, item];
-                                            }
                                             _a.label = 5;
                                         case 5:
                                             operationContext.debugger.raise('Unexpected condition', me, item);

package/dist/types/custom-type.d.ts

@@ -4,6 +4,7 @@ export declare abstract class CustomType {
     toNumber(): number;
     toString(): string;
     toTruthy(): boolean;
+    valueOf(): any;
 }
 export declare abstract class CustomLiteralType extends CustomType {
     value: any;

package/dist/types/custom-type.js

@@ -31,6 +31,9 @@ var CustomType = /** @class */ (function () {
     CustomType.prototype.toTruthy = function () {
         throw new Error('Implentation of "toTruthy" missing');
     };
+    CustomType.prototype.valueOf = function () {
+        throw new Error('Implentation of "valueOf" missing');
+    };
     return CustomType;
 }());
 exports.CustomType = CustomType;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "0.6.1",
+    "version": "0.6.2",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",