@abaplint/cli 2.115.3 → 2.115.4

package/build/cli.js

@@ -11974,7 +11974,7 @@ const combi_1 = __webpack_require__(/*! ../combi */ "./node_modules/@abaplint/co
 const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 class DataBegin {
     getMatcher() {
-        const occurs = (0, combi_1.seq)("OCCURS", expressions_1.Integer);
+        const occurs = (0, combi_1.seq)("OCCURS", (0, combi_1.altPrio)(expressions_1.Integer, expressions_1.FieldChain));
         const common = (0, combi_1.seq)("COMMON PART", (0, combi_1.optPrio)(expressions_1.DefinitionName));
         const structure = (0, combi_1.seq)("BEGIN OF", (0, combi_1.altPrio)(common, (0, combi_1.seq)(expressions_1.DefinitionName, (0, combi_1.optPrio)("READ-ONLY"), (0, combi_1.optPrio)(occurs))));
         return (0, combi_1.seq)("DATA", structure);
@@ -18678,7 +18678,8 @@ class Write {
         const as = (0, combi_1.seq)("AS", (0, combi_1.altPrio)("LINE", "ICON", "CHECKBOX", "SYMBOL"));
         const to = (0, combi_1.seq)("TO", expressions_1.Target);
         const options = (0, combi_1.per)(mask, to, (0, combi_1.seq)("EXPONENT", expressions_1.Source), "NO-GROUPING", "NO-ZERO", "CENTERED", (0, combi_1.seq)("INPUT", (0, combi_1.opt)(onOff)), "NO-GAP", "LEFT-JUSTIFIED", as, (0, combi_1.seq)("FRAMES", onOff), (0, combi_1.seq)("HOTSPOT", (0, combi_1.opt)(onOff)), "RIGHT-JUSTIFIED", (0, combi_1.seq)("TIME ZONE", expressions_1.Source), (0, combi_1.seq)("UNDER", expressions_1.Source), (0, combi_1.seq)("STYLE", expressions_1.Source), (0, combi_1.seq)("ROUND", expressions_1.Source), (0, combi_1.seq)("QUICKINFO", expressions_1.Source), "ENVIRONMENT TIME FORMAT", dateFormat, (0, combi_1.seq)("UNIT", expressions_1.Source), (0, combi_1.seq)("INTENSIFIED", (0, combi_1.opt)(onOff)), (0, combi_1.seq)("INDEX", expressions_1.Source), (0, combi_1.seq)("DECIMALS", expressions_1.Source), (0, combi_1.seq)("INVERSE", (0, combi_1.opt)(onOff)), expressions_1.Color, (0, combi_1.seq)("CURRENCY", expressions_1.Source), "RESET", "NO-SIGN");
-        const ret = (0, combi_1.seq)("WRITE", (0, combi_1.alt)("AT /", (0, combi_1.seq)((0, combi_1.opt)(expressions_1.WriteOffsetLength), (0, combi_1.alt)(expressions_1.Source, expressions_1.Dynamic, "/"), (0, combi_1.opt)(options))));
+        // Need to refactor all this sometime,
+        const ret = (0, combi_1.seq)("WRITE", (0, combi_1.alt)((0, combi_1.seq)("AT /", (0, combi_1.opt)(expressions_1.Source), (0, combi_1.opt)("NO-GAP")), (0, combi_1.seq)((0, combi_1.opt)(expressions_1.WriteOffsetLength), (0, combi_1.alt)(expressions_1.Source, expressions_1.Dynamic, "/"), (0, combi_1.opt)(options))));
         return (0, combi_1.verNot)(version_1.Version.Cloud, ret);
     }
 }
@@ -42633,8 +42634,22 @@ class DDIC {
             case "XSTRING":
                 return Types.XStringType.get({ qualifiedName: qualifiedName || name });
             case "D":
+                /*
+                if (length && length > 0) {
+                  throw new Error("Length for type D not possible");
+                } else if (decimals && decimals > 0) {
+                  throw new Error("Decimals for type D not possible");
+                }
+                */
                 return new Types.DateType({ qualifiedName: qualifiedName || name });
             case "T":
+                /*
+                if (length && length > 0) {
+                  throw new Error("Length for type T not possible");
+                } else if (decimals && decimals > 0) {
+                  throw new Error("Decimals for type T not possible");
+                }
+                */
                 return new Types.TimeType({ qualifiedName: qualifiedName || name });
             case "XSEQUENCE":
                 return new Types.XSequenceType({ qualifiedName: qualifiedName });
@@ -42667,6 +42682,13 @@ class DDIC {
             case "INT8": // todo, take version into account
                 return new Types.Integer8Type({ qualifiedName: qualifiedName || name });
             case "F":
+                /*
+                if (length && length > 0) {
+                  throw new Error("Length for type F not possible");
+                } else if (decimals && decimals > 0) {
+                  throw new Error("Decimals for type F not possible");
+                }
+                */
                 return new Types.FloatType({ qualifiedName: qualifiedName || name });
             case "P":
                 if (length && decimals) {
@@ -55215,7 +55237,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.115.3";
+        return "2.115.4";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -68448,7 +68470,7 @@ ENDIF.
             return [];
         }
         for (const cond of structure.findAllExpressionsMulti([Expressions.Cond, Expressions.ComponentCond])) {
-            issues.push(...this.analyze(file, cond));
+            issues.push(...this.analyzeCondition(file, cond));
         }
         for (const sub of structure.findAllExpressionsMulti([Expressions.CondSub, Expressions.ComponentCondSub])) {
             let cond = [];
@@ -68502,18 +68524,20 @@ ENDIF.
     }
     analyzeMove(file, m) {
         const issues = [];
-        const children = m.getChildren();
-        const last = children[children.length - 2];
-        const lastChildren = last.getChildren();
-        if (lastChildren.length === 3
-            && lastChildren[0].getFirstToken().getStr() === "("
-            && lastChildren[2].getFirstToken().getStr() === ")") {
-            const issue = issue_1.Issue.atToken(file, last.getFirstToken(), "Too many parentheses", this.getMetadata().key, this.conf.severity);
-            issues.push(issue);
+        for (const source of m.findAllExpressionsRecursive(Expressions.Source)) {
+            const lastChildren = source.getChildren();
+            if (lastChildren.length === 3
+                && lastChildren[0].getFirstToken().getStr() === "("
+                && lastChildren[1].getChildren().length === 1
+                && lastChildren[1].getFirstToken().getStr().startsWith("-") === false
+                && lastChildren[2].getFirstToken().getStr() === ")") {
+                const issue = issue_1.Issue.atToken(file, lastChildren[0].getFirstToken(), "Too many parentheses", this.getMetadata().key, this.conf.severity);
+                issues.push(issue);
+            }
         }
         return issues;
     }
-    analyze(file, cond) {
+    analyzeCondition(file, cond) {
         var _a, _b;
         const issues = [];
         let comparator = "";
@@ -70970,6 +70994,8 @@ class ObsoleteStatementConf extends _basic_rule_config_1.BasicRuleConfig {
         this.fieldGroups = true;
         /** Check for REPLACE INTO */
         this.replaceInto = true;
+        this.loopExtract = true;
+        this.sortExtract = true;
     }
 }
 exports.ObsoleteStatementConf = ObsoleteStatementConf;
@@ -71223,6 +71249,14 @@ ENDIF.`,
                     issues.push(issue);
                 }
             }
+            if (this.conf.loopExtract && sta instanceof Statements.LoopExtract) {
+                const issue = issue_1.Issue.atStatement(file, staNode, "LOOP extract", this.getMetadata().key, this.conf.severity);
+                issues.push(issue);
+            }
+            if (this.conf.sortExtract && sta instanceof Statements.SortDataset && staNode.getChildren().length === 2) {
+                const issue = issue_1.Issue.atStatement(file, staNode, "SORT extract", this.getMetadata().key, this.conf.severity);
+                issues.push(issue);
+            }
             if (configVersion >= version_1.Version.v754 && this.conf.clientSpecified
                 && (sta instanceof Statements.Select
                     || sta instanceof Statements.SelectLoop

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.115.3",
+    "version": "2.115.4",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.115.3",
+        "@abaplint/core": "^2.115.4",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",