greybel-interpreter 2.2.18 → 2.2.19

package/dist/operations/assign.js

@@ -29,6 +29,9 @@ class Assign extends operation_1.Operation {
     handle(ctx) {
         return __awaiter(this, void 0, void 0, function* () {
             const resolveResult = yield this.left.getResult(ctx);
+            if (ctx.isExit()) {
+                return default_1.DefaultType.Void;
+            }
             const rightValue = yield this.right.handle(ctx);
             if (!(resolveResult.handle instanceof resolve_1.ResolveNil)) {
                 const resultValueCtx = resolveResult.handle;

package/dist/operations/call.js

@@ -32,6 +32,9 @@ class Call extends operation_1.Operation {
     handle(ctx) {
         return __awaiter(this, void 0, void 0, function* () {
             const resolveResult = yield this.fnRef.getResult(ctx);
+            if (ctx.isExit()) {
+                return default_1.DefaultType.Void;
+            }
             const valueRef = yield this.fnRef.handle(ctx, resolveResult, false);
             const fnArgs = [];
             for (let index = 0; index < this.args.length; index++) {

package/dist/operations/function-reference.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FunctionReference = void 0;
+const default_1 = require("../types/default");
 const operation_1 = require("./operation");
 const resolve_1 = require("./resolve");
 class FunctionReference extends operation_1.Operation {
@@ -27,6 +28,9 @@ class FunctionReference extends operation_1.Operation {
     handle(ctx) {
         return __awaiter(this, void 0, void 0, function* () {
             const refResult = yield this.ref.getResult(ctx);
+            if (ctx.isExit()) {
+                return default_1.DefaultType.Void;
+            }
             if (!(refResult.handle instanceof resolve_1.ResolveNil)) {
                 if (refResult.path.count() === 0) {
                     return refResult.handle;

package/dist/operations/resolve.d.ts

@@ -50,6 +50,6 @@ export declare class Resolve extends Operation {
     constructor(item: ASTBase, target?: string);
     buildProcessor(node: ASTBase, visit: CPSVisit): Promise<void>;
     build(visit: CPSVisit): Promise<Resolve>;
-    getResult(ctx: OperationContext): Promise<ResolveResult>;
+    getResult(ctx: OperationContext): Promise<ResolveResult | null>;
     handle(ctx: OperationContext, result?: ResolveResult, autoCall?: boolean): Promise<CustomValue>;
 }

package/dist/operations/resolve.js

@@ -157,7 +157,7 @@ class Resolve extends operation_1.Operation {
             const lastIndex = maxIndex - 1;
             for (let index = 0; index < maxIndex; index++) {
                 if (ctx.isExit()) {
-                    return null;
+                    return new ResolveResult(null, default_1.DefaultType.Void);
                 }
                 const current = this.path.at(index);
                 if (current instanceof OperationSegment) {
@@ -215,7 +215,7 @@ class Resolve extends operation_1.Operation {
         return __awaiter(this, void 0, void 0, function* () {
             if (result === null) {
                 result = yield this.getResult(ctx);
-                if (result === null && ctx.isExit()) {
+                if (ctx.isExit()) {
                     return default_1.DefaultType.Void;
                 }
             }

package/package.json

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