greybel-interpreter 2.2.10 → 2.2.12

package/dist/context.js

@@ -51,6 +51,9 @@ class Scope extends map_1.CustomMap {
         if (this.has(path)) {
             return super.get(path);
         }
+        else if (this.context.globals.scope.has(path)) {
+            return this.context.globals.scope.get(path);
+        }
         else if (this.context.api.scope.has(path)) {
             return this.context.api.scope.get(path);
         }

package/dist/index.d.ts

@@ -12,7 +12,7 @@ export { Call } from './operations/call';
 export { Chunk } from './operations/chunk';
 export { Continue } from './operations/continue';
 export { DebuggerStatement } from './operations/debugger-statement';
-export { Evaluate, GenericProcessorHandler, handle, handleInterface, handleList, handleMap, handleNumber, handleString, ListProcessorHandler, MapProcessorHandler, NumberProcessorHandler, ProcessorHandler, ProcessorHandlerFunction, StringProcessorHandler } from './operations/evaluate';
+export { Evaluate, GenericProcessorHandler, handle, handleList, handleMap, handleNumber, handleString, ListProcessorHandler, MapProcessorHandler, NumberProcessorHandler, ProcessorHandler, ProcessorHandlerFunction, StringProcessorHandler } from './operations/evaluate';
 export { For } from './operations/for';
 export { FunctionOperation } from './operations/function';
 export { Clause, IfStatement } from './operations/if-statement';
@@ -34,7 +34,6 @@ export { CustomValue } from './types/base';
 export { CustomBoolean } from './types/boolean';
 export { DefaultType } from './types/default';
 export { Argument, Callback, CustomFunction } from './types/function';
-export { CustomInterface, CustomInterfaceIterator } from './types/interface';
 export { CustomList, CustomListIterator } from './types/list';
 export { CustomMap, CustomMapIterator } from './types/map';
 export { CustomNil } from './types/nil';

package/dist/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Not = exports.Noop = exports.NewInstance = exports.NegatedBinary = exports.MapOperation = exports.Literal = exports.List = exports.Include = exports.Import = exports.IfStatement = exports.Clause = exports.FunctionOperation = exports.For = exports.StringProcessorHandler = exports.NumberProcessorHandler = exports.MapProcessorHandler = exports.ListProcessorHandler = exports.handleString = exports.handleNumber = exports.handleMap = exports.handleList = exports.handleInterface = exports.handle = exports.GenericProcessorHandler = exports.Evaluate = exports.DebuggerStatement = exports.Continue = exports.Chunk = exports.Call = exports.Break = exports.Block = exports.Assign = 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.ObjectValue = exports.RuntimeError = exports.PrepareError = exports.deepEqual = exports.CustomValueWithIntrinsics = exports.CustomObject = exports.CustomStringIterator = exports.CustomString = exports.CustomNumber = exports.CustomNil = exports.CustomMapIterator = exports.CustomMap = exports.CustomListIterator = exports.CustomList = exports.CustomInterfaceIterator = exports.CustomInterface = exports.CustomFunction = exports.Argument = exports.DefaultType = exports.CustomBoolean = exports.CustomValue = exports.While = exports.Return = exports.ResolveResult = exports.Resolve = exports.OperationSegment = exports.IndexSegment = exports.IdentifierSegment = exports.Reference = exports.Operation = void 0;
+exports.Operation = exports.Not = exports.Noop = exports.NewInstance = exports.NegatedBinary = exports.MapOperation = exports.Literal = exports.List = exports.Include = exports.Import = exports.IfStatement = exports.Clause = exports.FunctionOperation = exports.For = exports.StringProcessorHandler = exports.NumberProcessorHandler = exports.MapProcessorHandler = exports.ListProcessorHandler = exports.handleString = exports.handleNumber = exports.handleMap = exports.handleList = exports.handle = exports.GenericProcessorHandler = exports.Evaluate = exports.DebuggerStatement = exports.Continue = exports.Chunk = exports.Call = exports.Break = exports.Block = exports.Assign = 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.ObjectValue = exports.RuntimeError = exports.PrepareError = exports.deepEqual = exports.CustomValueWithIntrinsics = exports.CustomObject = exports.CustomStringIterator = exports.CustomString = exports.CustomNumber = exports.CustomNil = exports.CustomMapIterator = exports.CustomMap = exports.CustomListIterator = exports.CustomList = exports.CustomFunction = exports.Argument = exports.DefaultType = exports.CustomBoolean = exports.CustomValue = exports.While = exports.Return = exports.ResolveResult = exports.Resolve = exports.OperationSegment = exports.IndexSegment = exports.IdentifierSegment = exports.Reference = 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; } });
@@ -45,7 +45,6 @@ var evaluate_1 = require("./operations/evaluate");
 Object.defineProperty(exports, "Evaluate", { enumerable: true, get: function () { return evaluate_1.Evaluate; } });
 Object.defineProperty(exports, "GenericProcessorHandler", { enumerable: true, get: function () { return evaluate_1.GenericProcessorHandler; } });
 Object.defineProperty(exports, "handle", { enumerable: true, get: function () { return evaluate_1.handle; } });
