2.10.7: fix REPLACEMENT COUNT + bugfix DELETE internal (#1454)

package.json

@@ -186,10 +186,10 @@
     },
     "homepage": "https://github.com/abaplint/transpiler_poc#readme",
     "devDependencies": {
-        "@abaplint/core": "^2.112.9",
+        "@abaplint/core": "^2.112.10",
         "@types/chai": "^4.3.17",
         "@types/mocha": "^10.0.7",
-        "@types/node": "^22.0.2",
+        "@types/node": "^22.1.0",
         "@types/sql.js": "^1.4.9",
         "@typescript-eslint/eslint-plugin": "^7.18.0",
         "@typescript-eslint/parser": "^7.18.0",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.10.6",
+  "version": "2.10.7",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -26,12 +26,12 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.10.6",
+    "@abaplint/transpiler": "^2.10.7",
     "@types/glob": "^8.1.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.7",
-    "@types/node": "^22.0.2",
-    "@abaplint/core": "^2.112.9",
+    "@types/node": "^22.1.0",
+    "@abaplint/core": "^2.112.10",
     "progress": "^2.0.3",
     "webpack": "^5.93.0",
     "webpack-cli": "^5.1.4",

packages/runtime/package.json

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

packages/runtime/src/statements/delete_internal.ts

@@ -4,7 +4,7 @@ import {INumeric} from "../types/_numeric";
 import {loop} from "./loop";
 
 export interface IDeleteInternalOptions {
-  where?: (i: any) => boolean,
+  where?: (i: any) => Promise<boolean>,
   index?: INumeric,
   adjacent?: boolean,
   comparing?: string[],
@@ -98,7 +98,7 @@ export async function deleteInternal(target: Table | HashedTable | FieldSymbol,
 
     if (options?.where) {
       const row = i instanceof Structure ? i.get() : {table_line: i};
-      if (options.where(row) === true) {
+      if (await options.where(row) === true) {
         if (target instanceof HashedTable) {
           target.deleteFrom(i);
         } else {

packages/runtime/src/statements/replace.ts

@@ -9,6 +9,7 @@ export type replaceInput = {
   sectionLength?: INumeric,
   sectionOffset?: INumeric,
   replacementLength?: INumeric,
+  replacementCount?: INumeric,
   regex?: ICharacter,
   pcre?: ICharacter,
   all: boolean,
@@ -53,7 +54,8 @@ export function replace(input: replaceInput): void {
     search = new RegExp(regex, ignoreCase + allOccurrences);
     found = temp.match(search) !== null;
   } else if (input.pcre) {
-    const regex = ABAPRegExp.convert(input.pcre.get());
+    const str = input.pcre.get();
+    const regex = ABAPRegExp.convert(str);
     if (regex.length === 0 && input.all === true) {
       throw "REPLACE, zero length input";
     }
@@ -96,6 +98,11 @@ export function replace(input: replaceInput): void {
     input.replacementLength.set(replacement.length);
   }
 
+  if (input.replacementCount) {
+    const match = temp.match(search);
+    input.replacementCount.set(match?.length || 0);
+  }
+
   temp = temp.replace(search, rr);
 
   const subrc = found ? 0 : 4;