greybel-interpreter 2.1.9 → 2.2.1

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,14 +50,24 @@ 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),
-    [greyscript_core_1.Operator.GreaterThanOrEqual]: (a, b) => new boolean_1.CustomBoolean(a.toString().length >= b.toString().length),
+    [greyscript_core_1.Operator.LessThan]: (a, b) => new boolean_1.CustomBoolean(a.toString() < b.toString()),
+    [greyscript_core_1.Operator.GreaterThan]: (a, b) => new boolean_1.CustomBoolean(a.toString() > b.toString()),
+    [greyscript_core_1.Operator.GreaterThanOrEqual]: (a, b) => new boolean_1.CustomBoolean(a.toString() >= b.toString()),
     [greyscript_core_1.Operator.Equal]: (a, b) => new boolean_1.CustomBoolean(a.toString() === b.toString()),
-    [greyscript_core_1.Operator.LessThanOrEqual]: (a, b) => new boolean_1.CustomBoolean(a.toString().length <= b.toString().length),
+    [greyscript_core_1.Operator.LessThanOrEqual]: (a, b) => new boolean_1.CustomBoolean(a.toString() <= b.toString()),
     [greyscript_core_1.Operator.NotEqual]: (a, b) => new boolean_1.CustomBoolean(a.toString() !== b.toString())
 };
 const multiplyList = (a, b) => {
@@ -93,36 +103,12 @@ exports.ListProcessorHandler = {
         }
         return left;
     },
-    [greyscript_core_1.Operator.LessThan]: (left, right) => {
-        if (right instanceof list_1.CustomList) {
-            return new boolean_1.CustomBoolean(left.value.length < right.value.length);
-        }
-        return default_1.DefaultType.Void;
-    },
-    [greyscript_core_1.Operator.GreaterThan]: (left, right) => {
-        if (right instanceof list_1.CustomList) {
-            return new boolean_1.CustomBoolean(left.value.length > right.value.length);
-        }
-        return default_1.DefaultType.Void;
-    },
-    [greyscript_core_1.Operator.GreaterThanOrEqual]: (left, right) => {
-        if (right instanceof list_1.CustomList) {
-            return new boolean_1.CustomBoolean(left.value.length >= right.value.length);
-        }
-        return default_1.DefaultType.Void;
-    },
     [greyscript_core_1.Operator.Equal]: (left, right) => {
         if (right instanceof list_1.CustomList) {
             return new boolean_1.CustomBoolean((0, deep_equal_1.deepEqual)(left, right));
         }
         return default_1.DefaultType.Void;
     },
-    [greyscript_core_1.Operator.LessThanOrEqual]: (left, right) => {
-        if (right instanceof list_1.CustomList) {
-            return new boolean_1.CustomBoolean(left.value.length <= right.value.length);
-        }
-        return default_1.DefaultType.Void;
-    },
     [greyscript_core_1.Operator.NotEqual]: (left, right) => {
         if (right instanceof list_1.CustomList) {
             return new boolean_1.CustomBoolean(!(0, deep_equal_1.deepEqual)(left, right));
@@ -139,36 +125,12 @@ exports.MapProcessorHandler = {
         }
         return left;
     },
-    [greyscript_core_1.Operator.LessThan]: (left, right) => {
-        if (right instanceof map_1.CustomMap) {
-            return new boolean_1.CustomBoolean(left.value.size < right.value.size);
-        }
-        return default_1.DefaultType.Void;
-    },
-    [greyscript_core_1.Operator.GreaterThan]: (left, right) => {
-        if (right instanceof map_1.CustomMap) {
-            return new boolean_1.CustomBoolean(left.value.size > right.value.size);
-        }
-        return default_1.DefaultType.Void;
-    },
-    [greyscript_core_1.Operator.GreaterThanOrEqual]: (left, right) => {
-        if (right instanceof map_1.CustomMap) {
-            return new boolean_1.CustomBoolean(left.value.size >= right.value.size);
-        }
-        return default_1.DefaultType.Void;
-    },
     [greyscript_core_1.Operator.Equal]: (left, right) => {
         if (right instanceof map_1.CustomMap) {
             return new boolean_1.CustomBoolean((0, deep_equal_1.deepEqual)(left, right));
         }
         return default_1.DefaultType.Void;
     },
-    [greyscript_core_1.Operator.LessThanOrEqual]: (left, right) => {
-        if (right instanceof map_1.CustomMap) {
-            return new boolean_1.CustomBoolean(left.value.size <= right.value.size);
-        }
-        return default_1.DefaultType.Void;
-    },
     [greyscript_core_1.Operator.NotEqual]: (left, right) => {
         if (right instanceof map_1.CustomMap) {
             return new boolean_1.CustomBoolean(!(0, deep_equal_1.deepEqual)(left, right));
@@ -189,7 +151,10 @@ exports.FunctionProcessorHandler = {
     [greyscript_core_1.Operator.NotEqual]: (a, b) => new boolean_1.CustomBoolean(a !== b)
 };
 const handleNumber = (op, a, b) => {
-    if (op in exports.NumberProcessorHandler) {
+    if (b instanceof nil_1.CustomNil) {
+        b = new number_1.CustomNumber(0);
+    }
+    if (op in exports.NumberProcessorHandler && b instanceof number_1.CustomNumber) {
         return exports.NumberProcessorHandler[op](a, b);
     }
     else if (op in exports.GenericProcessorHandler) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "greybel-interpreter",
-    "version": "2.1.9",
+    "version": "2.2.1",
     "description": "Interpreter",
     "main": "dist/index",
     "typings": "dist/index",
@@ -48,8 +48,8 @@
         "typescript": "^5.0.4"
     },
     "dependencies": {
-        "greybel-core": "^0.9.5",
-        "greyscript-core": "^0.9.7"
+        "greybel-core": "^0.9.6",
+        "greyscript-core": "^0.9.9"
     },
     "keywords": [
         "greyscript",