@abaplint/runtime 2.3.39 → 2.3.41

package/build/src/abap_regex.js

@@ -5,7 +5,10 @@ class ABAPRegExp {
     // converts from ABAP specific regex to javascript regex
     static convert(input) {
         let ret = input;
-        ret = input.replace(/\[\[:punct:\]\]/g, "[@%\\.\\,\\-\\{\\}\\[\\]\\:\\!\\?\\(\\)\\;\\']");
+        ret = ret.replace(/\[\[:punct:\]\]/g, "[@%\\.\\,\\-\\{\\}\\[\\]\\:\\!\\?\\(\\)\\;\\']");
+        // https://github.com/micromatch/posix-character-classes#posix-character-classes
+        ret = ret.replace(/\[\^\[:print:\]\]/g, "[\\x00-\\x1F\\x7F]");
+        ret = ret.replace("[[:space:]]", "\\s");
         return ret;
     }
 }

package/build/src/builtin/nmax.d.ts

@@ -1,5 +1,5 @@
 import { INumeric } from "../types/_numeric";
-import { Integer } from "../types/integer";
+import { Float } from "../types";
 export interface INmaxInput {
     val1: number | INumeric;
     val2: number | INumeric;
@@ -11,4 +11,4 @@ export interface INmaxInput {
     val8?: number | INumeric;
     val9?: number | INumeric;
 }
-export declare function nmax(input: INmaxInput): Integer;
+export declare function nmax(input: INmaxInput): Float;

package/build/src/builtin/nmax.js

@@ -1,42 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nmax = void 0;
-const integer_1 = require("../types/integer");
+const _parse_1 = require("../operators/_parse");
+const types_1 = require("../types");
 function nmax(input) {
     const values = [];
-    values.push(get_nmax_val_input(input.val1));
-    values.push(get_nmax_val_input(input.val2));
+    values.push((0, _parse_1.parse)(input.val1));
+    values.push((0, _parse_1.parse)(input.val2));
     if (input.val3) {
-        values.push(get_nmax_val_input(input.val3));
+        values.push((0, _parse_1.parse)(input.val3));
     }
     if (input.val4) {
-        values.push(get_nmax_val_input(input.val4));
+        values.push((0, _parse_1.parse)(input.val4));
     }
     if (input.val5) {
-        values.push(get_nmax_val_input(input.val5));
+        values.push((0, _parse_1.parse)(input.val5));
     }
     if (input.val6) {
-        values.push(get_nmax_val_input(input.val6));
+        values.push((0, _parse_1.parse)(input.val6));
     }
     if (input.val7) {
-        values.push(get_nmax_val_input(input.val7));
+        values.push((0, _parse_1.parse)(input.val7));
     }
     if (input.val8) {
-        values.push(get_nmax_val_input(input.val8));
+        values.push((0, _parse_1.parse)(input.val8));
     }
     if (input.val9) {
-        values.push(get_nmax_val_input(input.val9));
+        values.push((0, _parse_1.parse)(input.val9));
     }
     values.sort((a, b) => (b - a));
-    return new integer_1.Integer().set(values[0]);
+    return new types_1.Float().set(values[0]);
 }
 exports.nmax = nmax;
-function get_nmax_val_input(val) {
-    if (typeof val === "number") {
-        return val;
-    }
-    else {
-        return val.get();
-    }
-}
 //# sourceMappingURL=nmax.js.map

package/build/src/builtin/nmin.d.ts

@@ -1,5 +1,5 @@
 import { INumeric } from "../types/_numeric";
-import { Integer } from "../types/integer";
+import { Float } from "../types";
 export interface INminInput {
     val1: number | INumeric;
     val2: number | INumeric;
@@ -11,4 +11,4 @@ export interface INminInput {
     val8?: number | INumeric;
     val9?: number | INumeric;
 }
-export declare function nmin(input: INminInput): Integer;
+export declare function nmin(input: INminInput): Float;

package/build/src/builtin/nmin.js

@@ -1,42 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nmin = void 0;
-const integer_1 = require("../types/integer");
+const _parse_1 = require("../operators/_parse");
+const types_1 = require("../types");
 function nmin(input) {
     const values = [];
-    values.push(get_nmin_val_input(input.val1));
-    values.push(get_nmin_val_input(input.val2));
+    values.push((0, _parse_1.parse)(input.val1));
+    values.push((0, _parse_1.parse)(input.val2));
     if (input.val3) {
-        values.push(get_nmin_val_input(input.val3));
+        values.push((0, _parse_1.parse)(input.val3));
     }
     if (input.val4) {
-        values.push(get_nmin_val_input(input.val4));
+        values.push((0, _parse_1.parse)(input.val4));
     }
     if (input.val5) {
-        values.push(get_nmin_val_input(input.val5));
+        values.push((0, _parse_1.parse)(input.val5));
     }
     if (input.val6) {
-        values.push(get_nmin_val_input(input.val6));
+        values.push((0, _parse_1.parse)(input.val6));
     }
     if (input.val7) {
-        values.push(get_nmin_val_input(input.val7));
+        values.push((0, _parse_1.parse)(input.val7));
     }
     if (input.val8) {
-        values.push(get_nmin_val_input(input.val8));
+        values.push((0, _parse_1.parse)(input.val8));
     }
     if (input.val9) {
-        values.push(get_nmin_val_input(input.val9));
+        values.push((0, _parse_1.parse)(input.val9));
     }
     values.sort((a, b) => (a - b));
-    return new integer_1.Integer().set(values[0]);
+    return new types_1.Float().set(values[0]);
 }
 exports.nmin = nmin;
-function get_nmin_val_input(val) {
-    if (typeof val === "number") {
-        return val;
-    }
-    else {
-        return val.get();
-    }
-}
 //# sourceMappingURL=nmin.js.map

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

@@ -1,10 +1,10 @@
-import { Structure, Table } from "../types";
+import { ABAPObject, Structure, Table } from "../types";
 import { ICharacter } from "../types/_character";
 import { INumeric } from "../types/_numeric";
 export interface IFindOptions {
     find?: ICharacter | string;
     first?: boolean;
-    regex?: string | ICharacter;
+    regex?: string | ICharacter | ABAPObject;
     offset?: INumeric;
     sectionOffset?: INumeric;
     byteMode?: boolean;

package/build/src/statements/find.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.find = void 0;
+const abap_regex_1 = require("../abap_regex");
 const types_1 = require("../types");
 function find(input, options) {
     var _a, _b, _c, _d, _e, _f, _g;
@@ -38,11 +39,22 @@ function find(input, options) {
         if (typeof r !== "string") {
             r = r.get();
         }
-        // check type, it can also be a CL_ABAP_REGEX
         if (typeof r === "string") {
-            r = r.replace("[[:space:]]", "\\s");
+            r = abap_regex_1.ABAPRegExp.convert(r);
         }
-        s = new RegExp(r, "g" + (options.ignoringCase === true ? "i" : ""));
+        else if (r.constructor.name === "cl_abap_regex") {
+            const obj = r;
+            // @ts-ignore
+            r = obj.mv_pattern.get();
+            // @ts-ignore
+            if (obj.mv_ignore_case.get() === "X") {
+                options.ignoringCase = true;
+            }
+        }
+        else {
+            throw "find(), unexpected input";
+        }
+        s = new RegExp(r, "gm" + (options.ignoringCase === true ? "i" : ""));
     }
     else {
         throw "FIND, runtime, no input";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/runtime",
-  "version": "2.3.39",
+  "version": "2.3.41",
   "description": "Transpiler - Runtime",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -28,9 +28,9 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@types/chai": "^4.3.3",
+    "@types/chai": "^4.3.4",
     "@types/mocha": "^10.0.0",
-    "chai": "^4.3.6",
+    "chai": "^4.3.7",
     "mocha": "^10.1.0",
     "source-map-support": "^0.5.21",
     "typescript": "^4.8.4"