@abaplint/runtime 2.0.39 → 2.0.42

package/build/src/compare/eq.js

@@ -17,6 +17,10 @@ function compareTables(left, right) {
     return true;
 }
 function eq(left, right) {
+    /*
+      console.dir(left);
+      console.dir(right);
+    */
     if (right instanceof types_1.FieldSymbol) {
         return eq(left, right.getPointer());
     }
@@ -56,7 +60,7 @@ function eq(left, right) {
     }
     let l = undefined;
     if (left instanceof types_1.Character) {
-        l = left.get().trimEnd();
+        l = left.get().replace(/ *$/, "");
     }
     else if (typeof left === "object") {
         l = left.get();
@@ -66,7 +70,7 @@ function eq(left, right) {
     }
     let r = undefined;
     if (right instanceof types_1.Character) {
-        r = right.get().trimEnd();
+        r = right.get().replace(/ *$/, "");
     }
     else if (typeof right === "object") {
         r = right.get();
@@ -110,6 +114,10 @@ function eq(left, right) {
             }
         }
     }
+    /*
+      console.dir(l);
+      console.dir(r);
+    */
     return l === r;
 }
 exports.eq = eq;

package/build/src/operators/add.d.ts

@@ -1,4 +1,4 @@
 import { Float, Hex, Integer } from "../types";
 import { ICharacter } from "../types/_character";
 import { INumeric } from "../types/_numeric";
-export declare function add(left: INumeric | ICharacter | string | number | Float | Integer | Hex, right: INumeric | ICharacter | string | number | Float | Integer | Hex): Float | Integer;
+export declare function add(left: INumeric | ICharacter | string | number | Float | Integer | Hex, right: INumeric | ICharacter | string | number | Float | Integer | Hex): Integer | Float;

package/build/src/operators/add.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.add = void 0;
 const types_1 = require("../types");
+const string_1 = require("../types/string");
 const _parse_1 = require("./_parse");
 function add(left, right) {
     if (left instanceof types_1.Integer && right instanceof types_1.Integer) {
@@ -17,6 +18,12 @@ function add(left, right) {
     else if (typeof right === "number" && Number.isInteger(right) && left instanceof types_1.Integer) {
         return new types_1.Integer().set(left.get() + right);
     }
+    else if (left instanceof string_1.String && Number.isInteger(Number(left.get())) && right instanceof types_1.Integer) {
+        return new types_1.Integer().set(Number.parseInt(left.get(), 10) + right.get());
+    }
+    else if (right instanceof string_1.String && Number.isInteger(Number(right)) && left instanceof types_1.Integer) {
+        return new types_1.Integer().set(left.get() + Number.parseInt(right.get(), 10));
+    }
     return new types_1.Float().set((0, _parse_1.parse)(left) + (0, _parse_1.parse)(right));
 }
 exports.add = add;

package/build/src/operators/minus.d.ts

@@ -1,4 +1,4 @@
 import { Float, Integer } from "../types";
 import { ICharacter } from "../types/_character";
 import { INumeric } from "../types/_numeric";
-export declare function minus(left: INumeric | ICharacter | string | number | Integer | Float, right: INumeric | ICharacter | string | number | Integer | Float): Float | Integer;
+export declare function minus(left: INumeric | ICharacter | string | number | Integer | Float, right: INumeric | ICharacter | string | number | Integer | Float): Integer | Float;

package/build/src/operators/minus.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.minus = void 0;
 const types_1 = require("../types");
 const _parse_1 = require("./_parse");
+const string_1 = require("../types/string");
 function minus(left, right) {
     if (left instanceof types_1.Integer && right instanceof types_1.Integer) {
         return new types_1.Integer().set(left.get() - right.get());
@@ -17,6 +18,12 @@ function minus(left, right) {
     else if (typeof right === "number" && Number.isInteger(right) && left instanceof types_1.Integer) {
         return new types_1.Integer().set(left.get() - right);
     }
+    else if (left instanceof string_1.String && Number.isInteger(Number(left.get())) && right instanceof types_1.Integer) {
+        return new types_1.Integer().set(Number.parseInt(left.get(), 10) - right.get());
+    }
+    else if (right instanceof string_1.String && Number.isInteger(Number(right)) && left instanceof types_1.Integer) {
+        return new types_1.Integer().set(left.get() - Number.parseInt(right.get(), 10));
+    }
     return new types_1.Float().set((0, _parse_1.parse)(left) - (0, _parse_1.parse)(right));
 }
 exports.minus = minus;

package/build/src/operators/multiply.d.ts

@@ -1,4 +1,4 @@
 import { Float, Integer } from "../types";
 import { ICharacter } from "../types/_character";
 import { INumeric } from "../types/_numeric";
-export declare function multiply(left: INumeric | ICharacter | string | number, right: INumeric | ICharacter | string | number): Float | Integer;
+export declare function multiply(left: INumeric | ICharacter | string | number, right: INumeric | ICharacter | string | number): Integer | Float;

package/build/src/operators/multiply.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.multiply = void 0;
 const types_1 = require("../types");
 const _parse_1 = require("./_parse");
+const string_1 = require("../types/string");
 function multiply(left, right) {
     if (left instanceof types_1.Integer && right instanceof types_1.Integer) {
         return new types_1.Integer().set(left.get() * right.get());
@@ -17,6 +18,12 @@ function multiply(left, right) {
     else if (typeof right === "number" && Number.isInteger(right) && left instanceof types_1.Integer) {
         return new types_1.Integer().set(left.get() * right);
     }
+    else if (left instanceof string_1.String && Number.isInteger(Number(left.get())) && right instanceof types_1.Integer) {
+        return new types_1.Integer().set(Number.parseInt(left.get(), 10) * right.get());
+    }
+    else if (right instanceof string_1.String && Number.isInteger(Number(right)) && left instanceof types_1.Integer) {
+        return new types_1.Integer().set(left.get() * Number.parseInt(right.get(), 10));
+    }
     return new types_1.Float().set((0, _parse_1.parse)(left) * (0, _parse_1.parse)(right));
 }
 exports.multiply = multiply;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/runtime",
-  "version": "2.0.39",
+  "version": "2.0.42",
   "description": "Transpiler - Runtime",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",