greybel-interpreter 4.0.8 → 4.0.10

package/dist/context.d.ts

@@ -3,6 +3,7 @@ import { CustomMap } from './types/map';
 import { ObjectValue } from './utils/object-value';
 import { ContextTypeIntrinsics } from './context/types';
 import { Instruction } from './byte-compiler/instruction';
+import { CustomValueWithIntrinsicsResult } from './types/with-intrinsics';
 export declare enum ContextType {
     Api = 0,
     Global = 1,
@@ -13,6 +14,7 @@ export declare class Scope extends CustomMap {
     private readonly context;
     constructor(context: OperationContext);
     get(current: CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValue;
+    getWithOrigin(current: CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValueWithIntrinsicsResult;
 }
 export interface ContextOptions {
     code: Instruction[];

package/dist/context.js

@@ -35,6 +35,29 @@ class Scope extends map_1.CustomMap {
         }
         throw new Error(`Unknown path ${current.toString()}.`);
     }
+    getWithOrigin(current, typeIntrinsics) {
+        var _a, _b, _c, _d;
+        if (this.has(current)) {
+            return super.getWithOrigin(current, typeIntrinsics);
+        }
+        else if ((_a = this.context.outer) === null || _a === void 0 ? void 0 : _a.scope.has(current)) {
+            return this.context.outer.scope.getWithOrigin(current, typeIntrinsics);
+        }
+        else if ((_b = this.context.globals) === null || _b === void 0 ? void 0 : _b.scope.has(current)) {
+            return this.context.globals.scope.getWithOrigin(current, typeIntrinsics);
+        }
+        else if ((_c = this.context.api) === null || _c === void 0 ? void 0 : _c.scope.has(current)) {
+            return this.context.api.scope.getWithOrigin(current, typeIntrinsics);
+        }
+        const intrinsics = (_d = typeIntrinsics.map) !== null && _d !== void 0 ? _d : map_1.CustomMap.getIntrinsics();
+        if (intrinsics.has(current)) {
+            return {
+                value: intrinsics.get(current),
+                origin: null
+            };
+        }
+        throw new Error(`Unknown path ${current.toString()}.`);
+    }
 }
 exports.Scope = Scope;
 class OperationContext {

package/dist/vm.d.ts

@@ -36,7 +36,7 @@ export interface VMOptions {
     debugger: Debugger;
     environmentVariables?: Map<string, string>;
     imports?: Map<string, Instruction[]>;
-    frames?: Stack<OperationContext>;
+    externalFrames?: Stack<OperationContext>;
 }
 export declare class VM {
     private readonly ACTIONS_PER_LOOP;
@@ -55,6 +55,7 @@ export declare class VM {
     readonly handler: HandlerContainer;
     readonly debugger: Debugger;
     readonly imports: Map<string, Instruction[]>;
+    readonly externalFrames: Stack<OperationContext>;
     constructor(options: VMOptions);
     getTime(): number;
     isPending(): boolean;

package/dist/vm.js

@@ -96,13 +96,14 @@ class VM {
         this.sp = 0;
         this.time = -1;
         this.target = options.target;
-        this.frames = (_a = options.frames) !== null && _a !== void 0 ? _a : new stack_1.Stack(options.globals);
+        this.frames = new stack_1.Stack(options.globals);
         this.contextTypeIntrinsics = options.contextTypeIntrinsics;
         this.handler = options.handler;
         this.debugger = options.debugger;
-        this.environmentVariables = (_b = options.environmentVariables) !== null && _b !== void 0 ? _b : new Map();
+        this.environmentVariables = (_a = options.environmentVariables) !== null && _a !== void 0 ? _a : new Map();
         this.iterators = new stack_1.Stack();
-        this.imports = (_c = options.imports) !== null && _c !== void 0 ? _c : new Map();
+        this.imports = (_b = options.imports) !== null && _b !== void 0 ? _b : new Map();
+        this.externalFrames = (_c = options.externalFrames) !== null && _c !== void 0 ? _c : new stack_1.Stack();
     }
     getTime() {
         return this.time;
@@ -111,10 +112,14 @@ class VM {
         return this.state === VMState.PENDING;
     }
     getStacktrace() {
+        const externalFrames = this.externalFrames.values();
         const frames = this.frames.values();
         const stacktrace = [];
-        for (let index = frames.length - 1; index >= 0; index--) {
-            stacktrace.push(frames[index].getCurrentInstruction());
+        for (let index = 0; index < externalFrames.length; index++) {
+            stacktrace.push(externalFrames[index].getCurrentInstruction());
+        }
+        for (let index = 0; index < frames.length; index++) {
+            stacktrace.unshift(frames[index].getCurrentInstruction());
         }
         return stacktrace;
     }

package/package.json

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