greybel-interpreter 2.1.8 → 2.2.0

package/dist/operations/evaluate.d.ts

@@ -13,6 +13,7 @@ export interface ProcessorHandler {
 export declare const GenericProcessorHandler: ProcessorHandler;
 export declare const NumberProcessorHandler: ProcessorHandler;
 export declare const multiplyString: (a: CustomValue, b: CustomValue) => CustomValue;
+export declare const minusString: (a: CustomValue, b: CustomValue) => CustomValue;
 export declare const StringProcessorHandler: ProcessorHandler;
 export declare const multiplyList: (a: CustomList, b: CustomValue) => CustomValue;
 export declare const divideList: (a: CustomList, b: CustomValue) => CustomValue;

package/dist/operations/evaluate.js

@@ -9,7 +9,7 @@ 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.multiplyString = exports.NumberProcessorHandler = exports.GenericProcessorHandler = void 0;
+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.minusString = exports.multiplyString = 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");
@@ -50,8 +50,18 @@ const multiplyString = (a, b) => {
     return new string_1.CustomString(multiStr);
 };
 exports.multiplyString = multiplyString;
+const minusString = (a, b) => {
+    const origin = a.toString();
+    const toRemove = b.toString();
+    if (origin.endsWith(toRemove)) {
+        return new string_1.CustomString(origin.substring(0, origin.length - toRemove.length));
+    }
+    return new string_1.CustomString(origin);
+};
+exports.minusString = minusString;
 exports.StringProcessorHandler = {
     [greyscript_core_1.Operator.Plus]: (a, b) => new string_1.CustomString(a.toString() + b.toString()),
+    [greyscript_core_1.Operator.Minus]: (a, b) => (0, exports.minusString)(a, b),
     [greyscript_core_1.Operator.Asterik]: (a, b) => (0, exports.multiplyString)(a, b),
     [greyscript_core_1.Operator.LessThan]: (a, b) => new boolean_1.CustomBoolean(a.toString().length < b.toString().length),
     [greyscript_core_1.Operator.GreaterThan]: (a, b) => new boolean_1.CustomBoolean(a.toString().length > b.toString().length),

package/dist/operations/resolve.js

@@ -221,13 +221,18 @@ class Resolve extends operation_1.Operation {
                 }
                 if (result.handle instanceof with_intrinsics_1.CustomValueWithIntrinsics) {
                     const customValueCtx = result.handle;
+                    if (this.path.isSuper() && customValueCtx instanceof map_1.CustomMap) {
+                        const superChild = customValueCtx.isa.get(result.path);
+                        if (autoCall && superChild instanceof function_1.CustomFunction) {
+                            if (ctx.functionState.context) {
+                                return superChild.run(ctx.functionState.context, [], ctx, customValueCtx.isa);
+                            }
+                            return superChild.run(customValueCtx, [], ctx);
+                        }
+                        return superChild;
+                    }
                     const child = customValueCtx.get(result.path);
                     if (autoCall && child instanceof function_1.CustomFunction) {
-                        if (this.path.isSuper() &&
-                            ctx.functionState.context &&
-                            customValueCtx instanceof map_1.CustomMap) {
-                            return child.run(ctx.functionState.context, [], ctx, customValueCtx.isa);
-                        }
                         return child.run(customValueCtx, [], ctx);
                     }
                     return child;

package/package.json

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