greybel-interpreter 1.8.1 → 1.8.3

package/dist/context.d.ts

@@ -95,7 +95,7 @@ export declare class OperationContext {
     private static readonly lookupGlobalsType;
     private static readonly lookupLocalsType;
     constructor(options?: ContextOptions);
-    isAllowedInStack(op: Operation): boolean;
+    isIgnoredInDebugging(op: Operation): boolean;
     step(op: Operation): Promise<CustomValue>;
     setLastActive(ctx: OperationContext): OperationContext;
     getLastActive(): OperationContext;

package/dist/context.js

@@ -11,12 +11,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OperationContext = exports.FunctionState = exports.LoopState = exports.ProcessState = exports.Debugger = exports.Scope = exports.ContextState = exports.ContextType = void 0;
 const handler_container_1 = require("./handler-container");
+const noop_1 = require("./operations/noop");
 const operation_1 = require("./operations/operation");
 const base_1 = require("./types/base");
 const default_1 = require("./types/default");
 const map_1 = require("./types/map");
 const path_1 = require("./utils/path");
-const noop_1 = require("./operations/noop");
 var ContextType;
 (function (ContextType) {
     ContextType[ContextType["Api"] = 0] = "Api";
@@ -155,18 +155,21 @@ class OperationContext {
         this.cps = options.cps || null;
         this.processState = options.processState || new ProcessState();
         this.environmentVariables = options.environmentVariables || new Map();
+        this.functionState = new FunctionState();
+        this.loopState = new LoopState();
         this.api = this.lookupApi();
         this.globals = this.lookupGlobals();
         this.locals = this.lookupLocals() || this;
     }
-    isAllowedInStack(op) {
-        return !(op instanceof operation_1.OperationBlock) && !(op instanceof noop_1.Noop);
+    isIgnoredInDebugging(op) {
+        return op instanceof operation_1.OperationBlock || op instanceof noop_1.Noop;
     }
     step(op) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.isAllowedInStack(op)) {
-                this.stackTrace.unshift(op);
+            if (this.isIgnoredInDebugging(op)) {
+                return op.handle(this);
             }
+            this.stackTrace.unshift(op);
             if (!this.injected) {
                 this.target = op.target || this.target;
                 this.setLastActive(this);
@@ -176,9 +179,7 @@ class OperationContext {
                 }
             }
             const result = yield op.handle(this);
-            if (this.isAllowedInStack(op)) {
-                this.stackTrace.shift();
-            }
+            this.stackTrace.shift();
             return result;
         });
     }

package/dist/operations/for.js

@@ -60,7 +60,9 @@ class For extends operation_1.OperationBlock {
                         forCtx.set(idxIdentifier, new number_1.CustomNumber(index++));
                         forCtx.set(varIdentifier, current);
                         yield this.block.handle(forCtx);
-                        if (loopState.isBreak || ctx.isExit()) {
+                        if (loopState.isBreak ||
+                            forCtx.functionState.isReturn ||
+                            ctx.isExit()) {
                             resolve(default_1.DefaultType.Void);
                             return;
                         }

package/dist/operations/while.js

@@ -45,7 +45,9 @@ class While extends operation_1.OperationBlock {
                         }
                         loopState.isContinue = false;
                         yield this.block.handle(whileCtx);
-                        if (loopState.isBreak || ctx.isExit()) {
+                        if (loopState.isBreak ||
+                            whileCtx.functionState.isReturn ||
+                            ctx.isExit()) {
                             resolve(default_1.DefaultType.Void);
                             return;
                         }

package/package.json

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