greybel-interpreter 2.3.1 → 2.3.3

package/dist/cps.js

@@ -32,7 +32,6 @@ const negated_binary_1 = require("./operations/negated-binary");
 const new_instance_1 = require("./operations/new-instance");
 const noop_1 = require("./operations/noop");
 const not_1 = require("./operations/not");
-const resolve_1 = require("./operations/resolve");
 const return_1 = require("./operations/return");
 const while_1 = require("./operations/while");
 const error_1 = require("./utils/error");
@@ -56,12 +55,11 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
         case greyscript_core_1.ASTType.AssignmentStatement:
             return (0, create_assign_1.createAssign)(item, currentTarget).build(defaultVisit);
         case greyscript_core_1.ASTType.MemberExpression:
+        case greyscript_core_1.ASTType.IndexExpression:
+        case greyscript_core_1.ASTType.SliceExpression:
             return (0, create_resolve_1.createResolve)(item, currentTarget).build(defaultVisit);
         case greyscript_core_1.ASTType.Identifier:
             return (0, create_resolve_1.createIdentifierResolve)(item, currentTarget).build(defaultVisit);
-        case greyscript_core_1.ASTType.IndexExpression:
-        case greyscript_core_1.ASTType.SliceExpression:
-            return new resolve_1.Resolve(item, currentTarget).build(defaultVisit);
         case greyscript_core_1.ASTType.FunctionDeclaration:
             return new function_1.FunctionOperation(item, currentTarget).build(defaultVisit);
         case greyscript_core_1.ASTType.InvalidCodeExpression:

package/dist/utils/create-resolve.js

@@ -34,10 +34,12 @@ const optResolveMap = {
     outer: resolve_outer_1.ResolveOuter
 };
 function createResolve(item, target) {
-    if (item instanceof greyscript_core_1.ASTMemberExpression) {
-        const memberExpr = item;
-        const path = (0, lookup_path_1.lookupPath)(memberExpr);
+    if (item instanceof greyscript_core_1.ASTMemberExpression ||
+        item instanceof greyscript_core_1.ASTIndexExpression ||
+        item instanceof greyscript_core_1.ASTSliceExpression) {
+        const path = (0, lookup_path_1.lookupPath)(item);
         if (path.length > 0 &&
+            path[0] instanceof greyscript_core_1.ASTMemberExpression &&
             path[0].base instanceof greyscript_core_1.ASTIdentifier &&
             hasOwnProperty.call(optResolveMap, path[0].base.name)) {
             const OptResolve = optResolveMap[path[0].base.name];
@@ -47,7 +49,7 @@ function createResolve(item, target) {
             }
             const newBase = path[1];
             newBase.base = right;
-            return new OptResolve(memberExpr, target);
+            return new OptResolve(item, target);
         }
     }
     return new resolve_1.Resolve(item, target);

package/dist/utils/lookup-path.d.ts

@@ -1,2 +1,5 @@
-import { ASTMemberExpression } from 'greyscript-core';
-export declare function lookupPath(item: ASTMemberExpression): ASTMemberExpression[];
+import { ASTBase } from 'greyscript-core';
+export type PathItem = ASTBase & {
+    base: ASTBase;
+};
+export declare function lookupPath(item: PathItem): PathItem[];

package/dist/utils/lookup-path.js

@@ -5,7 +5,9 @@ const greyscript_core_1 = require("greyscript-core");
 function lookupPath(item) {
     const path = [item];
     let current = item.base;
-    while (current instanceof greyscript_core_1.ASTMemberExpression) {
+    while (current instanceof greyscript_core_1.ASTMemberExpression ||
+        current instanceof greyscript_core_1.ASTIndexExpression ||
+        current instanceof greyscript_core_1.ASTSliceExpression) {
         path.unshift(current);
         current = current.base;
     }

package/package.json

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