greybel-interpreter 5.2.0 → 5.2.2

package/dist/bytecode-generator/instruction.d.ts

@@ -8,23 +8,23 @@ export declare enum OpCode {
     CALL = 2,
     CALL_INTERNAL = 3,
     CALL_WITH_CONTEXT = 4,
-    CONSTRUCT_MAP = 5,
-    CONSTRUCT_LIST = 6,
-    GET_VARIABLE = 7,
-    GET_PROPERTY = 8,
-    GET_ENVAR = 9,
-    GET_SELF = 10,
-    GET_OUTER = 11,
-    GET_GLOBALS = 12,
-    GET_LOCALS = 13,
-    GET_SUPER = 14,
-    GET_SUPER_PROPERTY = 15,
-    CALL_SUPER_PROPERTY = 16,
-    FALSIFY = 17,
-    NEGATE = 18,
-    NEW = 19,
-    SLICE = 20,
-    ASSIGN = 21,
+    CALL_SUPER_PROPERTY = 5,
+    CONSTRUCT_MAP = 6,
+    CONSTRUCT_LIST = 7,
+    GET_VARIABLE = 8,
+    GET_PROPERTY = 9,
+    GET_ENVAR = 10,
+    GET_SELF = 11,
+    GET_OUTER = 12,
+    GET_GLOBALS = 13,
+    GET_LOCALS = 14,
+    GET_SUPER = 15,
+    GET_SUPER_PROPERTY = 16,
+    ASSIGN = 17,
+    FALSIFY = 18,
+    NEGATE = 19,
+    NEW = 20,
+    SLICE = 21,
     PUSH = 22,
     POP = 23,
     ISA = 24,

package/dist/bytecode-generator/instruction.js

@@ -8,23 +8,23 @@ var OpCode;
     OpCode[OpCode["CALL"] = 2] = "CALL";
     OpCode[OpCode["CALL_INTERNAL"] = 3] = "CALL_INTERNAL";
     OpCode[OpCode["CALL_WITH_CONTEXT"] = 4] = "CALL_WITH_CONTEXT";
-    OpCode[OpCode["CONSTRUCT_MAP"] = 5] = "CONSTRUCT_MAP";
-    OpCode[OpCode["CONSTRUCT_LIST"] = 6] = "CONSTRUCT_LIST";
-    OpCode[OpCode["GET_VARIABLE"] = 7] = "GET_VARIABLE";
-    OpCode[OpCode["GET_PROPERTY"] = 8] = "GET_PROPERTY";
-    OpCode[OpCode["GET_ENVAR"] = 9] = "GET_ENVAR";
-    OpCode[OpCode["GET_SELF"] = 10] = "GET_SELF";
-    OpCode[OpCode["GET_OUTER"] = 11] = "GET_OUTER";
-    OpCode[OpCode["GET_GLOBALS"] = 12] = "GET_GLOBALS";
-    OpCode[OpCode["GET_LOCALS"] = 13] = "GET_LOCALS";
-    OpCode[OpCode["GET_SUPER"] = 14] = "GET_SUPER";
-    OpCode[OpCode["GET_SUPER_PROPERTY"] = 15] = "GET_SUPER_PROPERTY";
-    OpCode[OpCode["CALL_SUPER_PROPERTY"] = 16] = "CALL_SUPER_PROPERTY";
-    OpCode[OpCode["FALSIFY"] = 17] = "FALSIFY";
-    OpCode[OpCode["NEGATE"] = 18] = "NEGATE";
-    OpCode[OpCode["NEW"] = 19] = "NEW";
-    OpCode[OpCode["SLICE"] = 20] = "SLICE";
-    OpCode[OpCode["ASSIGN"] = 21] = "ASSIGN";
+    OpCode[OpCode["CALL_SUPER_PROPERTY"] = 5] = "CALL_SUPER_PROPERTY";
+    OpCode[OpCode["CONSTRUCT_MAP"] = 6] = "CONSTRUCT_MAP";
+    OpCode[OpCode["CONSTRUCT_LIST"] = 7] = "CONSTRUCT_LIST";
+    OpCode[OpCode["GET_VARIABLE"] = 8] = "GET_VARIABLE";
+    OpCode[OpCode["GET_PROPERTY"] = 9] = "GET_PROPERTY";
+    OpCode[OpCode["GET_ENVAR"] = 10] = "GET_ENVAR";
+    OpCode[OpCode["GET_SELF"] = 11] = "GET_SELF";
+    OpCode[OpCode["GET_OUTER"] = 12] = "GET_OUTER";
+    OpCode[OpCode["GET_GLOBALS"] = 13] = "GET_GLOBALS";
+    OpCode[OpCode["GET_LOCALS"] = 14] = "GET_LOCALS";
+    OpCode[OpCode["GET_SUPER"] = 15] = "GET_SUPER";
+    OpCode[OpCode["GET_SUPER_PROPERTY"] = 16] = "GET_SUPER_PROPERTY";
+    OpCode[OpCode["ASSIGN"] = 17] = "ASSIGN";
+    OpCode[OpCode["FALSIFY"] = 18] = "FALSIFY";
+    OpCode[OpCode["NEGATE"] = 19] = "NEGATE";
+    OpCode[OpCode["NEW"] = 20] = "NEW";
+    OpCode[OpCode["SLICE"] = 21] = "SLICE";
     OpCode[OpCode["PUSH"] = 22] = "PUSH";
     OpCode[OpCode["POP"] = 23] = "POP";
     OpCode[OpCode["ISA"] = 24] = "ISA";

package/dist/types/function.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomFunction = exports.CustomFunctionIterator = void 0;
 const instruction_1 = require("../bytecode-generator/instruction");
 const keywords_1 = require("../bytecode-generator/keywords");
-const hash_1 = require("../utils/hash");
 const object_value_1 = require("../utils/object-value");
+const string_hash_1 = require("../utils/string-hash");
 const uuid_1 = require("../utils/uuid");
 const default_1 = require("./default");
 const nil_1 = require("./nil");
@@ -130,7 +130,7 @@ class CustomFunction extends with_intrinsics_1.CustomValueWithIntrinsics {
         };
     }
     hash() {
-        return (0, hash_1.getStringHashCode)(this.toString());
+        return (0, string_hash_1.getStringHashCode)(this.toString());
     }
 }
 CustomFunction.intrinsics = new object_value_1.ObjectValue();

