greybel-interpreter 4.0.14 → 4.0.16

package/dist/bytecode-generator.d.ts

@@ -26,7 +26,7 @@ export declare class BytecodeGenerator {
     parse(code: string): ASTBase | import("greybel-core").ASTChunkAdvanced;
     compile(code: string): Promise<BytecodeCompileResult>;
     protected getCurrentPointer(): number;
-    protected getSourceLocation(node: ASTBase): SourceLocation;
+    protected getSourceLocation(node: ASTBase, name?: string): SourceLocation;
     protected getInternalLocation(): SourceLocation;
     protected pushContext(): void;
     protected popContext(): BytecodeGeneratorContext;

package/dist/bytecode-generator.js

@@ -72,10 +72,10 @@ class BytecodeGenerator {
     getCurrentPointer() {
         return this.context.peek().code.length - 1;
     }
-    getSourceLocation(node) {
+    getSourceLocation(node, name) {
         const target = this.target.peek();
         return {
-            name: node.type,
+            name: name !== null && name !== void 0 ? name : node.type,
             path: target,
             start: node.start,
             end: node.end
@@ -375,7 +375,7 @@ class BytecodeGenerator {
                 yield this.processSubNode(node.index);
                 this.push({
                     op: instruction_1.OpCode.GET_SUPER_PROPERTY,
-                    source: this.getSourceLocation(base),
+                    source: this.getSourceLocation(node.index, node.type),
                     invoke: isInvoke
                 });
             }
@@ -384,7 +384,7 @@ class BytecodeGenerator {
                 yield this.processSubNode(node.index);
                 this.push({
                     op: instruction_1.OpCode.GET_PROPERTY,
-                    source: this.getSourceLocation(node.index),
+                    source: this.getSourceLocation(node.index, node.type),
                     invoke: isInvoke
                 });
             }
@@ -898,7 +898,7 @@ class BytecodeGenerator {
                     yield pushArgs();
                     this.push({
                         op: instruction_1.OpCode.CALL_SUPER_PROPERTY,
-                        source: this.getSourceLocation(node),
+                        source: this.getSourceLocation(node.base, node.type),
                         length: node.arguments.length
                     });
                 }
@@ -912,7 +912,7 @@ class BytecodeGenerator {
                     yield pushArgs();
                     this.push({
                         op: instruction_1.OpCode.CALL_WITH_CONTEXT,
-                        source: this.getSourceLocation(node),
+                        source: this.getSourceLocation(left.identifier, node.type),
                         length: node.arguments.length
                     });
                 }
@@ -924,7 +924,7 @@ class BytecodeGenerator {
                     yield pushArgs();
                     this.push({
                         op: instruction_1.OpCode.CALL_SUPER_PROPERTY,
-                        source: this.getSourceLocation(node),
+                        source: this.getSourceLocation(left.index, node.type),
                         length: node.arguments.length
                     });
                 }
@@ -934,7 +934,7 @@ class BytecodeGenerator {
                     yield pushArgs();
                     this.push({
                         op: instruction_1.OpCode.CALL_WITH_CONTEXT,
-                        source: this.getSourceLocation(node),
+                        source: this.getSourceLocation(left.index, node.type),
                         length: node.arguments.length
                     });
                 }
@@ -944,7 +944,7 @@ class BytecodeGenerator {
                 yield pushArgs();
                 this.push({
                     op: instruction_1.OpCode.CALL,
-                    source: this.getSourceLocation(node),
+                    source: this.getSourceLocation(left, node.type),
                     length: node.arguments.length
                 });
             }
@@ -953,7 +953,7 @@ class BytecodeGenerator {
                 yield pushArgs();
                 this.push({
                     op: instruction_1.OpCode.CALL,
-                    source: this.getSourceLocation(node),
+                    source: this.getSourceLocation(left, node.type),
                     length: node.arguments.length
                 });
             }

package/dist/context.js

@@ -137,7 +137,7 @@ class OperationContext {
             this.set(new string_1.CustomString('super'), this.super);
     }
     getCurrentInstruction() {
-        return this.code[this.ip - 1];
+        return this.code[this.ip];
     }
     fork(options) {
         return new OperationContext({

package/dist/interpreter.js

@@ -148,9 +148,8 @@ class Interpreter extends events_1.EventEmitter {
     start() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const process = this.vm.exec();
                 this.emit('start', this);
-                yield process;
+                yield this.vm.exec();
             }
             catch (err) {
                 if (err instanceof error_1.PrepareError || err instanceof error_1.RuntimeError) {

package/dist/utils/error.d.ts

@@ -1,6 +1,9 @@
 import { ASTRange } from 'miniscript-core';
 import { Instruction } from '../byte-compiler/instruction';
 interface RuntimeVM {
+    getFrame(): {
+        getCurrentInstruction: () => Instruction;
+    };
     getStacktrace?: () => Instruction[];
     target: string;
 }

package/dist/utils/error.js

@@ -5,7 +5,7 @@ class RuntimeError extends Error {
     constructor(message, vm, source) {
         var _a;
         super(message);
-        this.target = vm === null || vm === void 0 ? void 0 : vm.target;
+        this.target = vm === null || vm === void 0 ? void 0 : vm.getFrame().getCurrentInstruction().source.path;
         this.stackTrace = (_a = vm === null || vm === void 0 ? void 0 : vm.getStacktrace()) !== null && _a !== void 0 ? _a : [];
         this.stack = this.createTrace();
         this.source = source;

package/dist/vm.d.ts

@@ -37,9 +37,11 @@ export interface VMOptions {
     environmentVariables?: Map<string, string>;
     imports?: Map<string, Instruction[]>;
     externalFrames?: Stack<OperationContext>;
+    maxActionsPerLoop?: number;
 }
 export declare class VM {
     private readonly ACTIONS_PER_LOOP;
+    private maxActionsPerLoop;
     private actionCount;
     private state;
     private frames;
@@ -60,6 +62,7 @@ export declare class VM {
     getTime(): number;
     isPending(): boolean;
     getStacktrace(): Instruction[];
+    setMaxActionsPerLoop(actions: number): this;
     getOpenHandles(): number;
     getSignal(): EventEmitter;
     exit(): void;

package/dist/vm.js

@@ -85,12 +85,13 @@ var VMState;
 })(VMState = exports.VMState || (exports.VMState = {}));
 class VM {
     constructor(options) {
-        var _a, _b, _c;
-        this.ACTIONS_PER_LOOP = 120;
+        var _a, _b, _c, _d;
+        this.ACTIONS_PER_LOOP = 1200;
         this.STACK_LIMIT = 512;
         this.stack = new Array(this.STACK_LIMIT);
         this.signal = new events_1.default();
         this.state = VMState.PREPARATION;
+        this.maxActionsPerLoop = (_a = options.maxActionsPerLoop) !== null && _a !== void 0 ? _a : this.ACTIONS_PER_LOOP;
         this.actionCount = 0;
         this.sp = 0;
         this.time = -1;
@@ -99,10 +100,10 @@ class VM {
         this.contextTypeIntrinsics = options.contextTypeIntrinsics;
         this.handler = options.handler;
         this.debugger = options.debugger;
-        this.environmentVariables = (_a = options.environmentVariables) !== null && _a !== void 0 ? _a : new Map();
+        this.environmentVariables = (_b = options.environmentVariables) !== null && _b !== void 0 ? _b : new Map();
         this.iterators = new stack_1.Stack();
-        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();
+        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();
     }
     getTime() {
         return this.time;
@@ -122,6 +123,10 @@ class VM {
         }
         return stacktrace;
     }
+    setMaxActionsPerLoop(actions) {
+        this.maxActionsPerLoop = actions;
+        return this;
+    }
     getOpenHandles() {
         return this.sp;
     }
@@ -144,6 +149,7 @@ class VM {
         return this.stack[--this.sp];
     }
     createFrame(options) {
+        this.getFrame().ip--;
         const ctx = this.getFrame().fork({
             code: options.code,
             type: context_1.ContextType.Function,
@@ -155,7 +161,9 @@ class VM {
         return ctx;
     }
     popFrame() {
-        return this.frames.pop();
+        const frame = this.frames.pop();
+        this.getFrame().ip++;
+        return frame;
     }
     exec() {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -176,7 +184,7 @@ class VM {
                 const instruction = frame.code[frame.ip++];
                 switch (instruction.op) {
                     case instruction_1.OpCode.NOOP: {
-                        continue;
+                        break;
                     }
                     case instruction_1.OpCode.PUSH: {
                         const pushInstruction = instruction;
@@ -680,7 +688,7 @@ class VM {
                         return;
                     }
                 }
-                if (this.actionCount++ === this.ACTIONS_PER_LOOP) {
+                if (this.actionCount++ === this.maxActionsPerLoop) {
                     this.actionCount = 0;
                     yield (0, next_tick_1.nextTick)();
                 }

package/package.json

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