2.10.4: bugfix DELETE itab (#1450)

abaplint · Jul 8, 2024 · 91b1ecb · 91b1ecb
1 parent 77a6ff2
commit 91b1ecb
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 22 deletions.
diff --git a/packages/cli/package-lock.json b/packages/cli/package-lock.json
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.10.3",
+  "version": "2.10.4",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -26,7 +26,7 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.10.3",
+    "@abaplint/transpiler": "^2.10.4",
     "@types/glob": "^8.1.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.7",

diff --git a/packages/runtime/package-lock.json b/packages/runtime/package-lock.json
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/runtime",
-  "version": "2.10.3",
+  "version": "2.10.4",
   "description": "Transpiler - Runtime",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",

diff --git a/packages/transpiler/package-lock.json b/packages/transpiler/package-lock.json
diff --git a/packages/transpiler/package.json b/packages/transpiler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.10.3",
+  "version": "2.10.4",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",

diff --git a/packages/transpiler/src/statements/delete_internal.ts b/packages/transpiler/src/statements/delete_internal.ts
@@ -6,21 +6,28 @@ import {Chunk} from "../chunk";
 export class DeleteInternalTranspiler implements IStatementTranspiler {
 
   public transpile(node: abaplint.Nodes.StatementNode, traversal: Traversal): Chunk {
-    const target = traversal.traverse(node.findFirstExpression(abaplint.Expressions.Target)).getCode();
+    const target = traversal.traverse(node.findDirectExpression(abaplint.Expressions.Target)).getCode();
     const concat = node.concatTokens().toUpperCase();
 
     const extra: string[] = [];
-    const where = node.findFirstExpression(abaplint.Expressions.ComponentCond);
-    if (where) {
+
+    const componentCond = node.findDirectExpression(abaplint.Expressions.ComponentCond);
+    if (componentCond) {
       // todo, replacing "await" is a hack
-      extra.push("where: " + traversal.traverse(where).getCode().replace("await ", ""));
+      extra.push("where: " + traversal.traverse(componentCond).getCode().replace("await ", ""));
+    }
+
+    const componentCompare = node.findDirectExpression(abaplint.Expressions.ComponentCompare);
+    if (componentCompare) {
+      // todo: this can be optimized, WITH TABLE KEY
+      extra.push("where: " + traversal.traverse(componentCompare).getCode());
     }
 
 // todo, this is not completely correct, fields might have the name ADJACENT
 // comparisons should be on table key unless other is specified, but we're unaware
     if (node.findDirectTokenByText("ADJACENT")) {
       extra.push("adjacent: true");
-      if (node.findDirectTokenByText("COMPARING") && !node.concatTokens().toUpperCase().includes("COMPARING ALL FIELDS")) {
+      if (node.findDirectTokenByText("COMPARING") && !concat.includes("COMPARING ALL FIELDS")) {
         const comparing = node.findAllExpressions(abaplint.Expressions.FieldSub);
         if (comparing) {
           const compareFields = comparing.map(i => "'" + i.getFirstToken().getStr() + "'").join(",");

diff --git a/test/statements/delete_internal.ts b/test/statements/delete_internal.ts
@@ -470,4 +470,32 @@ ENDLOOP.`;
     expect(abap.console.get()).to.equal("6\n3\n10");
   });
 
+  it("DELETE, with table key", async () => {
+    const code = `
+TYPES: BEGIN OF ty,
+         foobar TYPE i,
+       END OF ty.
+TYPES ty_tt TYPE HASHED TABLE OF ty WITH UNIQUE KEY foobar.
+
+DATA itab TYPE ty_tt.
+DATA row LIKE LINE OF itab.
+
+row-foobar = 1.
+INSERT row INTO TABLE itab.
+row-foobar = 2.
+INSERT row INTO TABLE itab.
+row-foobar = 3.
+INSERT row INTO TABLE itab.
+
+DELETE TABLE itab WITH TABLE KEY foobar = 2.
+
+LOOP AT itab INTO row.
+  WRITE / row-foobar.
+ENDLOOP.`;
+    const js = await run(code);
+    const f = new AsyncFunction("abap", js);
+    await f(abap);
+    expect(abap.console.get()).to.equal("1\n3");
+  });
+
 });