package/dist/types/list.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomList = exports.CustomListIterator = void 0;
-const hash_1 = require("../utils/hash");
+const number_hash_1 = require("../utils/number-hash");
 const object_value_1 = require("../utils/object-value");
 const uuid_1 = require("../utils/uuid");
 const number_1 = require("./number");
@@ -130,11 +130,11 @@ class CustomList extends with_intrinsics_1.CustomObject {
         };
     }
     hash(recursionDepth = 0) {
-        let result = (0, hash_1.getHashCode)(this.value.length);
+        let result = (0, number_hash_1.getNumberHashCode)(this.value.length);
         if (recursionDepth > 4)
             return result;
         this.value.forEach((value) => {
-            result = (0, hash_1.rotateBits)(result) ^ value.hash(recursionDepth + 1);
+            result = (0, number_hash_1.rotateBits)(result) ^ value.hash(recursionDepth + 1);
         });
         return result;
     }

package/dist/types/map.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomMap = exports.CustomMapIterator = exports.CUSTOM_MAP_MAX_DEPTH_VALUE = exports.CUSTOM_MAP_MAX_DEPTH = void 0;
-const hash_1 = require("../utils/hash");
+const number_hash_1 = require("../utils/number-hash");
 const object_value_1 = require("../utils/object-value");
 const uuid_1 = require("../utils/uuid");
 const nil_1 = require("./nil");
