@abaplint/runtime 2.7.149 → 2.7.151

package/build/src/compare/eq.js

@@ -78,6 +78,16 @@ 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();
+        }
+    }
     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/read_table.js

@@ -5,6 +5,41 @@ const binary_search_1 = require("../binary_search");
 const compare_1 = require("../compare");
 const types_1 = require("../types");
 /** startIndex = javascript index, return ABAP index */
+function searchWithKeyEarlyExit(arr, withKey, startIndex = 0, usesTableLine, firstKeyName, firstValue) {
+    const isStructured = arr[0] instanceof types_1.Structure;
+    for (let index = startIndex; index < arr.length; index++) {
+        const a = arr[index];
+        let row = undefined;
+        if (usesTableLine === false && isStructured === true) {
+            row = a.get();
+        }
+        else {
+            row = isStructured ? Object.assign({ table_line: a }, a.get()) : { table_line: a };
+        }
+        if (withKey(row) === true) {
+            return {
+                found: a,
+                foundIndex: index + 1,
+            };
+        }
+        /*
+        console.dir(row);
+        console.dir(row[firstKeyName.toLowerCase()]);
+        console.dir(firstValue);
+        */
+        if ((0, compare_1.gt)(row[firstKeyName.toLowerCase()], firstValue)) {
+            return {
+                found: undefined,
+                foundIndex: 0,
+            };
+        }
+    }
+    return {
+        found: undefined,
+        foundIndex: 0,
+    };
+}
+/** startIndex = javascript index, return ABAP index */
 function searchWithKey(arr, withKey, startIndex = 0, usesTableLine) {
     const isStructured = arr[0] instanceof types_1.Structure;
     for (let index = startIndex; index < arr.length; index++) {
@@ -121,8 +156,7 @@ function readTable(table, options) {
         const startIndex = (0, binary_search_1.binarySearchFrom)(arr, 0, arr.length, firstKeyName.toLowerCase(), firstValue) - 1;
         //    console.dir("startindex: " + startIndex);
         if (startIndex >= 0) {
-            // todo: early exit if not found
-            const searchResult = searchWithKey(arr, options.withKey, startIndex, options.usesTableLine);
+            const searchResult = searchWithKeyEarlyExit(arr, options.withKey, startIndex, options.usesTableLine, firstKeyName, firstValue);
             //      console.dir(searchResult);
             found = searchResult.found;
             foundIndex = searchResult.foundIndex;

package/build/src/types/table.d.ts

@@ -79,7 +79,7 @@ export declare class HashedTable implements ITable {
     clear(): void;
     set(tab: HashedTable | TableRowType): ITable;
     getHeader(): TableRowType;
-    private getValue;
+    private cloneRow;
 }
 export declare class Table implements ITable {
     private value;
@@ -109,6 +109,6 @@ export declare class Table implements ITable {
     append(item: TableRowType): any;
     appendInitial(): TableRowType;
     sort(compareFn: (a: TableRowType, b: TableRowType) => number): void;
-    private getValue;
+    private cloneRow;
 }
 export {};

package/build/src/types/table.js

@@ -9,6 +9,7 @@ const field_symbol_1 = require("./field_symbol");
 const data_reference_1 = require("./data_reference");
 const insert_internal_1 = require("../statements/insert_internal");
 const sort_1 = require("../statements/sort");
+// const FEATURE_SHARED_TABLES = true;
 var TableAccessType;
 (function (TableAccessType) {
     TableAccessType["standard"] = "STANDARD";
@@ -129,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) {
@@ -138,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 + "|";
@@ -159,7 +165,7 @@ class HashedTable {
             return { value: undefined, subrc: 4 };
         }
         else {
-            const val = this.getValue(data);
+            const val = this.cloneRow(data);
             for (const loopController of this.loops.values()) {
                 loopController.array.push(val);
             }
@@ -230,7 +236,7 @@ class HashedTable {
         return this.header;
     }
     ///////////////////////////
-    getValue(item) {
+    cloneRow(item) {
         // make sure to do conversion if needed
         if (typeof item === "number") {
             const tmp = (0, clone_1.clone)(this.getRowType());
@@ -355,7 +361,7 @@ class Table {
         }
         let val;
         if (noClone === false) {
-            val = this.getValue(item);
+            val = this.cloneRow(item);
         }
         else {
             val = item;
@@ -414,7 +420,7 @@ class Table {
             return ref;
         }
         else {
-            const val = this.getValue(item);
+            const val = this.cloneRow(item);
             this.value.push(val);
             return val;
         }
@@ -431,7 +437,7 @@ class Table {
         this.value.sort(compareFn);
     }
     ///////////////////////////
-    getValue(item) {
+    cloneRow(item) {
         // make sure to do conversion if needed
         if (typeof item === "number") {
             const tmp = (0, clone_1.clone)(this.getRowType());

package/package.json

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