chore: sql preprocessor don't consume end dot

eclipse-che4z · May 13, 2024 · 0094f34 · 0094f34
1 parent 005917e
commit 0094f34
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/server/engine/src/main/antlr4/org/eclipse/lsp/db2/parser/Db2SqlParser.g4 b/server/engine/src/main/antlr4/org/eclipse/lsp/db2/parser/Db2SqlParser.g4
@@ -18,10 +18,10 @@ options {tokenVocab = Db2SqlLexer; superClass = MessageServiceParser;}
 startRule: .*? (execRule .*?) * EOF;
 //startIncludeRule: .*? (includeStatement .*?)* EOF;
 
-execRule: EXEC SQL sqlCode END_EXEC DOT_FS?
- | EXEC SQL END_EXEC DOT_FS?
- | EXEC SQLIMS sqlCode END_EXEC DOT_FS? // TODO: check when should this grammar be activated. Probably based on some compiler directives
- | {notifyError("cobolParser.missingEndExec");} EXEC SQL sqlCode DOT_FS? EOF
+execRule: EXEC SQL sqlCode END_EXEC
+ | EXEC SQL END_EXEC
+ | EXEC SQLIMS sqlCode END_EXEC // TODO: check when should this grammar be activated. Probably based on some compiler directives
+ | {notifyError("cobolParser.missingEndExec");} EXEC SQL sqlCode EOF
  | {notifyError("cobolParser.missingEndExec");} EXEC SQL;
 
 sqlCode

diff --git a/server/engine/src/test/resources/cfast/case_execCicsHandleAbend.cbl b/server/engine/src/test/resources/cfast/case_execCicsHandleAbend.cbl
@@ -15,4 +15,3 @@
  PROCEDURE DIVISION.
  EXEC CICS HANDLE ABEND
  END-EXEC.
-.
diff --git a/server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolDataDivisionParser.g4 b/server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolDataDivisionParser.g4
@@ -533,5 +533,5 @@ cobolWord
  ;
 
 dialectNodeFiller
- : ZERO_WIDTH_SPACE+
+ : ZERO_WIDTH_SPACE+ DOT_FS? EOF?
  ;
diff --git a/...er/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolIdentificationDivisionParser.g4 b/...er/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolIdentificationDivisionParser.g4
@@ -202,5 +202,5 @@ cobolWord
  ;
 
 dialectNodeFiller
- : ZERO_WIDTH_SPACE+
+ : ZERO_WIDTH_SPACE+ DOT_FS? EOF?
  ;
diff --git a/server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolParser.g4 b/server/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolParser.g4
@@ -762,6 +762,7 @@ procedureSection
 
 sentence
  : statement * (endClause | dialectStatement)
+ | dialectStatement
  ;
 
 paragraph
@@ -2207,7 +2208,7 @@ literal
  : NONNUMERICLITERAL | figurativeConstant | numericLiteral | booleanLiteral | charString | dialectLiteral | utfLiteral | hexadecimalUtfLiteral
  ;
 
-dialectLiteral: dialectNodeFiller+;
+dialectLiteral: dialectNodeFiller+ DOT_FS?;
 
 utfLiteral: U_CHAR NONNUMERICLITERAL;
 
@@ -2244,7 +2245,7 @@ power
  ;
 
 basis
- : dialectNodeFiller | generalIdentifier | literal | LPARENCHAR arithmeticExpression RPARENCHAR
+ : (dialectNodeFiller DOT_FS?) | generalIdentifier | literal | LPARENCHAR arithmeticExpression RPARENCHAR
  ;
 
 cobolWord
@@ -2263,7 +2264,7 @@ cobolKeywords
  ;
 
 dialectNodeFiller
- : ZERO_WIDTH_SPACE+
+ : ZERO_WIDTH_SPACE+ DOT_FS? EOF?
  ;
 
 dot_fs

diff --git a/...r/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolProcedureDivisionLexer.g4 b/...r/parser/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolProcedureDivisionLexer.g4
@@ -392,6 +392,7 @@ COMMENTLINE : COMMENTTAG ~('\n' | '\r')* -> channel(COMMENTS);
 WS : [ \t\f]+ -> channel(HIDDEN);
 COMPILERLINE : DOUBLEMORETHANCHAR ~('\n' | '\r')* -> channel(HIDDEN);
 // period full stopPosition
+DOT : '.';
 DOT_FS : '.' EOF?;
 
 LEVEL_NUMBER : ([1-9])|([0][1-9])|([1234][0-9]);

diff --git a/.../parser/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolProcedureDivisionParser.g4 b/.../parser/src/main/antlr4/org/eclipse/lsp/cobol/core/parser/CobolProcedureDivisionParser.g4
@@ -63,6 +63,7 @@ paragraph
 
 sentence
  : statement * (endClause | dialectStatement)
+ | dialectStatement
  ;
 
 conditionalStatementCall
@@ -1499,5 +1500,5 @@ cobolKeywords
  ;
 
 dialectNodeFiller
- : ZERO_WIDTH_SPACE+
+ : ZERO_WIDTH_SPACE+ DOT? EOF?
  ;