@@ -170,7 +170,7 @@ class CustomMap extends with_intrinsics_1.CustomObject {
         return isa instanceof CustomMap ? isa : null;
     }
     hash(recursionDepth = 0) {
-        let result = (0, hash_1.getHashCode)(this.value.size);
+        let result = (0, number_hash_1.getNumberHashCode)(this.value.size);
         if (recursionDepth > 4)
             return result;
         this.value.forEach((value, key) => {

package/dist/types/number.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Zero = exports.PositiveOne = exports.NegativeOne = exports.CustomNumber = exports.CustomNumberIterator = void 0;
-const hash_1 = require("../utils/hash");
+const number_hash_1 = require("../utils/number-hash");
 const object_value_1 = require("../utils/object-value");
 const with_intrinsics_1 = require("./with-intrinsics");
 class CustomNumberIterator {
@@ -71,7 +71,7 @@ class CustomNumber extends with_intrinsics_1.CustomValueWithIntrinsics {
         };
     }
     hash() {
-        return (0, hash_1.getHashCode)(this.value);
+        return (0, number_hash_1.getNumberHashCode)(this.value);
     }
 }
 CustomNumber.intrinsics = new object_value_1.ObjectValue();

package/dist/types/string.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Outer = exports.Locals = exports.Globals = exports.Super = exports.Isa = exports.Self = exports.CustomString = exports.CustomStringIterator = void 0;
 const keywords_1 = require("../bytecode-generator/keywords");
-const hash_1 = require("../utils/hash");
 const object_value_1 = require("../utils/object-value");
+const string_hash_1 = require("../utils/string-hash");
 const number_1 = require("./number");
 const with_intrinsics_1 = require("./with-intrinsics");
 class CustomStringIterator {
@@ -118,7 +118,7 @@ class CustomString extends with_intrinsics_1.CustomValueWithIntrinsics {
         };
     }
     hash() {
-        return (0, hash_1.getStringHashCode)(this.value);
+        return (0, string_hash_1.getStringHashCode)(this.value);
     }
 }
 CustomString.intrinsics = new object_value_1.ObjectValue();

package/dist/utils/deep-hash.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deepHash = void 0;
 const with_intrinsics_1 = require("../types/with-intrinsics");
-const hash_1 = require("./hash");
+const number_hash_1 = require("./number-hash");
 function deepHash(value) {
     let result = 0;
     const stack = [];
@@ -15,7 +15,7 @@ function deepHash(value) {
             visited.add(item.id);
             if (item instanceof with_intrinsics_1.CustomObject) {
                 if (Array.isArray(item.value)) {
-                    result ^= (0, hash_1.getHashCode)(item.value.length);
+                    result ^= (0, number_hash_1.getNumberHashCode)(item.value.length);
                     for (let j = item.value.length - 1; j >= 0; j--) {
                         const child = item.value[j];
                         if (!(child instanceof with_intrinsics_1.CustomObject) || !visited.has(child.id))
@@ -23,7 +23,7 @@ function deepHash(value) {
                     }
                 }
                 else {
-                    result ^= (0, hash_1.getHashCode)(item.value.length);
+                    result ^= (0, number_hash_1.getNumberHashCode)(item.value.length);
                     const chunk = [];
                     const entries = item.value.entries();
                     for (let j = 0; j < entries.length; j++) {
@@ -40,7 +40,7 @@ function deepHash(value) {
                 result ^= item.hash();
             }
         }
-        result ^= (0, hash_1.rotateBits)(result);
+        result ^= (0, number_hash_1.rotateBits)(result);
     }
     return result;
 }

package/dist/utils/lru-cache.d.ts

@@ -0,0 +1,10 @@
+export declare class LRUCache<K, T> {
+    private _capacity;
+    private _head;
+    private _tail;
+    private _cache;
+    constructor(capacity: number);
+    private moveNodeToHead;
+    get(key: K): T | null;
+    set(key: K, value: T): void;
+}

package/dist/utils/lru-cache.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LRUCache = void 0;
+const KEY_INDEX = 0;
+const VALUE_INDEX = 1;
+const PREV_INDEX = 2;
+const NEXT_INDEX = 3;
+class LRUCache {
+    constructor(capacity) {
+        if (capacity <= 0) {
+            throw new Error('Unexpected _capacity value. _capacity needs to be at least 1.');
+        }
+        this._capacity = capacity;
+        this._head = null;
+        this._tail = null;
+        this._cache = new Map();
+    }
+    moveNodeToHead(node) {
+        if (node[NEXT_INDEX]) {
+            if (node[PREV_INDEX]) {
+                node[NEXT_INDEX][PREV_INDEX] = node[PREV_INDEX];
+            }
+            else {
+                this._head = node[NEXT_INDEX];
+            }
+        }
+        if (node[PREV_INDEX]) {
+            if (node[NEXT_INDEX]) {
+                node[PREV_INDEX][NEXT_INDEX] = node[NEXT_INDEX];
+            }
+            else {
+                this._tail = node[PREV_INDEX];
+            }
+        }
+        const headNode = this._head;
+        this._head = node;
+        node[PREV_INDEX] = null;
+        node[NEXT_INDEX] = headNode;
+    }
+    get(key) {
+        const node = this._cache.get(key);
+        if (!node) {
+            return null;
+        }
+        this.moveNodeToHead(node);
+        return node[VALUE_INDEX];
+    }
+    set(key, value) {
+        if (this._cache.size >= this._capacity) {
+            const lastNode = this._tail;
+            this._tail = lastNode[PREV_INDEX];
+            this._cache.delete(lastNode[KEY_INDEX]);
+        }
+        const headNode = this._head;
+        this._head = [key, value, null, headNode];
+        if (this._tail === null) {
+            this._tail = this._head;
+        }
+        else {
+            headNode[PREV_INDEX] = this._head;
+        }
+        this._cache.set(key, this._head);
+    }
+}
+exports.LRUCache = LRUCache;

package/dist/utils/number-hash.d.ts

@@ -0,0 +1,2 @@
+export declare function rotateBits(n: number): number;
+export declare function getNumberHashCode(value: number, offset?: number): number;

package/dist/utils/number-hash.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNumberHashCode = exports.rotateBits = void 0;
+function rotateBits(n) {
+    return (n >> 1) | (n << 31);
+}
+exports.rotateBits = rotateBits;
+function getNumberHashCode(value, offset = 0) {
+    let unsigned = value >>> 0;
+    unsigned = ((unsigned >> 16) ^ unsigned) * 0x45d9f3b;
+    unsigned = ((unsigned >> 16) ^ unsigned) * 0x45d9f3b;
+    unsigned = (unsigned >> 16) ^ unsigned;
+    return ((offset << 5) - offset + unsigned) | 0;
+}
+exports.getNumberHashCode = getNumberHashCode;

package/dist/utils/string-hash.d.ts

@@ -0,0 +1 @@
+export declare function getStringHashCode(str: string): number;

package/dist/utils/string-hash.js

@@ -0,0 +1,19 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getStringHashCode = void 0;
+const imurmurhash_1 = __importDefault(require("imurmurhash"));
+const lru_cache_1 = require("./lru-cache");
+const CACHE = new lru_cache_1.LRUCache(1000);
+function getStringHashCode(str) {
+    const cachedHash = CACHE.get(str);
+    if (cachedHash) {
+        return cachedHash;
+    }
+    const hash = (0, imurmurhash_1.default)(str).result();
+    CACHE.set(str, hash);
+    return hash;
+}
+exports.getStringHashCode = getStringHashCode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "greybel-interpreter",
-  "version": "5.2.0",
+  "version": "5.2.2",
   "description": "Interpreter",
   "main": "dist/index",
   "typings": "dist/index",
@@ -28,6 +28,7 @@
   },
   "homepage": "https://github.com/ayecue/greybel-interpreter#readme",
   "devDependencies": {
+    "@types/imurmurhash": "^0.1.4",
     "@types/jest": "^27.0.3",
     "@types/node": "^20.14.11",
     "@types/uuid": "^8.3.3",
@@ -51,6 +52,7 @@
   "dependencies": {
     "greybel-core": "~2.2.0",
     "hyperid": "^3.2.0",
+    "imurmurhash": "^0.1.4",
     "non-blocking-schedule": "^0.2.0"
   },
   "keywords": [

package/dist/utils/hash.d.ts

@@ -1,3 +0,0 @@
-export declare function rotateBits(n: number): number;
-export declare function getHashCode(value: number, offset?: number): number;
-export declare const getStringHashCode: (value: string) => number;

package/dist/utils/hash.js

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStringHashCode = exports.getHashCode = exports.rotateBits = void 0;
-function rotateBits(n) {
-    return (n >> 1) | (n << 31);
-}
-exports.rotateBits = rotateBits;
-function getHashCode(value, offset = 0) {
-    let unsigned = value >>> 0;
-    unsigned = ((unsigned >> 16) ^ unsigned) * 0x45d9f3b;
-    unsigned = ((unsigned >> 16) ^ unsigned) * 0x45d9f3b;
-    unsigned = (unsigned >> 16) ^ unsigned;
-    return ((offset << 5) - offset + unsigned) | 0;
-}
-exports.getHashCode = getHashCode;
-exports.getStringHashCode = (function () {
-    const cache = new Map();
-    const generateHash = (s) => {
-        for (var i = 0, h = 0; i < s.length; i++)
-            h = (Math.imul(31, h) + s.charCodeAt(i)) | 0;
-        return h;
-    };
-    return (value) => {
-        if (value.length === 0) {
-            return 0;
-        }
-        const cachedHash = cache.get(value);
-        if (cachedHash !== undefined) {
-            return cachedHash;
-        }
-        const hash = generateHash(value);
-        cache.set(value, hash);
-        return hash;
-    };
-})();