greybel-interpreter 1.5.3 → 1.5.4

package/dist/cps.js

@@ -121,6 +121,7 @@ const visit = (context, currentTarget, item) => __awaiter(void 0, void 0, void 0
             return new literal_1.default(item, currentTarget).build(defaultVisit);
         case greyscript_core_1.ASTType.EmptyExpression:
             return new noop_1.default(item, currentTarget).build(defaultVisit);
+        case greyscript_core_1.ASTType.IsaExpression:
         case greyscript_core_1.ASTType.BinaryExpression:
         case greyscript_core_1.ASTType.LogicalExpression:
             return new evaluate_1.default(item, currentTarget).build(defaultVisit);

package/dist/operations/evaluate.js

@@ -316,6 +316,11 @@ class Evaluate extends operation_1.default {
             if (op instanceof Evaluate) {
                 const expr = op;
                 switch (expr.type) {
+                    case greyscript_core_1.ASTType.IsaExpression: {
+                        const left = yield this.resolve(ctx, expr.left);
+                        const right = yield this.resolve(ctx, expr.right);
+                        return new boolean_1.default(left.instanceOf(right));
+                    }
                     case greyscript_core_1.ASTType.BinaryExpression:
                         return this.resolveBinaryExpression(ctx, expr);
                     case greyscript_core_1.ASTType.LogicalExpression:

package/dist/operations/function.d.ts

@@ -4,6 +4,7 @@ import CustomValue from '../types/base';
 import CustomString from '../types/string';
 import Operation, { CPSVisit } from './operation';
 export declare const SELF_PROPERTY: CustomString;
+export declare const SUPER_PROPERTY: CustomString;
 export default class FunctionOperation extends Operation {
     readonly item: ASTFunctionStatement;
     block: Operation;

package/dist/operations/function.js

@@ -12,16 +12,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SELF_PROPERTY = void 0;
+exports.SUPER_PROPERTY = exports.SELF_PROPERTY = void 0;
 const greyscript_core_1 = require("greyscript-core");
 const context_1 = require("../context");
 const default_1 = __importDefault(require("../types/default"));
 const function_1 = __importDefault(require("../types/function"));
+const map_1 = __importDefault(require("../types/map"));
 const string_1 = __importDefault(require("../types/string"));
 const block_1 = __importDefault(require("./block"));
 const operation_1 = __importDefault(require("./operation"));
 const reference_1 = __importDefault(require("./reference"));
 exports.SELF_PROPERTY = new string_1.default('self');
+exports.SUPER_PROPERTY = new string_1.default('super');
 class FunctionOperation extends operation_1.default {
     constructor(item, target) {
         super(null, target);
@@ -57,6 +59,9 @@ class FunctionOperation extends operation_1.default {
         const func = new function_1.default(ctx, 'anonymous', (fnCtx, self, args) => __awaiter(this, void 0, void 0, function* () {
             fnCtx.functionState = new context_1.FunctionState();
             fnCtx.set(exports.SELF_PROPERTY, self);
+            if (self instanceof map_1.default && self.isa !== null) {
+                fnCtx.set(exports.SUPER_PROPERTY, self.isa);
+            }
             fnCtx.set(new string_1.default('locals'), fnCtx.locals.scope);
             fnCtx.set(new string_1.default('outer'), fnCtx.previous.locals.scope);
             for (const [key, value] of args) {

package/dist/types/base.d.ts

@@ -6,4 +6,5 @@ export default abstract class CustomValue {
     abstract toString(): string;
     abstract toTruthy(): boolean;
     abstract fork(): CustomValue;
+    abstract instanceOf(value: CustomValue): boolean;
 }

package/dist/types/boolean.d.ts

@@ -8,6 +8,7 @@ export default class CustomBoolean extends CustomValue {
     toNumber(): number;
     toInt(): number;
     toTruthy(): boolean;
+    instanceOf(v: CustomValue): boolean;
 }
 export declare const DefaultTrue: CustomBoolean;
 export declare const DefaultFalse: CustomBoolean;

package/dist/types/boolean.js

@@ -8,7 +8,7 @@ const base_1 = __importDefault(require("./base"));
 class CustomBoolean extends base_1.default {
     constructor(value) {
         super();
-        this.value = value;
+        this.value = !!value;
     }
     getCustomType() {
         return 'boolean';
@@ -28,6 +28,9 @@ class CustomBoolean extends base_1.default {
     toTruthy() {
         return this.value;
     }
+    instanceOf(v) {
+        return v instanceof CustomBoolean;
+    }
 }
 exports.default = CustomBoolean;
 exports.DefaultTrue = new CustomBoolean(true);

package/dist/types/function.d.ts

@@ -28,5 +28,6 @@ export default class CustomFunction extends CustomValue {
     toInt(): number;
     toString(): string;
     toTruthy(): boolean;
+    instanceOf(v: CustomValue): boolean;
     run(self: CustomValue, args: Array<CustomValue>, callContext: OperationContext): Promise<CustomValue>;
 }

package/dist/types/function.js

@@ -82,6 +82,9 @@ class CustomFunction extends base_1.default {
     toTruthy() {
         return true;
     }
+    instanceOf(v) {
+        return v instanceof CustomFunction;
+    }
     run(self, args, callContext) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {

package/dist/types/interface.d.ts

@@ -16,6 +16,7 @@ export default class CustomInterface extends CustomObject {
     toNumber(): number;
     toInt(): number;
     toTruthy(): boolean;
+    instanceOf(v: CustomValue): boolean;
     [Symbol.iterator](): CustomInterfaceIterator;
     has(path: Path<CustomValue> | CustomValue): boolean;
     set(_path: Path<CustomValue> | CustomValue, _newValue: CustomValue): void;

package/dist/types/interface.js

@@ -42,6 +42,9 @@ class CustomInterface extends with_intrinsics_1.CustomObject {
     toTruthy() {
         return true;
     }
+    instanceOf(v) {
+        return (v instanceof CustomInterface && v.getCustomType() === this.getCustomType());
+    }
     [Symbol.iterator]() {
         return new CustomInterfaceIterator();
     }

package/dist/types/list.d.ts

@@ -19,6 +19,7 @@ export default class CustomList extends CustomObject {
     toNumber(): number;
     toInt(): number;
     toTruthy(): boolean;
+    instanceOf(v: CustomValue): boolean;
     slice(a: CustomValue, b: CustomValue): CustomList;
     extend(list: CustomList | Array<CustomValue>): CustomList;
     [Symbol.iterator](): CustomListIterator;

package/dist/types/list.js

@@ -61,6 +61,9 @@ class CustomList extends with_intrinsics_1.CustomObject {
     toTruthy() {
         return this.value.length > 0;
     }
+    instanceOf(v) {
+        return v.value === CustomList.intrinsics;
+    }
     slice(a, b) {
         return new CustomList(this.value.slice(a.toNumber(), b.toNumber()));
     }

package/dist/types/map.d.ts

@@ -5,6 +5,8 @@ import CustomString from './string';
 import { CustomObject } from './with-intrinsics';
 export declare const CLASS_ID_PROPERTY: CustomString;
 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> {
     value: ObjectValue;
     index: number;
@@ -14,16 +16,17 @@ export declare class CustomMapIterator implements Iterator<CustomValue> {
 export default class CustomMap extends CustomObject {
     static readonly intrinsics: ObjectValue;
     value: ObjectValue;
-    readonly isa: ObjectValue;
+    readonly isa: CustomMap | null;
     private isInstance;
     static createWithInitialValue(value: ObjectValue): CustomMap;
-    constructor(value?: ObjectValue, isa?: ObjectValue);
+    constructor(value?: ObjectValue, isa?: CustomMap);
     getCustomType(): string;
-    toString(): string;
+    toString(depth?: number): string;
     fork(): CustomMap;
     toNumber(): number;
     toInt(): number;
     toTruthy(): boolean;
+    instanceOf(v: CustomValue): boolean;
     [Symbol.iterator](): CustomMapIterator;
     extend(map: CustomMap | ObjectValue): CustomMap;
     has(path: Path<CustomValue> | CustomValue): boolean;

package/dist/types/map.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomMapIterator = exports.ISA_PROPERTY = exports.CLASS_ID_PROPERTY = void 0;
+exports.CustomMapIterator = exports.CUSTOM_MAP_MAX_DEPTH_VALUE = exports.CUSTOM_MAP_MAX_DEPTH = exports.ISA_PROPERTY = exports.CLASS_ID_PROPERTY = void 0;
 const object_value_1 = __importDefault(require("../utils/object-value"));
 const path_1 = __importDefault(require("../utils/path"));
 const base_1 = __importDefault(require("./base"));
@@ -12,6 +12,8 @@ const string_1 = __importDefault(require("./string"));
 const with_intrinsics_1 = require("./with-intrinsics");
 exports.CLASS_ID_PROPERTY = new string_1.default('classID');
 exports.ISA_PROPERTY = new string_1.default('__isa');
+exports.CUSTOM_MAP_MAX_DEPTH = 2;
+exports.CUSTOM_MAP_MAX_DEPTH_VALUE = '{...}';
 class CustomMapIterator {
     constructor(value) {
         const me = this;
@@ -39,11 +41,11 @@ class CustomMapIterator {
 }
 exports.CustomMapIterator = CustomMapIterator;
 class CustomMap extends with_intrinsics_1.CustomObject {
-    constructor(value, isa) {
+    constructor(value, isa = null) {
         super();
         this.isInstance = false;
         this.value = new object_value_1.default(value);
-        this.isa = new object_value_1.default(isa);
+        this.isa = isa;
     }
     static createWithInitialValue(value) {
         const map = new CustomMap();
@@ -56,13 +58,19 @@ class CustomMap extends with_intrinsics_1.CustomObject {
         }
         return 'map';
     }
-    toString() {
-        const json = { [exports.ISA_PROPERTY.toString()]: {} };
-        for (const [key, value] of this.isa.entries()) {
-            json.__isa[key.toString()] = value.toString();
+    toString(depth = 0) {
+        const json = {};
+        if (exports.CUSTOM_MAP_MAX_DEPTH < depth) {
+            return exports.CUSTOM_MAP_MAX_DEPTH_VALUE;
+        }
+        if (this.isa) {
+            json[exports.ISA_PROPERTY.toString()] = this.isa.toString(depth + 1);
         }
         for (const [key, value] of this.value.entries()) {
-            json[key.toString()] = value.toString();
+            json[key.toString()] =
+                value instanceof CustomMap
+                    ? value.toString(depth + 1)
+                    : value.toString();
         }
         return JSON.stringify(json);
     }
@@ -78,6 +86,18 @@ class CustomMap extends with_intrinsics_1.CustomObject {
     toTruthy() {
         return this.value.size > 0;
     }
+    instanceOf(v) {
+        if (v instanceof CustomMap) {
+            let current = this;
+            while ((current = current.isa)) {
+                if (current === v) {
+                    return true;
+                }
+            }
+            return v.value === CustomMap.intrinsics;
+        }
+        return false;
+    }
     [Symbol.iterator]() {
         return new CustomMapIterator(this.value);
     }
@@ -103,14 +123,7 @@ class CustomMap extends with_intrinsics_1.CustomObject {
                 }
                 return traversalPath.count() === 0;
             }
-            else if (this.isa.has(current)) {
-                const sub = this.isa.get(current);
-                if (traversalPath.count() > 0 &&
-                    sub instanceof with_intrinsics_1.CustomValueWithIntrinsics) {
-                    return sub.has(traversalPath);
-                }
-                return traversalPath.count() === 0;
-            }
+            return this.isa ? this.isa.has(current) : false;
         }
         return false;
     }
@@ -134,6 +147,7 @@ class CustomMap extends with_intrinsics_1.CustomObject {
         this.value.set(last, newValue);
     }
     get(path) {
+        var _a, _b;
         if (path instanceof base_1.default) {
             return this.get(new path_1.default([path]));
         }
@@ -151,33 +165,17 @@ class CustomMap extends with_intrinsics_1.CustomObject {
                     return sub;
                 }
             }
-            else if (this.isa.has(current)) {
-                const sub = this.isa.get(current);
-                if (traversalPath.count() > 0) {
-                    if (sub instanceof with_intrinsics_1.CustomValueWithIntrinsics) {
-                        return sub.get(traversalPath);
-                    }
-                }
-                else if (traversalPath.count() === 0) {
-                    return sub;
-                }
+            else if ((_a = this.isa) === null || _a === void 0 ? void 0 : _a.has(current)) {
+                return this.isa.get(current);
             }
             else if (current.toString() === exports.ISA_PROPERTY.toString()) {
                 if (path.count() === 1) {
-                    return new CustomMap(this.isa);
+                    return this.isa;
                 }
                 else {
                     const ahead = traversalPath.next();
-                    if (this.isa.has(ahead)) {
-                        const sub = this.isa.get(ahead);
-                        if (traversalPath.count() > 0) {
-                            if (sub instanceof with_intrinsics_1.CustomValueWithIntrinsics) {
-                                return sub.get(traversalPath);
-                            }
-                        }
-                        else if (traversalPath.count() === 0) {
-                            return sub;
-                        }
+                    if ((_b = this.isa) === null || _b === void 0 ? void 0 : _b.has(ahead)) {
+                        return this.isa.get(ahead);
                     }
                 }
             }
@@ -188,10 +186,7 @@ class CustomMap extends with_intrinsics_1.CustomObject {
         throw new Error(`Unknown path in map ${path.toString()}.`);
     }
     createInstance() {
-        const newInstance = new CustomMap(new object_value_1.default(), new object_value_1.default(this.isa));
-        for (const [k, v] of this.value.entries()) {
-            newInstance.isa.set(k, v);
-        }
+        const newInstance = new CustomMap(new object_value_1.default(), this);
         newInstance.isInstance = true;
         return newInstance;
     }

package/dist/types/nil.d.ts

@@ -7,5 +7,6 @@ export default class CustomNil extends CustomValue {
     toNumber(): number;
     toInt(): number;
     toTruthy(): boolean;
+    instanceOf(v: CustomValue): boolean;
 }
 export declare const Void: CustomNil;

package/dist/types/nil.js

@@ -28,6 +28,9 @@ class CustomNil extends base_1.default {
     toTruthy() {
         return false;
     }
+    instanceOf(v) {
+        return v instanceof CustomNil;
+    }
 }
 exports.default = CustomNil;
 exports.Void = new CustomNil();

package/dist/types/number.d.ts

@@ -15,6 +15,7 @@ export default class CustomNumber extends CustomValueWithIntrinsics {
     toInt(): number;
     toNumber(): number;
     toTruthy(): boolean;
+    instanceOf(v: CustomValue): boolean;
     [Symbol.iterator](): CustomNumberIterator;
     has(_path: Path<CustomValue> | CustomValue): boolean;
     set(_path: Path<CustomValue> | CustomValue, _newValue: CustomValue): void;

package/dist/types/number.js

@@ -41,6 +41,9 @@ class CustomNumber extends with_intrinsics_1.CustomValueWithIntrinsics {
     toTruthy() {
         return !!this.value;
     }
+    instanceOf(v) {
+        return v.value === CustomNumber.intrinsics;
+    }
     [Symbol.iterator]() {
         return new CustomNumberIterator();
     }

package/dist/types/string.d.ts

@@ -22,6 +22,7 @@ export default class CustomString extends CustomValueWithIntrinsics {
     toNumber(): number;
     toInt(): number;
     toTruthy(): boolean;
+    instanceOf(v: CustomValue): boolean;
     slice(a: CustomValue, b: CustomValue): CustomString;
     [Symbol.iterator](): CustomStringIterator;
     getCharIndex(index: number): number;

package/dist/types/string.js

@@ -72,6 +72,9 @@ class CustomString extends with_intrinsics_1.CustomValueWithIntrinsics {
     toTruthy() {
         return this.value.length > 0;
     }
+    instanceOf(v) {
+        return v.value === CustomString.intrinsics;
+    }
     slice(a, b) {
         return new CustomString(this.value.slice(a.toNumber(), b.toNumber()));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "1.5.3",
+    "version": "1.5.4",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -48,8 +48,8 @@
         "typescript": "^4.5.4"
     },
     "dependencies": {
-        "greybel-core": "^0.6.1",
-        "greyscript-core": "^0.5.6"
+        "greybel-core": "^0.6.3",
+        "greyscript-core": "^0.5.8"
     },
     "keywords": [
         "greyscript",