greybel-interpreter 1.3.2 → 1.3.4

package/dist/index.d.ts

@@ -42,3 +42,4 @@ export { default as CustomNil } from './types/nil';
 export { default as CustomNumber } from './types/number';
 export { default as CustomString, CustomStringIterator } from './types/string';
 export { default as Path } from './utils/path';
+export { default as deepEqual } from './utils/deep-equal';

package/dist/index.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Noop = exports.NewInstance = exports.NegatedBinary = exports.MapOperation = exports.Literal = exports.List = exports.Include = exports.Import = exports.IfStatement = exports.Clause = exports.FunctionOpertion = exports.For = exports.StringProcessorHandler = exports.NumberProcessorHandler = exports.MapProcessorHandler = exports.ListProcessorHandler = exports.handleString = exports.handleNumber = exports.handleMap = exports.handleList = exports.handleBoolean = exports.handle = exports.GenericProcessorHandler = exports.Evaluate = exports.DebuggerStatement = exports.Continue = exports.Chunk = exports.Call = exports.Break = exports.Block = exports.Assign = exports.IntrinsicsContainer = exports.Interpreter = exports.HandlerContainer = exports.ResourceHandler = exports.DefaultResourceHandler = exports.OutputHandler = exports.DefaultOutputHandler = exports.ErrorHandler = exports.DefaultErrorHandler = exports.CPSContext = exports.CPS = exports.Scope = exports.ProcessState = exports.OperationContext = exports.LoopState = exports.FunctionState = exports.Debugger = exports.ContextType = exports.ContextState = void 0;
-exports.Path = exports.CustomStringIterator = exports.CustomString = exports.CustomNumber = exports.CustomNil = exports.CustomMapIterator = exports.CustomMap = exports.CustomListIterator = exports.CustomList = exports.CustomInterfaceIterator = exports.CustomInterface = exports.CustomValueWithIntrinsics = exports.CustomValue = exports.CustomObject = exports.CustomFunction = exports.Argument = exports.Defaults = exports.CustomBoolean = exports.While = exports.Return = exports.ResolveResult = exports.Resolve = exports.OperationSegment = exports.IndexSegment = exports.IdentifierSegment = exports.Reference = exports.Operation = exports.Not = void 0;
+exports.deepEqual = exports.Path = exports.CustomStringIterator = exports.CustomString = exports.CustomNumber = exports.CustomNil = exports.CustomMapIterator = exports.CustomMap = exports.CustomListIterator = exports.CustomList = exports.CustomInterfaceIterator = exports.CustomInterface = exports.CustomValueWithIntrinsics = exports.CustomValue = exports.CustomObject = exports.CustomFunction = exports.Argument = exports.Defaults = exports.CustomBoolean = exports.While = exports.Return = exports.ResolveResult = exports.Resolve = exports.OperationSegment = exports.IndexSegment = exports.IdentifierSegment = exports.Reference = exports.Operation = exports.Not = void 0;
 var context_1 = require("./context");
 Object.defineProperty(exports, "ContextState", { enumerable: true, get: function () { return context_1.ContextState; } });
 Object.defineProperty(exports, "ContextType", { enumerable: true, get: function () { return context_1.ContextType; } });
