greybel-interpreter 2.2.18 → 2.2.20

package/dist/context.d.ts

@@ -92,6 +92,7 @@ export declare class OperationContext {
     injected: boolean;
     readonly api: OperationContext;
     readonly locals: OperationContext;
+    readonly outer: OperationContext;
     readonly globals: OperationContext;
     private static readonly lookupApiType;
     private static readonly lookupGlobalsType;

package/dist/context.js

@@ -40,7 +40,7 @@ class Scope extends map_1.CustomMap {
         this.context = context;
     }
     get(path) {
-        var _a, _b;
+        var _a, _b, _c;
         if (path instanceof base_1.CustomValue) {
             return this.get(new path_1.Path([path]));
         }
@@ -52,10 +52,13 @@ class Scope extends map_1.CustomMap {
         if (this.has(path)) {
             return super.get(path);
         }
-        else if ((_a = this.context.globals) === null || _a === void 0 ? void 0 : _a.scope.has(path)) {
+        else if ((_a = this.context.outer) === null || _a === void 0 ? void 0 : _a.scope.has(path)) {
+            return this.context.outer.scope.get(path);
+        }
+        else if ((_b = this.context.globals) === null || _b === void 0 ? void 0 : _b.scope.has(path)) {
             return this.context.globals.scope.get(path);
         }
-        else if ((_b = this.context.api) === null || _b === void 0 ? void 0 : _b.scope.has(path)) {
+        else if ((_c = this.context.api) === null || _c === void 0 ? void 0 : _c.scope.has(path)) {
             return this.context.api.scope.get(path);
         }
         else if (path.count() === 1 && map_1.CustomMap.getIntrinsics().has(current)) {
@@ -149,7 +152,7 @@ class FunctionState {
 exports.FunctionState = FunctionState;
 class OperationContext {
     constructor(options = {}) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         this.target = (_a = options.target) !== null && _a !== void 0 ? _a : 'unknown';
         this.stackTrace = (_b = options.stackTrace) !== null && _b !== void 0 ? _b : [];
         this.previous = (_c = options.previous) !== null && _c !== void 0 ? _c : null;
@@ -168,6 +171,7 @@ class OperationContext {
         this.api = this.lookupApi();
         this.globals = this.lookupGlobals();
         this.locals = (_o = this.lookupLocals()) !== null && _o !== void 0 ? _o : this;
+        this.outer = (_q = (_p = this.locals.previous) === null || _p === void 0 ? void 0 : _p.lookupLocals()) !== null && _q !== void 0 ? _q : null;
     }
     isIgnoredInDebugging(op) {
         return op instanceof operation_1.OperationBlock || op instanceof noop_1.Noop;

package/dist/operations/assign.js

@@ -29,6 +29,9 @@ class Assign extends operation_1.Operation {
     handle(ctx) {
         return __awaiter(this, void 0, void 0, function* () {
             const resolveResult = yield this.left.getResult(ctx);
+            if (ctx.isExit()) {
+                return default_1.DefaultType.Void;
+            }
             const rightValue = yield this.right.handle(ctx);
             if (!(resolveResult.handle instanceof resolve_1.ResolveNil)) {
                 const resultValueCtx = resolveResult.handle;

package/dist/operations/call.js

@@ -32,6 +32,9 @@ class Call extends operation_1.Operation {
     handle(ctx) {
         return __awaiter(this, void 0, void 0, function* () {
             const resolveResult = yield this.fnRef.getResult(ctx);
+            if (ctx.isExit()) {
+                return default_1.DefaultType.Void;
+            }
             const valueRef = yield this.fnRef.handle(ctx, resolveResult, false);
             const fnArgs = [];
             for (let index = 0; index < this.args.length; index++) {

package/dist/operations/function-reference.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FunctionReference = void 0;
+const default_1 = require("../types/default");
 const operation_1 = require("./operation");
 const resolve_1 = require("./resolve");
 class FunctionReference extends operation_1.Operation {
@@ -27,6 +28,9 @@ class FunctionReference extends operation_1.Operation {
     handle(ctx) {
         return __awaiter(this, void 0, void 0, function* () {
             const refResult = yield this.ref.getResult(ctx);
+            if (ctx.isExit()) {
+                return default_1.DefaultType.Void;
+            }
             if (!(refResult.handle instanceof resolve_1.ResolveNil)) {
                 if (refResult.path.count() === 0) {
                     return refResult.handle;

package/dist/operations/resolve.d.ts

@@ -50,6 +50,6 @@ export declare class Resolve extends Operation {
     constructor(item: ASTBase, target?: string);
     buildProcessor(node: ASTBase, visit: CPSVisit): Promise<void>;
     build(visit: CPSVisit): Promise<Resolve>;
-    getResult(ctx: OperationContext): Promise<ResolveResult>;
+    getResult(ctx: OperationContext): Promise<ResolveResult | null>;
     handle(ctx: OperationContext, result?: ResolveResult, autoCall?: boolean): Promise<CustomValue>;
 }

package/dist/operations/resolve.js

@@ -157,7 +157,7 @@ class Resolve extends operation_1.Operation {
             const lastIndex = maxIndex - 1;
             for (let index = 0; index < maxIndex; index++) {
                 if (ctx.isExit()) {
-                    return null;
+                    return new ResolveResult(null, default_1.DefaultType.Void);
                 }
                 const current = this.path.at(index);
                 if (current instanceof OperationSegment) {
@@ -215,7 +215,7 @@ class Resolve extends operation_1.Operation {
         return __awaiter(this, void 0, void 0, function* () {
             if (result === null) {
                 result = yield this.getResult(ctx);
-                if (result === null && ctx.isExit()) {
+                if (ctx.isExit()) {
                     return default_1.DefaultType.Void;
                 }
             }

package/package.json

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