greybel-interpreter 4.1.2 → 4.1.3

package/dist/byte-compiler/keywords.d.ts

@@ -0,0 +1,8 @@
+export declare enum RuntimeKeyword {
+    Self = "self",
+    Super = "super",
+    Outer = "outer",
+    Locals = "locals",
+    Globals = "globals",
+    Isa = "__isa"
+}

package/dist/byte-compiler/keywords.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RuntimeKeyword = void 0;
+var RuntimeKeyword;
+(function (RuntimeKeyword) {
+    RuntimeKeyword["Self"] = "self";
+    RuntimeKeyword["Super"] = "super";
+    RuntimeKeyword["Outer"] = "outer";
+    RuntimeKeyword["Locals"] = "locals";
+    RuntimeKeyword["Globals"] = "globals";
+    RuntimeKeyword["Isa"] = "__isa";
+})(RuntimeKeyword = exports.RuntimeKeyword || (exports.RuntimeKeyword = {}));

package/dist/bytecode-generator.js

@@ -19,6 +19,7 @@ const boolean_1 = require("./types/boolean");
 const string_1 = require("./types/string");
 const default_1 = require("./types/default");
 const stack_1 = require("./utils/stack");
+const keywords_1 = require("./byte-compiler/keywords");
 function generateCustomValueFromASTLiteral(node) {
     switch (node.type) {
         case miniscript_core_1.ASTType.BooleanLiteral:
@@ -358,7 +359,7 @@ class BytecodeGenerator {
     processMemberExpression(node, isInvoke = true) {
         return __awaiter(this, void 0, void 0, function* () {
             const base = unwrap(node.base);
-            if (base instanceof miniscript_core_1.ASTIdentifier && base.name === 'super') {
+            if (base instanceof miniscript_core_1.ASTIdentifier && base.name === keywords_1.RuntimeKeyword.Super) {
                 this.push({
                     op: instruction_1.OpCode.PUSH,
                     source: this.getSourceLocation(node.identifier),
@@ -384,7 +385,7 @@ class BytecodeGenerator {
     processIndexExpression(node, isInvoke = true) {
         return __awaiter(this, void 0, void 0, function* () {
             const base = unwrap(node.base);
-            if (base instanceof miniscript_core_1.ASTIdentifier && base.name === 'super') {
+            if (base instanceof miniscript_core_1.ASTIdentifier && base.name === keywords_1.RuntimeKeyword.Super) {
                 yield this.processSubNode(node.index);
                 this.push({
                     op: instruction_1.OpCode.GET_SUPER_PROPERTY,
@@ -418,35 +419,35 @@ class BytecodeGenerator {
         return __awaiter(this, void 0, void 0, function* () {
             if (isFirst) {
                 switch (node.name) {
-                    case 'self': {
+                    case keywords_1.RuntimeKeyword.Self: {
                         this.push({
                             op: instruction_1.OpCode.GET_SELF,
                             source: this.getSourceLocation(node)
                         });
                         return;
                     }
-                    case 'super': {
+                    case keywords_1.RuntimeKeyword.Super: {
                         this.push({
                             op: instruction_1.OpCode.GET_SUPER,
                             source: this.getSourceLocation(node)
                         });
                         return;
                     }
-                    case 'outer': {
+                    case keywords_1.RuntimeKeyword.Outer: {
                         this.push({
                             op: instruction_1.OpCode.GET_OUTER,
                             source: this.getSourceLocation(node)
                         });
                         return;
                     }
-                    case 'locals': {
+                    case keywords_1.RuntimeKeyword.Locals: {
                         this.push({
                             op: instruction_1.OpCode.GET_LOCALS,
                             source: this.getSourceLocation(node)
                         });
                         return;
                     }
-                    case 'globals': {
+                    case keywords_1.RuntimeKeyword.Globals: {
                         this.push({
                             op: instruction_1.OpCode.GET_GLOBALS,
                             source: this.getSourceLocation(node)
@@ -902,7 +903,7 @@ class BytecodeGenerator {
             const left = unwrap(node.base);
             if (left instanceof miniscript_core_1.ASTMemberExpression) {
                 const base = unwrap(left.base);
-                if (base instanceof miniscript_core_1.ASTIdentifier && base.name === 'super') {
+                if (base instanceof miniscript_core_1.ASTIdentifier && base.name === keywords_1.RuntimeKeyword.Super) {
                     this.push({
                         op: instruction_1.OpCode.PUSH,
                         source: this.getSourceLocation(left.identifier),
@@ -932,7 +933,7 @@ class BytecodeGenerator {
             }
             else if (left instanceof miniscript_core_1.ASTIndexExpression) {
                 const base = unwrap(left.base);
-                if (base instanceof miniscript_core_1.ASTIdentifier && base.name === 'super') {
+                if (base instanceof miniscript_core_1.ASTIdentifier && base.name === keywords_1.RuntimeKeyword.Super) {
                     yield this.processSubNode(left.index);
                     yield pushArgs();
                     this.push({

package/dist/context.js

@@ -134,9 +134,9 @@ class OperationContext {
     }
     injectContext() {
         if (this.self)
-            this.set(new string_1.CustomString('self'), this.self);
+            this.set(string_1.Self, this.self);
         if (this.super)
-            this.set(new string_1.CustomString('super'), this.super);
+            this.set(string_1.Super, this.super);
     }
     getCurrentInstruction() {
         return this.code[this.ip];

package/dist/types/function.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomFunction = void 0;
 const instruction_1 = require("../byte-compiler/instruction");
+const keywords_1 = require("../byte-compiler/keywords");
 const hash_1 = require("../utils/hash");
 const object_value_1 = require("../utils/object-value");
 const uuid_1 = require("../utils/uuid");
@@ -36,7 +37,7 @@ class CustomFunction extends base_1.CustomValue {
         ], args);
     }
     static createExternalWithSelf(name, callback) {
-        return this.createExternal(name, callback).addArgument('self');
+        return this.createExternal(name, callback).addArgument(keywords_1.RuntimeKeyword.Self);
     }
     constructor(name, value, args = [], outer) {
         super();

package/dist/types/map.d.ts

@@ -1,9 +1,7 @@
 import { ContextTypeIntrinsics } from '../context/types';
 import { ObjectValue } from '../utils/object-value';
 import { CustomValue } from './base';
-import { CustomString } from './string';
 import { CustomObject, CustomValueWithIntrinsicsResult } from './with-intrinsics';
-export declare const ISA_PROPERTY: CustomString;
 export declare const CUSTOM_MAP_MAX_DEPTH = 2;
 export declare const CUSTOM_MAP_MAX_DEPTH_VALUE = "{...}";
 export declare class CustomMapIterator implements Iterator<CustomValue> {

package/dist/types/map.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomMap = exports.CustomMapIterator = exports.CUSTOM_MAP_MAX_DEPTH_VALUE = exports.CUSTOM_MAP_MAX_DEPTH = exports.ISA_PROPERTY = void 0;
+exports.CustomMap = exports.CustomMapIterator = exports.CUSTOM_MAP_MAX_DEPTH_VALUE = exports.CUSTOM_MAP_MAX_DEPTH = void 0;
 const hash_1 = require("../utils/hash");
 const object_value_1 = require("../utils/object-value");
 const uuid_1 = require("../utils/uuid");
 const nil_1 = require("./nil");
 const string_1 = require("./string");
 const with_intrinsics_1 = require("./with-intrinsics");
-exports.ISA_PROPERTY = new string_1.CustomString('__isa');
 exports.CUSTOM_MAP_MAX_DEPTH = 2;
 exports.CUSTOM_MAP_MAX_DEPTH_VALUE = '{...}';
 class CustomMapIterator {
@@ -160,12 +159,12 @@ class CustomMap extends with_intrinsics_1.CustomObject {
     }
     createInstance() {
         const newInstance = new CustomMap(new object_value_1.ObjectValue());
-        newInstance.value.set(exports.ISA_PROPERTY, this);
+        newInstance.value.set(string_1.Isa, this);
         newInstance.isInstance = true;
         return newInstance;
     }
     getIsa() {
-        const isa = this.value.get(exports.ISA_PROPERTY);
+        const isa = this.value.get(string_1.Isa);
         return isa instanceof CustomMap ? isa : null;
     }
     hash(recursionDepth = 0) {

package/dist/types/string.d.ts

@@ -34,3 +34,9 @@ export declare class CustomString extends CustomValueWithIntrinsics {
     getWithOrigin(current: CustomValue, typeIntrinsics: ContextTypeIntrinsics): CustomValueWithIntrinsicsResult;
     hash(): number;
 }
+export declare const Self: CustomString;
+export declare const Isa: CustomString;
+export declare const Super: CustomString;
+export declare const Globals: CustomString;
+export declare const Locals: CustomString;
+export declare const Outer: CustomString;

package/dist/types/string.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomString = exports.CustomStringIterator = void 0;
+exports.Outer = exports.Locals = exports.Globals = exports.Super = exports.Isa = exports.Self = exports.CustomString = exports.CustomStringIterator = void 0;
+const keywords_1 = require("../byte-compiler/keywords");
 const hash_1 = require("../utils/hash");
 const object_value_1 = require("../utils/object-value");
 const number_1 = require("./number");
@@ -122,3 +123,9 @@ class CustomString extends with_intrinsics_1.CustomValueWithIntrinsics {
 }
 CustomString.intrinsics = new object_value_1.ObjectValue();
 exports.CustomString = CustomString;
+exports.Self = new CustomString(keywords_1.RuntimeKeyword.Self);
+exports.Isa = new CustomString(keywords_1.RuntimeKeyword.Isa);
+exports.Super = new CustomString(keywords_1.RuntimeKeyword.Super);
+exports.Globals = new CustomString(keywords_1.RuntimeKeyword.Globals);
+exports.Locals = new CustomString(keywords_1.RuntimeKeyword.Locals);
+exports.Outer = new CustomString(keywords_1.RuntimeKeyword.Outer);

package/dist/vm/call.d.ts

@@ -0,0 +1,5 @@
+import { OperationContext } from '../context';
+import { CustomValue } from '../types/base';
+import { CustomFunction } from '../types/function';
+export declare function call(frame: OperationContext, fn: CustomFunction, args: CustomValue[]): void;
+export declare function callWithContext(frame: OperationContext, fn: CustomFunction, args: CustomValue[]): void;

package/dist/vm/call.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.callWithContext = exports.call = void 0;
+const keywords_1 = require("../byte-compiler/keywords");
+const map_1 = require("../types/map");
+function call(frame, fn, args) {
+    var _a;
+    const argsCount = args.length;
+    for (let index = 0; index < argsCount; index++) {
+        const argument = args.shift();
+        const paramNum = argsCount - 1 - index;
+        if (paramNum >= fn.arguments.length) {
+            throw new Error('Too many arguments.');
+        }
+        const param = fn.arguments[paramNum].name;
+        if (param.toString() === keywords_1.RuntimeKeyword.Self) {
+            frame.self = argument;
+            frame.super =
+                argument instanceof map_1.CustomMap
+                    ? (_a = argument.getIsa()) !== null && _a !== void 0 ? _a : new map_1.CustomMap()
+                    : null;
+        }
+        else {
+            frame.set(param, argument);
+        }
+    }
+    for (let paramNum = argsCount; paramNum < fn.arguments.length; paramNum++) {
+        frame.set(fn.arguments[paramNum].name, fn.arguments[paramNum].defaultValue);
+    }
+    frame.injectContext();
+}
+exports.call = call;
+function callWithContext(frame, fn, args) {
+    const argsCount = args.length;
+    const selfParam = fn.arguments.length > 0 &&
+        fn.arguments[0].name.toString() === keywords_1.RuntimeKeyword.Self
+        ? 1
+        : 0;
+    for (let index = 0; index < argsCount; index++) {
+        const argument = args.shift();
+        const paramNum = argsCount - 1 - index + selfParam;
+        if (paramNum >= fn.arguments.length) {
+            throw new Error('Too many arguments.');
+        }
+        const param = fn.arguments[paramNum].name;
+        if (param.toString() !== keywords_1.RuntimeKeyword.Self)
+            frame.set(param, argument);
+    }
+    for (let paramNum = argsCount + selfParam; paramNum < fn.arguments.length; paramNum++) {
+        frame.set(fn.arguments[paramNum].name, fn.arguments[paramNum].defaultValue);
+    }
+    frame.injectContext();
+}
+exports.callWithContext = callWithContext;

package/dist/vm.js

@@ -29,6 +29,7 @@ const set_immediate_1 = require("./utils/set-immediate");
 const string_1 = require("./types/string");
 const events_1 = __importDefault(require("events"));
 const object_value_1 = require("./utils/object-value");
+const call_1 = require("./vm/call");
 class Debugger {
     constructor() {
         this.breakpoint = false;
@@ -185,7 +186,7 @@ class VM {
         });
     }
     resume(done) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f;
         try {
             while (true) {
                 if (!this.isPending()) {
@@ -224,11 +225,11 @@ class VM {
                         break;
                     }
                     case instruction_1.OpCode.GET_SELF: {
-                        this.pushStack((_b = frame.self) !== null && _b !== void 0 ? _b : default_1.DefaultType.Void);
+                        this.pushStack(frame.locals.get(string_1.Self, this.contextTypeIntrinsics));
                         break;
                     }
                     case instruction_1.OpCode.GET_SUPER: {
-                        this.pushStack((_c = frame.super) !== null && _c !== void 0 ? _c : default_1.DefaultType.Void);
+                        this.pushStack((_b = frame.super) !== null && _b !== void 0 ? _b : default_1.DefaultType.Void);
                         break;
                     }
                     case instruction_1.OpCode.IMPORT: {
@@ -265,26 +266,7 @@ class VM {
                                 throw new Error('Too many arguments.');
                             }
                             const newFrame = this.createFrame({ code: fn.value, outer: fn.outer });
-                            const argsCount = args.length;
-                            for (let index = 0; index < argsCount; index++) {
-                                const argument = args.shift();
-                                const paramNum = argsCount - 1 - index;
-                                if (paramNum >= fn.arguments.length) {
-                                    throw new Error('Too many arguments.');
-                                }
-                                const param = fn.arguments[paramNum].name;
-                                if (param.toString() == "self") {
-                                    newFrame.self = argument;
-                                    newFrame.super = argument instanceof map_1.CustomMap ? ((_d = argument.getIsa()) !== null && _d !== void 0 ? _d : new map_1.CustomMap()) : null;
-                                }
-                                else {
-                                    newFrame.set(param, argument);
-                                }
-                            }
-                            for (let paramNum = argsCount; paramNum < fn.arguments.length; paramNum++) {
-                                newFrame.set(fn.arguments[paramNum].name, fn.arguments[paramNum].defaultValue);
-                            }
-                            newFrame.injectContext();
+                            (0, call_1.call)(newFrame, fn, args);
                         }
                         break;
                     }
@@ -301,25 +283,10 @@ class VM {
                             const newFrame = this.createFrame({
                                 code: fn.value,
                                 self: context,
-                                super: context instanceof map_1.CustomMap ? ((_e = context.getIsa()) !== null && _e !== void 0 ? _e : new map_1.CustomMap()) : null,
+                                super: context instanceof map_1.CustomMap ? ((_c = context.getIsa()) !== null && _c !== void 0 ? _c : new map_1.CustomMap()) : null,
                                 outer: fn.outer
                             });
-                            const argsCount = args.length;
-                            let selfParam = fn.arguments.length > 0 && fn.arguments[0].name.toString() == "self" ? 1 : 0;
-                            for (let index = 0; index < argsCount; index++) {
-                                const argument = args.shift();
-                                const paramNum = argsCount - 1 - index + selfParam;
-                                if (paramNum >= fn.arguments.length) {
-                                    throw new Error('Too many arguments.');
-                                }
-                                const param = fn.arguments[paramNum].name;
-                                if (param.toString() !== "self")
-                                    newFrame.set(param, argument);
-                            }
-                            for (let paramNum = argsCount + selfParam; paramNum < fn.arguments.length; paramNum++) {
-                                newFrame.set(fn.arguments[paramNum].name, fn.arguments[paramNum].defaultValue);
-                            }
-                            newFrame.injectContext();
+                            (0, call_1.callWithContext)(newFrame, fn, args);
                         }
                         break;
                     }
@@ -340,25 +307,10 @@ class VM {
                             const newFrame = this.createFrame({
                                 code: fn.value,
                                 self: frame.self,
-                                super: ret.origin instanceof map_1.CustomMap ? ((_f = ret.origin.getIsa()) !== null && _f !== void 0 ? _f : new map_1.CustomMap()) : null,
+                                super: ret.origin instanceof map_1.CustomMap ? ((_d = ret.origin.getIsa()) !== null && _d !== void 0 ? _d : new map_1.CustomMap()) : null,
                                 outer: fn.outer
                             });
-                            let selfParam = fn.arguments.length > 0 && fn.arguments[0].name.toString() == "self" ? 1 : 0;
-                            const argsCount = args.length;
-                            for (let index = 0; index < argsCount; index++) {
-                                const argument = args.shift();
-                                const paramNum = argsCount - 1 - index + selfParam;
-                                if (paramNum >= fn.arguments.length) {
-                                    throw new Error('Too many arguments.');
-                                }
-                                const param = fn.arguments[paramNum].name;
-                                if (param.toString() !== "self")
-                                    newFrame.set(param, argument);
-                            }
-                            for (let paramNum = argsCount + selfParam; paramNum < fn.arguments.length; paramNum++) {
-                                newFrame.set(fn.arguments[paramNum].name, fn.arguments[paramNum].defaultValue);
-                            }
-                            newFrame.injectContext();
+                            (0, call_1.callWithContext)(newFrame, fn, args);
                         }
                         break;
                     }
@@ -459,10 +411,7 @@ class VM {
                                 code: ret.value,
                                 outer: ret.outer
                             });
-                            for (let paramNum = 0; paramNum < ret.arguments.length; paramNum++) {
-                                newFrame.set(ret.arguments[paramNum].name, ret.arguments[paramNum].defaultValue);
-                            }
-                            newFrame.injectContext();
+                            (0, call_1.call)(newFrame, ret, []);
                             break;
                         }
                         this.pushStack(ret);
@@ -480,13 +429,10 @@ class VM {
                             const newFrame = this.createFrame({
                                 code: ret.value.value,
                                 self: context,
-                                super: ret.origin instanceof map_1.CustomMap ? ((_g = ret.origin.getIsa()) !== null && _g !== void 0 ? _g : new map_1.CustomMap()) : null,
+                                super: ret.origin instanceof map_1.CustomMap ? ((_e = ret.origin.getIsa()) !== null && _e !== void 0 ? _e : new map_1.CustomMap()) : null,
                                 outer: ret.value.outer
                             });
-                            for (let paramNum = 0; paramNum < ret.value.arguments.length; paramNum++) {
-                                newFrame.set(ret.value.arguments[paramNum].name, ret.value.arguments[paramNum].defaultValue);
-                            }
-                            newFrame.injectContext();
+                            (0, call_1.callWithContext)(newFrame, ret.value, []);
                             break;
                         }
                         this.pushStack(ret.value);
@@ -500,13 +446,10 @@ class VM {
                             const newFrame = this.createFrame({
                                 code: ret.value.value,
                                 self: frame.self,
-                                super: ret.origin instanceof map_1.CustomMap ? ((_h = ret.origin.getIsa()) !== null && _h !== void 0 ? _h : new map_1.CustomMap()) : null,
+                                super: ret.origin instanceof map_1.CustomMap ? ((_f = ret.origin.getIsa()) !== null && _f !== void 0 ? _f : new map_1.CustomMap()) : null,
                                 outer: ret.value.outer
                             });
-                            for (let paramNum = 0; paramNum < ret.value.arguments.length; paramNum++) {
-                                newFrame.set(ret.value.arguments[paramNum].name, ret.value.arguments[paramNum].defaultValue);
-                            }
-                            newFrame.injectContext();
+                            (0, call_1.callWithContext)(newFrame, ret.value, []);
                             break;
                         }
                         this.pushStack(ret.value);

package/package.json

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