greybel-interpreter 4.0.16 → 4.0.18

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;
@@ -73,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,11 +82,12 @@ 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, _d;
-        this.ACTIONS_PER_LOOP = 1200;
+        this.ACTIONS_PER_LOOP = 80000;
         this.STACK_LIMIT = 512;
         this.stack = new Array(this.STACK_LIMIT);
         this.signal = new events_1.default();
@@ -134,6 +135,7 @@ class VM {
         return this.signal;
     }
     exit() {
+        this.state = VMState.STOPPED;
         this.signal.emit('exit');
     }
     getFrame() {
@@ -166,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();
@@ -504,7 +518,16 @@ class VM {
                             const value = frame.scope.value.get(arg.name);
                             args.set(arg.name.toString(), value);
                         }
-                        this.pushStack(yield callback(this, frame.self, args));
+                        const immediateRet = callback(this, frame.self, args);
+                        // Due to transformations it can happen that return values may not be PromiseLike
+                        if (immediateRet === null || immediateRet === void 0 ? void 0 : immediateRet.then) {
+                            immediateRet.then((ret) => {
+                                this.pushStack(ret);
+                                this.resume(done);
+                            }).catch(done);
+                            return;
+                        }
+                        this.pushStack(immediateRet);
                         break;
                     }
                     case instruction_1.OpCode.SLICE: {
@@ -674,9 +697,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);
@@ -684,16 +709,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.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.16",
+    "version": "4.0.18",
     "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;