@abaplint/runtime 2.7.150 → 2.7.152

package/build/src/compare/eq.js

@@ -41,7 +41,10 @@ function eq(left, right) {
         else if (left instanceof types_1.Integer) {
             return (0, types_1.toInteger)(right.get(), false) === left.get();
         }
-        else if (left instanceof types_1.String) {
+        else if (left instanceof types_1.String
+            || left instanceof types_1.XString
+            || left instanceof types_1.Numc
+            || left instanceof types_1.Hex) {
             return right.getTrimEnd() === left.get();
         }
     }
@@ -53,16 +56,24 @@ function eq(left, right) {
             return right.get() === left.get();
         }
     }
-    else if (right instanceof types_1.Numc && left instanceof types_1.Numc && right.getLength() === left.getLength()) {
-        return right.get() === left.get();
+    else if (right instanceof types_1.Numc) {
+        if (left instanceof types_1.Numc && right.getLength() === left.getLength()) {
+            return right.get() === left.get();
+        }
+        else if (left instanceof types_1.Integer) {
+            return left.get() === parseInt(right.get(), 10);
+        }
     }
     else if (right instanceof types_1.Integer) {
-        if (left instanceof types_1.Integer) {
+        if (left instanceof types_1.Integer || left instanceof types_1.Integer8) {
             return right.get() === left.get();
         }
         else if (left instanceof types_1.Character) {
             return (parseInt(left.get(), 10) || 0) === right.get();
         }
+        else if (left instanceof types_1.Numc) {
+            return right.get() === parseInt(left.get(), 10);
+        }
     }
     else if (right instanceof types_1.DataReference && left instanceof types_1.DataReference) {
         return right.getPointer() === left.getPointer();
@@ -78,6 +89,31 @@ function eq(left, right) {
             return false;
         }
     }
+    else if (right instanceof types_1.Hex) {
+        if (left instanceof types_1.Hex || left instanceof types_1.XString) {
+            return right.get() === left.get();
+        }
+    }
+    else if (right instanceof types_1.XString) {
+        if (left instanceof types_1.Hex || left instanceof types_1.XString) {
+            return right.get() === left.get();
+        }
+    }
+    else if (right instanceof types_1.ABAPObject) {
+        if (left instanceof types_1.ABAPObject) {
+            return right.get() === left.get();
+        }
+    }
+    else if (right instanceof types_1.Date) {
+        if (left instanceof types_1.Date) {
+            return right.get() === left.get();
+        }
+    }
+    else if (right instanceof types_1.Packed) {
+        if (left instanceof types_1.Packed) {
+            return right.get() === left.get();
+        }
+    }
     if (left instanceof types_1.Structure || right instanceof types_1.Structure) {
         if (!(right instanceof types_1.Structure)) {
             return eq(left.getCharacter(), right);

package/build/src/compare/initial.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initial = void 0;
 const types_1 = require("../types");
+const REGEX_ZEROS = /^0+$/;
+const REGEX_SPACES = /^ *$/;
 function initial(val) {
     // todo, refactor? add as method in each type instead?
     if (val instanceof types_1.Table || val instanceof types_1.HashedTable) {
@@ -14,10 +16,10 @@ function initial(val) {
         return val.get() === "00000000";
     }
     else if (val instanceof types_1.Numc) {
-        return val.get().match(/^0+$/) !== null;
+        return val.get().match(REGEX_ZEROS) !== null;
     }
     else if (val instanceof types_1.Hex) {
-        return val.get().match(/^0+$/) !== null;
+        return val.get().match(REGEX_ZEROS) !== null;
     }
     else if (val instanceof types_1.Time) {
         return val.get() === "000000";
@@ -26,7 +28,7 @@ function initial(val) {
         return val.getRaw() === 0;
     }
     else if (val instanceof types_1.Character) {
-        return val.get().match(/^ *$/) !== null;
+        return val.get().match(REGEX_SPACES) !== null;
     }
     else if (val instanceof types_1.FieldSymbol && val.getPointer() === undefined) {
         throw new Error("FS not assigned");

package/build/src/statements/cast.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cast = void 0;
-const compare_1 = require("../compare");
 const throw_error_1 = require("../throw_error");
 const types_1 = require("../types");
 // todo, field symbols as input?
@@ -10,7 +9,7 @@ const types_1 = require("../types");
 // handling interfaces?
 async function cast(target, source) {
     var _a;
-    if ((0, compare_1.initial)(source)) {
+    if (source instanceof types_1.ABAPObject && source.get() === undefined) {
         target.clear();
         return;
     }

package/build/src/types/table.js

@@ -130,7 +130,7 @@ class HashedTable {
     }
     buildHashFromSimple(data) {
         let hash = "";
-        const rowType = (0, clone_1.clone)(this.getRowType());
+        const ttyp = this.getRowType();
         for (const k of this.options.primaryKey.keyFields) {
             let val = data[k.toLowerCase()];
             if (val instanceof structure_1.Structure) {
@@ -139,12 +139,17 @@ class HashedTable {
             else {
                 // convert to correct type, eg Chars have specific length, or rounding,
                 if (k === "TABLE_LINE") {
+                    const rowType = (0, clone_1.clone)(ttyp);
+                    rowType.set(val.get());
+                    val = rowType.get();
+                }
+                else if (ttyp instanceof structure_1.Structure) {
+                    const rowType = (0, clone_1.clone)(ttyp.get()[k.toLowerCase()]);
                     rowType.set(val.get());
                     val = rowType.get();
                 }
                 else {
-                    rowType.get()[k.toLowerCase()].set(val.get());
-                    val = rowType.get()[k.toLowerCase()].get();
+                    throw new Error("HashedTable, buildHashFromSimple, unexpected type");
                 }
             }
             hash += k + ":" + val + "|";

package/package.json

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