greybel-interpreter 2.3.0 → 2.3.1

package/dist/cps.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CPS = exports.CPSContext = void 0;
 const greybel_core_1 = require("greybel-core");
 const greyscript_core_1 = require("greyscript-core");
-const assign_1 = require("./operations/assign");
 const break_1 = require("./operations/break");
 const call_1 = require("./operations/call");
 const chunk_1 = require("./operations/chunk");
@@ -37,15 +36,8 @@ const resolve_1 = require("./operations/resolve");
 const return_1 = require("./operations/return");
 const while_1 = require("./operations/while");
 const error_1 = require("./utils/error");
-const assign_self_1 = require("./operations/assign-self");
-const assign_globals_1 = require("./operations/assign-globals");
-const assign_locals_1 = require("./operations/assign-locals");
-const assign_outer_1 = require("./operations/assign-outer");
-const reference_self_1 = require("./operations/reference-self");
-const reference_globals_1 = require("./operations/reference-globals");
-const reference_locals_1 = require("./operations/reference-locals");
-const reference_outer_1 = require("./operations/reference-outer");
 const create_resolve_1 = require("./utils/create-resolve");
+const create_assign_1 = require("./utils/create-assign");
 class CPSContext {
     constructor(target, handler) {
         this.target = target;
@@ -62,35 +54,11 @@ const visit = (context, stack, item) => __awaiter(void 0, void 0, void 0, functi
         case greyscript_core_1.ASTType.ListConstructorExpression:
             return new list_1.List(item, currentTarget).build(defaultVisit);
         case greyscript_core_1.ASTType.AssignmentStatement:
-            const assignStatement = item;
-            if (assignStatement.variable instanceof greyscript_core_1.ASTIdentifier) {
-                switch (assignStatement.variable.name) {
-                    case 'self':
-                        return new assign_self_1.AssignSelf(assignStatement, currentTarget).build(defaultVisit);
-                    case 'globals':
-                        return new assign_globals_1.AssignGlobals(assignStatement, currentTarget).build(defaultVisit);
-                    case 'locals':
-                        return new assign_locals_1.AssignLocals(assignStatement, currentTarget).build(defaultVisit);
-                    case 'outer':
-                        return new assign_outer_1.AssignOuter(assignStatement, currentTarget).build(defaultVisit);
-                }
-            }
-            return new assign_1.Assign(assignStatement, currentTarget).build(defaultVisit);
+            return (0, create_assign_1.createAssign)(item, currentTarget).build(defaultVisit);
         case greyscript_core_1.ASTType.MemberExpression:
             return (0, create_resolve_1.createResolve)(item, currentTarget).build(defaultVisit);
         case greyscript_core_1.ASTType.Identifier:
-            const identifier = item;
-            switch (identifier.name) {
-                case 'self':
-                    return new reference_self_1.ReferenceSelf(item, currentTarget).build(defaultVisit);
-                case 'globals':
-                    return new reference_globals_1.ReferenceGlobals(item, currentTarget).build(defaultVisit);
-                case 'locals':
-                    return new reference_locals_1.ReferenceLocals(item, currentTarget).build(defaultVisit);
-                case 'outer':
-                    return new reference_outer_1.ReferenceOuter(item, currentTarget).build(defaultVisit);
-            }
-            return new resolve_1.Resolve(identifier, currentTarget).build(defaultVisit);
+            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);

package/dist/utils/create-assign.d.ts

@@ -0,0 +1,3 @@
+import { ASTAssignmentStatement } from 'greyscript-core';
+import { Operation } from '../operations/operation';
+export declare function createAssign(item: ASTAssignmentStatement, target?: string): Operation;

package/dist/utils/create-assign.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createAssign = void 0;
+const greyscript_core_1 = require("greyscript-core");
+const assign_1 = require("../operations/assign");
+const assign_globals_1 = require("../operations/assign-globals");
+const assign_locals_1 = require("../operations/assign-locals");
+const assign_outer_1 = require("../operations/assign-outer");
+const assign_self_1 = require("../operations/assign-self");
+const hasOwnProperty = Object.prototype.hasOwnProperty;
+const optAssignMap = {
+    self: assign_self_1.AssignSelf,
+    globals: assign_globals_1.AssignGlobals,
+    locals: assign_locals_1.AssignLocals,
+    outer: assign_outer_1.AssignOuter
+};
+function createAssign(item, target) {
+    if (item.variable instanceof greyscript_core_1.ASTIdentifier &&
+        hasOwnProperty.call(optAssignMap, item.variable.name)) {
+        const OptAssign = optAssignMap[item.variable.name];
+        return new OptAssign(item, target);
+    }
+    return new assign_1.Assign(item, target);
+}
+exports.createAssign = createAssign;

package/dist/utils/create-resolve.d.ts

@@ -1,3 +1,5 @@
-import { ASTBase } from 'greyscript-core';
+import { ASTBase, ASTIdentifier } from 'greyscript-core';
+import { Operation } from '../operations/operation';
 import { Resolve } from '../operations/resolve';
+export declare function createIdentifierResolve(item: ASTIdentifier, target?: string): Operation;
 export declare function createResolve(item: ASTBase, target?: string): Resolve;

package/dist/utils/create-resolve.js

@@ -1,28 +1,53 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createResolve = void 0;
+exports.createResolve = exports.createIdentifierResolve = void 0;
 const greyscript_core_1 = require("greyscript-core");
+const reference_globals_1 = require("../operations/reference-globals");
+const reference_locals_1 = require("../operations/reference-locals");
+const reference_outer_1 = require("../operations/reference-outer");
+const reference_self_1 = require("../operations/reference-self");
 const resolve_1 = require("../operations/resolve");
 const resolve_globals_1 = require("../operations/resolve-globals");
 const resolve_locals_1 = require("../operations/resolve-locals");
 const resolve_outer_1 = require("../operations/resolve-outer");
 const resolve_self_1 = require("../operations/resolve-self");
 const lookup_path_1 = require("./lookup-path");
+const hasOwnProperty = Object.prototype.hasOwnProperty;
+const optIdentifierResolveMap = {
+    self: reference_self_1.ReferenceSelf,
+    globals: reference_globals_1.ReferenceGlobals,
+    locals: reference_locals_1.ReferenceLocals,
+    outer: reference_outer_1.ReferenceOuter
+};
+function createIdentifierResolve(item, target) {
+    if (hasOwnProperty.call(optIdentifierResolveMap, item.name)) {
+        const OptResolve = optIdentifierResolveMap[item.name];
+        return new OptResolve(item, target);
+    }
+    return new resolve_1.Resolve(item, target);
+}
+exports.createIdentifierResolve = createIdentifierResolve;
+const optResolveMap = {
+    self: resolve_self_1.ResolveSelf,
+    globals: resolve_globals_1.ResolveGlobals,
+    locals: resolve_locals_1.ResolveLocals,
+    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 (path[0].base instanceof greyscript_core_1.ASTIdentifier) {
-            switch (path[0].base.name) {
-                case 'self':
-                    return new resolve_self_1.ResolveSelf(path[0].identifier, target);
-                case 'globals':
-                    return new resolve_globals_1.ResolveGlobals(path[0].identifier, target);
-                case 'locals':
-                    return new resolve_locals_1.ResolveLocals(path[0].identifier, target);
-                case 'outer':
-                    return new resolve_outer_1.ResolveOuter(path[0].identifier, target);
+        if (path.length > 0 &&
+            path[0].base instanceof greyscript_core_1.ASTIdentifier &&
+            hasOwnProperty.call(optResolveMap, path[0].base.name)) {
+            const OptResolve = optResolveMap[path[0].base.name];
+            const right = path[0].identifier;
+            if (path.length === 1) {
+                return new OptResolve(right, target);
             }
+            const newBase = path[1];
+            newBase.base = right;
+            return new OptResolve(memberExpr, target);
         }
     }
     return new resolve_1.Resolve(item, target);

package/package.json

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