greybel-interpreter 0.5.7 → 0.6.1

package/dist/operations/return.js

@@ -50,10 +50,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         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 };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var operation_1 = require("../types/operation");
 var expression_1 = require("../types/expression");
 var typer_1 = require("../typer");
+var nil_1 = __importDefault(require("../custom-types/nil"));
 var ReturnOperation = /** @class */ (function (_super) {
     __extends(ReturnOperation, _super);
     function ReturnOperation(ast, options) {
@@ -87,7 +91,7 @@ var ReturnOperation = /** @class */ (function (_super) {
                         arg = _a.sent();
                         return [3 /*break*/, 6];
                     case 5:
-                        operationContext.debugger.raise('Unexpected return value', me, me.arg);
+                        arg = new nil_1.default();
                         _a.label = 6;
                     case 6:
                         functionContext.value = arg;

package/dist/operations/while.js

@@ -80,24 +80,33 @@ var WhileOperation = /** @class */ (function (_super) {
                             isBreak: false,
                             isContinue: false
                         };
-                        resolveCondition = function () {
+                        resolveCondition = function (item) {
                             return __awaiter(this, void 0, void 0, function () {
-                                var value;
+                                var value, value;
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0:
-                                            if (!(me.condition instanceof expression_1.Expression)) return [3 /*break*/, 2];
-                                            return [4 /*yield*/, me.condition.get(opc)];
+                                            if (!(item instanceof expression_1.Expression)) return [3 /*break*/, 2];
+                                            return [4 /*yield*/, item.get(opc)];
                                         case 1:
                                             value = _a.sent();
-                                            return [2 /*return*/, value.valueOf()];
+                                            return [2 /*return*/, resolveCondition(value)];
                                         case 2:
-                                            if ((0, typer_1.isCustomValue)(me.condition)) {
-                                                return [2 /*return*/, me.condition.valueOf()];
-                                            }
-                                            _a.label = 3;
+                                            if (!(item instanceof operation_1.Operation)) return [3 /*break*/, 4];
+                                            return [4 /*yield*/, item.get(opc)];
                                         case 3:
-                                            operationContext.debugger.raise('Unexpected condition', me, me.condition);
+                                            value = _a.sent();
+                                            return [2 /*return*/, resolveCondition(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*/];
                                     }
                                 });
@@ -105,7 +114,7 @@ var WhileOperation = /** @class */ (function (_super) {
                         };
                         opc.setMemory('loopContext', loopContext);
                         _a.label = 1;
-                    case 1: return [4 /*yield*/, resolveCondition()];
+                    case 1: return [4 /*yield*/, resolveCondition(me.condition)];
                     case 2:
                         if (!_a.sent()) return [3 /*break*/, 4];
                         loopContext.isContinue = false;

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

@@ -1,14 +1,16 @@
 export declare abstract class CustomType {
     static intrinsics: Map<string, Function>;
     getType(): string;
-    valueOf(): any;
+    toNumber(): number;
     toString(): string;
+    toTruthy(): boolean;
 }
 export declare abstract class CustomLiteralType extends CustomType {
     value: any;
 }
 export declare abstract class CustomObjectType extends CustomType {
     value: any;
+    has(path: any[]): Promise<boolean>;
     set(path: any[], value: any): Promise<void>;
     get(path: any[]): Promise<any>;
     getCallable(path: any[]): Promise<Callable>;

package/dist/types/custom-type.js

@@ -22,12 +22,15 @@ var CustomType = /** @class */ (function () {
     CustomType.prototype.getType = function () {
         throw new Error('Implentation of "getType" missing');
     };
-    CustomType.prototype.valueOf = function () {
-        throw new Error('Implentation of "valueOf" missing');
+    CustomType.prototype.toNumber = function () {
+        throw new Error('Implentation of "toNumber" missing');
     };
     CustomType.prototype.toString = function () {
         throw new Error('Implentation of "toString" missing');
     };
+    CustomType.prototype.toTruthy = function () {
+        throw new Error('Implentation of "toTruthy" missing');
+    };
     return CustomType;
 }());
 exports.CustomType = CustomType;
@@ -44,6 +47,9 @@ var CustomObjectType = /** @class */ (function (_super) {
     function CustomObjectType() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
+    CustomObjectType.prototype.has = function (path) {
+        throw new Error('Implentation of "has" missing');
+    };
     CustomObjectType.prototype.set = function (path, value) {
         throw new Error('Implentation of "set" missing');
     };

package/package.json

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