Merge branch 'hotfix/V2.18.1'

Riverside-Software · Nov 22, 2022 · 56991ab · 56991ab
2 parents d33b879 + 3b7a3f6
commit 56991ab
Show file tree

Hide file tree

Showing 12 changed files with 75 additions and 34 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.18.0</version>
+  <version>2.18.1</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.18.0</version>
+      <version>2.18.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.sonar.openedge</groupId>
       <artifactId>sonar-openedge-plugin</artifactId>
-      <version>2.18.0</version>
+      <version>2.18.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>proparse</artifactId>
-      <version>2.18.0</version>
+      <version>2.18.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>profiler-parser</artifactId>
-      <version>2.18.0</version>
+      <version>2.18.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>database-parser</artifactId>
-      <version>2.18.0</version>
+      <version>2.18.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>listing-parser</artifactId>
-      <version>2.18.0</version>
+      <version>2.18.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.checks</groupId>
       <artifactId>openedge-checks</artifactId>
-      <version>2.18.0</version>
+      <version>2.18.1</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.18.0</version>
+  <version>2.18.1</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.18.0</version>
+  <version>2.18.1</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.18.0</version>
+  <version>2.18.1</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.18.0</version>
+      <version>2.18.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>proparse</artifactId>
-      <version>2.18.0</version>
+      <version>2.18.1</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.18.0</version>
+  <version>2.18.1</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.18.0</version>
+      <version>2.18.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>listing-parser</artifactId>
-      <version>2.18.0</version>
+      <version>2.18.1</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>profiler-parser</artifactId>
-      <version>2.18.0</version>
+      <version>2.18.1</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>eu.rssw</groupId>
   <artifactId>sonar-openedge</artifactId>
-  <version>2.18.0</version>
+  <version>2.18.1</version>
   <packaging>pom</packaging>
 
   <name>OpenEdge plugin for SonarQube</name>

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.18.0</version>
+  <version>2.18.1</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.18.0</version>
+  <version>2.18.1</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.18.0</version>
+      <version>2.18.1</version>
     </dependency>
     <dependency>
       <groupId>org.antlr</groupId>

diff --git a/proparse/src/main/antlr4/imports/keywords.g4 b/proparse/src/main/antlr4/imports/keywords.g4
@@ -205,6 +205,7 @@ noArgFunction:
   AACONTROL
 | AAPCONTROL
 | AASERIAL
+| CURRENTDATE
 | CURRENTLANGUAGE
 | CURSOR
 | DATASERVERS

diff --git a/proparse/src/main/antlr4/org/prorefactor/proparse/antlr4/Proparse.g4 b/proparse/src/main/antlr4/org/prorefactor/proparse/antlr4/Proparse.g4
@@ -737,19 +737,58 @@ typeName2:
     nonPunctuating ( LEFTANGLE typeName RIGHTANGLE )?
   ;
 
+// These are necessarily reserved keywords.
 constant:
-     // These are necessarily reserved keywords.
-     TRUE | FALSE | YES | NO | UNKNOWNVALUE | QSTRING | LEXDATE | NUMBER | NULL
-  |  NOWAIT | SHARELOCK | EXCLUSIVELOCK | NOLOCK
-  |  BIGENDIAN
-  |  FINDCASESENSITIVE | FINDGLOBAL | FINDNEXTOCCURRENCE | FINDPREVOCCURRENCE | FINDSELECT | FINDWRAPAROUND
-  |  FUNCTIONCALLTYPE | GETATTRCALLTYPE | PROCEDURECALLTYPE | SETATTRCALLTYPE
-  |  HOSTBYTEORDER | LITTLEENDIAN
-  |  READAVAILABLE | READEXACTNUM
-  |  ROWUNMODIFIED | ROWDELETED | ROWMODIFIED | ROWCREATED
-  |  SAXCOMPLETE | SAXPARSERERROR | SAXRUNNING | SAXUNINITIALIZED | SAXWRITEBEGIN | SAXWRITECOMPLETE | SAXWRITECONTENT | SAXWRITEELEMENT | SAXWRITEERROR | SAXWRITEIDLE | SAXWRITETAG
-  |  SEARCHSELF | SEARCHTARGET
-  |  WINDOWDELAYEDMINIMIZE | WINDOWMINIMIZED | WINDOWNORMAL | WINDOWMAXIMIZED
+    LEXDATE | NULL | NUMBER | QSTRING | UNKNOWNVALUE
+  | BIGENDIAN
+  | DLLCALLTYPE
+  | EXCLUSIVELOCK
+  | FALSE
+  | FALSELEAKS
+  | FINDCASESENSITIVE
+  | FINDGLOBAL
+  | FINDNEXTOCCURRENCE
+  | FINDPREVOCCURRENCE
+  | FINDSELECT
+  | FINDWRAPAROUND
+  | FUNCTIONCALLTYPE
+  | GETATTRCALLTYPE
+  | HOSTBYTEORDER
+  | LEAKDETECTION
+  | LITTLEENDIAN
+  | NO
+  | NOLOCK
+  | NOWAIT
+  | PROCEDURECALLTYPE
+  | READAVAILABLE
+  | READEXACTNUM
+  | ROWCREATED
+  | ROWDELETED
+  | ROWMODIFIED
+  | ROWUNMODIFIED
+  | SAXCOMPLETE
+  | SAXPARSERERROR
+  | SAXRUNNING
+  | SAXUNINITIALIZED
+  | SAXWRITEBEGIN
+  | SAXWRITECOMPLETE
+  | SAXWRITECONTENT
+  | SAXWRITEELEMENT
+  | SAXWRITEERROR
+  | SAXWRITEIDLE
+  | SAXWRITETAG
+  | SEARCHSELF
+  | SEARCHTARGET
+  | SETATTRCALLTYPE
+  | SHARELOCK
+  | STOMPDETECTION
+  | STOMPFREQUENCY
+  | TRUE
+  | WINDOWDELAYEDMINIMIZE
+  | WINDOWMAXIMIZED
+  | WINDOWMINIMIZED
+  | WINDOWNORMAL
+  | YES
   ;
 
 nonPunctuating:

diff --git a/proparse/src/main/java/org/prorefactor/core/nodetypes/BuiltinFunctionNode.java b/proparse/src/main/java/org/prorefactor/core/nodetypes/BuiltinFunctionNode.java
@@ -279,6 +279,7 @@ public DataType getDataType() {
       case SQRT:
       case TRUNCATE:
         return DataType.DECIMAL;
+      case CURRENTDATE:
       case DATE:
       case ISODATE:
       case TODAY:

diff --git a/rcode-reader/pom.xml b/rcode-reader/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.rcode</groupId>
   <artifactId>rcode-reader</artifactId>
-  <version>2.18.0</version>
+  <version>2.18.1</version>
 
   <name>rcode-reader</name>
   <description>rcode reader</description>