@abaplint/core 2.93.11 → 2.93.12

package/build/src/abap/2_statements/statements/create_data.js

@@ -4,12 +4,13 @@ exports.CreateData = void 0;
 const combi_1 = require("../combi");
 const expressions_1 = require("../expressions");
 const version_1 = require("../../../version");
+// todo, similar to DATA or TYPES?
 class CreateData {
     getMatcher() {
-        // todo, similar to DATA or TYPES?
-        const area = (0, combi_1.seq)("AREA HANDLE", expressions_1.Source);
+        const areaHandle = (0, combi_1.seq)("AREA HANDLE", expressions_1.Source);
+        const typeHandle = (0, combi_1.seq)("TYPE HANDLE", expressions_1.Source);
         const type = (0, combi_1.seq)((0, combi_1.alt)("TYPE", "TYPE REF TO", "TYPE TABLE OF", "TYPE TABLE OF REF TO", "TYPE SORTED TABLE OF", "TYPE HASHED TABLE OF", "TYPE STANDARD TABLE OF", "TYPE LINE OF"), (0, combi_1.alt)(expressions_1.TypeName, expressions_1.Dynamic));
-        const like = (0, combi_1.seq)((0, combi_1.alt)("LIKE", "LIKE HASHED TABLE OF", "LIKE LINE OF", "LIKE STANDARD TABLE OF", "LIKE SORTED TABLE OF", "LIKE TABLE OF", "TYPE HANDLE"), (0, combi_1.alt)(expressions_1.Source, expressions_1.Dynamic));
+        const like = (0, combi_1.seq)((0, combi_1.alt)("LIKE", "LIKE HASHED TABLE OF", "LIKE LINE OF", "LIKE STANDARD TABLE OF", "LIKE SORTED TABLE OF", "LIKE TABLE OF"), (0, combi_1.alt)(expressions_1.Source, expressions_1.Dynamic));
         const length = (0, combi_1.seq)("LENGTH", expressions_1.Source);
         const initial = (0, combi_1.seq)("INITIAL SIZE", expressions_1.Source);
         const decimals = (0, combi_1.seq)("DECIMALS", expressions_1.Source);
@@ -18,7 +19,8 @@ class CreateData {
         const def = (0, combi_1.seq)((0, combi_1.opt)(uniq), (0, combi_1.alt)("DEFAULT KEY", emptyKey));
         const kdef = (0, combi_1.seq)((0, combi_1.opt)(uniq), "KEY", (0, combi_1.alt)((0, combi_1.plus)(expressions_1.Field), expressions_1.Dynamic));
         const key = (0, combi_1.seq)("WITH", (0, combi_1.alt)(def, kdef));
-        const ret = (0, combi_1.seq)("CREATE DATA", expressions_1.Target, (0, combi_1.opt)(area), (0, combi_1.opt)((0, combi_1.alt)(type, like)), (0, combi_1.opt)(key), (0, combi_1.opt)(initial), (0, combi_1.opt)(length), (0, combi_1.opt)(decimals));
+        const specified = (0, combi_1.seq)((0, combi_1.alt)(type, like), (0, combi_1.opt)(key), (0, combi_1.opt)(initial), (0, combi_1.opt)(length), (0, combi_1.opt)(decimals));
+        const ret = (0, combi_1.seq)("CREATE DATA", expressions_1.Target, (0, combi_1.opt)((0, combi_1.alt)(typeHandle, (0, combi_1.seq)((0, combi_1.opt)(areaHandle), specified))));
         return ret;
     }
 }

package/build/src/abap/2_statements/statements/method_def.js

@@ -15,7 +15,7 @@ class MethodDef {
         const ddl = "DDL OBJECT OPTIONS CDS SESSION CLIENT REQUIRED";
         const behavior = (0, combi_1.altPrio)((0, combi_1.seq)("VALIDATE ON SAVE IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName), (0, combi_1.seq)("MODIFY IMPORTING", expressions_1.MethodParamName, "FOR ACTION", expressions_1.TypeName, "RESULT", expressions_1.MethodParamName), (0, combi_1.seq)("FEATURES IMPORTING", expressions_1.MethodParamName, "REQUEST", expressions_1.NamespaceSimpleName, "FOR", expressions_1.NamespaceSimpleName, "RESULT", expressions_1.MethodParamName), (0, combi_1.seq)("DETERMINE ON MODIFY IMPORTING", expressions_1.MethodParamName, "FOR", expressions_1.TypeName));
         // todo, this is only from version something
-        const amdp = "AMDP OPTIONS CDS SESSION CLIENT current";
+        const amdp = (0, combi_1.seq)("AMDP OPTIONS CDS SESSION CLIENT CURRENT", (0, combi_1.optPrio)(expressions_1.MethodDefImporting), (0, combi_1.optPrio)(expressions_1.MethodDefExporting), (0, combi_1.optPrio)(expressions_1.MethodDefRaising));
         const ret = (0, combi_1.seq)((0, combi_1.altPrio)("CLASS-METHODS", "METHODS"), expressions_1.MethodName, (0, combi_1.alt)((0, combi_1.seq)((0, combi_1.optPrio)(expressions_1.Abstract), expressions_1.EventHandler), parameters, testing, (0, combi_1.seq)("FOR", (0, combi_1.alt)(tableFunction, ddl, behavior)), amdp, "NOT AT END OF MODE", (0, combi_1.optPrio)(expressions_1.Redefinition)));
         return ret;
     }

package/build/src/registry.js

@@ -63,7 +63,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.93.11";
+        return "2.93.12";
     }
     getDDICReferences() {
         return this.references;

package/build/src/rules/downport.js

@@ -1317,19 +1317,24 @@ ${indentation}    output = ${topTarget}.`;
         return undefined;
     }
     outlineFor(forLoop, indentation, lowFile, highSyntax) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         let body = "";
         let end = "";
         const loopSource = (_a = forLoop.findFirstExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.concatTokens();
-        const loopTargetField = (_b = forLoop.findFirstExpression(Expressions.TargetField)) === null || _b === void 0 ? void 0 : _b.concatTokens();
-        let cond = ((_c = forLoop.findDirectExpression(Expressions.ComponentCond)) === null || _c === void 0 ? void 0 : _c.concatTokens()) || "";
+        let loopTargetField = (_b = forLoop.findFirstExpression(Expressions.TargetField)) === null || _b === void 0 ? void 0 : _b.concatTokens();
+        if (((_d = (_c = forLoop.findDirectExpression(Expressions.InlineLoopDefinition)) === null || _c === void 0 ? void 0 : _c.getFirstChild()) === null || _d === void 0 ? void 0 : _d.get()) instanceof Expressions.TargetFieldSymbol) {
+            loopTargetField = undefined;
+        }
+        let cond = ((_e = forLoop.findDirectExpression(Expressions.ComponentCond)) === null || _e === void 0 ? void 0 : _e.concatTokens()) || "";
         if (cond !== "") {
             cond = " WHERE " + cond;
         }
+        const loop = forLoop.findDirectExpression(Expressions.InlineLoopDefinition);
+        const indexInto = (_f = loop === null || loop === void 0 ? void 0 : loop.findExpressionAfterToken("INTO")) === null || _f === void 0 ? void 0 : _f.concatTokens();
         if (forLoop.findDirectTokenByText("UNTIL")
             || forLoop.findDirectTokenByText("WHILE")) {
             const fieldDef = forLoop.findDirectExpression(Expressions.InlineFieldDefinition);
-            const field = (_d = fieldDef === null || fieldDef === void 0 ? void 0 : fieldDef.findFirstExpression(Expressions.Field)) === null || _d === void 0 ? void 0 : _d.concatTokens();
+            const field = (_g = fieldDef === null || fieldDef === void 0 ? void 0 : fieldDef.findFirstExpression(Expressions.Field)) === null || _g === void 0 ? void 0 : _g.concatTokens();
             const indexBackup = this.uniqueName(forLoop.getFirstToken().getStart(), lowFile.getFilename(), highSyntax);
             body += indentation + "DATA " + field + " TYPE i.\n";
             const second = fieldDef === null || fieldDef === void 0 ? void 0 : fieldDef.getChildren()[2];
@@ -1351,15 +1356,21 @@ ${indentation}    output = ${topTarget}.`;
             }
             end += indentation + "ENDWHILE";
         }
-        else if (loopTargetField) {
+        else if (loopTargetField !== undefined) {
             // todo, also backup sy-index / sy-tabix here?
             body += indentation + `LOOP AT ${loopSource} INTO DATA(${loopTargetField})${cond}.\n`;
+            if (indexInto) {
+                body += indentation + "  DATA(" + indexInto + ") = sy-tabix.\n";
+            }
             end = "ENDLOOP";
         }
         else if (loopTargetField === undefined) {
             // todo, also backup sy-index / sy-tabix here?
-            const loopTargetFieldSymbol = (_e = forLoop.findFirstExpression(Expressions.TargetFieldSymbol)) === null || _e === void 0 ? void 0 : _e.concatTokens();
+            const loopTargetFieldSymbol = (_h = forLoop.findFirstExpression(Expressions.TargetFieldSymbol)) === null || _h === void 0 ? void 0 : _h.concatTokens();
             body += indentation + `LOOP AT ${loopSource} ASSIGNING FIELD-SYMBOL(${loopTargetFieldSymbol})${cond}.\n`;
+            if (indexInto) {
+                body += indentation + "  DATA(" + indexInto + ") = sy-tabix.\n";
+            }
             end = "ENDLOOP";
         }
         const l = forLoop.findDirectExpression(Expressions.Let);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.93.11",
+    "version": "2.93.12",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",