@abaplint/runtime 2.7.42 → 2.7.45

package/build/src/builtin/contains.d.ts

@@ -3,7 +3,10 @@ import { ICharacter } from "../types/_character";
 import { INumeric } from "../types/_numeric";
 export type ContainsInput = {
     val: ICharacter;
-    regex: ICharacter;
+    regex?: ICharacter;
+    sub?: ICharacter;
+    start?: ICharacter;
+    end?: ICharacter;
     case?: ICharacter;
     off?: INumeric;
     len?: INumeric;

package/build/src/builtin/contains.js

@@ -9,7 +9,19 @@ function contains(input) {
         || input.occ !== undefined) {
         throw "runtime, contains() todo";
     }
-    const ret = input.val.get().match(input.regex.get()) !== null ? "X" : " ";
+    let ret = " ";
+    if (input.regex) {
+        ret = input.val.get().match(input.regex.get()) !== null ? "X" : " ";
+    }
+    else if (input.sub) {
+        ret = input.val.get().includes(input.sub.get()) ? "X" : " ";
+    }
+    else if (input.start) {
+        ret = input.val.get().startsWith(input.start.get()) ? "X" : " ";
+    }
+    else if (input.end) {
+        ret = input.val.get().endsWith(input.end.get()) ? "X" : " ";
+    }
     return new types_1.String().set(ret);
 }
 exports.contains = contains;

package/build/src/statements/read_table.js

@@ -32,6 +32,7 @@ function readTable(table, options) {
     var _a, _b, _c, _d;
     let found = undefined;
     let foundIndex = 0;
+    let binarySubrc = undefined;
     if (table instanceof types_1.FieldSymbol) {
         if (table.getPointer() === undefined) {
             throw new Error("GETWA_NOT_ASSIGNED");
@@ -42,11 +43,14 @@ function readTable(table, options) {
     if ((options === null || options === void 0 ? void 0 : options.withTableKey) === undefined
         && (options === null || options === void 0 ? void 0 : options.withKeySimple)
         && (((_a = table.getOptions().primaryKey) === null || _a === void 0 ? void 0 : _a.keyFields) || []).length > 0) {
-        const fields = new Set(table.getOptions().primaryKey.keyFields);
+        const firstKeyField = table.getOptions().primaryKey.keyFields[0];
+        let useKey = false;
         for (const name in options.withKeySimple) {
-            fields.delete(name.toUpperCase());
+            if (firstKeyField === name.toUpperCase()) {
+                useKey = true;
+            }
         }
-        if (fields.size === 0) {
+        if (useKey === true) {
             options.withTableKey = true;
         }
     }
@@ -97,6 +101,29 @@ function readTable(table, options) {
         const searchResult = searchWithKey(arr, options.withKey, startIndex, options.usesTableLine);
         found = searchResult.found;
         foundIndex = searchResult.foundIndex;
+        if (found === undefined) {
+            if (arr.length === 0) {
+                binarySubrc = 8;
+                foundIndex = 1;
+            }
+            else {
+                binarySubrc = 4;
+                foundIndex = startIndex + 1;
+                // check if going beyond the last row, todo: only checks one field
+                const last = arr[arr.length - 1];
+                const isStructured = last instanceof types_1.Structure;
+                let row = undefined;
+                if (options.usesTableLine === false && isStructured === true) {
+                    row = last.get();
+                }
+                else {
+                    row = isStructured ? Object.assign({ table_line: last }, last.get()) : { table_line: last };
+                }
+                if ((0, compare_1.ge)(first.value, first.key(row))) {
+                    binarySubrc = 8;
+                }
+            }
+        }
     }
     else if (options === null || options === void 0 ? void 0 : options.withKey) {
         const arr = table.array();
@@ -142,7 +169,10 @@ function readTable(table, options) {
         throw new Error("runtime, readTable, unexpected input");
     }
     let subrc = found ? 0 : 4;
-    if (((options === null || options === void 0 ? void 0 : options.from) || (options === null || options === void 0 ? void 0 : options.binarySearch) === true || (options === null || options === void 0 ? void 0 : options.keyName) !== undefined)
+    if (binarySubrc) {
+        subrc = binarySubrc;
+    }
+    else if (((options === null || options === void 0 ? void 0 : options.from) || (options === null || options === void 0 ? void 0 : options.binarySearch) === true || (options === null || options === void 0 ? void 0 : options.keyName) !== undefined)
         && subrc === 4) {
         subrc = 8;
     }

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

@@ -4,6 +4,7 @@ import { Structure } from "./structure";
 import { AbstractTypeData } from "./_abstract_type_data";
 import { ICharacter } from "./_character";
 import { INumeric } from "./_numeric";
+import { Integer } from "./integer";
 export declare class Character implements ICharacter {
     private value;
     private constant;
@@ -11,7 +12,7 @@ export declare class Character implements ICharacter {
     private readonly extra;
     constructor(length?: number, extra?: AbstractTypeData);
     setConstant(): this;
-    set(value: ICharacter | string | Structure | FieldSymbol): this;
+    set(value: ICharacter | string | Structure | FieldSymbol | Integer): this;
     getQualifiedName(): string | undefined;
     getConversionExit(): string | undefined;
     getDDICName(): string | undefined;

package/build/src/types/character.js

@@ -5,6 +5,7 @@ const _parse_1 = require("../operators/_parse");
 const throw_error_1 = require("../throw_error");
 const field_symbol_1 = require("./field_symbol");
 const structure_1 = require("./structure");
+const integer_1 = require("./integer");
 const TRIMREGEX = / *$/;
 class Character {
     constructor(length, extra) {
@@ -41,6 +42,10 @@ class Character {
             this.set(value.getCharacter());
             return this;
         }
+        else if (value instanceof integer_1.Integer) {
+            this.value = Math.abs(value.get()) + (value.get() < 0 ? "-" : " ");
+            this.value = this.value.padStart(this.length, " ");
+        }
         else {
             this.value = value.get() + "";
         }

package/package.json

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