@abaplint/runtime 2.10.48 → 2.10.50

package/build/src/builtin/strlen.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.strlen = strlen;
+const integer_factory_1 = require("../integer_factory");
 const types_1 = require("../types");
 function strlen(input) {
     let str = "";
@@ -13,6 +14,11 @@ function strlen(input) {
     else {
         str = input.val.get();
     }
-    return new types_1.Integer().set(str.length);
+    if (str.length <= 200) {
+        return integer_factory_1.IntegerFactory.get(str.length);
+    }
+    else {
+        return new types_1.Integer().set(str.length);
+    }
 }
 //# sourceMappingURL=strlen.js.map

package/build/src/character_factory.d.ts

@@ -0,0 +1,5 @@
+import { Character } from "./types";
+export declare class CharacterFactory {
+    private static readonly map;
+    static get(length: number, value: string): Character;
+}

package/build/src/character_factory.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CharacterFactory = void 0;
+const types_1 = require("./types");
+class CharacterFactory {
+    static get(length, value) {
+        if (CharacterFactory.map[value] === undefined) {
+            CharacterFactory.map[value] = new types_1.Character(length).set(value).setConstant();
+        }
+        return CharacterFactory.map[value];
+    }
+}
+exports.CharacterFactory = CharacterFactory;
+CharacterFactory.map = {};
+//# sourceMappingURL=character_factory.js.map

package/build/src/index.d.ts

@@ -16,6 +16,7 @@ import { MemoryConsole } from "./console/memory_console";
 import { buildDbTableName } from "./prefix";
 import { IntegerFactory } from "./integer_factory";
 import { dynamicCallLookup } from "./dynamic_call_lookup";
+import { CharacterFactory } from "./character_factory";
 export { RFC, types, DB, MemoryConsole };
 export type RuntimeDatabaseOptions = {
     schemaPrefix?: string;
@@ -66,8 +67,9 @@ export declare class ABAP {
     expandDynamic: typeof expandDynamic;
     buildDbTableName: typeof buildDbTableName;
     ClassicError: typeof ClassicError;
-    IntegerFactory: typeof IntegerFactory;
     dynamicCallLookup: typeof dynamicCallLookup;
+    IntegerFactory: typeof IntegerFactory;
+    CharacterFactory: typeof CharacterFactory;
     readonly context: Context;
     readonly dbo: RuntimeDatabaseOptions;
     constructor(input?: RuntimeOptions);

package/build/src/index.js

@@ -23,6 +23,7 @@ Object.defineProperty(exports, "MemoryConsole", { enumerable: true, get: functio
 const prefix_1 = require("./prefix");
 const integer_factory_1 = require("./integer_factory");
 const dynamic_call_lookup_1 = require("./dynamic_call_lookup");
+const character_factory_1 = require("./character_factory");
 class ABAP {
     constructor(input) {
         // global objects
@@ -46,8 +47,9 @@ class ABAP {
         this.expandDynamic = expand_dynamic_1.expandDynamic;
         this.buildDbTableName = prefix_1.buildDbTableName;
         this.ClassicError = classic_error_1.ClassicError;
-        this.IntegerFactory = integer_factory_1.IntegerFactory;
         this.dynamicCallLookup = dynamic_call_lookup_1.dynamicCallLookup;
+        this.IntegerFactory = integer_factory_1.IntegerFactory;
+        this.CharacterFactory = character_factory_1.CharacterFactory;
         this.context = new context_1.Context();
         this.console = input?.console ? input?.console : new standard_out_console_1.StandardOutConsole();
         this.context.console = this.console;

package/build/src/integer_factory.d.ts

@@ -1,5 +1,5 @@
 import { Integer } from "./types";
 export declare class IntegerFactory {
     private static readonly map;
-    static get(num: number): Integer;
+    static get(value: number): Integer;
 }

package/build/src/integer_factory.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IntegerFactory = void 0;
 const types_1 = require("./types");
 class IntegerFactory {
-    static get(num) {
-        if (IntegerFactory.map[num] === undefined) {
-            IntegerFactory.map[num] = new types_1.Integer().set(num).setConstant();
+    static get(value) {
+        if (IntegerFactory.map[value] === undefined) {
+            IntegerFactory.map[value] = new types_1.Integer().set(value).setConstant();
         }
-        return IntegerFactory.map[num];
+        return IntegerFactory.map[value];
     }
 }
 exports.IntegerFactory = IntegerFactory;

package/build/src/operators/minus.js

@@ -17,14 +17,14 @@ function minus(left, right) {
         }
         return minus(left, right.getPointer());
     }
-    if (left instanceof types_1.Integer8 || right instanceof types_1.Integer8) {
+    if (left instanceof types_1.Integer && right instanceof types_1.Integer) {
+        return new types_1.Integer().set(left.get() - right.get());
+    }
+    else if (left instanceof types_1.Integer8 || right instanceof types_1.Integer8) {
         const l = left instanceof types_1.Integer8 ? left.get() : BigInt((0, _parse_1.parse)(left));
         const r = right instanceof types_1.Integer8 ? right.get() : BigInt((0, _parse_1.parse)(right));
         return new types_1.Integer8().set(l - r);
     }
-    else if (left instanceof types_1.Integer && right instanceof types_1.Integer) {
-        return new types_1.Integer().set(left.get() - right.get());
-    }
     else if (typeof left === "number" && typeof right === "number"
         && Number.isInteger(left) && Number.isInteger(right)) {
         return new types_1.Integer().set(left - right);

package/build/src/statements/condense.js

@@ -1,14 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.condense = condense;
+const ENDS_WITH_SPACE = / +$/;
+const BEGINS_WITH_SPACE = /^ +/;
+const ANY_SPACES = / */g;
+const MULTIPLE_SPACES_REGEX = / {2,}/g;
 function condense(input, options) {
-    let trimmed = input.get().replace(/ +$/, "");
-    trimmed = trimmed.replace(/^ +/, "");
+    let trimmed = input.get().replace(ENDS_WITH_SPACE, "");
+    trimmed = trimmed.replace(BEGINS_WITH_SPACE, "");
     if (options.nogaps) {
-        trimmed = trimmed.replace(/ */g, "");
+        trimmed = trimmed.replace(ANY_SPACES, "");
     }
     else {
-        trimmed = trimmed.replace(/ {2,}/g, " ");
+        trimmed = trimmed.replace(MULTIPLE_SPACES_REGEX, " ");
     }
     input.set(trimmed);
 }

package/build/src/statements/index.d.ts

@@ -1,7 +1,6 @@
 import { append } from "./append";
 import { assert } from "./assert";
 import { assign } from "./assign";
-import { clear } from "./clear";
 import { commit } from "./commit";
 import { concatenate } from "./concatenate";
 import { condense } from "./condense";
@@ -56,7 +55,6 @@ export declare class Statements {
     assert: typeof assert;
     assign: typeof assign;
     cast: typeof cast;
-    clear: typeof clear;
     collect: typeof collect;
     commit: typeof commit;
     concatenate: typeof concatenate;

package/build/src/statements/index.js

@@ -4,7 +4,6 @@ exports.Statements = void 0;
 const append_1 = require("./append");
 const assert_1 = require("./assert");
 const assign_1 = require("./assign");
-const clear_1 = require("./clear");
 const commit_1 = require("./commit");
 const concatenate_1 = require("./concatenate");
 const condense_1 = require("./condense");
@@ -61,7 +60,6 @@ class Statements {
         this.assert = assert_1.assert;
         this.assign = assign_1.assign;
         this.cast = cast_1.cast;
-        this.clear = clear_1.clear;
         this.collect = collect_1.collect;
         this.commit = commit_1.commit;
         this.concatenate = concatenate_1.concatenate;

package/build/src/statements/read_table.js

@@ -73,7 +73,8 @@ function readTable(table, options) {
         if (table.getPointer() === undefined) {
             throw new Error("GETWA_NOT_ASSIGNED");
         }
-        return readTable(table.getPointer(), options);
+        // return readTable(table.getPointer(), options);
+        table = table.getPointer();
     }
     // check if it is a primary index read specified with WITH KEY instead of WITH TABLE KEY
     if (options?.withTableKey === undefined
@@ -257,8 +258,8 @@ function readTable(table, options) {
     if (binarySubrc) {
         subrc = binarySubrc;
     }
-    else if ((options?.binarySearch === true || options?.keyName !== undefined)
-        && subrc === 4) {
+    else if (subrc === 4
+        && (options?.binarySearch === true || options?.keyName !== undefined)) {
         subrc = 8;
     }
     // @ts-ignore

package/build/src/types/integer.js

@@ -8,6 +8,8 @@ const hex_1 = require("./hex");
 const xstring_1 = require("./xstring");
 const integer8_1 = require("./integer8");
 const hex_uint8_1 = require("./hex_uint8");
+const character_1 = require("./character");
+const string_1 = require("./string");
 exports.DIGITS = new RegExp(/^\s*-?\+?\d+\.?\d* *$/i);
 exports.MAX_INTEGER = 2147483647;
 exports.MIN_INTEGER = -2147483648;
@@ -54,8 +56,14 @@ class Integer {
         if (typeof value === "number") {
             this.value = Math.round(value);
         }
-        else if (typeof value === "string") {
-            this.value = toInteger(value);
+        else if (value instanceof Integer) {
+            this.set(value.get());
+        }
+        else if (value instanceof character_1.Character) {
+            this.value = toInteger(value.get());
+        }
+        else if (value instanceof string_1.String) {
+            this.value = toInteger(value.get());
         }
         else if (value instanceof integer8_1.Integer8) {
             this.set(Number(value.get()));
@@ -75,6 +83,9 @@ class Integer {
             }
             this.set(num);
         }
+        else if (typeof value === "string") {
+            this.value = toInteger(value);
+        }
         else {
             this.set(value.get());
         }

package/build/src/types/table.js

@@ -147,6 +147,7 @@ class HashedTable {
     buildHashFromSimple(data) {
         let hash = "";
         const tableRowType = this.getRowType();
+        const isStructured = tableRowType instanceof structure_1.Structure;
         for (const k of this.options.primaryKey.keyFields) {
             let val = data[k.toLowerCase()];
             // convert to correct type, eg Chars have specific length, or rounding,
@@ -155,7 +156,7 @@ class HashedTable {
                 row.set(val.get());
                 val = row.get();
             }
-            else if (tableRowType instanceof structure_1.Structure) {
+            else if (isStructured === true) {
                 const field = tableRowType.get()[k.toLowerCase()];
                 // if types match, there is no need to clone
                 if (field instanceof string_1.String && val instanceof string_1.String) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/runtime",
-  "version": "2.10.48",
+  "version": "2.10.50",
   "description": "Transpiler - Runtime",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -32,7 +32,7 @@
     "@types/chai": "^4.3.20",
     "@types/mocha": "^10.0.10",
     "chai": "^4.5.0",
-    "mocha": "^11.1.0",
+    "mocha": "^11.2.2",
     "source-map-support": "^0.5.21",
     "typescript": "^5.8.3"
   },

package/build/src/statements/clear.d.ts

@@ -1,4 +0,0 @@
-import { ICharacter } from "../types/_character";
-import { INumeric } from "../types/_numeric";
-import { Table } from "../types";
-export declare function clear(value: ICharacter | INumeric | Table): void;

package/build/src/statements/clear.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.clear = clear;
-function clear(value) {
-    value.clear();
-}
-//# sourceMappingURL=clear.js.map