@abaplint/runtime 2.8.12 → 2.8.14

package/build/src/abap_regex.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ABAPRegExp = void 0;
+// https://github.com/TooTallNate/pcre-to-regexp/blob/master/src/index.ts
 class ABAPRegExp {
     // converts from ABAP specific regex to javascript regex
     static convert(input) {

package/build/src/compare/eq.js

@@ -54,6 +54,7 @@ function eq(left, right) {
         else if (left instanceof types_1.String
             || left instanceof types_1.XString
             || left instanceof types_1.Numc
+            || left instanceof types_1.HexUInt8
             || left instanceof types_1.Hex) {
             return right.getTrimEnd() === left.get();
         }
@@ -105,13 +106,8 @@ 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) {
+    else if (right instanceof types_1.Hex || right instanceof types_1.HexUInt8 || right instanceof types_1.XString) {
+        if (left instanceof types_1.Hex || left instanceof types_1.XString || left instanceof types_1.HexUInt8) {
             return right.get() === left.get();
         }
     }
@@ -203,10 +199,12 @@ function eq(left, right) {
     else {
         r = right;
     }
-    if (right instanceof types_1.Hex && typeof l === "number") {
+    if ((right instanceof types_1.Hex || right instanceof types_1.HexUInt8) && typeof l === "number") {
+        // todo, handle this case earlier
         r = parseInt(right.get(), 16);
     }
-    else if (left instanceof types_1.Hex && typeof r === "number") {
+    else if ((left instanceof types_1.Hex || left instanceof types_1.HexUInt8) && typeof r === "number") {
+        // todo, handle this case earlier
         l = parseInt(left.get(), 16);
     }
     if (right instanceof types_1.Float && left instanceof types_1.Float) {

package/build/src/compare/gt.js

@@ -20,7 +20,7 @@ function gt(left, right) {
     if (left instanceof types_1.Table || right instanceof types_1.Table || left instanceof types_1.HashedTable || right instanceof types_1.HashedTable) {
         throw new Error("runtime_todo, gt TABLE");
     }
-    if (left instanceof types_1.Hex || right instanceof types_1.Hex) {
+    if (left instanceof types_1.Hex || right instanceof types_1.Hex || left instanceof types_1.HexUInt8 || right instanceof types_1.HexUInt8) {
         return gt_with_hex(left, right);
     }
     if (left instanceof types_1.Integer8 || right instanceof types_1.Integer8) {
@@ -79,6 +79,7 @@ function gt_with_hex(left, right) {
     return left_hex > right_hex;
 }
 function get_hex_from_parameter(comparison_part) {
+    // todo: optimize?
     let hex_from_parameter = "";
     switch (typeof comparison_part) {
         case "number":
@@ -90,7 +91,10 @@ function get_hex_from_parameter(comparison_part) {
                 .join("");
             break;
         case "object":
-            if (comparison_part instanceof types_1.Hex) {
+            if (comparison_part instanceof types_1.Hex
+                || comparison_part instanceof types_1.XString
+                || comparison_part instanceof types_1.HexUInt8
+                || comparison_part instanceof types_1.Character) {
                 hex_from_parameter = comparison_part.get();
             }
             else if (comparison_part instanceof integer_1.Integer) {
@@ -99,12 +103,6 @@ function get_hex_from_parameter(comparison_part) {
                     hex_from_parameter = "0" + hex_from_parameter;
                 }
             }
-            else if (comparison_part instanceof types_1.Character) {
-                hex_from_parameter = comparison_part.get();
-            }
-            else if (comparison_part instanceof types_1.XString) {
-                hex_from_parameter = comparison_part.get();
-            }
             else {
                 throw new Error("runtime_todo, gt hex1");
             }

package/build/src/compare/initial.js

@@ -21,7 +21,7 @@ function initial(val) {
     else if (val instanceof types_1.Numc) {
         return val.get().match(REGEX_ZEROS) !== null;
     }
-    else if (val instanceof types_1.Hex) {
+    else if (val instanceof types_1.Hex || val instanceof types_1.HexUInt8) {
         return val.get().match(REGEX_ZEROS) !== null;
     }
     else if (val instanceof types_1.Time) {

package/build/src/offset_length.d.ts

@@ -12,5 +12,5 @@ export declare class OffsetLength {
     private readonly isHex;
     constructor(obj: ICharacter | Character | Hex | XString | Structure | FieldSymbol, options: IOffsetLengthOptions);
     get(): string;
-    set(value: ICharacter | string): void;
+    set(value: ICharacter | string | Hex | XString): void;
 }

package/build/src/offset_length.js

@@ -11,7 +11,7 @@ class OffsetLength {
                 throw new Error("GETWA_NOT_ASSIGNED");
             }
         }
-        this.isHex = this.obj instanceof types_1.Hex || this.obj instanceof types_1.XString;
+        this.isHex = this.obj instanceof types_1.Hex || this.obj instanceof types_1.XString || this.obj instanceof types_1.HexUInt8;
         if (options.offset) {
             if (typeof options.offset === "number") {
                 this.offset = options.offset;
@@ -62,16 +62,12 @@ class OffsetLength {
         else if (value instanceof types_1.Integer) {
             val = value.get() + "";
             if (this.isHex) {
-                val = Number(val).toString(16);
+                val = Number(val).toString(16).toUpperCase();
             }
         }
         else {
             val = value.get() + "";
         }
-        let old = this.obj instanceof types_1.Structure ? this.obj.getCharacter() : this.obj.get();
-        if (this.obj instanceof types_1.Character) {
-            old = old.padEnd(this.obj.getLength(), " ");
-        }
         if (this.length) {
             val = val.substr(0, this.length);
             if (this.isHex || this.obj instanceof types_1.Time) {
@@ -81,20 +77,27 @@ class OffsetLength {
                 val = val.padEnd(this.length, " ");
             }
         }
-        if (this.length && this.offset) {
-            old = old.substr(0, this.offset) + val + old.substr(this.offset + this.length);
-        }
-        else if (this.length) {
-            old = val + old.substr(this.length);
-        }
-        else if (this.offset) {
-            old = old.substr(0, this.offset) + val;
+        if (this.isHex === true && this.obj instanceof types_1.HexUInt8) {
+            let base = this.offset ? this.offset / 2 : 0;
+            for (let current = 0; current < val.length; current += 2) {
+                const v = Number.parseInt(val.substr(current, 2), 16);
+                this.obj.setOffset(base, v);
+                base++;
+            }
         }
-        old = old.trimEnd();
-        if (this.obj instanceof types_1.Character) {
-            old = old.padEnd(this.obj.getLength(), " ");
+        else {
+            let old = this.obj instanceof types_1.Structure ? this.obj.getCharacter() : this.obj.get();
+            if (this.length && this.offset) {
+                old = old.substr(0, this.offset) + val + old.substr(this.offset + this.length);
+            }
+            else if (this.length) {
+                old = val + old.substr(this.length);
+            }
+            else if (this.offset) {
+                old = old.substr(0, this.offset) + val;
+            }
+            this.obj.set(old);
         }
-        this.obj.set(old);
     }
 }
 exports.OffsetLength = OffsetLength;

package/build/src/operators/_parse.js

@@ -22,13 +22,16 @@ function parse(val) {
     else if (val instanceof types_1.Float) {
         return val.getRaw();
     }
-    else if (val instanceof xstring_1.XString || val instanceof types_1.Hex) {
+    else if (val instanceof xstring_1.XString) {
         if (val.get() === "") {
             return 0;
         }
+        return parseInt(val.get(), 16);
+    }
+    else if (val instanceof types_1.Hex || val instanceof types_1.HexUInt8) {
         let num = parseInt(val.get(), 16);
         // handle two complement,
-        if (val instanceof types_1.Hex && val.getLength() >= 4) {
+        if (val.getLength() >= 4) {
             const maxVal = Math.pow(2, val.get().length / 2 * 8);
             if (num > maxVal / 2 - 1) {
                 num = num - maxVal;

package/build/src/operators/divide.d.ts

@@ -1,4 +1,4 @@
 import { Float, Integer, Integer8 } from "../types";
 import { ICharacter } from "../types/_character";
 import { INumeric } from "../types/_numeric";
-export declare function divide(left: INumeric | ICharacter | Integer8 | string | number, right: INumeric | ICharacter | Integer8 | string | number): Integer | Float | Integer8;
+export declare function divide(left: INumeric | ICharacter | Integer8 | string | number, right: INumeric | ICharacter | Integer8 | string | number): Integer | Integer8 | Float;

package/build/src/operators/multiply.d.ts

@@ -1,4 +1,4 @@
 import { Float, Integer, Integer8 } from "../types";
 import { ICharacter } from "../types/_character";
 import { INumeric } from "../types/_numeric";
-export declare function multiply(left: INumeric | ICharacter | string | Integer8 | number, right: INumeric | ICharacter | string | Integer8 | number): Integer | Float | Integer8;
+export declare function multiply(left: INumeric | ICharacter | string | Integer8 | number, right: INumeric | ICharacter | string | Integer8 | number): Integer | Integer8 | Float;

package/build/src/operators/power.d.ts

@@ -1,4 +1,4 @@
 import { Float, Integer8 } from "../types";
 import { ICharacter } from "../types/_character";
 import { INumeric } from "../types/_numeric";
-export declare function power(left: INumeric | ICharacter | Integer8 | string | number, right: INumeric | ICharacter | Integer8 | string | number): Float | Integer8;
+export declare function power(left: INumeric | ICharacter | Integer8 | string | number, right: INumeric | ICharacter | Integer8 | string | number): Integer8 | Float;

package/build/src/statements/describe.js

@@ -33,7 +33,7 @@ function describe(input) {
         else if (input.field instanceof types_1.Numc) {
             input.type.set("N");
         }
-        else if (input.field instanceof types_1.Hex) {
+        else if (input.field instanceof types_1.Hex || input.field instanceof types_1.HexUInt8) {
             input.type.set("X");
         }
         else if (input.field instanceof types_1.Packed) {
@@ -68,6 +68,7 @@ function describe(input) {
         if (input.field instanceof types_1.Character
             || input.field instanceof types_1.Packed
             || input.field instanceof types_1.Numc
+            || input.field instanceof types_1.HexUInt8
             || input.field instanceof types_1.Hex) {
             input.length.set(input.field.getLength());
         }

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

@@ -1,4 +1,4 @@
-import { Hex, XString } from "../types";
+import { Hex, HexUInt8, XString } from "../types";
 import { ICharacter } from "../types/_character";
 import { INumeric } from "../types/_numeric";
-export declare function getBit(number: INumeric, hex: XString | Hex, output: ICharacter): void;
+export declare function getBit(number: INumeric, hex: XString | Hex | HexUInt8, output: ICharacter): void;

package/build/src/statements/get_bit.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBit = void 0;
 function getBit(number, hex, output) {
+    // todo: optimize for HexUInt8
     const charIndex = Math.floor((number.get() - 1) / 8);
     const bitIndex = (number.get() - 1) % 8;
     if (bitIndex < 0) {

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

@@ -1,4 +1,4 @@
-import { Hex, XString } from "../types";
+import { Hex, HexUInt8, XString } from "../types";
 import { ICharacter } from "../types/_character";
 import { INumeric } from "../types/_numeric";
-export declare function setBit(number: INumeric, hex: XString | Hex, val?: INumeric | ICharacter): void;
+export declare function setBit(number: INumeric, hex: XString | Hex | HexUInt8, val?: INumeric | ICharacter): void;

package/build/src/statements/set_bit.js

@@ -5,6 +5,7 @@ function setBit(number, hex, val) {
     if (number.get() <= 0) {
         throw new Error("BIT_OFFSET_NOT_POSITIVE");
     }
+    // todo: optimize for HexUInt8
     const hexFull = hex.get();
     const fullByteLength = Math.ceil(hexFull.length / 2);
     const byteNum = Math.ceil(number.get() / 8);

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

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

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

@@ -17,7 +17,7 @@ export declare class FieldSymbol {
     unassign(): void;
     isAssigned(): boolean;
     getPointer(): any;
-    dereference(): INumeric | ICharacter | Float | import("packages/runtime/src/types").Integer8 | ABAPObject | Table | Structure | undefined;
+    dereference(): INumeric | ICharacter | import("packages/runtime/src/types").Integer8 | Float | ABAPObject | Table | Structure | undefined;
     clear(): void | Structure | undefined;
     get(): any;
     appendInitial(): import("./table").TableRowType | undefined;

package/build/src/types/field_symbol.js

@@ -6,6 +6,7 @@ const string_1 = require("./string");
 const hex_1 = require("./hex");
 const float_1 = require("./float");
 const data_reference_1 = require("./data_reference");
+const hex_uint8_1 = require("./hex_uint8");
 class FieldSymbol {
     constructor(type) {
         this.pointer = undefined;
@@ -49,7 +50,7 @@ class FieldSymbol {
     }
     get() {
         if (this.casting) {
-            if (this.type instanceof hex_1.Hex) {
+            if (this.type instanceof hex_1.Hex || this.type instanceof hex_uint8_1.HexUInt8) {
                 const pt = this.pointer;
                 if (pt instanceof float_1.Float) {
                     const buf = Buffer.allocUnsafe(8);

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

@@ -13,7 +13,7 @@ export declare class Hex implements ICharacter {
         qualifiedName?: string;
     });
     getQualifiedName(): string | undefined;
-    set(value: ICharacter | INumeric | string | number | Integer | Integer8 | Float): Hex;
+    set(value: ICharacter | INumeric | string | number | Integer | Integer8 | Float | Hex | XString): Hex;
     getLength(): number;
     clear(): void;
     get(): string;

package/build/src/types/hex.js

@@ -6,6 +6,7 @@ const float_1 = require("./float");
 const xstring_1 = require("./xstring");
 const throw_error_1 = require("../throw_error");
 const integer8_1 = require("./integer8");
+const REGEXP = /^(?![A-F0-9])/;
 class Hex {
     constructor(input) {
         this.length = input?.length ? input?.length : 1;
@@ -16,6 +17,7 @@ class Hex {
         return this.qualifiedName;
     }
     set(value) {
+        const doubleLength = this.length * 2;
         if (typeof value === "string") {
             this.value = value;
         }
@@ -23,57 +25,56 @@ class Hex {
             const maxVal = Math.pow(2, this.length * 8);
             if (value < 0) {
                 let hex = Math.round(value + 0x100000000).toString(16).toUpperCase();
-                if (hex.length > this.length * 2) {
-                    hex = hex.substring(hex.length - this.length * 2);
+                if (hex.length > doubleLength) {
+                    hex = hex.substring(hex.length - doubleLength);
                 }
                 this.value = hex;
             }
             else if (value >= maxVal) {
                 const sub = value % maxVal;
-                this.value = Math.round(sub).toString(16);
+                this.value = Math.round(sub).toString(16).toUpperCase();
             }
             else {
-                this.value = Math.round(value).toString(16);
+                this.value = Math.round(value).toString(16).toUpperCase();
             }
-            this.value = this.value.padStart(this.length * 2, "0");
+            this.value = this.value.padStart(doubleLength, "0");
         }
         else if (value instanceof integer8_1.Integer8) {
             let hex = "";
             if (value.get() < 0) {
                 hex = (value.get() + 0x10000000000000000n).toString(16).toUpperCase();
-                if (hex.length > this.length * 2) {
-                    hex = hex.substring(hex.length - this.length * 2);
+                if (hex.length > doubleLength) {
+                    hex = hex.substring(hex.length - doubleLength);
                 }
             }
             else {
                 hex = value.get().toString(16).toUpperCase();
-                hex = hex.padStart(this.length * 2, "0");
+                hex = hex.padStart(doubleLength, "0");
             }
-            this.set(hex);
+            return this.set(hex);
         }
         else {
-            let v = value.get();
+            const v = value.get();
             if (value instanceof float_1.Float) {
-                v = value.getRaw();
-                this.set(v);
+                return this.set(value.getRaw());
             }
             else if (typeof v === "number") {
-                this.set(v);
+                return this.set(v);
             }
             else {
                 this.value = v;
-                if (this.value.match(/^(?![A-F0-9])/)) {
+                if (this.value.match(REGEXP)) {
                     this.value = "";
                 }
             }
         }
-        if (this.value.length > this.length * 2) {
-            this.value = this.value.substr(0, this.length * 2);
+        if (this.value.length > doubleLength) {
+            this.value = this.value.substr(0, doubleLength);
         }
-        if (this.value.length < this.length * 2) {
-            this.value = this.value.padEnd(this.length * 2, "0");
+        else if (this.value.length < doubleLength) {
+            this.value = this.value.padEnd(doubleLength, "0");
         }
-        this.value = this.value.toUpperCase();
+        //    this.value = this.value.toUpperCase(); // todo, for some reason abapNTLM needs this? investigate
         return this;
     }
     getLength() {

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

@@ -0,0 +1,26 @@
+import { Float } from "./float";
+import { Integer } from "./integer";
+import { XString } from "./xstring";
+import { ICharacter } from "./_character";
+import { INumeric } from "./_numeric";
+import { Integer8 } from "./integer8";
+import { Hex } from "./hex";
+export declare class HexUInt8 implements ICharacter {
+    private value;
+    private readonly length;
+    private readonly qualifiedName;
+    constructor(input?: {
+        length?: number;
+        qualifiedName?: string;
+    });
+    getQualifiedName(): string | undefined;
+    setOffset(offset: number, value: number): void;
+    set(value: ICharacter | INumeric | string | number | Integer | Integer8 | Float | Hex | XString): HexUInt8;
+    getLength(): number;
+    clear(): void;
+    get(): string;
+    getOffset(input: {
+        offset?: number | INumeric | Hex | Integer8;
+        length?: number | INumeric | Hex | Integer8;
+    }): XString;
+}

package/build/src/types/hex_uint8.js

@@ -0,0 +1,148 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HexUInt8 = void 0;
+const _parse_1 = require("../operators/_parse");
+const float_1 = require("./float");
+const xstring_1 = require("./xstring");
+const throw_error_1 = require("../throw_error");
+const integer8_1 = require("./integer8");
+const REGEXP = /^(?![A-F0-9])/;
+class HexUInt8 {
+    constructor(input) {
+        this.length = input?.length ? input?.length : 1;
+        this.qualifiedName = input?.qualifiedName;
+        this.value = new Uint8Array(this.length);
+    }
+    getQualifiedName() {
+        return this.qualifiedName;
+    }
+    setOffset(offset, value) {
+        // caller must validate offset
+        this.value[offset] = value;
+    }
+    set(value) {
+        let hexString = "";
+        if (typeof value === "string") {
+            hexString = value;
+            if (hexString.length < this.length * 2) {
+                hexString = hexString.padEnd(this.length * 2, "0");
+            }
+        }
+        else if (typeof value === "number") {
+            const maxVal = Math.pow(2, this.length * 8);
+            if (value < 0) {
+                hexString = Math.round(value + 0x100000000).toString(16).toUpperCase();
+            }
+            else if (value >= maxVal) {
+                const sub = value % maxVal;
+                hexString = Math.round(sub).toString(16).toUpperCase();
+            }
+            else {
+                hexString = Math.round(value).toString(16).toUpperCase();
+            }
+            if (hexString.length > this.length * 2) {
+                hexString = hexString.substring(hexString.length - this.length * 2);
+            }
+            else if (hexString.length < this.length * 2) {
+                hexString = hexString.padStart(this.length * 2, "0");
+            }
+        }
+        else if (value instanceof integer8_1.Integer8) {
+            if (value.get() < 0) {
+                hexString = (value.get() + 0x10000000000000000n).toString(16).toUpperCase();
+            }
+            else {
+                hexString = value.get().toString(16).toUpperCase();
+            }
+            if (hexString.length > this.length * 2) {
+                hexString = hexString.substring(hexString.length - this.length * 2);
+            }
+            else if (hexString.length < this.length * 2) {
+                hexString = hexString.padStart(this.length * 2, "0");
+            }
+        }
+        else {
+            const v = value.get();
+            if (value instanceof float_1.Float) {
+                return this.set(value.getRaw());
+            }
+            else if (typeof v === "number") {
+                return this.set(v);
+            }
+            else {
+                hexString = v;
+                if (hexString.match(REGEXP)) {
+                    hexString = "";
+                }
+                if (hexString.length < this.length * 2) {
+                    hexString = hexString.padEnd(this.length * 2, "0");
+                }
+            }
+        }
+        if (hexString.length > this.length * 2) {
+            hexString = hexString.substring(0, this.length * 2);
+        }
+        this.value = Uint8Array.from(Buffer.from(hexString, "hex"));
+        return this;
+    }
+    getLength() {
+        return this.length;
+    }
+    clear() {
+        // optimize? https://gist.github.com/chrisj/872283d15e1bb460a4766a52f50ebcf6
+        for (let i = 0; i < this.value.length; i++) {
+            this.value[i] = 0;
+        }
+    }
+    get() {
+        return Buffer.from(this.value).toString("hex").toUpperCase();
+    }
+    getOffset(input) {
+        let offset = input?.offset;
+        if (offset) {
+            if (offset instanceof integer8_1.Integer8) {
+                offset = Number(offset.get());
+            }
+            else {
+                offset = (0, _parse_1.parse)(offset);
+            }
+            if (offset > this.length
+                || offset < 0) {
+                (0, throw_error_1.throwError)("CX_SY_RANGE_OUT_OF_BOUNDS");
+            }
+        }
+        else {
+            offset = 0;
+        }
+        let length = input?.length;
+        if (length) {
+            if (length instanceof integer8_1.Integer8) {
+                length = Number(length.get());
+            }
+            else {
+                length = (0, _parse_1.parse)(length);
+            }
+            if (length > this.length
+                || length < 0) {
+                (0, throw_error_1.throwError)("CX_SY_RANGE_OUT_OF_BOUNDS");
+            }
+        }
+        if (offset !== undefined && length !== undefined) {
+            if (offset + length > this.length) {
+                (0, throw_error_1.throwError)("CX_SY_RANGE_OUT_OF_BOUNDS");
+            }
+        }
+        // not sure how this works: without copying, https://nodejs.org/api/buffer.html#static-method-bufferfromarraybuffer-byteoffset-length
+        /*
+            console.dir(offset);
+            console.dir(length);
+            console.dir(this.value.subarray(offset, length ? offset + length : undefined));
+            console.dir(Buffer.from(this.value.subarray(offset, length ? offset + length : undefined)));
+        */
+        const str = Buffer.from(this.value.subarray(offset, length ? offset + length : undefined)).toString("hex")
+            .toUpperCase();
+        return new xstring_1.XString().set(str);
+    }
+}
+exports.HexUInt8 = HexUInt8;
+//# sourceMappingURL=hex_uint8.js.map

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

@@ -6,6 +6,7 @@ export * from "./decfloat34";
 export * from "./field_symbol";
 export * from "./float";
 export * from "./hex";
+export * from "./hex_uint8";
 export * from "./integer";
 export * from "./integer8";
 export * from "./numc";

package/build/src/types/index.js

@@ -22,6 +22,7 @@ __exportStar(require("./decfloat34"), exports);
 __exportStar(require("./field_symbol"), exports);
 __exportStar(require("./float"), exports);
 __exportStar(require("./hex"), exports);
+__exportStar(require("./hex_uint8"), exports);
 __exportStar(require("./integer"), exports);
 __exportStar(require("./integer8"), exports);
 __exportStar(require("./numc"), exports);

package/build/src/types/integer.js

@@ -6,6 +6,7 @@ const float_1 = require("./float");
 const hex_1 = require("./hex");
 const xstring_1 = require("./xstring");
 const integer8_1 = require("./integer8");
+const hex_uint8_1 = require("./hex_uint8");
 exports.DIGITS = new RegExp(/^\s*-?\+?\d+\.?\d* *$/i);
 exports.MAX_INTEGER = 2147483647;
 exports.MIN_INTEGER = -2147483648;
@@ -56,10 +57,11 @@ class Integer {
         else if (value instanceof float_1.Float) {
             this.set(Math.round(value.getRaw()));
         }
-        else if (value instanceof hex_1.Hex || value instanceof xstring_1.XString) {
+        else if (value instanceof hex_1.Hex || value instanceof xstring_1.XString || value instanceof hex_uint8_1.HexUInt8) {
             let num = parseInt(value.get(), 16);
             // handle two complement,
-            if (value instanceof hex_1.Hex && value.getLength() >= 4) {
+            if ((value instanceof hex_1.Hex || value instanceof hex_uint8_1.HexUInt8)
+                && value.getLength() >= 4) {
                 const maxVal = Math.pow(2, value.get().length / 2 * 8);
                 if (num > maxVal / 2 - 1) {
                     num = num - maxVal;

package/build/src/types/integer8.js

@@ -8,6 +8,7 @@ const xstring_1 = require("./xstring");
 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 digits = new RegExp(/^\s*-?\+?\d+\.?\d* *$/i);
 class Integer8 {
     constructor(input) {
@@ -39,7 +40,7 @@ class Integer8 {
         else if (value instanceof float_1.Float) {
             this.set(Math.round(value.getRaw()));
         }
-        else if (value instanceof hex_1.Hex || value instanceof xstring_1.XString) {
+        else if (value instanceof hex_1.Hex || value instanceof xstring_1.XString || value instanceof hex_uint8_1.HexUInt8) {
             if (value.get().length === 16) {
                 const lv_bit = new character_1.Character();
                 (0, get_bit_1.getBit)(new integer_1.Integer().set(1), value, lv_bit);

package/build/src/types/xstring.js

@@ -17,11 +17,12 @@ class XString {
     set(value) {
         if (typeof value === "string") {
             this.value = value;
-            const finalLength = Math.ceil(this.value.length / 2) * 2;
-            this.value = this.value.padEnd(finalLength, "0");
+            if (this.value.length % 2 === 1) {
+                this.value = this.value + "0";
+            }
         }
         else if (typeof value === "number") {
-            this.value = Math.round(value).toString(16);
+            this.value = Math.round(value).toString(16).toUpperCase();
             if (this.value.length % 2 === 1) {
                 this.value = "0" + this.value;
             }
@@ -36,9 +37,10 @@ class XString {
                 this.set(value.getTrimEnd());
             }
             else if (typeof v === "number") {
-                this.value = v.toString(16);
-                const finalLength = Math.ceil(this.value.length / 2) * 2;
-                this.value = this.value.padStart(finalLength, "0");
+                this.value = v.toString(16).toUpperCase();
+                if (this.value.length % 2 === 1) {
+                    this.value = "0" + this.value;
+                }
             }
             else {
                 this.set(v);

package/package.json

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