@abaplint/runtime 2.0.2 → 2.0.3

package/build/src/builtin/insert.js

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.insert = void 0;
 const types_1 = require("../types");
 function insert(input) {
-    let value = input.val.get();
     let offset = 0;
     if (input.off) {
         offset = input.off.get();
     }
-    value = value.substring(0, offset) + input.sub.get() + value.substring(offset);
+    const value = input.val.getOffset({ offset: 0, length: offset }).get() +
+        input.sub.get() +
+        input.val.getOffset({ offset: offset }).get();
     return new types_1.String().set(value);
 }
 exports.insert = insert;

package/build/src/builtin/replace.js

@@ -34,11 +34,18 @@ function replace(input) {
     else if (input.regex) {
         sub = input.regex.get();
     }
-    if (input.off && input.len) {
+    if (input.off && input.len && typeof input.val === "string") {
         const offset = input.off.get();
         const length = input.len.get();
         val = val.substring(0, offset) + wi + val.substring(offset + length);
     }
+    else if (input.off && input.len && !(typeof input.val === "string")) {
+        const offset = input.off.get();
+        const length = input.len.get();
+        val = input.val.getOffset({ offset: 0, length: offset }).get() +
+            wi +
+            input.val.getOffset({ offset: offset + length }).get();
+    }
     else if (input.occ === undefined && sub && wi) {
         val = val.replace(sub, wi);
     }

package/build/src/builtin/substring.js

@@ -4,13 +4,18 @@ exports.substring = void 0;
 const string_1 = require("../types/string");
 function substring(input) {
     var _a, _b;
-    const val = typeof input.val === "string" ? input.val : input.val.get();
     let off = (_a = input === null || input === void 0 ? void 0 : input.off) === null || _a === void 0 ? void 0 : _a.get();
     if (off === undefined) {
         off = 0;
     }
     const len = (_b = input === null || input === void 0 ? void 0 : input.len) === null || _b === void 0 ? void 0 : _b.get();
-    const sub = val.substr(off, len);
+    let sub = "";
+    if (typeof input.val === "string") {
+        sub = input.val.substr(off, len);
+    }
+    else {
+        sub = input.val.getOffset({ offset: off, length: len }).get();
+    }
     return new string_1.String().set(sub);
 }
 exports.substring = substring;

package/build/src/compare/initial.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initial = void 0;
 const types_1 = require("../types");
 function initial(val) {
+    // todo, refactor? add as method in each type instead?
     if (val instanceof types_1.Table) {
         return val.array().length === 0;
     }

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

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

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

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

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

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

package/build/src/statements/shift.js

@@ -47,13 +47,11 @@ function shift_character_mode(target, options) {
             value = value.substr(index);
         }
     }
+    else if (options === null || options === void 0 ? void 0 : options.circular) {
+        value = value.substr(1) + value.substr(0, 1);
+    }
     else {
-        if (options === null || options === void 0 ? void 0 : options.circular) {
-            value = value.substr(1) + value.substr(0, 1);
-        }
-        else {
-            value = value.substr(1);
-        }
+        value = value.substr(1);
     }
     target.set(value);
 }
@@ -91,6 +89,12 @@ function shift_byte_mode(target, options) {
             value = value.substr(index);
         }
     }
+    else if (options === null || options === void 0 ? void 0 : options.circular) {
+        value = value.substr(2) + value.substr(0, 2);
+    }
+    else {
+        value = value.substr(2);
+    }
     target.set(value);
 }
 //# sourceMappingURL=shift.js.map

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

@@ -2,4 +2,8 @@ export interface ICharacter {
     set(value: ICharacter | string): void;
     get(): string;
     clear(): void;
+    getOffset(input: {
+        offset?: number;
+        length?: number;
+    }): ICharacter;
 }

package/build/src/types/character.js

