greybel-interpreter 2.2.16 → 2.2.17

package/dist/operations/call.js

@@ -42,7 +42,7 @@ class Call extends operation_1.Operation {
                 if (this.fnRef.path.isSuper() &&
                     ctx.functionState.context &&
                     resolveResult.handle instanceof map_1.CustomMap) {
-                    return func.run(ctx.functionState.context, fnArgs, ctx, resolveResult.handle.isa);
+                    return func.run(ctx.functionState.context, fnArgs, ctx, resolveResult.handle.getIsa());
                 }
                 return func.run(resolveResult.handle, fnArgs, ctx);
             }

package/dist/operations/resolve.js

@@ -156,6 +156,9 @@ class Resolve extends operation_1.Operation {
             const maxIndex = this.path.count();
             const lastIndex = maxIndex - 1;
             for (let index = 0; index < maxIndex; index++) {
+                if (ctx.isExit()) {
+                    return null;
+                }
                 const current = this.path.at(index);
                 if (current instanceof OperationSegment) {
                     const opSegment = current;
@@ -184,7 +187,7 @@ class Resolve extends operation_1.Operation {
                             traversedPath.toString() === function_1.SUPER_NAMESPACE &&
                             ctx.functionState.context &&
                             previous instanceof map_1.CustomMap) {
-                            handle = yield handle.run(ctx.functionState.context, [], ctx, previous.isa);
+                            handle = yield handle.run(ctx.functionState.context, [], ctx, previous.getIsa());
                         }
                         else {
                             handle = yield handle.run(previous || default_1.DefaultType.Void, [], ctx);
@@ -208,9 +211,13 @@ class Resolve extends operation_1.Operation {
         });
     }
     handle(ctx, result = null, autoCall = true) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (result === null) {
                 result = yield this.getResult(ctx);
+                if (result === null && ctx.isExit()) {
+                    return default_1.DefaultType.Void;
+                }
             }
             if (!(result.handle instanceof ResolveNil)) {
                 if (result.path.count() === 0) {
@@ -222,10 +229,10 @@ class Resolve extends operation_1.Operation {
                 if (result.handle instanceof with_intrinsics_1.CustomValueWithIntrinsics) {
                     const customValueCtx = result.handle;
                     if (this.path.isSuper() && customValueCtx instanceof map_1.CustomMap) {
-                        const superChild = customValueCtx.isa.get(result.path);
+                        const superChild = (_a = customValueCtx.getIsa()) === null || _a === void 0 ? void 0 : _a.get(result.path);
                         if (autoCall && superChild instanceof function_1.CustomFunction) {
                             if (ctx.functionState.context) {
-                                return superChild.run(ctx.functionState.context, [], ctx, customValueCtx.isa);
+                                return superChild.run(ctx.functionState.context, [], ctx, customValueCtx.getIsa());
                             }
                             return superChild.run(customValueCtx, [], ctx);
                         }

package/dist/types/function.js

@@ -136,7 +136,7 @@ class CustomFunction extends base_1.CustomValue {
             if (!isSelfNull) {
                 argMap.set(exports.SELF_NAMESPACE, self);
             }
-            const isa = next !== null && next !== void 0 ? next : (self instanceof map_1.CustomMap ? self.isa : null);
+            const isa = next !== null && next !== void 0 ? next : (self instanceof map_1.CustomMap ? self.getIsa() : null);
             return this.value(fnCtx !== null && fnCtx !== void 0 ? fnCtx : callContext, self, argMap, isa);
         });
     }

package/dist/types/map.d.ts

@@ -16,10 +16,9 @@ export declare class CustomMapIterator implements Iterator<CustomValue> {
 export declare class CustomMap extends CustomObject {
     static readonly intrinsics: ObjectValue;
     value: ObjectValue;
-    readonly isa: CustomMap | null;
     private isInstance;
     static createWithInitialValue(value: ObjectValue): CustomMap;
-    constructor(value?: ObjectValue, isa?: CustomMap);
+    constructor(value?: ObjectValue);
     getCustomType(): string;
     toJSON(depth?: number): string;
     toString(depth?: number): string;
@@ -34,4 +33,5 @@ export declare class CustomMap extends CustomObject {
     set(path: Path<CustomValue> | CustomValue, newValue: CustomValue): void;
     get(path: Path<CustomValue> | CustomValue): CustomValue;
     createInstance(): CustomMap;
+    getIsa(): CustomMap | null;
 }

package/dist/types/map.js

@@ -43,11 +43,10 @@ class CustomMap extends with_intrinsics_1.CustomObject {
         map.value = value;
         return map;
     }
-    constructor(value, isa = null) {
+    constructor(value) {
         super();
         this.isInstance = false;
         this.value = new object_value_1.ObjectValue(value);
-        this.isa = isa;
     }
     getCustomType() {
         if (this.value.has(exports.CLASS_ID_PROPERTY)) {
@@ -63,9 +62,6 @@ class CustomMap extends with_intrinsics_1.CustomObject {
         if (exports.CUSTOM_MAP_MAX_DEPTH < depth) {
             return exports.CUSTOM_MAP_MAX_DEPTH_VALUE;
         }
-        if (this.isa) {
-            fields.push(`${exports.ISA_PROPERTY.toJSON()}:${this.isa.toJSON(depth + 1)}`);
-        }
         for (const [key, value] of this.value.entries()) {
             fields.push(`${key instanceof CustomMap ? key.toJSON(depth + 1) : key.toJSON(depth)}:${value instanceof CustomMap
                 ? value.toJSON(depth + 1)
@@ -88,7 +84,7 @@ class CustomMap extends with_intrinsics_1.CustomObject {
     instanceOf(v) {
         if (v instanceof CustomMap) {
             let current = this;
-            while ((current = current.isa)) {
+            while ((current = current.getIsa())) {
                 if (current === v) {
                     return true;
                 }
@@ -122,7 +118,8 @@ class CustomMap extends with_intrinsics_1.CustomObject {
                 }
                 return traversalPath.count() === 0;
             }
-            return this.isa ? this.isa.has(current) : false;
+            const isa = this.getIsa();
+            return isa ? isa.has(current) : false;
         }
         return false;
     }
@@ -146,12 +143,12 @@ class CustomMap extends with_intrinsics_1.CustomObject {
         this.value.set(last, newValue);
     }
     get(path) {
-        var _a, _b;
         if (path instanceof base_1.CustomValue) {
             return this.get(new path_1.Path([path]));
         }
         const traversalPath = path.clone();
         const current = traversalPath.next();
+        const isa = this.getIsa();
         if (current !== null) {
             if (this.value.has(current)) {
                 const sub = this.value.get(current);
@@ -164,19 +161,8 @@ class CustomMap extends with_intrinsics_1.CustomObject {
                     return sub;
                 }
             }
-            else if ((_a = this.isa) === null || _a === void 0 ? void 0 : _a.has(current)) {
-                return this.isa.get(current);
-            }
-            else if (current.toString() === exports.ISA_PROPERTY.toString()) {
-                if (path.count() === 1) {
-                    return this.isa;
-                }
-                else {
-                    const ahead = traversalPath.next();
-                    if ((_b = this.isa) === null || _b === void 0 ? void 0 : _b.has(ahead)) {
-                        return this.isa.get(ahead);
-                    }
-                }
+            else if (isa === null || isa === void 0 ? void 0 : isa.has(current)) {
+                return isa.get(current);
             }
             else if (path.count() === 1 && CustomMap.getIntrinsics().has(current)) {
                 return CustomMap.getIntrinsics().get(current);
@@ -185,10 +171,15 @@ class CustomMap extends with_intrinsics_1.CustomObject {
         throw new Error(`Unknown path in map ${path.toString()}.`);
     }
     createInstance() {
-        const newInstance = new CustomMap(new object_value_1.ObjectValue(), this);
+        const newInstance = new CustomMap(new object_value_1.ObjectValue());
+        newInstance.value.set(exports.ISA_PROPERTY, this);
         newInstance.isInstance = true;
         return newInstance;
     }
+    getIsa() {
+        const isa = this.value.get(exports.ISA_PROPERTY);
+        return isa instanceof CustomMap ? isa : null;
+    }
 }
 CustomMap.intrinsics = new object_value_1.ObjectValue();
 exports.CustomMap = CustomMap;

package/package.json

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