-Object.defineProperty(exports, "handleInterface", { enumerable: true, get: function () { return evaluate_1.handleInterface; } });
 Object.defineProperty(exports, "handleList", { enumerable: true, get: function () { return evaluate_1.handleList; } });
 Object.defineProperty(exports, "handleMap", { enumerable: true, get: function () { return evaluate_1.handleMap; } });
 Object.defineProperty(exports, "handleNumber", { enumerable: true, get: function () { return evaluate_1.handleNumber; } });
@@ -102,9 +101,6 @@ Object.defineProperty(exports, "DefaultType", { enumerable: true, get: function
 var function_2 = require("./types/function");
 Object.defineProperty(exports, "Argument", { enumerable: true, get: function () { return function_2.Argument; } });
 Object.defineProperty(exports, "CustomFunction", { enumerable: true, get: function () { return function_2.CustomFunction; } });
-var interface_1 = require("./types/interface");
-Object.defineProperty(exports, "CustomInterface", { enumerable: true, get: function () { return interface_1.CustomInterface; } });
-Object.defineProperty(exports, "CustomInterfaceIterator", { enumerable: true, get: function () { return interface_1.CustomInterfaceIterator; } });
 var list_2 = require("./types/list");
 Object.defineProperty(exports, "CustomList", { enumerable: true, get: function () { return list_2.CustomList; } });
 Object.defineProperty(exports, "CustomListIterator", { enumerable: true, get: function () { return list_2.CustomListIterator; } });

package/dist/operations/evaluate.d.ts

@@ -22,14 +22,12 @@ export declare const multiplyList: (a: CustomList, b: CustomNumber) => CustomVal
 export declare const divideList: (a: CustomList, b: CustomNumber) => CustomValue;
 export declare const ListProcessorHandler: ProcessorHandler;
 export declare const MapProcessorHandler: ProcessorHandler;
-export declare const InterfaceProcessorHandler: ProcessorHandler;
 export declare const NilProcessorHandler: ProcessorHandler;
 export declare const FunctionProcessorHandler: ProcessorHandler;
 export declare const handleNumber: ProcessorHandlerFunction;
 export declare const handleString: ProcessorHandlerFunction;
 export declare const handleList: ProcessorHandlerFunction;
 export declare const handleMap: ProcessorHandlerFunction;
-export declare const handleInterface: ProcessorHandlerFunction;
 export declare const handleNil: ProcessorHandlerFunction;
 export declare const handleFunction: ProcessorHandlerFunction;
 export declare const handle: (op: string, a: CustomValue, b: CustomValue) => CustomValue;

package/dist/operations/evaluate.js

@@ -9,12 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Evaluate = exports.handle = exports.handleFunction = exports.handleNil = exports.handleInterface = exports.handleMap = exports.handleList = exports.handleString = exports.handleNumber = exports.FunctionProcessorHandler = exports.NilProcessorHandler = exports.InterfaceProcessorHandler = exports.MapProcessorHandler = exports.ListProcessorHandler = exports.divideList = exports.multiplyList = exports.StringProcessorHandler = exports.divideString = exports.multiplyString = exports.minusString = exports.NumberProcessorHandler = exports.GenericProcessorHandler = void 0;
+exports.Evaluate = exports.handle = exports.handleFunction = exports.handleNil = exports.handleMap = exports.handleList = exports.handleString = exports.handleNumber = exports.FunctionProcessorHandler = exports.NilProcessorHandler = exports.MapProcessorHandler = exports.ListProcessorHandler = exports.divideList = exports.multiplyList = exports.StringProcessorHandler = exports.divideString = exports.multiplyString = exports.minusString = exports.NumberProcessorHandler = exports.GenericProcessorHandler = void 0;
 const greyscript_core_1 = require("greyscript-core");
 const boolean_1 = require("../types/boolean");
 const default_1 = require("../types/default");
 const function_1 = require("../types/function");
-const interface_1 = require("../types/interface");
 const list_1 = require("../types/list");
 const map_1 = require("../types/map");
 const nil_1 = require("../types/nil");
@@ -170,10 +169,6 @@ exports.MapProcessorHandler = {
         return default_1.DefaultType.Void;
     }
 };
-exports.InterfaceProcessorHandler = {
-    [greyscript_core_1.Operator.Equal]: (left, right) => new boolean_1.CustomBoolean(left.value === right.value),
-    [greyscript_core_1.Operator.NotEqual]: (left, right) => new boolean_1.CustomBoolean(left.value !== right.value)
-};
 exports.NilProcessorHandler = {
     [greyscript_core_1.Operator.Plus]: () => default_1.DefaultType.Void,
     [greyscript_core_1.Operator.Minus]: () => default_1.DefaultType.Void,
@@ -234,16 +229,6 @@ const handleMap = (op, a, b) => {
     return default_1.DefaultType.Void;
 };
 exports.handleMap = handleMap;
-const handleInterface = (op, a, b) => {
-    if (op in exports.InterfaceProcessorHandler) {
-        return exports.InterfaceProcessorHandler[op](a, b);
-    }
-    else if (op in exports.GenericProcessorHandler) {
-        return exports.GenericProcessorHandler[op](a, b);
-    }
-    return default_1.DefaultType.Void;
-};
-exports.handleInterface = handleInterface;
 const handleNil = (op, a, b) => {
     if (op in exports.NilProcessorHandler) {
         return exports.NilProcessorHandler[op](a, b);
@@ -294,9 +279,6 @@ const handle = (op, a, b) => {
     else if (a instanceof map_1.CustomMap) {
         return (0, exports.handleMap)(op, a, b);
     }
-    else if (a instanceof interface_1.CustomInterface) {
-        return (0, exports.handleInterface)(op, a, b);
-    }
     else if (a instanceof function_1.CustomFunction) {
         return (0, exports.handleFunction)(op, a, b);
     }

package/dist/utils/object-value.d.ts

@@ -3,5 +3,6 @@ export declare class ObjectValue extends Map<CustomValue, CustomValue> {
     get(mapKey: CustomValue): CustomValue;
     has(mapKey: CustomValue): boolean;
     set(mapKey: CustomValue, mapValue: CustomValue): this;
+    delete(mapKey: CustomValue): boolean;
     extend(objVal: ObjectValue): this;
 }

package/dist/utils/object-value.js

@@ -30,6 +30,15 @@ class ObjectValue extends Map {
         super.set(mapKey, mapValue);
         return this;
     }
+    delete(mapKey) {
+        for (const key of this.keys()) {
+            if ((0, deep_equal_1.deepEqual)(key, mapKey)) {
+                super.delete(key);
+                return true;
+            }
+        }
+        return false;
+    }
     extend(objVal) {
         for (const [key, value] of objVal) {
             this.set(key, value);

package/package.json

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

package/dist/types/interface.d.ts

@@ -1,27 +0,0 @@
-import { Path } from '../utils/path';
-import { CustomValue } from './base';
-import { CustomFunction } from './function';
-import { CustomObject } from './with-intrinsics';
-export declare class CustomInterfaceIterator implements Iterator<CustomValue> {
-    index: number;
-    next(): IteratorResult<CustomValue>;
-}
-export declare class CustomInterface extends CustomObject {
-    private readonly interfaceFns;
-    private readonly type;
-    readonly value: Object;
-    constructor(type: string);
-    getCustomType(): string;
-    toJSON(): string;
-    toString(): string;
-    fork(): CustomInterface;
-    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;
-    get(path: Path<CustomValue> | CustomValue): CustomValue;
-    addFunction(name: string, fn: CustomFunction): CustomInterface;
-}

package/dist/types/interface.js

@@ -1,89 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomInterface = exports.CustomInterfaceIterator = void 0;
-const path_1 = require("../utils/path");
-const base_1 = require("./base");
-const default_1 = require("./default");
-const with_intrinsics_1 = require("./with-intrinsics");
-class CustomInterfaceIterator {
-    constructor() {
-        this.index = 0;
-    }
-    next() {
-        return {
-            value: default_1.DefaultType.Void,
-            done: true
-        };
-    }
-}
-exports.CustomInterfaceIterator = CustomInterfaceIterator;
-class CustomInterface extends with_intrinsics_1.CustomObject {
-    constructor(type) {
-        super();
-        this.value = {};
-        this.type = type;
-        this.interfaceFns = new Map();
-    }
-    getCustomType() {
-        return this.type;
-    }
-    toJSON() {
-        return this.toString();
-    }
-    toString() {
-        return this.type;
-    }
-    fork() {
-        return this;
-    }
-    toNumber() {
-        return Number.NaN;
-    }
-    toInt() {
-        return 0;
-    }
-    toTruthy() {
-        return true;
-    }
-    instanceOf(v) {
-        return (v instanceof CustomInterface && v.getCustomType() === this.getCustomType());
-    }
-    [Symbol.iterator]() {
-        return new CustomInterfaceIterator();
-    }
-    has(path) {
-        if (path instanceof base_1.CustomValue) {
-            return this.has(new path_1.Path([path]));
-        }
-        const traversalPath = path.clone();
-        const current = traversalPath.next();
-        if (current !== null) {
-            return this.interfaceFns.has(current.toString());
-        }
-        return false;
-    }
-    set(_path, _newValue) {
-        throw new Error('Cannot set property on an interface.');
-    }
-    get(path) {
-        if (path instanceof base_1.CustomValue) {
-            return this.get(new path_1.Path([path]));
-        }
-        if (path.count() === 0) {
-            return this;
-        }
-        const traversalPath = path.clone();
-        const current = traversalPath.next();
-        if (current !== null) {
-            if (this.interfaceFns.has(current.toString())) {
-                return this.interfaceFns.get(current.toString());
-            }
-        }
-        throw new Error(`Unknown path in interface ${path.toString()}.`);
-    }
-    addFunction(name, fn) {
-        this.interfaceFns.set(name, fn);
-        return this;
-    }
-}
-exports.CustomInterface = CustomInterface;