@abaplint/runtime 2.13.46 → 2.13.48

package/build/src/builtin/abs.js

@@ -11,7 +11,7 @@ function abs(input) {
         num_in = parseFloat(input.val);
     }
     else if (input.val instanceof types_1.Float) {
-        num_in = input.val.getRaw();
+        num_in = input.val.getCalculationValue();
     }
     else {
         num_in = parseFloat(input.val.get().toString());

package/build/src/builtin/ceil.js

@@ -11,7 +11,7 @@ function ceil(input) {
         num_in = parseFloat(input.val);
     }
     else if (input.val instanceof types_1.Float) {
-        num_in = input.val.getRaw();
+        num_in = input.val.getCalculationValue();
     }
     else {
         num_in = parseFloat(input.val.get().toString());

package/build/src/builtin/floor.js

@@ -11,7 +11,7 @@ function floor(input) {
         num_in = parseFloat(input.val);
     }
     else if (input.val instanceof types_1.Float) {
-        num_in = input.val.getRaw();
+        num_in = input.val.getCalculationValue();
     }
     else {
         num_in = parseFloat(input.val.get().toString());

package/build/src/builtin/frac.js

@@ -12,8 +12,10 @@ function frac(input) {
     else if (typeof input.val === "string") {
         num_in = parseFloat(input.val);
     }
-    else if (input.val instanceof types_1.DecFloat34
-        || input.val instanceof types_1.Float) {
+    else if (input.val instanceof types_1.Float) {
+        num_in = input.val.getCalculationValue();
+    }
+    else if (input.val instanceof types_1.DecFloat34) {
         num_in = input.val.getRaw();
     }
     else {

package/build/src/builtin/trunc.js

@@ -11,7 +11,7 @@ function trunc(input) {
         num_in = parseFloat(input.val);
     }
     else if (input.val instanceof types_1.Float) {
-        num_in = input.val.getRaw();
+        num_in = input.val.getCalculationValue();
     }
     else {
         num_in = parseFloat(input.val.get().toString());

package/build/src/operators/add.js

@@ -22,16 +22,16 @@ function add(left, right) {
         return new types_1.Integer().set(left.get() + right);
     }
     else if ((left instanceof string_1.String || left instanceof types_1.Character) && isIntegerCharacter(left) && right instanceof types_1.Integer) {
-        return new types_1.Integer().set(Number.parseInt(left.get(), 10) + right.get());
+        return new types_1.Integer().set(Number.parseInt(left.get(), 10) + right.get()).clearIntegerCalculationType();
     }
     else if ((right instanceof string_1.String || right instanceof types_1.Character) && isIntegerCharacter(right) && left instanceof types_1.Integer) {
-        return new types_1.Integer().set(left.get() + Number.parseInt(right.get(), 10));
+        return new types_1.Integer().set(left.get() + Number.parseInt(right.get(), 10)).clearIntegerCalculationType();
     }
     else if ((left instanceof string_1.String || left instanceof types_1.Character)
         && (right instanceof string_1.String || right instanceof types_1.Character)
         && isIntegerCharacter(left)
         && isIntegerCharacter(right)) {
-        return new types_1.Integer().set(Number.parseInt(left.get(), 10) + Number.parseInt(right.get(), 10));
+        return new types_1.Integer().set(Number.parseInt(left.get(), 10) + Number.parseInt(right.get(), 10)).clearIntegerCalculationType();
     }
     else if (left instanceof types_1.Integer8) {
         if (right instanceof types_1.Integer8) {

package/build/src/operators/divide.js

@@ -30,6 +30,16 @@ function divide(left, right) {
         }
     }
     const val = l / r;
-    return new types_1.Float().set(val);
+    const ret = new types_1.Float().set(val);
+    if (isIntegerOperand(left) && isIntegerOperand(right)) {
+        ret.setIntegerCalculationType();
+    }
+    return ret;
+}
+function isIntegerOperand(val) {
+    if (val instanceof types_1.Integer) {
+        return val.isIntegerCalculationType();
+    }
+    return val instanceof types_1.Integer8;
 }
 //# sourceMappingURL=divide.js.map

package/build/src/operators/minus.js

@@ -36,10 +36,10 @@ function minus(left, right) {
         return new types_1.Integer().set(left.get() - right);
     }
     else if ((left instanceof string_1.String || left instanceof types_1.Character) && Number.isInteger(Number(left.get())) && right instanceof types_1.Integer) {
-        return new types_1.Integer().set(Number.parseInt(left.get(), 10) - right.get());
+        return new types_1.Integer().set(Number.parseInt(left.get(), 10) - right.get()).clearIntegerCalculationType();
     }
     else if ((right instanceof string_1.String || right instanceof types_1.Character) && 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.Integer().set(left.get() - Number.parseInt(right.get(), 10)).clearIntegerCalculationType();
     }
     return new types_1.Float().set((0, _parse_1.parse)(left) - (0, _parse_1.parse)(right));
 }

package/build/src/operators/multiply.js

@@ -29,11 +29,11 @@ function multiply(left, right) {
     }
     else if ((left instanceof string_1.String || left instanceof types_1.Character) && Number.isInteger(Number(left.get())) && right instanceof types_1.Integer) {
         const val = Number.parseInt(left.get(), 10) * right.get();
-        return new types_1.Integer().set(val);
+        return new types_1.Integer().set(val).clearIntegerCalculationType();
     }
     else if ((right instanceof string_1.String || right instanceof types_1.Character) && Number.isInteger(Number(right)) && left instanceof types_1.Integer) {
         const val = left.get() * Number.parseInt(right.get(), 10);
-        return new types_1.Integer().set(val);
+        return new types_1.Integer().set(val).clearIntegerCalculationType();
     }
     return new types_1.Float().set((0, _parse_1.parse)(left) * (0, _parse_1.parse)(right));
 }

package/build/src/statements/modify_database.js

@@ -12,12 +12,18 @@ async function modifyDatabase(table, options, context) {
         options.values = options.values.getPointer();
     }
     if (options.table) {
+        let subrc = 0;
+        let dbcnt = 0;
         for (const row of options.table.array()) {
-            const subrc = await (0, insert_database_1.insertDatabase)(table, { values: row }, context);
-            if (subrc !== 0) {
+            const insertSubrc = await (0, insert_database_1.insertDatabase)(table, { values: row }, context);
+            if (insertSubrc !== 0) {
                 await (0, update_database_1.updateDatabase)(table, { from: row }, context);
             }
+            subrc = Math.max(subrc, abap.builtin.sy.get().subrc.get());
+            dbcnt += abap.builtin.sy.get().dbcnt.get();
         }
+        abap.builtin.sy.get().subrc.set(subrc);
+        abap.builtin.sy.get().dbcnt.set(dbcnt);
     }
     else if (options.values) {
         const subrc = await (0, insert_database_1.insertDatabase)(table, { values: options.values }, context);

package/build/src/statements/select.js

@@ -59,7 +59,12 @@ function rowsToTarget(target, rows) {
             }
             else {
                 const columnName = Object.keys(row)[0];
-                targetRow.set(row[columnName]);
+                if (row[columnName] === null) {
+                    targetRow.clear();
+                }
+                else {
+                    targetRow.set(row[columnName]);
+                }
             }
             abap.statements.insertInternal({ table: target, data: targetRow, noClone: true });
         }
@@ -67,12 +72,24 @@ function rowsToTarget(target, rows) {
     else if (Array.isArray(target)) {
         for (let index = 0; index < target.length; index++) {
             const element = target[index];
-            element.set(rows[0][Object.keys(rows[0])[index]]);
+            const value = rows[0][Object.keys(rows[0])[index]];
+            if (value === null) {
+                element.clear();
+            }
+            else {
+                element.set(value);
+            }
         }
     }
     else if (target !== undefined) {
         // its a simple type
-        target.set(rows[0][Object.keys(rows[0])[0]]);
+        const value = rows[0][Object.keys(rows[0])[0]];
+        if (value === null) {
+            target.clear();
+        }
+        else {
+            target.set(value);
+        }
     }
 }
 //# sourceMappingURL=select.js.map

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

@@ -23,7 +23,7 @@ export declare class DataReference {
     get(): any;
     array(): any;
     getArrayLength(): any;
-    set(value: any): void | Table | Structure | ABAPObject | Float | Integer8 | this | DecFloat34;
+    set(value: any): void | Table | Structure | ABAPObject | Float | Integer8 | DecFloat34 | this;
     getOffset(input: {
         offset?: number | INumeric | Hex;
         length?: number | INumeric | Hex;

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

@@ -5,7 +5,7 @@ export declare class DecFloat34 {
     private value;
     constructor();
     clone(): DecFloat34;
-    set(value: INumeric | ICharacter | Hex | string | number): this;
+    set(value: INumeric | ICharacter | Hex | string | number | DecFloat34): this;
     clear(): void;
     getRaw(): number;
     get(): string;

package/build/src/types/decfloat34.js

@@ -24,6 +24,9 @@ class DecFloat34 {
         else if (typeof value === "string") {
             this.value = parseFloat(value);
         }
+        else if (value instanceof DecFloat34) {
+            this.value = value.getRaw();
+        }
         else if (value instanceof _1.Float) {
             this.value = value.getRaw();
         }

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

@@ -3,11 +3,18 @@ import { ICharacter } from "./_character";
 import { INumeric } from "./_numeric";
 export declare class Float {
     private value;
+    private integerCalculationType;
     private readonly qualifiedName;
     constructor(input?: {
         qualifiedName?: string;
     });
     clone(): Float;
+    /** ABAP calculates in type i if all operands are integers, ie. "3 / 2" is 2. The exact value is
+     * kept here, so assigning to a float or packed target, which raises the calculation type, still
+     * gives the exact result. Consumers without a target type must use getCalculationValue() */
+    setIntegerCalculationType(): Float;
+    /** value as seen by the calculation type, ie. rounded if the calculation type is integer */
+    getCalculationValue(): number;
     getQualifiedName(): string | undefined;
     set(value: INumeric | ICharacter | Hex | string | number): this;
     clear(): void;

package/build/src/types/float.js

@@ -4,6 +4,7 @@ exports.Float = void 0;
 const hex_1 = require("./hex");
 const xstring_1 = require("./xstring");
 const integer8_1 = require("./integer8");
+const decfloat34_1 = require("./decfloat34");
 /*
 function getNumberParts(x: number) {
   if(isNaN(x)) {
@@ -21,6 +22,7 @@ function getNumberParts(x: number) {
 */
 class Float {
     value;
+    integerCalculationType = false;
     qualifiedName;
     constructor(input) {
         this.value = 0;
@@ -31,6 +33,21 @@ class Float {
         n.value = this.value;
         return n;
     }
+    /** ABAP calculates in type i if all operands are integers, ie. "3 / 2" is 2. The exact value is
+     * kept here, so assigning to a float or packed target, which raises the calculation type, still
+     * gives the exact result. Consumers without a target type must use getCalculationValue() */
+    setIntegerCalculationType() {
+        this.integerCalculationType = true;
+        return this;
+    }
+    /** value as seen by the calculation type, ie. rounded if the calculation type is integer */
+    getCalculationValue() {
+        if (this.integerCalculationType === true) {
+            // ABAP rounds half away from zero
+            return this.value < 0 ? -Math.round(-this.value) : Math.round(this.value);
+        }
+        return this.value;
+    }
     getQualifiedName() {
         return this.qualifiedName;
     }
@@ -47,7 +64,7 @@ class Float {
         else if (value instanceof integer8_1.Integer8) {
             this.value = Number(value.get());
         }
-        else if (value instanceof Float) {
+        else if (value instanceof Float || value instanceof decfloat34_1.DecFloat34) {
             this.value = value.getRaw();
         }
         else if (value instanceof hex_1.Hex || value instanceof xstring_1.XString) {

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

@@ -2,6 +2,7 @@ import { Float } from "./float";
 import { Hex } from "./hex";
 import { ICharacter } from "./_character";
 import { INumeric } from "./_numeric";
+import { DecFloat34 } from "./decfloat34";
 export declare const DIGITS: RegExp;
 export declare const MAX_INTEGER = 2147483647;
 export declare const MIN_INTEGER = -2147483648;
@@ -9,14 +10,19 @@ export declare function toInteger(value: string, exception?: boolean): number;
 export declare class Integer implements INumeric {
     private value;
     private constant;
+    private integerCalculationType;
     private readonly qualifiedName;
     constructor(input?: {
         qualifiedName?: string;
     });
+    /** ABAP determines the calculation type from the operand types, character-like operands raise it
+     * above type i even if the intermediate result is integer, ie. "'1.0' * 18 / 16" is not rounded */
+    clearIntegerCalculationType(): Integer;
+    isIntegerCalculationType(): boolean;
     getQualifiedName(): string | undefined;
     clone(): Integer;
     setConstant(): this;
-    set(value: INumeric | ICharacter | Hex | string | number | Integer | Float): this;
+    set(value: INumeric | ICharacter | Hex | string | number | Integer | Float | DecFloat34): this;
     clear(): void;
     get(): number;
 }

package/build/src/types/integer.js

@@ -10,6 +10,7 @@ const integer8_1 = require("./integer8");
 const hex_uint8_1 = require("./hex_uint8");
 const character_1 = require("./character");
 const string_1 = require("./string");
+const decfloat34_1 = require("./decfloat34");
 exports.DIGITS = new RegExp(/^\s*-?\+?\d+\.?\d* *$/i);
 exports.MAX_INTEGER = 2147483647;
 exports.MIN_INTEGER = -2147483648;
@@ -33,11 +34,21 @@ function toInteger(value, exception = true) {
 class Integer {
     value;
     constant = false;
+    integerCalculationType = true;
     qualifiedName;
     constructor(input) {
         this.value = 0;
         this.qualifiedName = input?.qualifiedName;
     }
+    /** ABAP determines the calculation type from the operand types, character-like operands raise it
+     * above type i even if the intermediate result is integer, ie. "'1.0' * 18 / 16" is not rounded */
+    clearIntegerCalculationType() {
+        this.integerCalculationType = false;
+        return this;
+    }
+    isIntegerCalculationType() {
+        return this.integerCalculationType;
+    }
     getQualifiedName() {
         return this.qualifiedName;
     }
@@ -70,7 +81,7 @@ class Integer {
         else if (value instanceof integer8_1.Integer8) {
             this.set(Number(value.get()));
         }
-        else if (value instanceof float_1.Float) {
+        else if (value instanceof float_1.Float || value instanceof decfloat34_1.DecFloat34) {
             this.set(Math.round(value.getRaw()));
         }
         else if (value instanceof hex_1.Hex || value instanceof xstring_1.XString || value instanceof hex_uint8_1.HexUInt8) {

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

@@ -3,6 +3,7 @@ import { Hex } from "./hex";
 import { ICharacter } from "./_character";
 import { INumeric } from "./_numeric";
 import { Integer } from "./integer";
+import { DecFloat34 } from "./decfloat34";
 export declare class Integer8 {
     private value;
     private readonly qualifiedName;
@@ -11,7 +12,7 @@ export declare class Integer8 {
     });
     clone(): Integer8;
     getQualifiedName(): string | undefined;
-    set(value: INumeric | ICharacter | Hex | string | number | bigint | Integer8 | Integer | Float): this;
+    set(value: INumeric | ICharacter | Hex | string | number | bigint | Integer8 | Integer | Float | DecFloat34): this;
     clear(): void;
     get(): bigint;
 }

package/build/src/types/integer8.js

@@ -9,6 +9,7 @@ const integer_1 = require("./integer");
 const get_bit_1 = require("../statements/get_bit");
 const character_1 = require("./character");
 const hex_uint8_1 = require("./hex_uint8");
+const decfloat34_1 = require("./decfloat34");
 const digits = new RegExp(/^\s*-?\+?\d+\.?\d* *$/i);
 class Integer8 {
     value;
@@ -45,7 +46,7 @@ class Integer8 {
             }
             this.value = BigInt(value);
         }
-        else if (value instanceof float_1.Float) {
+        else if (value instanceof float_1.Float || value instanceof decfloat34_1.DecFloat34) {
             this.set(Math.round(value.getRaw()));
         }
         else if (value instanceof hex_1.Hex || value instanceof xstring_1.XString || value instanceof hex_uint8_1.HexUInt8) {

package/build/src/types/packed.js

@@ -4,6 +4,7 @@ exports.Packed = void 0;
 const float_1 = require("./float");
 const throw_error_1 = require("../throw_error");
 const integer8_1 = require("./integer8");
+const decfloat34_1 = require("./decfloat34");
 const digits = new RegExp(/^\s*-?\+?\d*\.?\d*(?:E[+-]?\d+)? *$/i);
 function pow10(exp) {
     return 10n ** BigInt(exp);
@@ -110,7 +111,7 @@ class Packed {
         else if (value instanceof integer8_1.Integer8) {
             this.value = value.get() * pow10(this.decimals);
         }
-        else if (value instanceof float_1.Float) {
+        else if (value instanceof float_1.Float || value instanceof decfloat34_1.DecFloat34) {
             this.value = this.numberToScaled(value.getRaw());
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/runtime",
-  "version": "2.13.46",
+  "version": "2.13.48",
   "description": "Transpiler - Runtime",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -31,7 +31,7 @@
   "devDependencies": {
     "@types/chai": "^4.3.20",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^24.13.2",
+    "@types/node": "^24.13.3",
     "chai": "^4.5.0",
     "mocha": "^11.7.6",
     "source-map-support": "^0.5.21",