greybel-interpreter 4.1.0 → 4.1.2

package/dist/context.d.ts

@@ -4,6 +4,7 @@ import { ObjectValue } from './utils/object-value';
 import { ContextTypeIntrinsics } from './context/types';
 import { Instruction } from './byte-compiler/instruction';
 import { CustomValueWithIntrinsicsResult } from './types/with-intrinsics';
+import { Stack } from './utils/stack';
 export declare enum ContextType {
     Api = 0,
     Global = 1,
@@ -35,6 +36,9 @@ export interface ContextForkOptions {
 }
 export declare class OperationContext {
     previous: OperationContext;
+    iterators: Stack<Iterator<CustomValue> & {
+        index: number;
+    }>;
     readonly type: ContextType;
     readonly scope: Scope;
     isProtected: boolean;

package/dist/context.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OperationContext = exports.Scope = exports.ContextType = void 0;
 const map_1 = require("./types/map");
 const string_1 = require("./types/string");
+const stack_1 = require("./utils/stack");
 var ContextType;
 (function (ContextType) {
     ContextType[ContextType["Api"] = 0] = "Api";
@@ -63,6 +64,7 @@ exports.Scope = Scope;
 class OperationContext {
     constructor(options) {
         var _a, _b, _c, _d, _e, _f, _g;
+        this.iterators = new stack_1.Stack();
         this.code = options.code;
         this.ip = 0;
         this.previous = (_a = options.previous) !== null && _a !== void 0 ? _a : null;

package/dist/utils/stack.d.ts

@@ -7,4 +7,6 @@ export declare class Stack<T> {
     peek(): T;
     includes(value: T): boolean;
     values(): T[];
+    get length(): number;
+    clear(): void;
 }

package/dist/utils/stack.js

@@ -26,5 +26,12 @@ class Stack {
     values() {
         return this.stack.slice(0);
     }
+    get length() {
+        return this.stack.length;
+    }
+    clear() {
+        this.stack = [];
+        this.last = undefined;
+    }
 }
 exports.Stack = Stack;

package/dist/vm.d.ts

@@ -50,7 +50,6 @@ export declare class VM {
     private readonly STACK_LIMIT;
     private sp;
     private stack;
-    private iterators;
     private time;
     readonly target: string;
     readonly contextTypeIntrinsics: ContextTypeIntrinsics;

package/dist/vm.js

@@ -102,7 +102,6 @@ class VM {
         this.handler = options.handler;
         this.debugger = options.debugger;
         this.environmentVariables = (_b = options.environmentVariables) !== null && _b !== void 0 ? _b : new Map();
-        this.iterators = new stack_1.Stack();
         this.imports = (_c = options.imports) !== null && _c !== void 0 ? _c : new Map();
         this.externalFrames = (_d = options.externalFrames) !== null && _d !== void 0 ? _d : new stack_1.Stack();
     }
@@ -163,6 +162,9 @@ class VM {
         return ctx;
     }
     popFrame() {
+        if (this.frames.length === 1) {
+            return null;
+        }
         const frame = this.frames.pop();
         this.getFrame().ip++;
         return frame;
@@ -429,17 +431,17 @@ class VM {
                     case instruction_1.OpCode.PUSH_ITERATOR: {
                         const value = this.popStack();
                         const iterator = value[Symbol.iterator]();
-                        this.iterators.push(iterator);
+                        frame.iterators.push(iterator);
                         break;
                     }
                     case instruction_1.OpCode.POP_ITERATOR: {
-                        this.iterators.pop();
+                        frame.iterators.pop();
                         break;
                     }
                     case instruction_1.OpCode.NEXT: {
                         const nextInstruction = instruction;
                         let idx = frame.get(nextInstruction.idxVariable, this.contextTypeIntrinsics).toNumber();
-                        const iterator = this.iterators.peek();
+                        const iterator = frame.iterators.peek();
                         iterator.index = ++idx;
                         const iteratorResult = iterator.next();
                         this.pushStack(new boolean_1.CustomBoolean(!iteratorResult.done));
@@ -684,6 +686,7 @@ class VM {
                     }
                     case instruction_1.OpCode.RETURN: {
                         const value = this.popStack();
+                        frame.iterators.clear();
                         this.popFrame();
                         this.pushStack(value !== null && value !== void 0 ? value : default_1.DefaultType.Void);
                         break;

package/package.json

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