greybel-interpreter 0.2.2 → 0.2.6

package/dist/context.d.ts

@@ -1,3 +1,4 @@
+import CustomMap from './custom-types/map';
 import { Operation } from './types/operation';
 import { Expression } from './types/expression';
 import { Callable } from './types/custom-type';
@@ -16,12 +17,9 @@ export declare enum ContextState {
     TEMPORARY = "TEMPORARY",
     DEFAULT = "DEFAULT"
 }
-export declare class Scope {
+export declare class Scope extends CustomMap {
     context: OperationContext;
-    refs: Map<string, any>;
     constructor(context: OperationContext);
-    valueOf(): Map<string, any>;
-    extend(map?: Map<string, any>): Scope;
     set(path: string[], value: any): Promise<void>;
     get(path: string[]): Promise<any>;
     getCallable(path: string[]): Promise<Callable>;
@@ -34,7 +32,7 @@ export declare class Debugger {
     raise(message: string, ...args: any[]): void;
     debug(message: string, ...args: any[]): void;
     setBreakpoint(state: boolean): Debugger;
-    getBreakpoint(): boolean;
+    getBreakpoint(operationContext: OperationContext): boolean;
     next(): Debugger;
     resume(): Promise<void>;
     interact(operationContext: OperationContext, item: Operation | Expression): void;
@@ -46,36 +44,44 @@ export interface OperationContextProcessState {
 export interface OperationContextOptions {
     target?: string;
     isProtected?: boolean;
-    type?: string;
-    state?: string;
+    type?: ContextType;
+    state?: ContextState;
     previous?: OperationContext;
     debugger?: Debugger;
     cps?: CPS;
     processState?: OperationContextProcessState;
 }
 export interface OperationContextForkOptions {
-    type: string;
-    state: string;
+    type: ContextType;
+    state: ContextState;
     target?: string;
 }
 export declare class OperationContext {
     target: string;
+    line: number;
     debugger: Debugger;
     previous: OperationContext | null;
-    type: string;
-    state: string;
+    type: ContextType;
+    state: ContextState;
     scope: Scope;
     isProtected: boolean;
     memory: Map<string, any>;
     cps: CPS | null;
     processState: OperationContextProcessState;
+    api: Scope | null;
+    locals: Scope | null;
+    globals: Scope | null;
     constructor(options: OperationContextOptions);
-    valueOf(): Map<string, any>;
+    lookupType(validate: (type: ContextType) => boolean): Scope;
+    lookupAPI(): Scope;
+    lookupGlobals(): Scope;
+    lookupLocals(): Scope;
+    valueOf(): CustomMap;
     extend(map: Map<string, any>): OperationContext;
-    set(path: any[], value: any): Promise<OperationContext>;
-    get(path: any[]): any;
+    set(path: any[], value: any): Promise<void>;
+    get(path: any[]): Promise<any>;
+    getCallable(path: string[]): Promise<Callable>;
     setMemory(key: string, value: any): OperationContext;
     getMemory(key: string): any;
-    getCallable(path: string[]): Promise<Callable>;
     fork({ type, state, target }: OperationContextForkOptions): OperationContext;
 }

package/dist/context.js

@@ -1,4 +1,19 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 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) {
@@ -65,11 +80,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OperationContext = exports.Debugger = exports.Scope = exports.ContextState = exports.ContextType = void 0;
-var boolean_1 = __importDefault(require("./custom-types/boolean"));
-var number_1 = __importDefault(require("./custom-types/number"));
-var string_1 = __importDefault(require("./custom-types/string"));
-var nil_1 = __importDefault(require("./custom-types/nil"));
-var custom_type_1 = require("./types/custom-type");
+var map_1 = __importDefault(require("./custom-types/map"));
 var greybel_core_1 = require("greybel-core");
 var ContextType;
 (function (ContextType) {
@@ -87,128 +98,98 @@ var ContextState;
     ContextState["TEMPORARY"] = "TEMPORARY";
     ContextState["DEFAULT"] = "DEFAULT";
 })(ContextState = exports.ContextState || (exports.ContextState = {}));
-var Scope = /** @class */ (function () {
+var Scope = /** @class */ (function (_super) {
+    __extends(Scope, _super);
     function Scope(context) {
-        var me = this;
-        me.context = context;
-        me.refs = new Map();
+        var _this = _super.call(this) || this;
+        _this.context = context;
+        return _this;
     }
-    Scope.prototype.valueOf = function () {
-        return this.refs;
-    };
-    Scope.prototype.extend = function (map) {
-        if (map === void 0) { map = new Map(); }
-        var me = this;
-        me.refs = new Map(__spreadArray(__spreadArray([], __read(me.refs.entries()), false), __read(map.entries()), false));
-        return me;
-    };
     Scope.prototype.set = function (path, value) {
-        return __awaiter(this, void 0, void 0, function () {
-            var me, traversalPath, refs, last, current, origin;
-            return __generator(this, function (_a) {
-                me = this;
-                traversalPath = [].concat(path);
-                refs = me.refs;
-                last = traversalPath.pop();
-                current = traversalPath.shift();
-                origin = refs;
-                if (current != null) {
-                    if (origin.has(current)) {
-                        origin = origin.get(current);
-                        if (origin instanceof custom_type_1.CustomObjectType ||
-                            origin instanceof Scope) {
-                            return [2 /*return*/, origin.set(traversalPath.concat([last]), value)];
-                        }
-                    }
-                    else if (me.context.previous && !me.context.previous.isProtected) {
-                        me.context.previous.set(path, value);
-                        return [2 /*return*/];
-                    }
-                    else if (traversalPath.length > 0) {
-                        throw new Error("Cannot set path ".concat(path.join('.')));
-                    }
-                }
-                if (origin &&
-                    !(origin instanceof boolean_1.default) &&
-                    !(origin instanceof string_1.default) &&
-                    !(origin instanceof number_1.default) &&
-                    !(origin instanceof nil_1.default)) {
-                    origin.set(last, value);
-                }
-                else {
-                    throw new Error("Cannot set path ".concat(path.join('.')));
-                }
-                return [2 /*return*/];
-            });
-        });
+        var me = this;
+        var traversalPath = [].concat(path);
+        var current = traversalPath.shift();
+        if (current != null) {
+            if (current === 'locals') {
+                return me.context.locals.set(traversalPath, value);
+            }
+            else if (current === 'globals') {
+                return me.context.globals.set(traversalPath, value);
+            }
+            else if (me.context.locals != null) {
+                return map_1.default.prototype.set.call(me.context.locals, path, value);
+            }
+            else {
+                throw new Error("Cannot set path ".concat(path.join('.')));
+            }
+        }
     };
     Scope.prototype.get = function (path) {
-        return __awaiter(this, void 0, void 0, function () {
-            var me, traversalPath, refs, current, context, origin;
-            return __generator(this, function (_a) {
-                me = this;
-                traversalPath = [].concat(path);
-                refs = me.refs;
-                current = traversalPath.shift();
-                origin = refs;
-                if (current != null) {
-                    if (origin.has(current)) {
-                        context = origin;
-                        origin = origin.get(current);
-                        if (traversalPath.length > 0 &&
-                            (origin instanceof custom_type_1.CustomObjectType ||
-                                origin instanceof Scope)) {
-                            return [2 /*return*/, origin.get(traversalPath)];
-                        }
-                    }
-                    else if (me.context.previous) {
-                        return [2 /*return*/, me.context.previous.get(path)];
-                    }
-                    else {
-                        throw new Error("Cannot get path ".concat(path.join('.')));
-                    }
-                }
-                else {
-                    return [2 /*return*/, null];
-                }
-                return [2 /*return*/, origin];
-            });
-        });
+        var _a, _b, _c;
+        var me = this;
+        var traversalPath = [].concat(path);
+        var current = traversalPath.shift();
+        if (current != null) {
+            if (current === 'locals') {
+                return traversalPath.length === 0
+                    ? Promise.resolve(me.context.locals)
+                    : me.context.locals.get(traversalPath);
+            }
+            else if (current === 'globals') {
+                return traversalPath.length === 0
+                    ? Promise.resolve(me.context.globals)
+                    : me.context.globals.get(traversalPath);
+            }
+            else if ((_a = me.context.locals) === null || _a === void 0 ? void 0 : _a.value.has(current)) {
+                return map_1.default.prototype.get.call(me.context.locals, path);
+            }
+            else if ((_b = me.context.globals) === null || _b === void 0 ? void 0 : _b.value.has(current)) {
+                return map_1.default.prototype.get.call(me.context.globals, path);
+            }
+            else if ((_c = me.context.api) === null || _c === void 0 ? void 0 : _c.value.has(current)) {
+                return map_1.default.prototype.get.call(me.context.api, path);
+            }
+            else if (me.value.has(current)) {
+                return _super.prototype.get.call(this, path);
+            }
+            else {
+                throw new Error("Cannot get path ".concat(path.join('.')));
+            }
+        }
+        return null;
     };
     Scope.prototype.getCallable = function (path) {
-        return __awaiter(this, void 0, void 0, function () {
-            var me, traversalPath, refs, current, origin, context;
-            return __generator(this, function (_a) {
-                me = this;
-                traversalPath = [].concat(path);
-                refs = me.refs;
-                current = traversalPath.shift();
-                origin = refs;
-                if (current != null) {
-                    if (origin.has(current)) {
-                        context = origin;
-                        origin = origin.get(current);
-                        if (origin instanceof custom_type_1.CustomObjectType ||
-                            origin instanceof Scope) {
-                            return [2 /*return*/, origin.getCallable(traversalPath)];
-                        }
-                    }
-                    else if (me.context.previous) {
-                        return [2 /*return*/, me.context.previous.getCallable(path)];
-                    }
-                    else {
-                        throw new Error("Cannot get path ".concat(path.join('.')));
-                    }
-                }
-                return [2 /*return*/, {
-                        origin: origin,
-                        context: context
-                    }];
-            });
+        var _a, _b, _c;
+        var me = this;
+        var traversalPath = [].concat(path);
+        var current = traversalPath.shift();
+        if (current != null) {
+            if (current === 'locals') {
+                return me.context.locals.getCallable(traversalPath);
+            }
+            else if (current === 'globals') {
+                return me.context.globals.getCallable(traversalPath);
+            }
+            else if ((_a = me.context.locals) === null || _a === void 0 ? void 0 : _a.value.has(current)) {
+                return map_1.default.prototype.getCallable.call(me.context.locals, path);
+            }
+            else if ((_b = me.context.globals) === null || _b === void 0 ? void 0 : _b.value.has(current)) {
+                return map_1.default.prototype.getCallable.call(me.context.globals, path);
+            }
+            else if ((_c = me.context.api) === null || _c === void 0 ? void 0 : _c.value.has(current)) {
+                return map_1.default.prototype.getCallable.call(me.context.api, path);
+            }
+            else {
+                return _super.prototype.getCallable.call(this, path);
+            }
+        }
+        return Promise.resolve({
+            origin: me,
+            context: null
         });
     };
     return Scope;
-}());
+}(map_1.default));
 exports.Scope = Scope;
 var Debugger = /** @class */ (function () {
     function Debugger() {
@@ -236,8 +217,8 @@ var Debugger = /** @class */ (function () {
         me.breakpoint = state;
         return me;
     };
-    Debugger.prototype.getBreakpoint = function () {
-        return this.breakpoint;
+    Debugger.prototype.getBreakpoint = function (operationContext) {
+        return operationContext.type !== ContextType.INJECTION && this.breakpoint;
     };
     Debugger.prototype.next = function () {
         var me = this;
@@ -311,6 +292,7 @@ var OperationContext = /** @class */ (function () {
     function OperationContext(options) {
         var me = this;
         me.target = options.target || 'unknown';
+        me.line = -1;
         me.previous = options.previous || null;
         me.type = options.type || ContextType.API;
         me.state = options.state || ContextState.DEFAULT;
@@ -322,7 +304,33 @@ var OperationContext = /** @class */ (function () {
         me.processState = options.processState || {
             exit: false
         };
+        me.api = me.lookupAPI();
+        me.globals = me.lookupGlobals();
+        me.locals = me.lookupLocals();
     }
+    OperationContext.prototype.lookupType = function (validate) {
+        var me = this;
+        if (validate(me.type)) {
+            return me.scope;
+        }
+        var current = me.previous;
+        while (current) {
+            if (validate(current.type)) {
+                return current.scope;
+            }
+            current = current.previous;
+        }
+        return null;
+    };
+    OperationContext.prototype.lookupAPI = function () {
+        return this.lookupType(function (type) { return [ContextType.API].includes(type); });
+    };
+    OperationContext.prototype.lookupGlobals = function () {
+        return this.lookupType(function (type) { return [ContextType.GLOBAL].includes(type); });
+    };
+    OperationContext.prototype.lookupLocals = function () {
+        return this.lookupType(function (type) { return [ContextType.GLOBAL, ContextType.FUNCTION].includes(type); });
+    };
     OperationContext.prototype.valueOf = function () {
         return this.scope.valueOf();
     };
@@ -339,25 +347,13 @@ var OperationContext = /** @class */ (function () {
     };
     OperationContext.prototype.set = function (path, value) {
         var _a;
-        return __awaiter(this, void 0, void 0, function () {
-            var me;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        me = this;
-                        if (!(me.state === ContextState.TEMPORARY)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, ((_a = me.previous) === null || _a === void 0 ? void 0 : _a.set(path, value))];
-                    case 1:
-                        _b.sent();
-                        return [3 /*break*/, 4];
-                    case 2: return [4 /*yield*/, me.scope.set(path, value)];
-                    case 3:
-                        _b.sent();
-                        _b.label = 4;
-                    case 4: return [2 /*return*/, me];
-                }
-            });
-        });
+        var me = this;
+        if (me.state === ContextState.TEMPORARY) {
+            return (_a = me.previous) === null || _a === void 0 ? void 0 : _a.set(path, value);
+        }
+        else {
+            return me.scope.set(path, value);
+        }
     };
     OperationContext.prototype.get = function (path) {
         var _a;
@@ -367,6 +363,14 @@ var OperationContext = /** @class */ (function () {
         }
         return me.scope.get(path);
     };
+    OperationContext.prototype.getCallable = function (path) {
+        var _a;
+        var me = this;
+        if (me.state === ContextState.TEMPORARY) {
+            return (_a = me.previous) === null || _a === void 0 ? void 0 : _a.getCallable(path);
+        }
+        return me.scope.getCallable(path);
+    };
     OperationContext.prototype.setMemory = function (key, value) {
         var me = this;
         me.memory.set(key, value);
@@ -376,14 +380,6 @@ var OperationContext = /** @class */ (function () {
         var me = this;
         return me.memory.get(key);
     };
-    OperationContext.prototype.getCallable = function (path) {
-        var _a;
-        var me = this;
-        if (me.state === ContextState.TEMPORARY) {
-            return (_a = me.previous) === null || _a === void 0 ? void 0 : _a.getCallable(path);
-        }
-        return me.scope.getCallable(path);
-    };
     OperationContext.prototype.fork = function (_a) {
         var type = _a.type, state = _a.state, target = _a.target;
         var me = this;
@@ -396,9 +392,6 @@ var OperationContext = /** @class */ (function () {
             cps: me.cps,
             processState: me.processState
         });
-        if (me.type === ContextType.FUNCTION || me.type === ContextType.GLOBAL) {
-            opc.scope.refs.set('locals', opc.scope);
-        }
         if (type !== ContextType.FUNCTION) {
             if (type !== ContextType.LOOP) {
                 opc.setMemory('loopContext', me.getMemory('loopContext'));

package/dist/custom-types/map.d.ts

@@ -13,14 +13,14 @@ export default class CustomMap extends CustomObjectType implements Iterable<Cust
     static intrinsics: Map<string, Function>;
     value: Map<string, any>;
     isInstance: boolean;
-    constructor(value: Map<string, any>);
+    constructor(value?: Map<string, any>);
     [Symbol.iterator](): CustomMapIterator;
     extend(value: Map<string, any>): CustomMap;
     set(path: string[], value: any): Promise<void>;
     get(path: string[]): Promise<any>;
     getCallable(path: string[]): Promise<Callable>;
     callMethod(method: string[], ...args: any[]): any;
-    createInstancefunction(): CustomMap;
+    createInstance(): CustomMap;
     getType(): string;
     valueOf(): CustomMap | null;
     toString(): string;

package/dist/custom-types/map.js

@@ -14,42 +14,6 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-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());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        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;
@@ -111,7 +75,7 @@ var CustomMap = /** @class */ (function (_super) {
     function CustomMap(value) {
         var _this = _super.call(this) || this;
         var me = _this;
-        me.value = new Map(__spreadArray([], __read(value.entries()), false));
+        me.value = value || new Map();
         me.isInstance = false;
         return _this;
     }
@@ -124,107 +88,92 @@ var CustomMap = /** @class */ (function (_super) {
         return me;
     };
     CustomMap.prototype.set = function (path, value) {
-        return __awaiter(this, void 0, void 0, function () {
-            var me, traversalPath, refs, last, current, origin;
-            return __generator(this, function (_a) {
-                me = this;
-                traversalPath = [].concat(path);
-                refs = me.value;
-                last = traversalPath.pop();
-                current = traversalPath.shift();
-                origin = refs;
-                if (current != null) {
-                    if (origin.has(current)) {
-                        origin = origin.get(current);
-                        if (origin instanceof custom_type_1.CustomObjectType) {
-                            return [2 /*return*/, origin.set(traversalPath.concat(last), value)];
-                        }
-                    }
-                    else {
-                        throw new Error("Cannot set path ".concat(path.join('.')));
-                    }
-                }
-                if (origin) {
-                    if (value instanceof operation_1.FunctionOperationBase) {
-                        origin.set(last, value.fork(me));
-                    }
-                    else {
-                        origin.set(last, value);
-                    }
-                }
-                else {
-                    throw new Error("Cannot set path ".concat(path.join('.')));
+        var me = this;
+        var traversalPath = [].concat(path);
+        var refs = me.value;
+        var last = traversalPath.pop();
+        var current = traversalPath.shift();
+        var origin = refs;
+        if (current != null) {
+            if (origin.has(current)) {
+                origin = origin.get(current);
+                if (origin instanceof custom_type_1.CustomObjectType) {
+                    return origin.set(traversalPath.concat(last), value);
                 }
-                return [2 /*return*/];
-            });
-        });
+            }
+            else {
+                throw new Error("Cannot set path ".concat(path.join('.')));
+            }
+        }
+        if (origin) {
+            if (value instanceof operation_1.FunctionOperationBase) {
+                origin.set(last, value.fork(me));
+            }
+            else {
+                origin.set(last, value);
+            }
+        }
+        else {
+            throw new Error("Cannot set path ".concat(path.join('.')));
+        }
     };
     CustomMap.prototype.get = function (path) {
-        return __awaiter(this, void 0, void 0, function () {
-            var me, traversalPath, refs, current, currentValue, origin;
-            return __generator(this, function (_a) {
-                me = this;
-                if (path.length === 0) {
-                    return [2 /*return*/, me];
-                }
-                traversalPath = [].concat(path);
-                refs = me.value;
-                current = traversalPath.shift();
-                currentValue = current.valueOf();
-                origin = refs;
-                if (currentValue != null) {
-                    if (origin.has(currentValue)) {
-                        origin = origin.get(currentValue);
-                        if (traversalPath.length > 0 && origin instanceof custom_type_1.CustomObjectType) {
-                            return [2 /*return*/, origin.get(traversalPath)];
-                        }
-                    }
-                    else if (path.length === 1 && CustomMap.intrinsics.has(currentValue)) {
-                        return [2 /*return*/, CustomMap.intrinsics.get(currentValue).bind(null, me)];
-                    }
-                    else {
-                        throw new Error("Cannot get path ".concat(path.join('.')));
-                    }
-                }
-                else {
-                    return [2 /*return*/, null];
+        var me = this;
+        if (path.length === 0) {
+            return Promise.resolve(me);
+        }
+        var traversalPath = [].concat(path);
+        var refs = me.value;
+        var current = traversalPath.shift();
+        var currentValue = current.valueOf();
+        var origin = refs;
+        if (currentValue != null) {
+            if (origin.has(currentValue)) {
+                origin = origin.get(currentValue);
+                if (traversalPath.length > 0 && origin instanceof custom_type_1.CustomObjectType) {
+                    return origin.get(traversalPath);
                 }
-                return [2 /*return*/, origin];
-            });
-        });
+            }
+            else if (path.length === 1 && CustomMap.intrinsics.has(currentValue)) {
+                return Promise.resolve(CustomMap.intrinsics.get(currentValue).bind(null, me));
+            }
+            else {
+                throw new Error("Cannot get path ".concat(path.join('.')));
+            }
+        }
+        else {
+            return null;
+        }
+        return Promise.resolve(origin);
     };
     CustomMap.prototype.getCallable = function (path) {
-        return __awaiter(this, void 0, void 0, function () {
-            var me, traversalPath, refs, current, origin, context;
-            return __generator(this, function (_a) {
-                me = this;
-                traversalPath = [].concat(path);
-                refs = me.value;
-                current = traversalPath.shift();
-                origin = refs;
-                if (current != null) {
-                    if (origin.has(current)) {
-                        context = origin;
-                        origin = origin.get(current);
-                        if (origin instanceof custom_type_1.CustomObjectType) {
-                            return [2 /*return*/, origin.getCallable(traversalPath)];
-                        }
-                    }
-                    else if (path.length === 1 && CustomMap.intrinsics.has(current)) {
-                        return [2 /*return*/, {
-                                origin: CustomMap.intrinsics.get(current).bind(null, me),
-                                context: me
-                            }];
-                    }
-                    else {
-                        throw new Error("Cannot get path ".concat(path.join('.')));
-                    }
+        var me = this;
+        var traversalPath = [].concat(path);
+        var refs = me.value;
+        var current = traversalPath.shift();
+        var origin = refs;
+        var context;
+        if (current != null) {
+            if (origin.has(current)) {
+                context = origin;
+                origin = origin.get(current);
+                if (origin instanceof custom_type_1.CustomObjectType) {
+                    return origin.getCallable(traversalPath);
                 }
-                return [2 /*return*/, {
-                        origin: origin,
-                        context: context
-                    }];
-            });
+            }
+            else if (path.length === 1 && CustomMap.intrinsics.has(current)) {
+                return Promise.resolve({
+                    origin: CustomMap.intrinsics.get(current).bind(null, me),
+                    context: me
+                });
+            }
+            else {
+                throw new Error("Cannot get path ".concat(path.join('.')));
+            }
+        }
+        return Promise.resolve({
+            origin: origin,
+            context: context
         });
     };
     CustomMap.prototype.callMethod = function (method) {
@@ -249,21 +198,21 @@ var CustomMap = /** @class */ (function (_super) {
         }
         return CustomMap.intrinsics.get(key).apply(void 0, __spreadArray([me], __read(args), false));
     };
-    CustomMap.prototype.createInstancefunction = function () {
+    CustomMap.prototype.createInstance = function () {
         var me = this;
-        var value = new Map();
-        var newInstance = new CustomMap(value);
+        var newInstance = new CustomMap();
         newInstance.isInstance = true;
         me.value.forEach(function (item, key) {
-            value.set(key, item instanceof operation_1.FunctionOperationBase
+            newInstance.value.set(key, item instanceof operation_1.FunctionOperationBase
                 ? item.fork(newInstance)
                 : item);
         });
         return newInstance;
     };
     CustomMap.prototype.getType = function () {
+        var _a;
         var me = this;
-        return me.value.get('classID') || 'map';
+        return ((_a = me.value.get('classID')) === null || _a === void 0 ? void 0 : _a.toString()) || 'map';
     };
     CustomMap.prototype.valueOf = function () {
         var me = this;

package/dist/expressions/assign.js

@@ -162,7 +162,7 @@ var AssignExpression = /** @class */ (function (_super) {
                                 });
                             });
                         };
-                        operationContext.debugger.debug('AssignExpression', 'get', 'expr', me.expr);
+                        operationContext.debugger.debug('Line', me.ast.line, 'AssignExpression', 'get', 'expr', me.expr);
                         return [4 /*yield*/, evaluate(me.expr)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }

package/dist/expressions/binary-negated-expression.js

@@ -123,7 +123,7 @@ var BinaryNegatedExpression = /** @class */ (function (_super) {
                 });
             });
         };
-        operationContext.debugger.debug('BinaryNegatedExpression', 'get', 'expr', me.expr);
+        operationContext.debugger.debug('Line', me.ast.line, 'BinaryNegatedExpression', 'get', 'expr', me.expr);
         return evaluate(me.expr);
     };
     return BinaryNegatedExpression;

package/dist/expressions/call.js

@@ -169,7 +169,7 @@ var CallExpression = /** @class */ (function (_super) {
                             return [4 /*yield*/, node.path.get(opc, me.expr)];
                         case 2:
                             pathExpr = _f.sent();
-                            operationContext.debugger.debug('CallExpression', 'pathExpr', pathExpr);
+                            operationContext.debugger.debug('Line', me.ast.line, 'CallExpression', 'pathExpr', pathExpr);
                             if (!pathExpr.handle) return [3 /*break*/, 8];
                             if (!(0, typer_1.isCustomMap)(pathExpr.handle)) return [3 /*break*/, 7];
                             return [4 /*yield*/, pathExpr.handle.getCallable(pathExpr.path)];
@@ -203,7 +203,7 @@ var CallExpression = /** @class */ (function (_super) {
                 });
             });
         };
-        operationContext.debugger.debug('CallExpression', 'get', 'expr', me.expr);
+        operationContext.debugger.debug('Line', me.ast.line, 'CallExpression', 'get', 'expr', me.expr);
         return evaluate(me.expr);
     };
     return CallExpression;

package/dist/expressions/import.js

@@ -143,7 +143,7 @@ var ImportExpression = /** @class */ (function (_super) {
                                 });
                             });
                         };
-                        operationContext.debugger.debug('ImportExpression', 'get', 'expr', me.expr);
+                        operationContext.debugger.debug('Line', me.ast.line, 'ImportExpression', 'get', 'expr', me.expr);
                         return [4 /*yield*/, evaluate(me.expr)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }

package/dist/expressions/include.js

@@ -120,7 +120,7 @@ var IncludeExpression = /** @class */ (function (_super) {
                                 });
                             });
                         };
-                        operationContext.debugger.debug('IncludeExpression', 'get', 'expr', me.expr);
+                        operationContext.debugger.debug('Line', me.ast.line, 'IncludeExpression', 'get', 'expr', me.expr);
                         return [4 /*yield*/, evaluate(me.expr)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }

package/dist/expressions/list.js

@@ -126,7 +126,7 @@ var ListExpression = /** @class */ (function (_super) {
                 });
             });
         };
-        operationContext.debugger.debug('ListExpression', 'get', 'expr', me.expr);
+        operationContext.debugger.debug('Line', me.ast.line, 'ListExpression', 'get', 'expr', me.expr);
         return evaluate(me.expr.values);
     };
     return ListExpression;

package/dist/expressions/logical-and-binary.js

@@ -204,7 +204,7 @@ var LogicalAndBinaryExpression = /** @class */ (function (_super) {
                 }
             });
         }); };
-        operationContext.debugger.debug('LogicalAndBinaryExpression', 'get', 'expr', me.expr);
+        operationContext.debugger.debug('Line', me.ast.line, 'LogicalAndBinaryExpression', 'get', 'expr', me.expr);
         return evaluate(me.expr);
     };
     return LogicalAndBinaryExpression;

package/dist/expressions/map.js

@@ -188,7 +188,7 @@ var MapExpression = /** @class */ (function (_super) {
                 });
             });
         };
-        operationContext.debugger.debug('MapExpression', 'get', 'expr', me.expr);
+        operationContext.debugger.debug('Line', me.ast.line, 'MapExpression', 'get', 'expr', me.expr);
         return evaluate(me.expr.values);
     };
     return MapExpression;

package/dist/expressions/path.js

@@ -315,7 +315,7 @@ var PathExpression = /** @class */ (function (_super) {
                                 });
                             });
                         };