@@ -3,9 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Character = void 0;
 class Character {
     constructor(input) {
-        this.value = "";
         this.length = (input === null || input === void 0 ? void 0 : input.length) ? input === null || input === void 0 ? void 0 : input.length : 1;
+        if (this.length <= 0) {
+            throw "Character, invalid length";
+        }
         this.qualifiedName = input === null || input === void 0 ? void 0 : input.qualifiedName;
+        this.clear();
     }
     set(value) {
         if (typeof value === "string" || typeof value === "number") {
@@ -16,6 +19,9 @@ class Character {
         }
         if (this.value.length > this.length) {
             this.value = this.value.substr(0, this.length);
+            // todo, maintain consistent length
+            //    } else if (this.value.length < this.length) {
+            //      this.value.padEnd(this.length, " ");
         }
         return this;
     }
@@ -26,12 +32,24 @@ class Character {
         return this.length;
     }
     clear() {
+        // todo, maintain consistent length
+        //    this.value = " ".repeat(this.length);
         this.value = "";
     }
     get() {
         return this.value;
     }
     getOffset(input) {
+        if (input.offset && input.offset >= this.length) {
+            // @ts-ignore
+            if (abap.Classes["CX_SY_RANGE_OUT_OF_BOUNDS"] !== undefined) {
+                // @ts-ignore
+                throw new abap.Classes["CX_SY_RANGE_OUT_OF_BOUNDS"]();
+            }
+            else {
+                throw "Global class CX_SY_RANGE_OUT_OF_BOUNDS not found";
+            }
+        }
         let ret = this.value;
         if (input === null || input === void 0 ? void 0 : input.offset) {
             ret = ret.substr(input.offset);

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

@@ -1,3 +1,5 @@
+import { Float } from "./float";
+import { Integer } from "./integer";
 import { XString } from "./xstring";
 import { ICharacter } from "./_character";
 import { INumeric } from "./_numeric";
@@ -7,7 +9,7 @@ export declare class Hex implements ICharacter {
     constructor(input?: {
         length?: number;
     });
-    set(value: ICharacter | INumeric | string | number): void;
+    set(value: ICharacter | INumeric | string | number | Integer | Float): void;
     getLength(): number;
     clear(): void;
     get(): string;

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

@@ -1,10 +1,11 @@
+import { Float } from "./float";
 import { Hex } from "./hex";
 import { ICharacter } from "./_character";
 import { INumeric } from "./_numeric";
 export declare class Integer implements INumeric {
     private value;
     constructor();
-    set(value: INumeric | ICharacter | Hex | string | number): this;
+    set(value: INumeric | ICharacter | Hex | string | number | Integer | Float): this;
     clear(): void;
     get(): number;
 }

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

@@ -11,4 +11,8 @@ export declare class Numc implements ICharacter {
     getLength(): number;
     clear(): void;
     get(): string;
+    getOffset(_input: {
+        offset?: number;
+        length?: number;
+    }): Numc;
 }

package/build/src/types/numc.js

@@ -37,6 +37,9 @@ class Numc {
     get() {
         return this.value;
     }
+    getOffset(_input) {
+        throw "todo, runtime, numc getOffset()";
+    }
 }
 exports.Numc = Numc;
 //# sourceMappingURL=numc.js.map

package/build/src/types/string.js

@@ -34,6 +34,16 @@ class String {
         return this.value;
     }
     getOffset(input) {
+        if (input.offset && input.offset > this.value.length) {
+            // @ts-ignore
+            if (abap.Classes["CX_SY_RANGE_OUT_OF_BOUNDS"] !== undefined) {
+                // @ts-ignore
+                throw new abap.Classes["CX_SY_RANGE_OUT_OF_BOUNDS"]();
+            }
+            else {
+                throw "Global class CX_SY_RANGE_OUT_OF_BOUNDS not found";
+            }
+        }
         let ret = this.value;
         if (input === null || input === void 0 ? void 0 : input.offset) {
             ret = ret.substr(input.offset);

package/package.json

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