Merge branch 'release/V2.14.3'

Riverside-Software · Sep 22, 2021 · f1e0f64 · f1e0f64
2 parents 0e6338a + bc6d325
commit f1e0f64
Show file tree

Hide file tree

Showing 69 changed files with 1,527 additions and 921 deletions.
diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>coverage-report</artifactId>
-  <version>2.14.2</version>
+  <version>2.14.3</version>
 
   <name>JaCoCo report</name>
   <description>Fake module for code coverage report in SonarQube</description>
@@ -20,37 +20,37 @@
     <dependency>
       <groupId>eu.rssw.openedge.rcode</groupId>
       <artifactId>rcode-reader</artifactId>
-      <version>2.14.2</version>
+      <version>2.14.3</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.sonar.openedge</groupId>
       <artifactId>sonar-openedge-plugin</artifactId>
-      <version>2.14.2</version>
+      <version>2.14.3</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>proparse</artifactId>
-      <version>2.14.2</version>
+      <version>2.14.3</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>profiler-parser</artifactId>
-      <version>2.14.2</version>
+      <version>2.14.3</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>database-parser</artifactId>
-      <version>2.14.2</version>
+      <version>2.14.3</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>listing-parser</artifactId>
-      <version>2.14.2</version>
+      <version>2.14.3</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.checks</groupId>
       <artifactId>openedge-checks</artifactId>
-      <version>2.14.2</version>
+      <version>2.14.3</version>
     </dependency>
   </dependencies>
 

diff --git a/database-parser/pom.xml b/database-parser/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>database-parser</artifactId>
-  <version>2.14.2</version>
+  <version>2.14.3</version>
 
   <name>OpenEdge database definition lexer and parser</name>
   <description>OpenEdge dump files parser</description>

diff --git a/listing-parser/pom.xml b/listing-parser/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>listing-parser</artifactId>
-  <version>2.14.2</version>
+  <version>2.14.3</version>
 
   <name>OpenEdge listing so-called parser</name>
   <description>OpenEdge listing files parser</description>

diff --git a/openedge-checks/pom.xml b/openedge-checks/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.checks</groupId>
   <artifactId>openedge-checks</artifactId>
-  <version>2.14.2</version>
+  <version>2.14.3</version>
 
   <name>OpenEdge checks</name>
   <description>OpenEdge checks</description>
@@ -55,12 +55,12 @@
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>database-parser</artifactId>
-      <version>2.14.2</version>
+      <version>2.14.3</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>proparse</artifactId>
-      <version>2.14.2</version>
+      <version>2.14.3</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>

diff --git a/openedge-plugin/pom.xml b/openedge-plugin/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.sonar.openedge</groupId>
   <artifactId>sonar-openedge-plugin</artifactId>
-  <version>2.14.2</version>
+  <version>2.14.3</version>
   <packaging>sonar-plugin</packaging>
 
   <name>OpenEdge plugin for SonarQube</name>
@@ -60,17 +60,17 @@
     <dependency>
       <groupId>eu.rssw.openedge.checks</groupId>
       <artifactId>openedge-checks</artifactId>
-      <version>2.14.2</version>
+      <version>2.14.3</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>listing-parser</artifactId>
-      <version>2.14.2</version>
+      <version>2.14.3</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>profiler-parser</artifactId>
-      <version>2.14.2</version>
+      <version>2.14.3</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>

