greybel-interpreter 0.3.8 → 0.3.9

package/dist/context.d.ts

@@ -1,8 +1,6 @@
 import CustomMap from './custom-types/map';
-import { Operation } from './types/operation';
-import { Expression } from './types/expression';
 import { Callable } from './types/custom-type';
-import { ASTPosition } from 'greyscript-core';
+import { ASTBase } from 'greybel-core';
 import CPS from './cps';
 export declare enum ContextType {
     API = "API",
@@ -36,7 +34,7 @@ export declare class Debugger {
     getBreakpoint(operationContext: OperationContext): boolean;
     next(): Debugger;
     resume(): Promise<void>;
-    interact(operationContext: OperationContext, item: Operation | Expression): void;
+    interact(operationContext: OperationContext, item: ASTBase): void;
     run(code: string): Promise<void>;
 }
 export interface OperationContextProcessState {
@@ -60,7 +58,7 @@ export interface OperationContextForkOptions {
 }
 export declare class OperationContext {
     target: string;
-    position: ASTPosition;
+    stackItem: ASTBase | null;
     debugger: Debugger;
     previous: OperationContext | null;
     type: ContextType;
@@ -74,6 +72,7 @@ export declare class OperationContext {
     locals: Scope | null;
     globals: Scope | null;
     constructor(options: OperationContextOptions);
+    step(item: ASTBase): Promise<void>;
     exit(): Promise<OperationContext>;
     setPending(pending: boolean): OperationContext;
     isExit(): boolean;

package/dist/context.js

@@ -292,10 +292,7 @@ var OperationContext = /** @class */ (function () {
     function OperationContext(options) {
         var me = this;
         me.target = options.target || 'unknown';
-        me.position = {
-            line: 0,
-            character: 0
-        };
+        me.stackItem = null;
         me.previous = options.previous || null;
         me.type = options.type || ContextType.API;
         me.state = options.state || ContextState.DEFAULT;
@@ -312,6 +309,16 @@ var OperationContext = /** @class */ (function () {
         me.globals = me.lookupGlobals();
         me.locals = me.lookupLocals();
     }
+    OperationContext.prototype.step = function (item) {
+        var me = this;
+        var dbgr = me.debugger;
+        me.stackItem = item;
+        if (dbgr.getBreakpoint(me)) {
+            dbgr.interact(me, item);
+            return dbgr.resume();
+        }
+        return Promise.resolve();
+    };
     OperationContext.prototype.exit = function () {
         var me = this;
         var state = me.processState;

package/dist/operations/body.js

@@ -94,48 +94,43 @@ var BodyOperation = /** @class */ (function (_super) {
                         }
                         _d.label = 1;
                     case 1:
-                        _d.trys.push([1, 11, 12, 13]);
+                        _d.trys.push([1, 10, 11, 12]);
                         _a = __values(me.stack), _b = _a.next();
                         _d.label = 2;
                     case 2:
-                        if (!!_b.done) return [3 /*break*/, 10];
+                        if (!!_b.done) return [3 /*break*/, 9];
                         entity = _b.value;
-                        operationContext.position = entity.ast.start;
-                        if (!dbgr.getBreakpoint(operationContext)) return [3 /*break*/, 4];
-                        dbgr.interact(operationContext, entity);
-                        return [4 /*yield*/, dbgr.resume()];
+                        return [4 /*yield*/, operationContext.step(entity.ast)];
                     case 3:
                         _d.sent();
-                        _d.label = 4;
-                    case 4:
-                        if (!(entity instanceof expression_1.Expression)) return [3 /*break*/, 6];
+                        if (!(entity instanceof expression_1.Expression)) return [3 /*break*/, 5];
                         return [4 /*yield*/, entity.get(operationContext)];
-                    case 5:
+                    case 4:
                         _d.sent();
-                        return [3 /*break*/, 8];
-                    case 6: return [4 /*yield*/, entity.run(operationContext)];
-                    case 7:
+                        return [3 /*break*/, 7];
+                    case 5: return [4 /*yield*/, entity.run(operationContext)];
+                    case 6:
                         _d.sent();
+                        _d.label = 7;
+                    case 7:
+                        if (isEOL() || operationContext.isExit())
+                            return [3 /*break*/, 9];
                         _d.label = 8;
                     case 8:
-                        if (isEOL() || operationContext.isExit())
-                            return [3 /*break*/, 10];
-                        _d.label = 9;
-                    case 9:
                         _b = _a.next();
                         return [3 /*break*/, 2];
-                    case 10: return [3 /*break*/, 13];
-                    case 11:
+                    case 9: return [3 /*break*/, 12];
+                    case 10:
                         e_1_1 = _d.sent();
                         e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 13];
-                    case 12:
+                        return [3 /*break*/, 12];
+                    case 11:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];
-                    case 13: return [2 /*return*/];
+                    case 12: return [2 /*return*/];
                 }
             });
         });

package/package.json

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