greybel-interpreter 4.0.15 → 4.0.17

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(node.index),
+                    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.base),
+                        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(left.identifier),
+                        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(left.index),
+                        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(left.index),
+                        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(left),
+                    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(left),
+                    source: this.getSourceLocation(left, node.type),
                     length: node.arguments.length
                 });
             }

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/vm.d.ts

@@ -26,7 +26,8 @@ export interface FrameOptions {
 export declare enum VMState {
     PREPARATION = 0,
     PENDING = 1,
-    FINISHED = 2
+    FINISHED = 2,
+    STOPPED = 3
 }
 export interface VMOptions {
     target: string;
@@ -37,9 +38,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 +63,7 @@ export declare class VM {
     getTime(): number;
     isPending(): boolean;
     getStacktrace(): Instruction[];
+    setMaxActionsPerLoop(actions: number): this;
     getOpenHandles(): number;
     getSignal(): EventEmitter;
     exit(): void;
@@ -70,4 +74,5 @@ export declare class VM {
     private createFrame;
     private popFrame;
     exec(): Promise<void>;
+    private resume;
 }

package/dist/vm.js

@@ -25,7 +25,7 @@ const evaluation_1 = require("./vm/evaluation");
 const number_1 = require("./types/number");
 const map_1 = require("./types/map");
 const list_1 = require("./types/list");
-const next_tick_1 = require("./utils/next-tick");
+const set_immediate_1 = require("./utils/set-immediate");
 const string_1 = require("./types/string");
 const events_1 = __importDefault(require("events"));
 const object_value_1 = require("./utils/object-value");
@@ -63,7 +63,7 @@ class Debugger {
                     resolve();
                 }
                 else {
-                    setImmediate(check);
+                    (0, set_immediate_1.setImmediate)(check);
                 }
             };
             check();
@@ -82,15 +82,17 @@ var VMState;
     VMState[VMState["PREPARATION"] = 0] = "PREPARATION";
     VMState[VMState["PENDING"] = 1] = "PENDING";
     VMState[VMState["FINISHED"] = 2] = "FINISHED";
+    VMState[VMState["STOPPED"] = 3] = "STOPPED";
 })(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 = 80000;
         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 +101,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 +124,10 @@ class VM {
         }
         return stacktrace;
     }
+    setMaxActionsPerLoop(actions) {
+        this.maxActionsPerLoop = actions;
+        return this;
+    }
     getOpenHandles() {
         return this.sp;
     }
@@ -129,6 +135,7 @@ class VM {
         return this.signal;
     }
     exit() {
+        this.state = VMState.STOPPED;
         this.signal.emit('exit');
     }
     getFrame() {
@@ -161,16 +168,28 @@ class VM {
         return frame;
     }
     exec() {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
         return __awaiter(this, void 0, void 0, function* () {
-            let shouldContinue = true;
-            const exitCallback = () => {
-                shouldContinue = false;
-            };
-            this.time = Date.now();
-            this.state = VMState.PENDING;
-            this.signal.once('exit', exitCallback);
-            while (shouldContinue) {
+            return new Promise((resolve, reject) => {
+                this.state = VMState.PENDING;
+                this.time = Date.now();
+                this.resume((err) => {
+                    if (err) {
+                        reject(err);
+                        return;
+                    }
+                    resolve();
+                });
+            });
+        });
+    }
+    resume(done) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        try {
+            while (true) {
+                if (!this.isPending()) {
+                    done();
+                    return;
+                }
                 const frame = this.getFrame();
                 if (frame.code.length === frame.ip) {
                     this.popFrame();
@@ -499,8 +518,11 @@ class VM {
                             const value = frame.scope.value.get(arg.name);
                             args.set(arg.name.toString(), value);
                         }
-                        this.pushStack(yield callback(this, frame.self, args));
-                        break;
+                        callback(this, frame.self, args).then((result) => {
+                            this.pushStack(result);
+                            this.resume(done);
+                        }).catch(done);
+                        return;
                     }
                     case instruction_1.OpCode.SLICE: {
                         const b = this.popStack();
@@ -669,9 +691,11 @@ class VM {
                     case instruction_1.OpCode.BREAKPOINT: {
                         if (this.debugger.getBreakpoint(this)) {
                             this.debugger.interact(this, instruction.source);
-                            yield this.debugger.resume();
+                            this.debugger.resume().then(() => {
+                                this.resume(done);
+                            }).catch(done);
                         }
-                        break;
+                        return;
                     }
                     case instruction_1.OpCode.BREAKPOINT_ENABLE: {
                         this.debugger.setBreakpoint(true);
@@ -679,16 +703,23 @@ class VM {
                     }
                     case instruction_1.OpCode.HALT: {
                         this.state = VMState.FINISHED;
-                        this.signal.off('exit', exitCallback);
+                        this.signal.emit('done');
+                        done();
                         return;
                     }
                 }
-                if (this.actionCount++ === this.ACTIONS_PER_LOOP) {
+                if (this.actionCount++ === this.maxActionsPerLoop) {
                     this.actionCount = 0;
-                    yield (0, next_tick_1.nextTick)();
+                    (0, set_immediate_1.setImmediate)(() => {
+                        this.resume(done);
+                    });
+                    return;
                 }
             }
-        });
+        }
+        catch (err) {
+            done(err);
+        }
     }
 }
 exports.VM = VM;

package/package.json

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

package/dist/utils/next-tick.d.ts

@@ -1 +0,0 @@
-export declare const nextTick: () => Promise<void>;

package/dist/utils/next-tick.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.nextTick = void 0;
-const set_immediate_1 = require("./set-immediate");
-const nextTick = () => {
-    return new Promise((resolve) => {
-        (0, set_immediate_1.setImmediate)(resolve);
-    });
-};
-exports.nextTick = nextTick;