@@ -127,3 +127,5 @@ Object.defineProperty(exports, "CustomString", { enumerable: true, get: function
 Object.defineProperty(exports, "CustomStringIterator", { enumerable: true, get: function () { return string_1.CustomStringIterator; } });
 var path_1 = require("./utils/path");
 Object.defineProperty(exports, "Path", { enumerable: true, get: function () { return __importDefault(path_1).default; } });
+var deep_equal_1 = require("./utils/deep-equal");
+Object.defineProperty(exports, "deepEqual", { enumerable: true, get: function () { return __importDefault(deep_equal_1).default; } });

package/dist/operations/evaluate.js

@@ -65,6 +65,7 @@ var map_1 = __importDefault(require("../types/map"));
 var nil_1 = __importDefault(require("../types/nil"));
 var number_1 = __importDefault(require("../types/number"));
 var string_1 = __importDefault(require("../types/string"));
+var deep_equal_1 = __importDefault(require("../utils/deep-equal"));
 var operation_1 = __importDefault(require("./operation"));
 exports.GenericProcessorHandler = (_b = {},
     _b[greyscript_core_1.Operator.And] = function (a, b) { return new boolean_1.default(a.toTruthy() && b.toTruthy()); },
@@ -140,7 +141,7 @@ exports.ListProcessorHandler = (_e = {},
         return new boolean_1.default(left.value.length >= right.value.length);
     },
     _e[greyscript_core_1.Operator.Equal] = function (left, right) {
-        return new boolean_1.default(left.value === right.value);
+        return new boolean_1.default((0, deep_equal_1.default)(left, right));
     },
     _e[greyscript_core_1.Operator.LessThanOrEqual] = function (left, right) {
         return new boolean_1.default(left.value.length <= right.value.length);
@@ -163,7 +164,7 @@ exports.MapProcessorHandler = (_f = {},
         return new boolean_1.default(left.value.size >= right.value.size);
     },
     _f[greyscript_core_1.Operator.Equal] = function (left, right) {
-        return new boolean_1.default(left.value === right.value);
+        return new boolean_1.default((0, deep_equal_1.default)(left, right));
     },
     _f[greyscript_core_1.Operator.LessThanOrEqual] = function (left, right) {
         return new boolean_1.default(left.value.size <= right.value.size);

package/dist/types/map.js

@@ -52,13 +52,14 @@ var default_1 = __importDefault(require("./default"));
 var generics_1 = require("./generics");
 var nil_1 = __importDefault(require("./nil"));
 var string_1 = __importDefault(require("./string"));
+var deep_equal_1 = __importDefault(require("../utils/deep-equal"));
 exports.CLASS_ID_PROPERTY = new string_1.default('classID');
 var getValue = function (map, mapKey) {
     var e_1, _a;
     try {
-        for (var _b = __values(map.value), _c = _b.next(); !_c.done; _c = _b.next()) {
+        for (var _b = __values(map.value.entries()), _c = _b.next(); !_c.done; _c = _b.next()) {
             var _d = __read(_c.value, 2), key = _d[0], value = _d[1];
-            if (key.value === mapKey.value) {
+            if ((0, deep_equal_1.default)(key, mapKey)) {
                 return value;
             }
         }
@@ -78,7 +79,7 @@ var hasValue = function (map, mapKey) {
     try {
         for (var _b = __values(map.value.keys()), _c = _b.next(); !_c.done; _c = _b.next()) {
             var key = _c.value;
-            if (key.value === mapKey.value) {
+            if ((0, deep_equal_1.default)(key, mapKey)) {
                 return true;
             }
         }
@@ -98,7 +99,7 @@ var setValue = function (map, mapKey, mapValue) {
     try {
         for (var _b = __values(map.value.keys()), _c = _b.next(); !_c.done; _c = _b.next()) {
             var key = _c.value;
-            if (key.value === mapKey.value) {
+            if ((0, deep_equal_1.default)(key, mapKey)) {
                 map.value.set(key, mapValue);
                 return;
             }

package/dist/utils/deep-equal.d.ts

@@ -0,0 +1 @@
+export default function equal(a: any, b: any, maxDepth?: number): boolean;

package/dist/utils/deep-equal.js

@@ -0,0 +1,67 @@
+'use strict';
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !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 generics_1 = require("../types/generics");
+var list_1 = __importDefault(require("../types/list"));
+var map_1 = __importDefault(require("../types/map"));
+function equalInner(a, b, maxDepth, depth) {
+    var e_1, _a;
+    if (depth === void 0) { depth = 0; }
+    if (maxDepth <= depth)
+        return a === b;
+    if (a.value === b.value)
+        return true;
+    if (a && b && a instanceof generics_1.CustomObject && b instanceof generics_1.CustomObject) {
+        if (a.constructor !== b.constructor)
+            return false;
+        if (a instanceof list_1.default && b instanceof list_1.default) {
+            var length = a.value.length;
+            if (length !== b.value.length)
+                return false;
+            for (var i = length; i-- !== 0;)
+                if (!equalInner(a.value[i], b.value[i], maxDepth, depth + 1))
+                    return false;
+            return true;
+        }
+        if (a instanceof map_1.default && b instanceof map_1.default) {
+            if (a.value.size !== b.value.size)
+                return false;
+            try {
+                for (var _b = __values(a.value.keys()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var i = _c.value;
+                    if (!b.has(i) || !equalInner(a.get(i), b.get(i), maxDepth, depth + 1))
+                        return false;
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            return true;
+        }
+        return false;
+    }
+    // true if both NaN, false otherwise
+    return a.value === NaN && b.value === NaN;
+}
+function equal(a, b, maxDepth) {
+    if (maxDepth === void 0) { maxDepth = 2; }
+    return equalInner(a, b, maxDepth);
+}
+exports.default = equal;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "1.3.2",
+    "version": "1.3.4",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -48,8 +48,8 @@
         "typescript": "^4.5.4"
     },
     "dependencies": {
-        "greybel-core": "^0.4.8",
-        "greyscript-core": "^0.4.3"
+        "greybel-core": "^0.4.9",
+        "greyscript-core": "^0.4.4"
     },
     "keywords": [
         "greyscript",