@abaplint/runtime 2.8.11 → 2.8.13

package/build/src/offset_length.d.ts

@@ -1,4 +1,4 @@
-import { Character, Hex, Structure, XString } from "./types";
+import { Character, FieldSymbol, Hex, Structure, XString } from "./types";
 import { ICharacter } from "./types/_character";
 import { INumeric } from "./types/_numeric";
 export interface IOffsetLengthOptions {
@@ -10,7 +10,7 @@ export declare class OffsetLength {
     private readonly offset?;
     private readonly length?;
     private readonly isHex;
-    constructor(obj: ICharacter | Character | Hex | XString | Structure, options: IOffsetLengthOptions);
+    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

@@ -5,7 +5,13 @@ const types_1 = require("./types");
 class OffsetLength {
     constructor(obj, options) {
         this.obj = obj;
-        this.isHex = obj instanceof types_1.Hex || obj instanceof types_1.XString;
+        if (this.obj instanceof types_1.FieldSymbol) {
+            this.obj = this.obj.getPointer();
+            if (this.obj === undefined) {
+                throw new Error("GETWA_NOT_ASSIGNED");
+            }
+        }
+        this.isHex = this.obj instanceof types_1.Hex || this.obj instanceof types_1.XString;
         if (options.offset) {
             if (typeof options.offset === "number") {
                 this.offset = options.offset;
@@ -56,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) {
@@ -75,6 +77,7 @@ class OffsetLength {
                 val = val.padEnd(this.length, " ");
             }
         }
+        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);
         }
@@ -84,10 +87,6 @@ class OffsetLength {
         else if (this.offset) {
             old = old.substr(0, this.offset) + val;
         }
-        old = old.trimEnd();
-        if (this.obj instanceof types_1.Character) {
-            old = old.padEnd(this.obj.getLength(), " ");
-        }
         this.obj.set(old);
     }
 }

package/build/src/statements/set_bit.js

@@ -5,12 +5,8 @@ function setBit(number, hex, val) {
     if (number.get() <= 0) {
         throw new Error("BIT_OFFSET_NOT_POSITIVE");
     }
-    let hexFull = hex.get();
-    if (hexFull === "") {
-        hexFull = "00";
-    }
+    const hexFull = hex.get();
     const fullByteLength = Math.ceil(hexFull.length / 2);
-    hexFull = hexFull.padEnd(fullByteLength * 2, "0");
     const byteNum = Math.ceil(number.get() / 8);
     if (byteNum > fullByteLength) {
         return;

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/xstring.js

@@ -21,7 +21,7 @@ class XString {
             this.value = this.value.padEnd(finalLength, "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,7 +36,7 @@ class XString {
                 this.set(value.getTrimEnd());
             }
             else if (typeof v === "number") {
-                this.value = v.toString(16);
+                this.value = v.toString(16).toUpperCase();
                 const finalLength = Math.ceil(this.value.length / 2) * 2;
                 this.value = this.value.padStart(finalLength, "0");
             }

package/package.json

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