greybel-interpreter 3.5.0 → 4.0.0

package/dist/types/function.js

@@ -1,19 +1,7 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomFunction = exports.Argument = exports.SUPER_NAMESPACE = exports.SELF_NAMESPACE = exports.DEFAULT_FUNCTION_NAME = void 0;
-const context_1 = require("../context");
-const literal_1 = require("../operations/literal");
-const operation_1 = require("../operations/operation");
-const reference_1 = require("../operations/reference");
+exports.CustomFunction = void 0;
+const instruction_1 = require("../byte-compiler/instruction");
 const hash_1 = require("../utils/hash");
 const object_value_1 = require("../utils/object-value");
 const uuid_1 = require("../utils/uuid");
@@ -21,56 +9,53 @@ const base_1 = require("./base");
 const default_1 = require("./default");
 const nil_1 = require("./nil");
 const string_1 = require("./string");
-exports.DEFAULT_FUNCTION_NAME = 'anonymous';
-exports.SELF_NAMESPACE = 'self';
-exports.SUPER_NAMESPACE = 'super';
-class Argument {
-    static createWithCustomValue(name, defaultValue) {
-        return new Argument(name, new reference_1.Reference(defaultValue));
-    }
-    constructor(name, defaultValue = default_1.DefaultType.Void) {
-        this.name = name;
-        if (defaultValue instanceof base_1.CustomValue) {
-            this.defaultValue = new reference_1.Reference(defaultValue);
-        }
-        else if (defaultValue instanceof operation_1.Operation) {
-            this.defaultValue = defaultValue;
-        }
-        else {
-            throw new Error('Invalid defaultValue in argument.');
-        }
-    }
-}
-exports.Argument = Argument;
 class CustomFunction extends base_1.CustomValue {
-    static createExternalAnonymous(callback) {
-        return new CustomFunction(null, exports.DEFAULT_FUNCTION_NAME, callback);
-    }
     static createExternal(name, callback) {
-        return new CustomFunction(null, name, callback);
+        const args = [];
+        return new CustomFunction(name, [
+            {
+                op: instruction_1.OpCode.CALL_INTERNAL,
+                source: {
+                    path: 'internal',
+                    start: { line: 0, character: 0 },
+                    end: { line: 0, character: 0 }
+                },
+                callback,
+                arguments: args
+            },
+            {
+                op: instruction_1.OpCode.RETURN,
+                source: {
+                    path: 'internal',
+                    start: { line: 0, character: 0 },
+                    end: { line: 0, character: 0 }
+                }
+            }
+        ], args);
     }
     static createExternalWithSelf(name, callback) {
-        return new CustomFunction(null, name, callback).addArgument(exports.SELF_NAMESPACE);
+        return this.createExternal(name, callback).addArgument('self');
     }
-    constructor(scope, name, callback, argumentDefs = [], assignOuter = false) {
+    constructor(name, value, args = [], outer) {
         super();
         this.id = (0, uuid_1.uuid)();
-        this.scope = scope;
         this.name = name;
-        this.value = callback;
-        this.argumentDefs = argumentDefs;
-        this.assignOuter = assignOuter;
-        this._nextContext = null;
+        this.value = value;
+        this.arguments = args;
+        this.outer = outer;
     }
     addArgument(name, defaultValue = default_1.DefaultType.Void) {
-        this.argumentDefs.push(new Argument(name, defaultValue));
+        this.arguments.push({
+            name: new string_1.CustomString(name),
+            defaultValue
+        });
         return this;
     }
     fork() {
-        return new CustomFunction(this.scope, this.name, this.value, this.argumentDefs);
+        return new CustomFunction(this.name, this.value, this.arguments, this.outer);
     }
     forkAs(name) {
-        return new CustomFunction(this.scope, name, this.value, this.argumentDefs);
+        return new CustomFunction(name, this.value, this.arguments, this.outer);
     }
     getCustomType() {
         return 'function';
@@ -85,23 +70,15 @@ class CustomFunction extends base_1.CustomValue {
         return this.toString();
     }
     toString() {
-        let refs = 1;
-        const args = this.argumentDefs.map((item) => {
-            if (item.defaultValue instanceof literal_1.Literal ||
-                item.defaultValue instanceof reference_1.Reference) {
-                const value = item.defaultValue.value;
-                if (value instanceof nil_1.CustomNil) {
-                    return item.name;
-                }
-                else if (value instanceof string_1.CustomString) {
-                    return `${item.name}="${value.value}"`;
-                }
-                return `${item.name}=${value.value}`;
+        const args = this.arguments.map((item) => {
+            const value = item.defaultValue;
+            if (value instanceof nil_1.CustomNil) {
+                return item.name;
             }
-            else if (item.defaultValue.item != null) {
-                return `${item.name}=_${refs++}`;
+            else if (value instanceof string_1.CustomString) {
+                return `${item.name}="${value.value}"`;
             }
-            return item.name;
+            return `${item.name}=${value.value}`;
         });
         return `FUNCTION(${args.join(', ')})`;
     }
@@ -112,47 +89,6 @@ class CustomFunction extends base_1.CustomValue {
         var _a;
         return v.value === ((_a = typeIntrinsics.function) !== null && _a !== void 0 ? _a : CustomFunction.intrinsics);
     }
-    setNextContext(value) {
-        this._nextContext = value;
-        return this;
-    }
-    getNextContext() {
-        return this._nextContext;
-    }
-    run(self, args, callContext) {
-        var _a, _b, _c, _d;
-        return __awaiter(this, void 0, void 0, function* () {
-            if (args.length > this.argumentDefs.length) {
-                throw new Error('Too many arguments.');
-            }
-            const fnCtx = (_a = this.scope) === null || _a === void 0 ? void 0 : _a.fork({
-                type: context_1.ContextType.Function,
-                state: context_1.ContextState.Default,
-                ignoreOuter: !this.assignOuter,
-                processState: callContext.processState
-            });
-            const argMap = new Map();
-            const hasSelf = !(self instanceof nil_1.CustomNil);
-            let selfWithinArgs = default_1.DefaultType.Void;
-            let argIndex = this.argumentDefs.length - 1;
-            const selfParam = hasSelf && ((_b = this.argumentDefs[0]) === null || _b === void 0 ? void 0 : _b.name) === exports.SELF_NAMESPACE ? 1 : 0;
-            for (; argIndex >= selfParam; argIndex--) {
-                const item = this.argumentDefs[argIndex];
-                if (item.name === exports.SELF_NAMESPACE) {
-                    selfWithinArgs = (_c = args[argIndex - selfParam]) !== null && _c !== void 0 ? _c : default_1.DefaultType.Void;
-                    continue;
-                }
-                argMap.set(item.name, (_d = args[argIndex - selfParam]) !== null && _d !== void 0 ? _d : (yield item.defaultValue.handle(fnCtx)));
-            }
-            const selfValue = hasSelf ? self : selfWithinArgs;
-            if (selfValue) {
-                argMap.set(exports.SELF_NAMESPACE, selfValue);
-            }
-            const result = yield this.value(fnCtx !== null && fnCtx !== void 0 ? fnCtx : callContext, selfValue, argMap);
-            this._nextContext = null;
-            return result;
-        });
-    }
     hash() {
         return (0, hash_1.getStringHashCode)(this.toString());
     }

package/dist/types/list.d.ts

@@ -1,6 +1,5 @@
 import { ContextTypeIntrinsics } from '../context/types';
 import { ObjectValue } from '../utils/object-value';
-import { Path } from '../utils/path';
 import { CustomValue } from './base';
 import { CustomObject, CustomValueWithIntrinsicsResult } from './with-intrinsics';
 export declare class CustomListIterator implements Iterator<CustomValue> {
@@ -28,9 +27,9 @@ export declare class CustomList extends CustomObject {
     extend(list: CustomList | Array<CustomValue>): CustomList;
     [Symbol.iterator](): CustomListIterator;
     getItemIndex(index: number): number;
-    has(path: Path<CustomValue> | CustomValue): boolean;
-    set(path: Path<CustomValue> | CustomValue, newValue: CustomValue): void;
-    get(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValue;
-    getWithOrigin(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValueWithIntrinsicsResult;
+    has(current: CustomValue): boolean;
+    set(current: CustomValue, newValue: CustomValue): void;
+    get(current: CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValue;
+    getWithOrigin(current: CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValueWithIntrinsicsResult;
     hash(recursionDepth?: number): number;
 }

package/dist/types/list.js

@@ -3,9 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomList = exports.CustomListIterator = void 0;
 const hash_1 = require("../utils/hash");
 const object_value_1 = require("../utils/object-value");
-const path_1 = require("../utils/path");
 const uuid_1 = require("../utils/uuid");
-const base_1 = require("./base");
 const number_1 = require("./number");
 const with_intrinsics_1 = require("./with-intrinsics");
 class CustomListIterator {
@@ -89,46 +87,19 @@ class CustomList extends with_intrinsics_1.CustomObject {
     getItemIndex(index) {
         return CustomList.getItemIndex(this, index);
     }
-    has(path) {
-        if (path instanceof base_1.CustomValue) {
-            return this.has(new path_1.Path([path]));
-        }
-        const traversalPath = path.clone();
-        const current = traversalPath.next();
+    has(current) {
         if (current instanceof number_1.CustomNumber) {
             const currentIndex = this.getItemIndex(current.toInt());
             const sub = this.value[currentIndex];
             if (sub) {
-                if (traversalPath.count() > 0 &&
-                    sub instanceof with_intrinsics_1.CustomValueWithIntrinsics) {
-                    return sub.has(traversalPath);
-                }
-                return traversalPath.count() === 0;
+                return true;
             }
         }
         return false;
     }
-    set(path, newValue) {
-        if (path instanceof base_1.CustomValue) {
-            return this.set(new path_1.Path([path]), newValue);
-        }
-        const traversalPath = path.clone();
-        const last = traversalPath.last();
-        const current = traversalPath.next();
+    set(current, newValue) {
         if (current instanceof number_1.CustomNumber) {
-            const currentIndex = this.getItemIndex(current.toInt());
-            const sub = this.value[currentIndex];
-            if (sub) {
-                if (traversalPath.count() > 0 &&
-                    sub instanceof with_intrinsics_1.CustomValueWithIntrinsics) {
-                    sub.set(traversalPath, newValue);
-                    return;
-                }
-            }
-            throw new Error(`Cannot set path ${path.toString()}.`);
-        }
-        if (last instanceof number_1.CustomNumber) {
-            const lastIndex = this.getItemIndex(last.toInt());
+            const lastIndex = this.getItemIndex(current.toInt());
             if (lastIndex >= 0 && lastIndex < this.value.length) {
                 this.value[lastIndex] = newValue;
                 return;
@@ -137,37 +108,24 @@ class CustomList extends with_intrinsics_1.CustomObject {
         }
         throw new Error(`Index is not a number.`);
     }
-    get(path, typeIntrinsics) {
+    get(current, typeIntrinsics) {
         var _a;
-        if (path instanceof base_1.CustomValue) {
-            return this.get(new path_1.Path([path]), typeIntrinsics);
-        }
-        const traversalPath = path.clone();
-        const current = traversalPath.next();
         if (current instanceof number_1.CustomNumber) {
             const currentIndex = this.getItemIndex(current.toInt());
             if (currentIndex >= 0 && currentIndex < this.value.length) {
-                const sub = this.value[currentIndex];
-                if (traversalPath.count() > 0) {
-                    if (sub instanceof with_intrinsics_1.CustomValueWithIntrinsics) {
-                        return sub.get(traversalPath, typeIntrinsics);
-                    }
-                }
-                else if (traversalPath.count() === 0) {
-                    return sub;
-                }
+                return this.value[currentIndex];
             }
             throw new Error(`Index error (list index ${currentIndex} out of range).`);
         }
         const intrinsics = (_a = typeIntrinsics.list) !== null && _a !== void 0 ? _a : CustomList.getIntrinsics();
-        if (path.count() === 1 && intrinsics.has(current)) {
+        if (intrinsics.has(current)) {
             return intrinsics.get(current);
         }
-        throw new Error(`Unknown path in list ${path.toString()}.`);
+        throw new Error(`Unknown path in list ${current.toString()}.`);
     }
-    getWithOrigin(path, typeIntrinsics) {
+    getWithOrigin(current, typeIntrinsics) {
         return {
-            value: this.get(path, typeIntrinsics),
+            value: this.get(current, typeIntrinsics),
             origin: null
         };
     }

package/dist/types/map.d.ts

@@ -1,6 +1,5 @@
 import { ContextTypeIntrinsics } from '../context/types';
 import { ObjectValue } from '../utils/object-value';
-import { Path } from '../utils/path';
 import { CustomValue } from './base';
 import { CustomString } from './string';
 import { CustomObject, CustomValueWithIntrinsicsResult } from './with-intrinsics';
@@ -17,7 +16,7 @@ export declare class CustomMap extends CustomObject {
     static readonly intrinsics: ObjectValue;
     readonly id: string;
     value: ObjectValue;
-    private isInstance;
+    isInstance: boolean;
     static createWithInitialValue(value: ObjectValue): CustomMap;
     constructor(value?: ObjectValue);
     getCustomType(): string;
@@ -31,10 +30,10 @@ export declare class CustomMap extends CustomObject {
     instanceOf(v: CustomValue, typeIntrinsics: ContextTypeIntrinsics): boolean;
     [Symbol.iterator](): CustomMapIterator;
     extend(map: CustomMap | ObjectValue): CustomMap;
-    has(path: Path<CustomValue> | CustomValue): boolean;
-    set(path: Path<CustomValue> | CustomValue, newValue: CustomValue): void;
-    get(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValue;
-    getWithOrigin(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValueWithIntrinsicsResult;
+    has(current: CustomValue): boolean;
+    set(current: CustomValue, newValue: CustomValue): void;
+    get(current: CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValue;
+    getWithOrigin(current: CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValueWithIntrinsicsResult;
     createInstance(): CustomMap;
     getIsa(): CustomMap | null;
     hash(recursionDepth?: number): number;

package/dist/types/map.js

@@ -3,9 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomMap = exports.CustomMapIterator = exports.CUSTOM_MAP_MAX_DEPTH_VALUE = exports.CUSTOM_MAP_MAX_DEPTH = exports.ISA_PROPERTY = void 0;
 const hash_1 = require("../utils/hash");
 const object_value_1 = require("../utils/object-value");
-const path_1 = require("../utils/path");
 const uuid_1 = require("../utils/uuid");
-const base_1 = require("./base");
 const nil_1 = require("./nil");
 const string_1 = require("./string");
 const with_intrinsics_1 = require("./with-intrinsics");
@@ -106,116 +104,59 @@ class CustomMap extends with_intrinsics_1.CustomObject {
         this.value.extend(map);
         return this;
     }
-    has(path) {
-        if (path instanceof base_1.CustomValue) {
-            return this.has(new path_1.Path([path]));
-        }
-        const traversalPath = path.clone();
-        const current = traversalPath.next();
+    has(current) {
         if (current !== null) {
             if (this.value.has(current)) {
-                const sub = this.value.get(current);
-                if (traversalPath.count() > 0 &&
-                    sub instanceof with_intrinsics_1.CustomValueWithIntrinsics) {
-                    return sub.has(traversalPath);
-                }
-                return traversalPath.count() === 0;
+                return true;
             }
             const isa = this.getIsa();
             return isa ? isa.has(current) : false;
         }
         return false;
     }
-    set(path, newValue) {
-        if (path instanceof base_1.CustomValue) {
-            return this.set(new path_1.Path([path]), newValue);
-        }
-        const traversalPath = path.clone();
-        const last = traversalPath.last();
-        const current = traversalPath.next();
-        if (current !== null) {
-            if (this.value.has(current)) {
-                const sub = this.value.get(current);
-                if (sub instanceof with_intrinsics_1.CustomValueWithIntrinsics) {
-                    sub.set(traversalPath, newValue);
-                    return;
-                }
-            }
-            throw new Error(`Cannot set path ${path.toString()}.`);
-        }
-        this.value.set(last, newValue);
+    set(current, newValue) {
+        this.value.set(current, newValue);
     }
-    get(path, typeIntrinsics) {
+    get(current, typeIntrinsics) {
         var _a;
-        if (path instanceof base_1.CustomValue) {
-            return this.get(new path_1.Path([path]), typeIntrinsics);
-        }
-        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);
-                if (traversalPath.count() > 0) {
-                    if (sub instanceof with_intrinsics_1.CustomValueWithIntrinsics) {
-                        return sub.get(traversalPath, typeIntrinsics);
-                    }
-                }
-                else if (traversalPath.count() === 0) {
-                    return sub;
-                }
+                return this.value.get(current);
             }
             else if (isa === null || isa === void 0 ? void 0 : isa.has(current)) {
                 return isa.get(current, typeIntrinsics);
             }
             const intrinsics = (_a = typeIntrinsics.map) !== null && _a !== void 0 ? _a : CustomMap.getIntrinsics();
-            if (traversalPath.count() === 0 && intrinsics.has(current)) {
+            if (intrinsics.has(current)) {
                 return intrinsics.get(current);
             }
         }
-        throw new Error(`Unknown path in map ${path.toString()}.`);
+        throw new Error(`Unknown path in map ${current.toString()}.`);
     }
-    getWithOrigin(path, typeIntrinsics) {
+    getWithOrigin(current, typeIntrinsics) {
         var _a;
-        if (path instanceof base_1.CustomValue) {
-            return this.getWithOrigin(new path_1.Path([path]), typeIntrinsics);
-        }
-        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);
-                if (traversalPath.count() > 0) {
-                    if (sub instanceof CustomMap) {
-                        return sub.getWithOrigin(traversalPath, typeIntrinsics);
-                    }
-                    if (sub instanceof with_intrinsics_1.CustomValueWithIntrinsics) {
-                        return {
-                            value: sub.get(traversalPath, typeIntrinsics),
-                            origin: this
-                        };
-                    }
-                }
-                else if (traversalPath.count() === 0) {
-                    return {
-                        value: sub,
-                        origin: this
-                    };
-                }
+                return {
+                    value: sub,
+                    origin: this
+                };
             }
             else if (isa === null || isa === void 0 ? void 0 : isa.has(current)) {
                 return isa.getWithOrigin(current, typeIntrinsics);
             }
             const intrinsics = (_a = typeIntrinsics.map) !== null && _a !== void 0 ? _a : CustomMap.getIntrinsics();
-            if (traversalPath.count() === 0 && intrinsics.has(current)) {
+            if (intrinsics.has(current)) {
                 return {
                     value: intrinsics.get(current),
                     origin: null
                 };
             }
         }
-        throw new Error(`Unknown path in map ${path.toString()}.`);
+        throw new Error(`Unknown path in map ${current.toString()}.`);
     }
     createInstance() {
         const newInstance = new CustomMap(new object_value_1.ObjectValue());

package/dist/types/number.d.ts

@@ -1,6 +1,5 @@
 import { ContextTypeIntrinsics } from '../context/types';
 import { ObjectValue } from '../utils/object-value';
-import { Path } from '../utils/path';
 import { CustomValue } from './base';
 import { CustomValueWithIntrinsics, CustomValueWithIntrinsicsResult } from './with-intrinsics';
 export declare class CustomNumberIterator implements Iterator<CustomValue> {
@@ -21,10 +20,10 @@ export declare class CustomNumber extends CustomValueWithIntrinsics {
     toTruthy(): boolean;
     instanceOf(v: CustomValue, typeIntrinsics: ContextTypeIntrinsics): boolean;
     [Symbol.iterator](): CustomNumberIterator;
-    has(_path: Path<CustomValue> | CustomValue): boolean;
-    set(_path: Path<CustomValue> | CustomValue, _newValue: CustomValue): void;
-    get(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValue;
-    getWithOrigin(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValueWithIntrinsicsResult;
+    has(_path: CustomValue): boolean;
+    set(_path: CustomValue, _newValue: CustomValue): void;
+    get(current: CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValue;
+    getWithOrigin(current: CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValueWithIntrinsicsResult;
     hash(): number;
 }
 export declare const NegativeOne: CustomNumber;

package/dist/types/number.js

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Zero = exports.PositiveOne = exports.NegativeOne = exports.CustomNumber = exports.CustomNumberIterator = void 0;
 const hash_1 = require("../utils/hash");
 const object_value_1 = require("../utils/object-value");
-const path_1 = require("../utils/path");
-const base_1 = require("./base");
 const with_intrinsics_1 = require("./with-intrinsics");
 class CustomNumberIterator {
     constructor() {
@@ -58,22 +56,17 @@ class CustomNumber extends with_intrinsics_1.CustomValueWithIntrinsics {
     set(_path, _newValue) {
         throw new Error('Mutable operations are not allowed on a number.');
     }
-    get(path, typeIntrinsics) {
+    get(current, typeIntrinsics) {
         var _a;
-        if (path instanceof base_1.CustomValue) {
-            return this.get(new path_1.Path([path]), typeIntrinsics);
-        }
-        const traversalPath = path.clone();
-        const current = traversalPath.next();
         const intrinsics = (_a = typeIntrinsics.number) !== null && _a !== void 0 ? _a : CustomNumber.getIntrinsics();
-        if (traversalPath.count() === 0 && intrinsics.has(current)) {
+        if (intrinsics.has(current)) {
             return intrinsics.get(current);
         }
-        throw new Error(`Unknown path in number ${path.toString()}.`);
+        throw new Error(`Unknown path in number ${current.toString()}.`);
     }
-    getWithOrigin(path, typeIntrinsics) {
+    getWithOrigin(current, typeIntrinsics) {
         return {
-            value: this.get(path, typeIntrinsics),
+            value: this.get(current, typeIntrinsics),
             origin: null
         };
     }

package/dist/types/string.d.ts

@@ -1,6 +1,5 @@
 import { ContextTypeIntrinsics } from '../context/types';
 import { ObjectValue } from '../utils/object-value';
-import { Path } from '../utils/path';
 import { CustomValue } from './base';
 import { CustomValueWithIntrinsics, CustomValueWithIntrinsicsResult } from './with-intrinsics';
 export declare class CustomStringIterator implements Iterator<CustomValue> {
@@ -29,9 +28,9 @@ export declare class CustomString extends CustomValueWithIntrinsics {
     slice(a: CustomValue, b: CustomValue): CustomString;
     [Symbol.iterator](): CustomStringIterator;
     getCharIndex(index: number): number;
-    has(path: Path<CustomValue> | CustomValue): boolean;
-    set(_path: Path<CustomValue> | CustomValue, _newValue: CustomValue): void;
-    get(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValue;
-    getWithOrigin(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValueWithIntrinsicsResult;
+    has(current: CustomValue): boolean;
+    set(_path: CustomValue, _newValue: CustomValue): void;
+    get(current: CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValue;
+    getWithOrigin(current: CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValueWithIntrinsicsResult;
     hash(): number;
 }

package/dist/types/string.js

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomString = exports.CustomStringIterator = void 0;
 const hash_1 = require("../utils/hash");
 const object_value_1 = require("../utils/object-value");
-const path_1 = require("../utils/path");
-const base_1 = require("./base");
 const number_1 = require("./number");
 const with_intrinsics_1 = require("./with-intrinsics");
 class CustomStringIterator {
@@ -86,12 +84,7 @@ class CustomString extends with_intrinsics_1.CustomValueWithIntrinsics {
     getCharIndex(index) {
         return CustomString.getCharIndex(this, index);
     }
-    has(path) {
-        if (path instanceof base_1.CustomValue) {
-            return this.has(new path_1.Path([path]));
-        }
-        const traversalPath = path.clone();
-        const current = traversalPath.next();
+    has(current) {
         if (current instanceof number_1.CustomNumber) {
             const index = current.toInt();
             return !!this.value[index];
@@ -101,13 +94,8 @@ class CustomString extends with_intrinsics_1.CustomValueWithIntrinsics {
     set(_path, _newValue) {
         throw new Error('Mutable operations are not allowed on a string.');
     }
-    get(path, typeIntrinsics) {
+    get(current, typeIntrinsics) {
         var _a;
-        if (path instanceof base_1.CustomValue) {
-            return this.get(new path_1.Path([path]), typeIntrinsics);
-        }
-        const traversalPath = path.clone();
-        const current = traversalPath.next();
         if (current instanceof number_1.CustomNumber) {
             const currentIndex = this.getCharIndex(current.toInt());
             const segment = this.value[currentIndex];
@@ -117,14 +105,14 @@ class CustomString extends with_intrinsics_1.CustomValueWithIntrinsics {
             throw new Error(`Index error (string index ${currentIndex} out of range).`);
         }
         const intrinsics = (_a = typeIntrinsics.string) !== null && _a !== void 0 ? _a : CustomString.getIntrinsics();
-        if (traversalPath.count() === 0 && intrinsics.has(current)) {
+        if (intrinsics.has(current)) {
             return intrinsics.get(current);
         }
-        throw new Error(`Unknown path in string ${path.toString()}.`);
+        throw new Error(`Unknown path in string ${current.toString()}.`);
     }
-    getWithOrigin(path, typeIntrinsics) {
+    getWithOrigin(current, typeIntrinsics) {
         return {
-            value: this.get(path, typeIntrinsics),
+            value: this.get(current, typeIntrinsics),
             origin: null
         };
     }

package/dist/types/with-intrinsics.d.ts

@@ -1,6 +1,5 @@
 import { ContextTypeIntrinsics } from '../context/types';
 import { ObjectValue } from '../utils/object-value';
-import { Path } from '../utils/path';
 import { CustomValue } from './base';
 import { CustomFunction } from './function';
 export type CustomValueWithIntrinsicsResult = {
@@ -8,10 +7,10 @@ export type CustomValueWithIntrinsicsResult = {
     origin: CustomValueWithIntrinsics;
 };
 export declare abstract class CustomValueWithIntrinsics extends CustomValue {
-    abstract has(path: Path<CustomValue> | CustomValue): boolean;
-    abstract set(path: Path<CustomValue> | CustomValue, value: CustomValue): void;
-    abstract get(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValue;
-    abstract getWithOrigin(path: Path<CustomValue> | CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValueWithIntrinsicsResult;
+    abstract has(path: CustomValue): boolean;
+    abstract set(path: CustomValue, value: CustomValue): void;
+    abstract get(path: CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValue;
+    abstract getWithOrigin(path: CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValueWithIntrinsicsResult;
     abstract [Symbol.iterator](): Iterator<CustomValue> & {
         index: number;
     };