greybel-interpreter 0.2.4 → 0.2.8

package/dist/context.d.ts

@@ -44,16 +44,16 @@ 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 {
@@ -61,14 +61,21 @@ export declare class OperationContext {
     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);
+    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<void>;

package/dist/context.js

@@ -110,76 +110,47 @@ var Scope = /** @class */ (function (_super) {
         var traversalPath = [].concat(path);
         var current = traversalPath.shift();
         if (current != null) {
-            if (current === 'globals') {
-                if (me.context.type === ContextType.GLOBAL) {
-                    return me.set(traversalPath, value);
-                }
-                else if (me.context.previous && !me.context.previous.isProtected) {
-                    return me.context.previous.set(traversalPath, value);
-                }
-                else {
-                    throw new Error("Cannot set globals scope for ".concat(path.join('.')));
-                }
+            if (current === 'locals') {
+                return me.context.locals.set(traversalPath, value);
             }
-            else if (current === 'locals') {
-                if (me.context.type === ContextType.GLOBAL ||
-                    me.context.type === ContextType.FUNCTION) {
-                    return me.set(traversalPath, value);
-                }
-                else if (me.context.previous && !me.context.previous.isProtected) {
-                    return me.context.previous.set(traversalPath, value);
-                }
-                else {
-                    throw new Error("Cannot set locals scope for ".concat(path.join('.')));
-                }
+            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 {
-                return _super.prototype.set.call(this, path, value);
+                throw new Error("Cannot set path ".concat(path.join('.')));
             }
         }
     };
     Scope.prototype.get = function (path) {
+        var _a, _b, _c;
         var me = this;
         var traversalPath = [].concat(path);
         var current = traversalPath.shift();
         if (current != null) {
-            if (me.value.has(current)) {
-                return _super.prototype.get.call(this, path);
-            }
-            else if (path.length === 1 && map_1.default.intrinsics.has(current)) {
-                return map_1.default.intrinsics.get(current).bind(null, me);
+            if (current === 'locals') {
+                return traversalPath.length === 0
+                    ? Promise.resolve(me.context.locals)
+                    : me.context.locals.get(traversalPath);
             }
             else if (current === 'globals') {
-                if (me.context.type === ContextType.GLOBAL) {
-                    if (path.length === 1) {
-                        return Promise.resolve(me);
-                    }
-                    return me.get(traversalPath);
-                }
-                else if (me.context.previous) {
-                    return me.context.previous.get(traversalPath);
-                }
-                else {
-                    throw new Error("Cannot find globals scope for ".concat(path.join('.')));
-                }
+                return traversalPath.length === 0
+                    ? Promise.resolve(me.context.globals)
+                    : me.context.globals.get(traversalPath);
             }
-            else if (current === 'locals') {
-                if (me.context.type === ContextType.GLOBAL ||
-                    me.context.type === ContextType.FUNCTION) {
-                    if (path.length === 1) {
-                        return Promise.resolve(me);
-                    }
-                    return me.get(traversalPath);
-                }
-                else if (me.context.previous) {
-                    return me.context.previous.get(traversalPath);
-                }
-                else {
-                    throw new Error("Cannot find locals scope for ".concat(path.join('.')));
-                }
+            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 (me.context.previous) {
-                return me.context.previous.get(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('.')));
@@ -188,59 +159,28 @@ var Scope = /** @class */ (function (_super) {
         return null;
     };
     Scope.prototype.getCallable = function (path) {
+        var _a, _b, _c;
         var me = this;
         var traversalPath = [].concat(path);
         var current = traversalPath.shift();
         if (current != null) {
-            if (me.value.has(current)) {
-                return _super.prototype.getCallable.call(this, path);
-            }
-            else if (path.length === 1 && map_1.default.intrinsics.has(current)) {
-                return Promise.resolve({
-                    origin: map_1.default.intrinsics.get(current).bind(null, me),
-                    context: me
-                });
+            if (current === 'locals') {
+                return me.context.locals.getCallable(traversalPath);
             }
             else if (current === 'globals') {
-                if (me.context.type === ContextType.GLOBAL) {
-                    if (path.length === 1) {
-                        return Promise.resolve({
-                            origin: me,
-                            context: null
-                        });
-                    }
-                    return me.getCallable(traversalPath);
-                }
-                else if (me.context.previous) {
-                    return me.context.previous.getCallable(traversalPath);
-                }
-                else {
-                    throw new Error("Cannot find callable in globals scope for ".concat(path.join('.')));
-                }
+                return me.context.globals.getCallable(traversalPath);
             }
-            else if (current === 'locals') {
-                if (me.context.type === ContextType.GLOBAL ||
-                    me.context.type === ContextType.FUNCTION) {
-                    if (path.length === 1) {
-                        return Promise.resolve({
-                            origin: me,
-                            context: null
-                        });
-                    }
-                    return me.getCallable(traversalPath);
-                }
-                else if (me.context.previous) {
-                    return me.context.previous.getCallable(traversalPath);
-                }
-                else {
-                    throw new Error("Cannot find callable in locals scope for ".concat(path.join('.')));
-                }
+            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 (me.context.previous) {
-                return me.context.previous.getCallable(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 {
-                throw new Error("Cannot get callable path ".concat(path.join('.')));
+                return _super.prototype.getCallable.call(this, path);
             }
         }
         return Promise.resolve({
@@ -364,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();
     };

package/dist/custom-types/map.js

@@ -200,11 +200,10 @@ var CustomMap = /** @class */ (function (_super) {
     };
     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);
         });

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,9 +99,7 @@ var Interpreter = /** @class */ (function () {
                         topOperation = new (_b.apply(top_1.default, _c.concat([(_d.body = _e.sent(),
                                 _d)])))();
                         mainContext.extend(me.api);
-                        return [4 /*yield*/, mainContext.set(['params'], (0, typer_1.cast)(me.params))];
-                    case 4:
-                        _e.sent();
+                        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/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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "0.2.4",
+    "version": "0.2.8",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -34,8 +34,8 @@
         "typescript": "^4.5.4"
     },
     "dependencies": {
-        "greybel-core": "^0.1.5",
-        "greyscript-core": "^0.1.1",
+        "greybel-core": "^0.1.7",
+        "greyscript-core": "^0.1.4",
         "uuid": "^8.3.2"
     },
     "keywords": [