From e38809a18f8716d7a17432e14c64d91ca8697e1d Mon Sep 17 00:00:00 2001 From: Gilles Querret Date: Tue, 22 Nov 2022 08:40:04 +0100 Subject: [PATCH 1/3] Prepare 2.18.1 --- coverage-report/pom.xml | 16 ++++++++-------- database-parser/pom.xml | 2 +- listing-parser/pom.xml | 2 +- openedge-checks/pom.xml | 6 +++--- openedge-plugin/pom.xml | 8 ++++---- pom.xml | 2 +- profiler-parser/pom.xml | 2 +- proparse/pom.xml | 4 ++-- rcode-reader/pom.xml | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml index f056d99f5..90ad699f7 100644 --- a/coverage-report/pom.xml +++ b/coverage-report/pom.xml @@ -4,7 +4,7 @@ eu.rssw.openedge.parsers coverage-report - 2.18.0 + 2.18.1 JaCoCo report Fake module for code coverage report in SonarQube @@ -20,37 +20,37 @@ eu.rssw.openedge.rcode rcode-reader - 2.18.0 + 2.18.1 eu.rssw.sonar.openedge sonar-openedge-plugin - 2.18.0 + 2.18.1 eu.rssw.openedge.parsers proparse - 2.18.0 + 2.18.1 eu.rssw.openedge.parsers profiler-parser - 2.18.0 + 2.18.1 eu.rssw.openedge.parsers database-parser - 2.18.0 + 2.18.1 eu.rssw.openedge.parsers listing-parser - 2.18.0 + 2.18.1 eu.rssw.openedge.checks openedge-checks - 2.18.0 + 2.18.1 diff --git a/database-parser/pom.xml b/database-parser/pom.xml index 599dcb502..f83c3e0af 100644 --- a/database-parser/pom.xml +++ b/database-parser/pom.xml @@ -4,7 +4,7 @@ eu.rssw.openedge.parsers database-parser - 2.18.0 + 2.18.1 OpenEdge database definition lexer and parser OpenEdge dump files parser diff --git a/listing-parser/pom.xml b/listing-parser/pom.xml index d7973c2d6..c328b6788 100644 --- a/listing-parser/pom.xml +++ b/listing-parser/pom.xml @@ -4,7 +4,7 @@ eu.rssw.openedge.parsers listing-parser - 2.18.0 + 2.18.1 OpenEdge listing so-called parser OpenEdge listing files parser diff --git a/openedge-checks/pom.xml b/openedge-checks/pom.xml index 1d727165d..c64211e17 100644 --- a/openedge-checks/pom.xml +++ b/openedge-checks/pom.xml @@ -4,7 +4,7 @@ eu.rssw.openedge.checks openedge-checks - 2.18.0 + 2.18.1 OpenEdge checks OpenEdge checks @@ -55,12 +55,12 @@ eu.rssw.openedge.parsers database-parser - 2.18.0 + 2.18.1 eu.rssw.openedge.parsers proparse - 2.18.0 + 2.18.1 org.testng diff --git a/openedge-plugin/pom.xml b/openedge-plugin/pom.xml index 445a449df..57b0dd2b5 100644 --- a/openedge-plugin/pom.xml +++ b/openedge-plugin/pom.xml @@ -4,7 +4,7 @@ eu.rssw.sonar.openedge sonar-openedge-plugin - 2.18.0 + 2.18.1 sonar-plugin OpenEdge plugin for SonarQube @@ -60,17 +60,17 @@ eu.rssw.openedge.checks openedge-checks - 2.18.0 + 2.18.1 eu.rssw.openedge.parsers listing-parser - 2.18.0 + 2.18.1 eu.rssw.openedge.parsers profiler-parser - 2.18.0 + 2.18.1 commons-io diff --git a/pom.xml b/pom.xml index 98884fb85..c558c5ca2 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ eu.rssw sonar-openedge - 2.18.0 + 2.18.1 pom OpenEdge plugin for SonarQube diff --git a/profiler-parser/pom.xml b/profiler-parser/pom.xml index e9eef0776..749d9fec8 100644 --- a/profiler-parser/pom.xml +++ b/profiler-parser/pom.xml @@ -4,7 +4,7 @@ eu.rssw.openedge.parsers profiler-parser - 2.18.0 + 2.18.1 OpenEdge profiler output lexer and parser OpenEdge profiler files parser diff --git a/proparse/pom.xml b/proparse/pom.xml index c55f5b446..9a805afb8 100644 --- a/proparse/pom.xml +++ b/proparse/pom.xml @@ -4,7 +4,7 @@ eu.rssw.openedge.parsers proparse - 2.18.0 + 2.18.1 Proparse ABL code parser @@ -55,7 +55,7 @@ eu.rssw.openedge.rcode rcode-reader - 2.18.0 + 2.18.1 org.antlr diff --git a/rcode-reader/pom.xml b/rcode-reader/pom.xml index ed00f6707..721bd4c87 100644 --- a/rcode-reader/pom.xml +++ b/rcode-reader/pom.xml @@ -4,7 +4,7 @@ eu.rssw.openedge.rcode rcode-reader - 2.18.0 + 2.18.1 rcode-reader rcode reader From 6d97045a5193cb45639be502df1e73064868381d Mon Sep 17 00:00:00 2001 From: Gilles Querret Date: Tue, 22 Nov 2022 08:41:54 +0100 Subject: [PATCH 2/3] Rewrite 'constant' section in alphanumeric order --- .../prorefactor/proparse/antlr4/Proparse.g4 | 58 +++++++++++++++---- 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/proparse/src/main/antlr4/org/prorefactor/proparse/antlr4/Proparse.g4 b/proparse/src/main/antlr4/org/prorefactor/proparse/antlr4/Proparse.g4 index 8402c4484..3e2287d80 100644 --- 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,53 @@ 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 + | EXCLUSIVELOCK + | FALSE + | FINDCASESENSITIVE + | FINDGLOBAL + | FINDNEXTOCCURRENCE + | FINDPREVOCCURRENCE + | FINDSELECT + | FINDWRAPAROUND + | FUNCTIONCALLTYPE + | GETATTRCALLTYPE + | HOSTBYTEORDER + | 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 + | TRUE + | WINDOWDELAYEDMINIMIZE + | WINDOWMAXIMIZED + | WINDOWMINIMIZED + | WINDOWNORMAL + | YES ; nonPunctuating: From 3b7a3f638265e47958af68e1745fe5df6cff8d17 Mon Sep 17 00:00:00 2001 From: Gilles Querret Date: Tue, 22 Nov 2022 09:23:56 +0100 Subject: [PATCH 3/3] Missing constants Following commit e5aa104 (which should say "up to 12.6", not "up to 11.6") --- proparse/src/main/antlr4/imports/keywords.g4 | 1 + .../main/antlr4/org/prorefactor/proparse/antlr4/Proparse.g4 | 5 +++++ .../org/prorefactor/core/nodetypes/BuiltinFunctionNode.java | 1 + 3 files changed, 7 insertions(+) diff --git a/proparse/src/main/antlr4/imports/keywords.g4 b/proparse/src/main/antlr4/imports/keywords.g4 index fc4345107..8773f63df 100644 --- 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 index 3e2287d80..593417887 100644 --- a/proparse/src/main/antlr4/org/prorefactor/proparse/antlr4/Proparse.g4 +++ b/proparse/src/main/antlr4/org/prorefactor/proparse/antlr4/Proparse.g4 @@ -741,8 +741,10 @@ typeName2: constant: LEXDATE | NULL | NUMBER | QSTRING | UNKNOWNVALUE | BIGENDIAN + | DLLCALLTYPE | EXCLUSIVELOCK | FALSE + | FALSELEAKS | FINDCASESENSITIVE | FINDGLOBAL | FINDNEXTOCCURRENCE @@ -752,6 +754,7 @@ constant: | FUNCTIONCALLTYPE | GETATTRCALLTYPE | HOSTBYTEORDER + | LEAKDETECTION | LITTLEENDIAN | NO | NOLOCK @@ -778,6 +781,8 @@ constant: | SEARCHTARGET | SETATTRCALLTYPE | SHARELOCK + | STOMPDETECTION + | STOMPFREQUENCY | TRUE | WINDOWDELAYEDMINIMIZE | WINDOWMAXIMIZED diff --git a/proparse/src/main/java/org/prorefactor/core/nodetypes/BuiltinFunctionNode.java b/proparse/src/main/java/org/prorefactor/core/nodetypes/BuiltinFunctionNode.java index 606df63ab..84ac9e71a 100644 --- 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: