greybel-interpreter 1.9.2 → 1.9.4

package/dist/operations/assign.js

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

package/dist/operations/function-reference.js

@@ -10,7 +10,6 @@ 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 {
@@ -28,7 +27,7 @@ class FunctionReference extends operation_1.Operation {
     handle(ctx) {
         return __awaiter(this, void 0, void 0, function* () {
             const refResult = yield this.ref.getResult(ctx);
-            if (refResult.handle !== 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

@@ -3,6 +3,7 @@ import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { Path } from '../utils/path';
 import { CPSVisit, Operation } from './operation';
+import { CustomNil } from '../types/nil';
 export declare class SliceSegment {
     readonly left: Operation;
     readonly right: Operation;
@@ -35,6 +36,8 @@ export declare class SegmentContainer {
     isSuper(): boolean;
     getLast(): Segment;
 }
+export declare class ResolveNil extends CustomNil {
+}
 export declare class ResolveResult {
     readonly path: Path<CustomValue>;
     readonly handle: CustomValue;

package/dist/operations/resolve.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Resolve = exports.ResolveResult = exports.SegmentContainer = exports.OperationSegment = exports.IndexSegment = exports.IdentifierSegment = exports.PathSegment = exports.SliceSegment = void 0;
+exports.Resolve = exports.ResolveResult = exports.ResolveNil = exports.SegmentContainer = exports.OperationSegment = exports.IndexSegment = exports.IdentifierSegment = exports.PathSegment = exports.SliceSegment = void 0;
 const greyscript_core_1 = require("greyscript-core");
 const default_1 = require("../types/default");
 const function_1 = require("../types/function");
@@ -19,6 +19,7 @@ const string_1 = require("../types/string");
 const with_intrinsics_1 = require("../types/with-intrinsics");
 const path_1 = require("../utils/path");
 const operation_1 = require("./operation");
+const nil_1 = require("../types/nil");
 class SliceSegment {
     constructor(left, right) {
         this.left = left;
@@ -86,6 +87,9 @@ class SegmentContainer {
     }
 }
 exports.SegmentContainer = SegmentContainer;
+class ResolveNil extends nil_1.CustomNil {
+}
+exports.ResolveNil = ResolveNil;
 class ResolveResult {
     constructor(path, handle) {
         this.path = path;
@@ -148,7 +152,7 @@ class Resolve extends operation_1.Operation {
     getResult(ctx) {
         return __awaiter(this, void 0, void 0, function* () {
             let traversedPath = new path_1.Path();
-            let handle = default_1.DefaultType.Void;
+            let handle = new ResolveNil();
             const maxIndex = this.path.count();
             const lastIndex = maxIndex - 1;
             for (let index = 0; index < maxIndex; index++) {
@@ -163,13 +167,13 @@ class Resolve extends operation_1.Operation {
                         break;
                     }
                     const previous = handle;
-                    if (handle !== default_1.DefaultType.Void) {
+                    if (!(handle instanceof ResolveNil)) {
                         if (handle instanceof with_intrinsics_1.CustomValueWithIntrinsics) {
                             const customValueCtx = handle;
                             handle = customValueCtx.get(traversedPath);
                         }
                         else {
-                            throw new Error('Handle has no properties.');
+                            throw new Error(`Unknown path ${traversedPath.toString()}.`);
                         }
                     }
                     else {
@@ -208,24 +212,26 @@ class Resolve extends operation_1.Operation {
             if (result === null) {
                 result = yield this.getResult(ctx);
             }
-            if (result.handle !== default_1.DefaultType.Void) {
+            if (!(result.handle instanceof ResolveNil)) {
                 if (result.path.count() === 0) {
                     if (autoCall && result.handle instanceof function_1.CustomFunction) {
                         return result.handle.run(default_1.DefaultType.Void, [], ctx);
                     }
                     return result.handle;
                 }
-                const customValueCtx = result.handle;
-                const child = customValueCtx.get(result.path);
-                if (autoCall && child instanceof function_1.CustomFunction) {
-                    if (this.path.isSuper() &&
-                        ctx.functionState.context &&
-                        customValueCtx instanceof map_1.CustomMap) {
-                        return child.run(ctx.functionState.context, [], ctx, customValueCtx.isa);
+                if (result.handle instanceof with_intrinsics_1.CustomValueWithIntrinsics) {
+                    const customValueCtx = result.handle;
+                    const child = customValueCtx.get(result.path);
+                    if (autoCall && child instanceof function_1.CustomFunction) {
+                        if (this.path.isSuper() &&
+                            ctx.functionState.context &&
+                            customValueCtx instanceof map_1.CustomMap) {
+                            return child.run(ctx.functionState.context, [], ctx, customValueCtx.isa);
+                        }
+                        return child.run(customValueCtx, [], ctx);
                     }
-                    return child.run(customValueCtx, [], ctx);
+                    return child;
                 }
-                return child;
             }
             const handle = ctx.get(result.path);
             if (autoCall && handle instanceof function_1.CustomFunction) {

package/package.json

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