greybel-interpreter 2.2.1 → 2.2.3

package/dist/operations/evaluate.d.ts

@@ -3,6 +3,8 @@ import { OperationContext } from '../context';
 import { CustomValue } from '../types/base';
 import { CustomBoolean } from '../types/boolean';
 import { CustomList } from '../types/list';
+import { CustomNumber } from '../types/number';
+import { CustomString } from '../types/string';
 import { CPSVisit, Operation } from './operation';
 export interface ProcessorHandlerFunction {
     (op: string, a: CustomValue, b: CustomValue): CustomValue;
@@ -12,11 +14,12 @@ 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 minusString: (a: CustomString, b: CustomValue) => CustomValue;
+export declare const multiplyString: (a: CustomString, b: CustomValue) => CustomValue;
+export declare const divideString: (a: CustomString, 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;
+export declare const multiplyList: (a: CustomList, b: CustomNumber) => CustomValue;
+export declare const divideList: (a: CustomList, b: CustomNumber) => CustomValue;
 export declare const ListProcessorHandler: ProcessorHandler;
 export declare const MapProcessorHandler: ProcessorHandler;
 export declare const InterfaceProcessorHandler: ProcessorHandler;

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.minusString = 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.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");
@@ -45,11 +45,6 @@ exports.NumberProcessorHandler = {
     [greyscript_core_1.Operator.LessThanOrEqual]: (a, b) => new boolean_1.CustomBoolean(a.toNumber() <= b.toNumber()),
     [greyscript_core_1.Operator.NotEqual]: (a, b) => new boolean_1.CustomBoolean(a.toNumber() !== b.toNumber())
 };
-const multiplyString = (a, b) => {
-    const multiStr = new Array(b.toNumber()).fill(a.toString()).join('');
-    return new string_1.CustomString(multiStr);
-};
-exports.multiplyString = multiplyString;
 const minusString = (a, b) => {
     const origin = a.toString();
     const toRemove = b.toString();
@@ -59,10 +54,37 @@ const minusString = (a, b) => {
     return new string_1.CustomString(origin);
 };
 exports.minusString = minusString;
+const multiplyString = (a, b) => {
+    const factor = b.toNumber();
+    if (factor <= 0) {
+        return new list_1.CustomList();
+    }
+    let newString = '';
+    const max = Math.floor(a.value.length * factor);
+    for (let index = 0; index < max; index++) {
+        newString += a.value[index % a.value.length];
+    }
+    return new string_1.CustomString(newString);
+};
+exports.multiplyString = multiplyString;
+const divideString = (a, b) => {
+    const factor = 1 / b.toNumber();
+    if (factor <= 0) {
+        return new list_1.CustomList();
+    }
+    let newString = '';
+    const max = Math.floor(a.value.length * factor);
+    for (let index = 0; index < max; index++) {
+        newString += a.value[index % a.value.length];
+    }
+    return new string_1.CustomString(newString);
+};
+exports.divideString = divideString;
 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.Slash]: (a, b) => (0, exports.divideString)(a, b),
     [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()),
@@ -101,7 +123,7 @@ exports.ListProcessorHandler = {
         if (right instanceof list_1.CustomList) {
             return left.fork().extend(right);
         }
-        return left;
+        return default_1.DefaultType.Void;
     },
     [greyscript_core_1.Operator.Equal]: (left, right) => {
         if (right instanceof list_1.CustomList) {
@@ -115,15 +137,25 @@ exports.ListProcessorHandler = {
         }
         return default_1.DefaultType.Void;
     },
-    [greyscript_core_1.Operator.Asterik]: (left, right) => (0, exports.multiplyList)(left, right),
-    [greyscript_core_1.Operator.Slash]: (left, right) => (0, exports.divideList)(left, right)
+    [greyscript_core_1.Operator.Asterik]: (left, right) => {
+        if (right instanceof number_1.CustomNumber) {
+            return (0, exports.multiplyList)(left, right);
+        }
+        return default_1.DefaultType.Void;
+    },
+    [greyscript_core_1.Operator.Slash]: (left, right) => {
+        if (right instanceof number_1.CustomNumber) {
+            return (0, exports.divideList)(left, right);
+        }
+        return default_1.DefaultType.Void;
+    }
 };
 exports.MapProcessorHandler = {
     [greyscript_core_1.Operator.Plus]: (left, right) => {
         if (right instanceof map_1.CustomMap) {
             return left.fork().extend(right);
         }
-        return left;
+        return default_1.DefaultType.Void;
     },
     [greyscript_core_1.Operator.Equal]: (left, right) => {
         if (right instanceof map_1.CustomMap) {
@@ -143,6 +175,12 @@ exports.InterfaceProcessorHandler = {
     [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,
+    [greyscript_core_1.Operator.Slash]: () => default_1.DefaultType.Void,
+    [greyscript_core_1.Operator.Asterik]: () => default_1.DefaultType.Void,
+    [greyscript_core_1.Operator.Power]: () => default_1.DefaultType.Void,
+    [greyscript_core_1.Operator.PercentSign]: () => default_1.DefaultType.Void,
     [greyscript_core_1.Operator.Equal]: (_a, b) => new boolean_1.CustomBoolean(b instanceof nil_1.CustomNil),
     [greyscript_core_1.Operator.NotEqual]: (_a, b) => new boolean_1.CustomBoolean(!(b instanceof nil_1.CustomNil))
 };
@@ -151,9 +189,8 @@ exports.FunctionProcessorHandler = {
     [greyscript_core_1.Operator.NotEqual]: (a, b) => new boolean_1.CustomBoolean(a !== b)
 };
 const handleNumber = (op, a, b) => {
-    if (b instanceof nil_1.CustomNil) {
+    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);
     }
@@ -164,6 +201,10 @@ const handleNumber = (op, a, b) => {
 };
 exports.handleNumber = handleNumber;
 const handleString = (op, a, b) => {
+    if (a instanceof nil_1.CustomNil)
+        a = new string_1.CustomString('');
+    if (b instanceof nil_1.CustomNil)
+        b = new string_1.CustomString('');
     if (op in exports.StringProcessorHandler) {
         return exports.StringProcessorHandler[op](a, b);
     }
@@ -174,10 +215,8 @@ const handleString = (op, a, b) => {
 };
 exports.handleString = handleString;
 const handleList = (op, a, b) => {
-    const left = a;
-    const right = b;
     if (op in exports.ListProcessorHandler) {
-        return exports.ListProcessorHandler[op](left, right);
+        return exports.ListProcessorHandler[op](a, b);
     }
     else if (op in exports.GenericProcessorHandler) {
         return exports.GenericProcessorHandler[op](a, b);
@@ -186,10 +225,8 @@ const handleList = (op, a, b) => {
 };
 exports.handleList = handleList;
 const handleMap = (op, a, b) => {
-    const left = a;
-    const right = b;
     if (op in exports.MapProcessorHandler) {
-        return exports.MapProcessorHandler[op](left, right);
+        return exports.MapProcessorHandler[op](a, b);
     }
     else if (op in exports.GenericProcessorHandler) {
         return exports.GenericProcessorHandler[op](a, b);
@@ -198,10 +235,8 @@ const handleMap = (op, a, b) => {
 };
 exports.handleMap = handleMap;
 const handleInterface = (op, a, b) => {
-    const left = a;
-    const right = b;
     if (op in exports.InterfaceProcessorHandler) {
-        return exports.InterfaceProcessorHandler[op](left, right);
+        return exports.InterfaceProcessorHandler[op](a, b);
     }
     else if (op in exports.GenericProcessorHandler) {
         return exports.GenericProcessorHandler[op](a, b);
@@ -245,7 +280,7 @@ const handle = (op, a, b) => {
     }
     if ((a instanceof string_1.CustomString || b instanceof string_1.CustomString) &&
         op === greyscript_core_1.Operator.Plus) {
-        return exports.StringProcessorHandler[op](a, b);
+        return (0, exports.handleString)(op, a, b);
     }
     else if (a instanceof number_1.CustomNumber) {
         return (0, exports.handleNumber)(op, a, b);

package/dist/types/nil.js

@@ -14,7 +14,7 @@ class CustomNil extends base_1.CustomValue {
         return this.toString();
     }
     toString() {
-        return '';
+        return 'null';
     }
     fork() {
         return new CustomNil();

package/package.json

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