-                        operationContext.debugger.debug('PathExpression', 'get', 'expr', me.expr);
+                        operationContext.debugger.debug('Line', me.ast.line, 'PathExpression', 'get', 'expr', me.expr);
                         return [4 /*yield*/, evaluate(me.expr)];
                     case 1:
                         resultExpr = _c.sent();

package/dist/interpreter.js

@@ -99,7 +99,7 @@ var Interpreter = /** @class */ (function () {
                         topOperation = new (_b.apply(top_1.default, _c.concat([(_d.body = _e.sent(),
                                 _d)])))();
                         mainContext.extend(me.api);
-                        mainContext.scope.refs.set('params', (0, typer_1.cast)(me.params));
+                        mainContext.scope.value.set('params', (0, typer_1.cast)(me.params));
                         me.context = mainContext;
                         return [2 /*return*/, topOperation.run(mainContext)
                                 .catch(function (err) {

package/dist/operations/argument.js

@@ -61,10 +61,14 @@ var __values = (this && this.__values) || function(o) {
     };
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var typer_1 = require("../typer");
 var operation_1 = require("../types/operation");
 var expression_1 = require("../types/expression");
+var assign_1 = __importDefault(require("../expressions/assign"));
 var ArgumentOperation = /** @class */ (function (_super) {
     __extends(ArgumentOperation, _super);
     function ArgumentOperation(ast) {
@@ -76,50 +80,60 @@ var ArgumentOperation = /** @class */ (function (_super) {
     }
     ArgumentOperation.prototype.get = function (operationContext) {
         return __awaiter(this, void 0, void 0, function () {
-            var me, stack, args, stack_1, stack_1_1, entity, _a, _b, e_1_1;
-            var e_1, _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var me, stack, args, stack_1, stack_1_1, entity, _a, _b, _c, _d, e_1_1;
+            var e_1, _e;
+            return __generator(this, function (_f) {
+                switch (_f.label) {
                     case 0:
                         me = this;
                         stack = me.stack;
                         args = [];
-                        _d.label = 1;
+                        _f.label = 1;
                     case 1:
-                        _d.trys.push([1, 8, 9, 10]);
+                        _f.trys.push([1, 11, 12, 13]);
                         stack_1 = __values(stack), stack_1_1 = stack_1.next();
-                        _d.label = 2;
+                        _f.label = 2;
                     case 2:
-                        if (!!stack_1_1.done) return [3 /*break*/, 7];
+                        if (!!stack_1_1.done) return [3 /*break*/, 10];
                         entity = stack_1_1.value;
                         if (!(0, typer_1.isCustomValue)(entity)) return [3 /*break*/, 3];
                         args.push(entity);
-                        return [3 /*break*/, 6];
+                        return [3 /*break*/, 9];
                     case 3:
-                        if (!(entity instanceof expression_1.Expression)) return [3 /*break*/, 5];
-                        _b = (_a = args).push;
+                        if (!(entity instanceof assign_1.default)) return [3 /*break*/, 6];
                         return [4 /*yield*/, entity.get(operationContext, me)];
                     case 4:
-                        _b.apply(_a, [_d.sent()]);
-                        return [3 /*break*/, 6];
+                        _f.sent();
+                        _b = (_a = args).push;
+                        return [4 /*yield*/, entity.expr.left.get(operationContext)];
                     case 5:
-                        operationContext.debugger.raise('Unexpected argument', me, entity);
-                        _d.label = 6;
+                        _b.apply(_a, [_f.sent()]);
+                        return [3 /*break*/, 9];
                     case 6:
+                        if (!(entity instanceof expression_1.Expression)) return [3 /*break*/, 8];
+                        _d = (_c = args).push;
+                        return [4 /*yield*/, entity.get(operationContext, me)];
+                    case 7:
+                        _d.apply(_c, [_f.sent()]);
+                        return [3 /*break*/, 9];
+                    case 8:
+                        operationContext.debugger.raise('Unexpected argument', me, entity);
+                        _f.label = 9;
+                    case 9:
                         stack_1_1 = stack_1.next();
                         return [3 /*break*/, 2];
-                    case 7: return [3 /*break*/, 10];
-                    case 8:
-                        e_1_1 = _d.sent();
+                    case 10: return [3 /*break*/, 13];
+                    case 11:
+                        e_1_1 = _f.sent();
                         e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 10];
-                    case 9:
+                        return [3 /*break*/, 13];
+                    case 12:
                         try {
-                            if (stack_1_1 && !stack_1_1.done && (_c = stack_1.return)) _c.call(stack_1);
+                            if (stack_1_1 && !stack_1_1.done && (_e = stack_1.return)) _e.call(stack_1);
                         }
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];
-                    case 10: return [2 /*return*/, args];
+                    case 13: return [2 /*return*/, args];
                 }
             });
         });

package/dist/operations/body.js

@@ -100,7 +100,8 @@ var BodyOperation = /** @class */ (function (_super) {
                     case 2:
                         if (!!_b.done) return [3 /*break*/, 10];
                         entity = _b.value;
-                        if (!(operationContext.type !== context_1.ContextType.INJECTION && dbgr.getBreakpoint())) return [3 /*break*/, 4];
+                        operationContext.line = entity.ast.line;
+                        if (!dbgr.getBreakpoint(operationContext)) return [3 /*break*/, 4];
                         dbgr.interact(operationContext, entity);
                         return [4 /*yield*/, dbgr.resume()];
                     case 3:

package/dist/operations/function.js

@@ -110,14 +110,17 @@ var FunctionOperation = /** @class */ (function (_super) {
                         max = args.length;
                         _a.label = 2;
                     case 2:
-                        if (!(index < max)) return [3 /*break*/, 4];
-                        return [4 /*yield*/, opc.set(args[index].path[0], incArgs[index])];
+                        if (!(index < max)) return [3 /*break*/, 5];
+                        if (!incArgs[index]) return [3 /*break*/, 4];
+                        return [4 /*yield*/, opc.set(args[index].path, incArgs[index])];
                     case 3:
                         _a.sent();
+                        _a.label = 4;
+                    case 4:
                         index++;
                         return [3 /*break*/, 2];
-                    case 4: return [4 /*yield*/, me.body.run(opc)];
-                    case 5:
+                    case 5: return [4 /*yield*/, me.body.run(opc)];
+                    case 6:
                         _a.sent();
                         return [2 /*return*/, functionContext.value];
                 }

package/dist/operations/top.js

@@ -73,7 +73,6 @@ var TopOperation = /** @class */ (function (_super) {
                             type: context_1.ContextType.GLOBAL,
                             state: context_1.ContextState.DEFAULT
                         });
-                        opc.scope.refs.set('globals', opc.scope);
                         return [4 /*yield*/, me.body.run(opc)];
                     case 1:
                         _a.sent();

package/package.json

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