greybel-interpreter 1.1.2 → 1.1.5

package/dist/context.d.ts

@@ -22,7 +22,7 @@ export declare enum ContextState {
 export declare class Scope extends CustomMap {
     private readonly context;
     constructor(context: OperationContext);
-    get(path: Path<string> | string): CustomValue;
+    get(path: Path<CustomValue> | CustomValue): CustomValue;
 }
 export declare class Debugger {
     private breakpoint;
@@ -102,8 +102,8 @@ export default class OperationContext {
     lookupApi(): OperationContext;
     lookupGlobals(): OperationContext;
     lookupLocals(): OperationContext;
-    extend(map: Map<string, CustomValue>): OperationContext;
-    set(path: Path<string> | string, value: CustomValue): void;
-    get(path: Path<string> | string): CustomValue;
+    extend(map: Map<CustomValue, CustomValue>): OperationContext;
+    set(path: Path<CustomValue> | CustomValue, value: CustomValue): void;
+    get(path: Path<CustomValue> | CustomValue): CustomValue;
     fork(options: ContextForkOptions): OperationContext;
 }

package/dist/context.js

@@ -46,6 +46,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FunctionState = exports.LoopState = exports.ProcessState = exports.Debugger = exports.Scope = exports.ContextState = exports.ContextType = void 0;
 var handler_container_1 = __importDefault(require("./handler-container"));
 var default_1 = __importDefault(require("./types/default"));
+var generics_1 = require("./types/generics");
 var map_1 = __importDefault(require("./types/map"));
 var path_1 = __importDefault(require("./utils/path"));
 var ContextType;
@@ -71,7 +72,7 @@ var Scope = /** @class */ (function (_super) {
         return _this;
     }
     Scope.prototype.get = function (path) {
-        if (typeof path === 'string') {
+        if (path instanceof generics_1.CustomValue) {
             return this.get(new path_1.default([path]));
         }
         if (path.count() === 0) {
@@ -79,7 +80,7 @@ var Scope = /** @class */ (function (_super) {
         }
         var traversalPath = path.clone();
         var current = traversalPath.next();
-        if (current === 'locals' || current === 'globals') {
+        if (current.value === 'locals' || current.value === 'globals') {
             return this.context.get(traversalPath);
         }
         else if (this.has(path)) {
@@ -88,8 +89,8 @@ var Scope = /** @class */ (function (_super) {
         else if (this.context.api.scope.has(path)) {
             return this.context.api.scope.get(path);
         }
-        else if (path.count() === 1 && map_1.default.getIntrinsics().has(current)) {
-            return map_1.default.getIntrinsics().get(current);
+        else if (path.count() === 1 && map_1.default.getIntrinsics().has(current.toString())) {
+            return map_1.default.getIntrinsics().get(current.toString());
         }
         else if (this.context.previous !== null) {
             return this.context.previous.get(path);
@@ -307,16 +308,16 @@ var OperationContext = /** @class */ (function () {
     };
     OperationContext.prototype.set = function (path, value) {
         var _a;
-        if (typeof path === 'string') {
+        if (path instanceof generics_1.CustomValue) {
             this.set(new path_1.default([path]), value);
             return;
         }
         var traversalPath = path.clone();
         var current = traversalPath.next();
-        if (current === 'locals') {
+        if (current.value === 'locals') {
             this.locals.set(traversalPath, value);
         }
-        else if (current === 'globals') {
+        else if (current.value === 'globals') {
             this.globals.set(traversalPath, value);
         }
         else if (this.state === ContextState.Temporary) {
@@ -328,15 +329,18 @@ var OperationContext = /** @class */ (function () {
     };
     OperationContext.prototype.get = function (path) {
         var _a;
-        if (typeof path === 'string') {
+        if (path instanceof generics_1.CustomValue) {
             return this.get(new path_1.default([path]));
         }
+        if (path.count() === 0) {
+            return this.scope;
+        }
         var traversalPath = path.clone();
         var current = traversalPath.next();
-        if (current === 'locals') {
+        if (current.value === 'locals') {
             return this.locals.get(traversalPath);
         }
-        else if (current === 'globals') {
+        else if (current.value === 'globals') {
             return this.globals.get(traversalPath);
         }
         else if (this.state === ContextState.Temporary) {

package/dist/interpreter.d.ts

@@ -5,6 +5,8 @@ import CPS from './cps';
 import HandlerContainer from './handler-container';
 import Operation from './operations/operation';
 import { CustomValue } from './types/generics';
+import CustomString from './types/string';
+export declare const PARAMS_PROPERTY: CustomString;
 export interface InterpreterOptions {
     target?: string;
     api?: Map<string, CustomValue>;

package/dist/interpreter.js

@@ -73,10 +73,27 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PARAMS_PROPERTY = void 0;
 var events_1 = __importDefault(require("events"));
 var greybel_core_1 = require("greybel-core");
 var context_1 = __importStar(require("./context"));
@@ -86,6 +103,7 @@ var noop_1 = __importDefault(require("./operations/noop"));
 var default_1 = __importDefault(require("./types/default"));
 var list_1 = __importDefault(require("./types/list"));
 var string_1 = __importDefault(require("./types/string"));
+exports.PARAMS_PROPERTY = new string_1.default('params');
 var Interpreter = /** @class */ (function (_super) {
     __extends(Interpreter, _super);
     function Interpreter(options) {
@@ -222,16 +240,21 @@ var Interpreter = /** @class */ (function (_super) {
     };
     Interpreter.prototype.start = function (top) {
         return __awaiter(this, void 0, void 0, function () {
-            var newParams, process_1, err_2;
+            var api, newParams, process_1, err_2;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (this.apiContext !== null && this.apiContext.isPending()) {
                             throw new Error('Process already running.');
                         }
-                        this.apiContext.extend(this.api);
+                        api = Array.from(this.api.entries()).reduce(function (result, _a) {
+                            var _b = __read(_a, 2), key = _b[0], value = _b[1];
+                            result.set(new string_1.default(key), value);
+                            return result;
+                        }, new Map());
+                        this.apiContext.extend(api);
                         newParams = new list_1.default(this.params.map(function (item) { return new string_1.default(item); }));
-                        this.globalContext.scope.set('params', newParams);
+                        this.globalContext.scope.set(exports.PARAMS_PROPERTY, newParams);
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, 4, 5]);
@@ -277,13 +300,13 @@ var Interpreter = /** @class */ (function (_super) {
     };
     Interpreter.prototype.setGlobalVariable = function (path, value) {
         if (this.globalContext != null) {
-            this.globalContext.set(path, value);
+            this.globalContext.set(new string_1.default(path), value);
         }
         return this;
     };
     Interpreter.prototype.getGlobalVariable = function (path) {
         if (this.globalContext != null) {
-            this.globalContext.get(path);
+            this.globalContext.get(new string_1.default(path));
         }
         return default_1.default.Void;
     };

package/dist/operations/for.d.ts

@@ -1,13 +1,12 @@
-import { ASTForGenericStatement } from 'greyscript-core';
+import { ASTForGenericStatement, ASTIdentifier } from 'greyscript-core';
 import context from '../context';
 import { CustomValue } from '../types/generics';
 import Block from './block';
 import Operation, { CPSVisit } from './operation';
-import Resolve from './resolve';
 export default class For extends Operation {
     readonly item: ASTForGenericStatement;
     block: Block;
-    variable: Resolve;
+    variable: ASTIdentifier;
     iterator: Operation;
     constructor(item: ASTForGenericStatement, target?: string);
     build(visit: CPSVisit): Promise<Operation>;

package/dist/operations/for.js

@@ -56,9 +56,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var context_1 = require("../context");
 var default_1 = __importDefault(require("../types/default"));
+var number_1 = __importDefault(require("../types/number"));
+var string_1 = __importDefault(require("../types/string"));
 var block_1 = __importDefault(require("./block"));
 var operation_1 = __importDefault(require("./operation"));
-var resolve_1 = __importDefault(require("./resolve"));
 var For = /** @class */ (function (_super) {
     __extends(For, _super);
     function For(item, target) {
@@ -75,13 +76,10 @@ var For = /** @class */ (function (_super) {
                     case 1:
                         stack = _b.sent();
                         this.block = new block_1.default(stack);
-                        this.variable = new resolve_1.default(this.item.variable);
-                        return [4 /*yield*/, this.variable.build(visit)];
-                    case 2:
-                        _b.sent();
+                        this.variable = this.item.variable;
                         _a = this;
                         return [4 /*yield*/, visit(this.item.iterator)];
-                    case 3:
+                    case 2:
                         _a.iterator = _b.sent();
                         return [2 /*return*/, this];
                 }
@@ -90,7 +88,7 @@ var For = /** @class */ (function (_super) {
     };
     For.prototype.handle = function (ctx) {
         return __awaiter(this, void 0, void 0, function () {
-            var forCtx, resolveResult, iteratorValue, loopState;
+            var forCtx, identifier, iteratorValue, loopState, index;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -99,16 +97,17 @@ var For = /** @class */ (function (_super) {
                             type: context_1.ContextType.Loop,
                             state: context_1.ContextState.Temporary
                         });
-                        return [4 /*yield*/, this.variable.getResult(ctx)];
-                    case 1:
-                        resolveResult = _a.sent();
+                        identifier = this.variable.name;
                         return [4 /*yield*/, this.iterator.handle(ctx)];
-                    case 2:
+                    case 1:
                         iteratorValue = (_a.sent());
                         loopState = new context_1.LoopState();
+                        index = 0;
                         forCtx.loopState = loopState;
                         return [2 /*return*/, new Promise(function (resolve, reject) {
                                 var iterator = iteratorValue[Symbol.iterator]();
+                                var idxIdentifier = new string_1.default("__".concat(identifier, "_idx"));
+                                var varIdentifier = new string_1.default(identifier);
                                 var iteratorResult = iterator.next();
                                 var iteration = function () { return __awaiter(_this, void 0, void 0, function () {
                                     var current, err_1;
@@ -122,7 +121,8 @@ var For = /** @class */ (function (_super) {
                                                 }
                                                 current = iteratorResult.value;
                                                 loopState.isContinue = false;
-                                                forCtx.set(resolveResult.path, current);
+                                                forCtx.set(idxIdentifier, new number_1.default(index++));
+                                                forCtx.set(varIdentifier, current);
                                                 return [4 /*yield*/, this.block.handle(forCtx)];
                                             case 1:
                                                 _a.sent();

package/dist/operations/function.d.ts

@@ -1,7 +1,9 @@
 import { ASTFunctionStatement } from 'greyscript-core';
 import OperationContext from '../context';
 import { CustomValue } from '../types/generics';
+import CustomString from '../types/string';
 import Operation, { CPSVisit } from './operation';
+export declare const SELF_PROPERTY: CustomString;
 export default class FunctionOperation extends Operation {
     readonly item: ASTFunctionStatement;
     block: Operation;

package/dist/operations/function.js

@@ -81,14 +81,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.SELF_PROPERTY = void 0;
 var greyscript_core_1 = require("greyscript-core");
 var context_1 = require("../context");
 var default_1 = __importDefault(require("../types/default"));
 var function_1 = __importDefault(require("../types/function"));
-var path_1 = __importDefault(require("../utils/path"));
+var string_1 = __importDefault(require("../types/string"));
 var block_1 = __importDefault(require("./block"));
 var operation_1 = __importDefault(require("./operation"));
 var reference_1 = __importDefault(require("./reference"));
+exports.SELF_PROPERTY = new string_1.default('self');
 var FunctionOperation = /** @class */ (function (_super) {
     __extends(FunctionOperation, _super);
     function FunctionOperation(item, target) {
@@ -157,11 +159,11 @@ var FunctionOperation = /** @class */ (function (_super) {
                 switch (_c.label) {
                     case 0:
                         fnCtx.functionState = new context_1.FunctionState();
-                        fnCtx.set(new path_1.default(['self']), self);
+                        fnCtx.set(exports.SELF_PROPERTY, self);
                         try {
                             for (args_1 = __values(args), args_1_1 = args_1.next(); !args_1_1.done; args_1_1 = args_1.next()) {
                                 _a = __read(args_1_1.value, 2), key = _a[0], value = _a[1];
-                                fnCtx.set(new path_1.default([key]), value);
+                                fnCtx.set(new string_1.default(key), value);
                             }
                         }
                         catch (e_2_1) { e_2 = { error: e_2_1 }; }

package/dist/operations/import.d.ts

@@ -2,7 +2,10 @@ import { ASTFeatureImportExpression } from 'greybel-core';
 import { ASTBase } from 'greyscript-core';
 import context from '../context';
 import { CustomValue } from '../types/generics';
+import CustomString from '../types/string';
 import Operation, { CPSVisit } from './operation';
+export declare const MODULE_PROPERTY: CustomString;
+export declare const EXPORTS_PROPERTY: CustomString;
 export default class Include extends Operation {
     readonly item: ASTFeatureImportExpression;
     code: string;

package/dist/operations/import.js

@@ -54,11 +54,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.EXPORTS_PROPERTY = exports.MODULE_PROPERTY = void 0;
 var greybel_core_1 = require("greybel-core");
 var context_1 = require("../context");
 var default_1 = __importDefault(require("../types/default"));
 var map_1 = __importDefault(require("../types/map"));
+var string_1 = __importDefault(require("../types/string"));
 var operation_1 = __importDefault(require("./operation"));
+exports.MODULE_PROPERTY = new string_1.default('module');
+exports.EXPORTS_PROPERTY = new string_1.default('exports');
 var Include = /** @class */ (function (_super) {
     __extends(Include, _super);
     function Include(item, target, code) {
@@ -96,15 +100,15 @@ var Include = /** @class */ (function (_super) {
                             target: this.target
                         });
                         moduleMap = new map_1.default();
-                        importCtx.set('module', moduleMap);
+                        importCtx.set(exports.MODULE_PROPERTY, moduleMap);
                         return [4 /*yield*/, this.top.handle(importCtx)];
                     case 1:
                         _a.sent();
-                        item = moduleMap.has('exports')
-                            ? moduleMap.get('exports')
+                        item = moduleMap.has(exports.EXPORTS_PROPERTY)
+                            ? moduleMap.get(exports.EXPORTS_PROPERTY)
                             : default_1.default.Void;
                         identifier = this.item.name;
-                        ctx.set(identifier.name, item);
+                        ctx.set(new string_1.default(identifier.name), item);
                         return [2 /*return*/, default_1.default.Void];
                 }
             });

package/dist/operations/map.d.ts

@@ -4,7 +4,7 @@ import { CustomValue } from '../types/generics';
 import Operation, { CPSVisit } from './operation';
 export default class MapOperation extends Operation {
     readonly item: ASTMapConstructorExpression;
-    fields: Map<string, Operation>;
+    fields: Map<Operation, Operation>;
     constructor(item: ASTMapConstructorExpression, target?: string);
     build(visit: CPSVisit): Promise<Operation>;
     handle(ctx: context): Promise<CustomValue>;

package/dist/operations/map.js

@@ -105,9 +105,11 @@ var MapOperation = /** @class */ (function (_super) {
                                     case 0:
                                         mapKeyString = child;
                                         _b = (_a = this.fields).set;
-                                        _c = [mapKeyString.key];
-                                        return [4 /*yield*/, visit(mapKeyString.value)];
+                                        return [4 /*yield*/, visit(mapKeyString.key)];
                                     case 1:
+                                        _c = [_d.sent()];
+                                        return [4 /*yield*/, visit(mapKeyString.value)];
+                                    case 2:
                                         _b.apply(_a, _c.concat([_d.sent()]));
                                         return [2 /*return*/];
                                 }
@@ -131,33 +133,35 @@ var MapOperation = /** @class */ (function (_super) {
                         newMap = new Map();
                         _h.label = 1;
                     case 1:
-                        _h.trys.push([1, 6, 7, 8]);
+                        _h.trys.push([1, 7, 8, 9]);
                         _a = __values(this.fields), _b = _a.next();
                         _h.label = 2;
                     case 2:
-                        if (!!_b.done) return [3 /*break*/, 5];
+                        if (!!_b.done) return [3 /*break*/, 6];
                         _c = __read(_b.value, 2), key = _c[0], value = _c[1];
                         _e = (_d = newMap).set;
-                        _f = [key];
-                        return [4 /*yield*/, value.handle(ctx)];
+                        return [4 /*yield*/, key.handle(ctx)];
                     case 3:
-                        _e.apply(_d, _f.concat([_h.sent()]));
-                        _h.label = 4;
+                        _f = [_h.sent()];
+                        return [4 /*yield*/, value.handle(ctx)];
                     case 4:
+                        _e.apply(_d, _f.concat([_h.sent()]));
+                        _h.label = 5;
+                    case 5:
                         _b = _a.next();
                         return [3 /*break*/, 2];
-                    case 5: return [3 /*break*/, 8];
-                    case 6:
+                    case 6: return [3 /*break*/, 9];
+                    case 7:
                         e_1_1 = _h.sent();
                         e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 8];
-                    case 7:
+                        return [3 /*break*/, 9];
+                    case 8:
                         try {
                             if (_b && !_b.done && (_g = _a.return)) _g.call(_a);
                         }
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];
-                    case 8: return [2 /*return*/, new map_1.default(newMap)];
+                    case 9: return [2 /*return*/, new map_1.default(newMap)];
                 }
             });
         });

package/dist/operations/resolve.d.ts

@@ -22,9 +22,9 @@ export declare class OperationSegment {
 }
 export declare type Segment = SliceSegment | IdentifierSegment | IndexSegment | OperationSegment;
 export declare class ResolveResult {
-    readonly path: Path<string>;
+    readonly path: Path<CustomValue>;
     readonly handle: CustomValue;
-    constructor(path: Path<string>, handle: CustomValue);
+    constructor(path: Path<CustomValue>, handle: CustomValue);
 }
 export default class Resolve extends Operation {
     readonly item: ASTBase;

package/dist/operations/resolve.js

@@ -212,7 +212,7 @@ var Resolve = /** @class */ (function (_super) {
                     case 3:
                         if (!(current instanceof IdentifierSegment)) return [3 /*break*/, 6];
                         identifierSegment = current;
-                        traversedPath.add(identifierSegment.value);
+                        traversedPath.add(new string_1.default(identifierSegment.value));
                         if (index === lastIndex) {
                             return [3 /*break*/, 12];
                         }
@@ -243,7 +243,7 @@ var Resolve = /** @class */ (function (_super) {
                         return [4 /*yield*/, indexSegment.op.handle(ctx)];
                     case 7:
                         indexValue = _a.sent();
-                        traversedPath.add(indexValue.toString());
+                        traversedPath.add(indexValue);
                         if (index === lastIndex) {
                             return [3 /*break*/, 12];
                         }

package/dist/types/function.d.ts

@@ -13,7 +13,7 @@ export declare class Argument {
 export default class CustomFunction extends CustomValue {
     readonly scope?: OperationContext;
     readonly name: string;
-    readonly callback: Callback;
+    readonly value: Callback;
     private injectSelf;
     readonly argumentDefs: Array<Argument>;
     static createExternalAnonymous(callback: Callback): CustomFunction;

package/dist/types/function.js

@@ -88,7 +88,7 @@ var CustomFunction = /** @class */ (function (_super) {
         var _this = _super.call(this) || this;
         _this.scope = scope;
         _this.name = name;
-        _this.callback = callback;
+        _this.value = callback;
         _this.injectSelf = injectSelf;
         _this.argumentDefs = [];
         return _this;
@@ -112,7 +112,7 @@ var CustomFunction = /** @class */ (function (_super) {
         return this;
     };
     CustomFunction.prototype.fork = function () {
-        return new CustomFunction(this.scope, this.name, this.callback);
+        return new CustomFunction(this.scope, this.name, this.value);
     };
     CustomFunction.prototype.getCustomType = function () {
         return 'function';
@@ -164,7 +164,7 @@ var CustomFunction = /** @class */ (function (_super) {
                     case 4:
                         index++;
                         return [3 /*break*/, 1];
-                    case 5: return [2 /*return*/, this.callback(fnCtx || callContext, self, argMap)];
+                    case 5: return [2 /*return*/, this.value(fnCtx || callContext, self, argMap)];
                 }
             });
         });

package/dist/types/generics.d.ts

@@ -1,5 +1,6 @@
 import Path from '../utils/path';
 export declare abstract class CustomValue {
+    abstract value: any;
     abstract getCustomType(): string;
     abstract toNumber(): number;
     abstract toInt(): number;
@@ -8,9 +9,9 @@ export declare abstract class CustomValue {
     abstract fork(): CustomValue;
 }
 export declare abstract class CustomValueWithIntrinsics extends CustomValue {
-    abstract has(path: Path<string> | string): boolean;
-    abstract set(path: Path<string> | string, value: CustomValue): void;
-    abstract get(path: Path<string> | string): CustomValue;
+    abstract has(path: Path<CustomValue> | CustomValue): boolean;
+    abstract set(path: Path<CustomValue> | CustomValue, value: CustomValue): void;
+    abstract get(path: Path<CustomValue> | CustomValue): CustomValue;
     abstract [Symbol.iterator](): Iterator<CustomValue>;
 }
 export declare abstract class CustomObject extends CustomValueWithIntrinsics {

package/dist/types/interface.d.ts

@@ -7,6 +7,7 @@ export declare class CustomInterfaceIterator implements Iterator<CustomValue> {
 export default class CustomInterface extends CustomObject {
     private readonly interfaceFns;
     private readonly type;
+    readonly value: Object;
     constructor(type: string);
     getCustomType(): string;
     toString(): string;
@@ -15,8 +16,8 @@ export default class CustomInterface extends CustomObject {
     toInt(): number;
     toTruthy(): boolean;
     [Symbol.iterator](): CustomInterfaceIterator;
-    has(path: Path<string> | string): boolean;
-    set(_path: Path<string> | string, _newValue: CustomValue): void;
-    get(path: Path<string> | string): CustomValue;
+    has(path: Path<CustomValue> | CustomValue): boolean;
+    set(_path: Path<CustomValue> | CustomValue, _newValue: CustomValue): void;
+    get(path: Path<CustomValue> | CustomValue): CustomValue;
     addFunction(name: string, fn: CustomFunction): CustomInterface;
 }

package/dist/types/interface.js

@@ -38,6 +38,7 @@ var CustomInterface = /** @class */ (function (_super) {
     __extends(CustomInterface, _super);
     function CustomInterface(type) {
         var _this = _super.call(this) || this;
+        _this.value = {};
         _this.type = type;
         _this.interfaceFns = new Map();
         return _this;
@@ -64,13 +65,13 @@ var CustomInterface = /** @class */ (function (_super) {
         return new CustomInterfaceIterator();
     };
     CustomInterface.prototype.has = function (path) {
-        if (typeof path === 'string') {
+        if (path instanceof generics_1.CustomValue) {
             return this.has(new path_1.default([path]));
         }
         var traversalPath = path.clone();
         var current = traversalPath.next();
         if (current !== null) {
-            return this.interfaceFns.has(current);
+            return this.interfaceFns.has(current.toString());
         }
         return false;
     };
@@ -78,7 +79,7 @@ var CustomInterface = /** @class */ (function (_super) {
         throw new Error('Cannot set property on an interface.');
     };
     CustomInterface.prototype.get = function (path) {
-        if (typeof path === 'string') {
+        if (path instanceof generics_1.CustomValue) {
             return this.get(new path_1.default([path]));
         }
         if (path.count() === 0) {
@@ -87,8 +88,8 @@ var CustomInterface = /** @class */ (function (_super) {
         var traversalPath = path.clone();
         var current = traversalPath.next();
         if (current !== null) {
-            if (this.interfaceFns.has(current)) {
-                return this.interfaceFns.get(current);
+            if (this.interfaceFns.has(current.toString())) {
+                return this.interfaceFns.get(current.toString());
             }
         }
         throw new Error("Unknown path in interface ".concat(path.toString(), "."));

package/dist/types/list.d.ts

@@ -25,7 +25,7 @@ export default class CustomList extends CustomObject {
     extend(list: CustomList | Array<CustomValue>): CustomList;
     [Symbol.iterator](): CustomListIterator;
     getItemIndex(index: number): number;
-    has(path: Path<string> | string): boolean;
-    set(path: Path<string> | string, newValue: CustomValue): void;
-    get(path: Path<string> | string): CustomValue;
+    has(path: Path<CustomValue> | CustomValue): boolean;
+    set(path: Path<CustomValue> | CustomValue, newValue: CustomValue): void;
+    get(path: Path<CustomValue> | CustomValue): CustomValue;
 }

package/dist/types/list.js

@@ -47,6 +47,7 @@ exports.CustomListIterator = void 0;
 var intrinsics_container_1 = __importDefault(require("../intrinsics-container"));
 var path_1 = __importDefault(require("../utils/path"));
 var generics_1 = require("./generics");
+var number_1 = __importDefault(require("./number"));
 var CustomListIterator = /** @class */ (function () {
     function CustomListIterator(value) {
         var me = this;
@@ -128,19 +129,15 @@ var CustomList = /** @class */ (function (_super) {
         return CustomList.getItemIndex(this, index);
     };
     CustomList.prototype.has = function (path) {
-        if (typeof path === 'string') {
+        if (path instanceof generics_1.CustomValue) {
             return this.has(new path_1.default([path]));
         }
         var traversalPath = path.clone();
         var current = traversalPath.next();
-        if (current !== null) {
-            var currentIndex = parseInt(current);
-            var isCurrentNumber = !Number.isNaN(currentIndex);
-            if (isCurrentNumber) {
-                currentIndex = this.getItemIndex(currentIndex);
-            }
-            if (isCurrentNumber) {
-                var sub = this.value[currentIndex];
+        if (current instanceof number_1.default) {
+            var currentIndex = this.getItemIndex(current.toInt());
+            var sub = this.value[currentIndex];
+            if (sub) {
                 if (traversalPath.count() > 0 &&
                     sub instanceof generics_1.CustomValueWithIntrinsics) {
                     return sub.has(traversalPath);
@@ -151,22 +148,16 @@ var CustomList = /** @class */ (function (_super) {
         return false;
     };
     CustomList.prototype.set = function (path, newValue) {
-        if (typeof path === 'string') {
+        if (path instanceof generics_1.CustomValue) {
             return this.set(new path_1.default([path]), newValue);
         }
         var traversalPath = path.clone();
         var last = traversalPath.last();
         var current = traversalPath.next();
-        if (current !== null) {
-            var currentIndex = parseInt(current);
-            var isCurrentNumber = !Number.isNaN(currentIndex);
-            if (isCurrentNumber) {
-                currentIndex = this.getItemIndex(currentIndex);
-            }
-            if (isCurrentNumber &&
-                currentIndex >= 0 &&
-                currentIndex < this.value.length) {
-                var sub = this.value[currentIndex];
+        if (current instanceof number_1.default) {
+            var currentIndex = this.getItemIndex(current.toInt());
+            var sub = this.value[currentIndex];
+            if (sub) {
                 if (traversalPath.count() > 0 &&
                     sub instanceof generics_1.CustomValueWithIntrinsics) {
                     sub.set(traversalPath, newValue);
@@ -175,31 +166,25 @@ var CustomList = /** @class */ (function (_super) {
             }
             throw new Error("Cannot set path ".concat(path.toString(), "."));
         }
-        var lastIndex = parseInt(last);
-        var isLastNumber = !Number.isNaN(lastIndex);
-        if (isLastNumber) {
-            lastIndex = this.getItemIndex(lastIndex);
-        }
-        if (isLastNumber && lastIndex >= 0 && lastIndex < this.value.length) {
-            this.value[lastIndex] = newValue;
-            return;
+        if (last instanceof number_1.default) {
+            var lastIndex = this.getItemIndex(last.toInt());
+            if (lastIndex >= 0 && lastIndex < this.value.length) {
+                this.value[lastIndex] = newValue;
+                return;
+            }
+            throw new Error("Index error (list index ".concat(lastIndex, " out of range)."));
         }
-        throw new Error("Index error (list index ".concat(lastIndex, " out of range)."));
+        throw new Error("Index is not a number.");
     };
     CustomList.prototype.get = function (path) {
-        if (typeof path === 'string') {
+        if (path instanceof generics_1.CustomValue) {
             return this.get(new path_1.default([path]));
         }
         var traversalPath = path.clone();
         var current = traversalPath.next();
-        if (current !== null) {
-            var currentIndex = parseInt(current);
-            var isCurrentNumber = !Number.isNaN(currentIndex);
-            if (isCurrentNumber) {
-                currentIndex = this.getItemIndex(currentIndex);
-            }
-            if (isCurrentNumber &&
-                currentIndex >= 0 &&
+        if (current instanceof number_1.default) {
+            var currentIndex = this.getItemIndex(current.toInt());
+            if (currentIndex >= 0 &&
                 currentIndex < this.value.length) {
                 var sub = this.value[currentIndex];
                 if (traversalPath.count() > 0) {
@@ -211,13 +196,10 @@ var CustomList = /** @class */ (function (_super) {
                     return sub;
                 }
             }
-            else if (path.count() === 1 &&
-                CustomList.getIntrinsics().has(current)) {
-                return CustomList.getIntrinsics().get(current);
-            }
-            if (isCurrentNumber) {
-                throw new Error("Index error (list index ".concat(currentIndex, " out of range)."));
-            }
+            throw new Error("Index error (list index ".concat(currentIndex, " out of range)."));
+        }
+        else if (path.count() === 1 && CustomList.getIntrinsics().has(current.toString())) {
+            return CustomList.getIntrinsics().get(current.toString());
         }
         throw new Error("Unknown path in list ".concat(path.toString(), "."));
     };

package/dist/types/map.d.ts

@@ -2,19 +2,24 @@ import IntrinsicsContainer from '../intrinsics-container';
 import Path from '../utils/path';
 import CustomFunction from './function';
 import { CustomObject, CustomValue } from './generics';
+import CustomString from './string';
+export declare const CLASS_ID_PROPERTY: CustomString;
+export declare const getValue: (map: CustomMap, mapKey: CustomValue) => CustomValue;
+export declare const hasValue: (map: CustomMap, mapKey: CustomValue) => boolean;
+export declare const setValue: (map: CustomMap, mapKey: CustomValue, mapValue: CustomValue) => void;
 export declare class CustomMapIterator implements Iterator<CustomValue> {
-    value: Map<string, CustomValue>;
+    value: Map<CustomValue, CustomValue>;
     index: number;
-    constructor(value: Map<string, CustomValue>);
+    constructor(value: Map<CustomValue, CustomValue>);
     next(): IteratorResult<CustomMap>;
 }
 export default class CustomMap extends CustomObject {
     private static intrinsics;
     static getIntrinsics(): IntrinsicsContainer;
     static addIntrinsic(name: string, fn: CustomFunction): void;
-    readonly value: Map<string, CustomValue>;
+    readonly value: Map<CustomValue, CustomValue>;
     private isInstance;
-    constructor(value?: Map<string, CustomValue>);
+    constructor(value?: Map<CustomValue, CustomValue>);
     getCustomType(): string;
     toString(): string;
     fork(): CustomMap;
@@ -22,9 +27,9 @@ export default class CustomMap extends CustomObject {
     toInt(): number;
     toTruthy(): boolean;
     [Symbol.iterator](): CustomMapIterator;
-    extend(map: CustomMap | Map<string, CustomValue>): CustomMap;
-    has(path: Path<string> | string): boolean;
-    set(path: Path<string> | string, newValue: CustomValue): void;
-    get(path: Path<string> | string): CustomValue;
+    extend(map: CustomMap | Map<CustomValue, CustomValue>): CustomMap;
+    has(path: Path<CustomValue> | CustomValue): boolean;
+    set(path: Path<CustomValue> | CustomValue, newValue: CustomValue): void;
+    get(path: Path<CustomValue> | CustomValue): CustomValue;
     createInstance(): CustomMap;
 }

package/dist/types/map.js

@@ -45,12 +45,75 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomMapIterator = void 0;
+exports.CustomMapIterator = exports.setValue = exports.hasValue = exports.getValue = exports.CLASS_ID_PROPERTY = void 0;
 var intrinsics_container_1 = __importDefault(require("../intrinsics-container"));
 var path_1 = __importDefault(require("../utils/path"));
+var default_1 = __importDefault(require("./default"));
 var generics_1 = require("./generics");
 var nil_1 = __importDefault(require("./nil"));
 var string_1 = __importDefault(require("./string"));
+exports.CLASS_ID_PROPERTY = new string_1.default('classID');
+var getValue = function (map, mapKey) {
+    var e_1, _a;
+    try {
+        for (var _b = __values(map.value), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var _d = __read(_c.value, 2), key = _d[0], value = _d[1];
+            if (key.value === mapKey.value) {
+                return value;
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return default_1.default.Void;
+};
+exports.getValue = getValue;
+var hasValue = function (map, mapKey) {
+    var e_2, _a;
+    try {
+        for (var _b = __values(map.value.keys()), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var key = _c.value;
+            if (key.value === mapKey.value) {
+                return true;
+            }
+        }
+    }
+    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    finally {
+        try {
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        }
+        finally { if (e_2) throw e_2.error; }
+    }
+    return false;
+};
+exports.hasValue = hasValue;
+var setValue = function (map, mapKey, mapValue) {
+    var e_3, _a;
+    try {
+        for (var _b = __values(map.value.keys()), _c = _b.next(); !_c.done; _c = _b.next()) {
+            var key = _c.value;
+            if (key.value === mapKey.value) {
+                map.value.set(key, mapValue);
+                return;
+            }
+        }
+    }
+    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+    finally {
+        try {
+            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+        }
+        finally { if (e_3) throw e_3.error; }
+    }
+    map.value.set(mapKey, mapValue);
+};
+exports.setValue = setValue;
 var CustomMapIterator = /** @class */ (function () {
     function CustomMapIterator(value) {
         var me = this;
@@ -69,8 +132,8 @@ var CustomMapIterator = /** @class */ (function () {
         var key = keys[me.index++];
         return {
             value: new CustomMap(new Map([
-                ['key', new string_1.default(key)],
-                ['value', me.value.get(key)]
+                [new string_1.default('key'), key],
+                [new string_1.default('value'), me.value.get(key)]
             ])),
             done: false
         };
@@ -94,13 +157,13 @@ var CustomMap = /** @class */ (function (_super) {
         this.intrinsics.add(name, fn);
     };
     CustomMap.prototype.getCustomType = function () {
-        if (this.has('classID')) {
-            return this.get('classID').toString();
+        if ((0, exports.hasValue)(this, exports.CLASS_ID_PROPERTY)) {
+            return (0, exports.getValue)(this, exports.CLASS_ID_PROPERTY).toString();
         }
         return 'map';
     };
     CustomMap.prototype.toString = function () {
-        var e_1, _a;
+        var e_4, _a;
         var values = [];
         try {
             for (var _b = __values(this.value), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -108,12 +171,12 @@ var CustomMap = /** @class */ (function (_super) {
                 values.push("".concat(key, ": ").concat(value.toString()));
             }
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_1) throw e_1.error; }
+            finally { if (e_4) throw e_4.error; }
         }
         return "{ ".concat(values.join(', '), " }");
     };
@@ -133,34 +196,34 @@ var CustomMap = /** @class */ (function (_super) {
         return new CustomMapIterator(this.value);
     };
     CustomMap.prototype.extend = function (map) {
-        var e_2, _a;
+        var e_5, _a;
         if (map instanceof CustomMap) {
             map = map.value;
         }
         try {
             for (var map_1 = __values(map), map_1_1 = map_1.next(); !map_1_1.done; map_1_1 = map_1.next()) {
                 var _b = __read(map_1_1.value, 2), key = _b[0], value = _b[1];
-                this.value.set(key, value);
+                (0, exports.setValue)(this, key, value);
             }
         }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
         finally {
             try {
                 if (map_1_1 && !map_1_1.done && (_a = map_1.return)) _a.call(map_1);
             }
-            finally { if (e_2) throw e_2.error; }
+            finally { if (e_5) throw e_5.error; }
         }
         return this;
     };
     CustomMap.prototype.has = function (path) {
-        if (typeof path === 'string') {
+        if (path instanceof generics_1.CustomValue) {
             return this.has(new path_1.default([path]));
         }
         var traversalPath = path.clone();
         var current = traversalPath.next();
         if (current !== null) {
-            if (this.value.has(current)) {
-                var sub = this.value.get(current);
+            if ((0, exports.hasValue)(this, current)) {
+                var sub = (0, exports.getValue)(this, current);
                 if (traversalPath.count() > 0 &&
                     sub instanceof generics_1.CustomValueWithIntrinsics) {
                     return sub.has(traversalPath);
@@ -171,15 +234,15 @@ var CustomMap = /** @class */ (function (_super) {
         return false;
     };
     CustomMap.prototype.set = function (path, newValue) {
-        if (typeof path === 'string') {
+        if (path instanceof generics_1.CustomValue) {
             return this.set(new path_1.default([path]), newValue);
         }
         var traversalPath = path.clone();
         var last = traversalPath.last();
         var current = traversalPath.next();
         if (current !== null) {
-            if (this.value.has(current)) {
-                var sub = this.value.get(current);
+            if ((0, exports.hasValue)(this, current)) {
+                var sub = (0, exports.getValue)(this, current);
                 if (sub instanceof generics_1.CustomValueWithIntrinsics) {
                     sub.set(traversalPath, newValue);
                     return;
@@ -187,17 +250,17 @@ var CustomMap = /** @class */ (function (_super) {
             }
             throw new Error("Cannot set path ".concat(path.toString(), "."));
         }
-        this.value.set(last, newValue);
+        (0, exports.setValue)(this, last, newValue);
     };
     CustomMap.prototype.get = function (path) {
-        if (typeof path === 'string') {
+        if (path instanceof generics_1.CustomValue) {
             return this.get(new path_1.default([path]));
         }
         var traversalPath = path.clone();
         var current = traversalPath.next();
         if (current !== null) {
-            if (this.value.has(current)) {
-                var sub = this.value.get(current);
+            if ((0, exports.hasValue)(this, current)) {
+                var sub = (0, exports.getValue)(this, current);
                 if (traversalPath.count() > 0) {
                     if (sub instanceof generics_1.CustomValueWithIntrinsics) {
                         return sub.get(traversalPath);
@@ -207,8 +270,8 @@ var CustomMap = /** @class */ (function (_super) {
                     return sub;
                 }
             }
-            else if (path.count() === 1 && CustomMap.getIntrinsics().has(current)) {
-                return CustomMap.getIntrinsics().get(current);
+            else if (path.count() === 1 && CustomMap.getIntrinsics().has(current.toString())) {
+                return CustomMap.getIntrinsics().get(current.toString());
             }
         }
         throw new Error("Unknown path in map ".concat(path.toString(), "."));

package/dist/types/nil.d.ts

@@ -1,5 +1,6 @@
 import { CustomValue } from './generics';
 export default class CustomNil extends CustomValue {
+    value: null;
     getCustomType(): string;
     toString(): string;
     fork(): CustomNil;

package/dist/types/nil.js

@@ -19,7 +19,9 @@ var generics_1 = require("./generics");
 var CustomNil = /** @class */ (function (_super) {
     __extends(CustomNil, _super);
     function CustomNil() {
-        return _super !== null && _super.apply(this, arguments) || this;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.value = null;
+        return _this;
     }
     CustomNil.prototype.getCustomType = function () {
         return 'null';

package/dist/types/string.d.ts

@@ -27,7 +27,7 @@ export default class CustomString extends CustomValueWithIntrinsics {
     slice(a: CustomValue, b: CustomValue): CustomString;
     [Symbol.iterator](): CustomStringIterator;
     getCharIndex(index: number): number;
-    has(path: Path<string> | string): boolean;
-    set(_path: Path<string> | string, _newValue: CustomValue): void;
-    get(path: Path<string> | string): CustomValue;
+    has(path: Path<CustomValue> | CustomValue): boolean;
+    set(_path: Path<CustomValue> | CustomValue, _newValue: CustomValue): void;
+    get(path: Path<CustomValue> | CustomValue): CustomValue;
 }

package/dist/types/string.js

@@ -23,6 +23,7 @@ var intrinsics_container_1 = __importDefault(require("../intrinsics-container"))
 var path_1 = __importDefault(require("../utils/path"));
 var default_1 = __importDefault(require("./default"));
 var generics_1 = require("./generics");
+var number_1 = __importDefault(require("./number"));
 var CustomStringIterator = /** @class */ (function () {
     function CustomStringIterator(value) {
         var me = this;
@@ -104,16 +105,13 @@ var CustomString = /** @class */ (function (_super) {
         return CustomString.getCharIndex(this, index);
     };
     CustomString.prototype.has = function (path) {
-        if (typeof path === 'string') {
+        if (path instanceof generics_1.CustomValue) {
             return this.has(new path_1.default([path]));
         }
         var traversalPath = path.clone();
         var current = traversalPath.next();
-        if (current !== null) {
-            var index = parseInt(current);
-            if (Number.isNaN(index)) {
-                return false;
-            }
+        if (current instanceof number_1.default) {
+            var index = current.toInt();
             return !!this.value[index];
         }
         return false;
@@ -122,24 +120,22 @@ var CustomString = /** @class */ (function (_super) {
         throw new Error('Mutable operations are not allowed on a string.');
     };
     CustomString.prototype.get = function (path) {
-        if (typeof path === 'string') {
+        if (path instanceof generics_1.CustomValue) {
             return this.get(new path_1.default([path]));
         }
         var traversalPath = path.clone();
         var current = traversalPath.next();
-        if (current !== null) {
-            var currentIndex = parseInt(current);
-            var isCurrentNumber = !Number.isNaN(currentIndex);
-            if (isCurrentNumber) {
-                currentIndex = this.getCharIndex(currentIndex);
-            }
-            if (isCurrentNumber) {
-                return new CustomString(this.value[currentIndex].toString());
-            }
-            else if (path.count() === 1 &&
-                CustomString.getIntrinsics().has(current)) {
-                return CustomString.intrinsics.get(current);
+        if (current instanceof number_1.default) {
+            var currentIndex = this.getCharIndex(current.toInt());
+            var segment = this.value[currentIndex];
+            if (segment) {
+                return new CustomString(segment);
             }
+            throw new Error("Index error (string index ".concat(currentIndex, " out of range)."));
+        }
+        else if (path.count() === 1 &&
+            CustomString.getIntrinsics().has(current.toString())) {
+            return CustomString.intrinsics.get(current.toString());
         }
         return default_1.default.Void;
     };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "1.1.2",
+    "version": "1.1.5",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -10,8 +10,8 @@
         "watch": "tsc -w -p .",
         "clean": "rm -rf dist",
         "test": "jest ./tests",
-        "lint": "eslint 'src/**/*.ts'",
-        "lint:fix": "eslint --fix 'src/**/*.ts'"
+        "lint": "eslint ./src/**/*.ts",
+        "lint:fix": "eslint --fix ./src/**/*.ts"
     },
     "repository": {
         "type": "git",
@@ -48,8 +48,8 @@
         "typescript": "^4.5.4"
     },
     "dependencies": {
-        "greybel-core": "^0.3.1",
-        "greyscript-core": "^0.2.9"
+        "greybel-core": "^0.4.1",
+        "greyscript-core": "^0.3.4"
     },
     "keywords": [
         "greyscript",