diff --git a/openedge-plugin/src/main/java/org/sonar/plugins/openedge/checks/MultiLineIssue.java b/openedge-plugin/src/main/java/org/sonar/plugins/openedge/checks/MultiLineIssue.java
@@ -31,8 +31,9 @@ public class MultiLineIssue extends OpenEdgeProparseCheck {
 
   @Override
   public void execute(InputFile file, ParseUnit unit) {
-    NewIssue issue = createIssue(file, unit.getTopNode().getFirstStatement(), "First statement", true);
-    addLocation(issue, file, unit.getTopNode().getFirstStatement().getNextStatement(), "... and next one", false);
+    NewIssue issue = createIssue(file, unit.getTopNode().getFirstStatement().asJPNode(), "First statement", true);
+    addLocation(issue, file, unit.getTopNode().getFirstStatement().getNextStatement().asJPNode(), "... and next one",
+        false);
     issue.save();
   }
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <groupId>eu.rssw</groupId>
   <artifactId>sonar-openedge</artifactId>
   <packaging>pom</packaging>
-  <version>2.14.2</version>
+  <version>2.14.3</version>
   <name>OpenEdge plugin for SonarQube</name>
   <url>http://www.riverside-software.fr/</url>
   <description>Open source code analysis for OpenEdge</description>

diff --git a/profiler-parser/pom.xml b/profiler-parser/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>profiler-parser</artifactId>
-  <version>2.14.2</version>
+  <version>2.14.3</version>
 
   <name>OpenEdge profiler output lexer and parser</name>
   <description>OpenEdge profiler files parser</description>

diff --git a/proparse/pom.xml b/proparse/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>proparse</artifactId>
-  <version>2.14.2</version>
+  <version>2.14.3</version>
 
   <name>Proparse</name>
   <description>ABL code parser</description>
@@ -55,7 +55,7 @@
     <dependency>
       <groupId>eu.rssw.openedge.rcode</groupId>
       <artifactId>rcode-reader</artifactId>
-      <version>2.14.2</version>
+      <version>2.14.3</version>
     </dependency>
     <dependency>
       <groupId>org.antlr</groupId>

diff --git a/proparse/src/main/antlr4/org/prorefactor/proparse/antlr4/Proparse.g4 b/proparse/src/main/antlr4/org/prorefactor/proparse/antlr4/Proparse.g4
@@ -880,15 +880,15 @@ caseSensitiveOrNot:
   ;
 
 caseStatement:
-    CASE expression blockColon caseBlock caseOtherwise? (EOF | caseEnd statementEnd)
+    CASE expression blockColon caseWhen* caseOtherwise? (EOF | caseEnd statementEnd)
   ;
 
-caseBlock:
-    caseWhen*
+caseWhen:
+    WHEN caseExpression caseWhenThen
   ;
 
-caseWhen:
-    WHEN caseExpression THEN blockOrStatement
+caseWhenThen:
+    THEN blockOrStatement
   ;
 
 caseExpression:
@@ -2350,9 +2350,12 @@ hideStatement:
 ifStatement:
     // Plplt. Progress compiles this fine: DO: IF FALSE THEN END.
     // i.e. you don't have to have anything after the THEN or the ELSE.
-    IF expression THEN blockOrStatement ifElse?
+    IF expression ifThen ifElse?
   ;
 
+ifThen:
+    THEN blockOrStatement;
+
 ifElse:
     ELSE blockOrStatement
   ;
@@ -3212,7 +3215,8 @@ stopStatement:
   ;
 
 superStatement:
-    SUPER LEFTPAREN ( parameter ( COMMA parameter )* )? RIGHTPAREN statementEnd
+    // Only for SUPER(...) in FUNCTION ; SUPER() in a class is handled by exprt2ParenCall2
+    SUPER parameterListNoRoot statementEnd // TODO Use parameterList
   ;
 
 streamNameOrHandle:

diff --git a/proparse/src/main/java/org/prorefactor/core/IConstants.java b/proparse/src/main/java/org/prorefactor/core/IConstants.java
@@ -81,13 +81,6 @@ public class IConstants {
    * without referencing its value (i.e. no buffer scope).
    */
   public static final int BUFFERSCOPE = -212;
-  /**
-   * A valid value for setLink() and getLink(). You should not use this directly. Only JPNodes of subtype BlockNode will
-   * have this set, so use BlockNode.getBlock instead.
-   * 
-   * @see org.prorefactor.core.nodetypes.BlockNode
-   */
-  public static final int BLOCK = -214;
   /**
    * A valid value for setLink() and getLink().
    */