From 043e33353b260e16a0ad5efb85fa1b1d2f61267e Mon Sep 17 00:00:00 2001
From: Iurii Shchekochikhin <iurii.shchekochikhin@broadcom.com>
Date: Thu, 18 Apr 2024 11:24:36 +0200
Subject: [PATCH] wip: basic support preprocessors in hw parser

---
 .../java/org/eclipse/lsp/cobol/dialects/ibm/ParserStage.java  | 2 +-
 .../main/java/org/eclipse/lsp/cobol/core/hw/CobolParser.java  | 2 +-
 .../core/hw/antlradapter/ProcedureDivisionAntlrAdapter.java   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/engine/src/main/java/org/eclipse/lsp/cobol/dialects/ibm/ParserStage.java b/server/engine/src/main/java/org/eclipse/lsp/cobol/dialects/ibm/ParserStage.java
index d5be66ed26..1e7c1552f8 100644
--- a/server/engine/src/main/java/org/eclipse/lsp/cobol/dialects/ibm/ParserStage.java
+++ b/server/engine/src/main/java/org/eclipse/lsp/cobol/dialects/ibm/ParserStage.java
@@ -55,7 +55,7 @@ public StageResult<ParserStageResult> run(AnalysisContext context, StageResult<D
       ParserListener listener = new ParserListener(context.getExtendedDocument(), context.getCopybooksRepository());
       CobolErrorStrategy errorStrategy = new CobolErrorStrategy(messageService);
       AstBuilder parser = ParserUtils.isHwParserEnabled()
-              ? new SplitParser(CharStreams.fromString(context.getExtendedDocument().toString().replace('\u200B', ' ')),
+              ? new SplitParser(CharStreams.fromString(context.getExtendedDocument().toString()),
               listener, errorStrategy, treeListener)
               : new AntlrCobolParser(CharStreams.fromString(context.getExtendedDocument().toString()),
               listener, errorStrategy, treeListener);
diff --git a/server/parser/src/main/java/org/eclipse/lsp/cobol/core/hw/CobolParser.java b/server/parser/src/main/java/org/eclipse/lsp/cobol/core/hw/CobolParser.java
index c4a8af678c..6123651597 100644
--- a/server/parser/src/main/java/org/eclipse/lsp/cobol/core/hw/CobolParser.java
+++ b/server/parser/src/main/java/org/eclipse/lsp/cobol/core/hw/CobolParser.java
@@ -303,7 +303,7 @@ private void paragraph() {
   private void statement() {
     ctx.push(new Statement());
     try {
-      while (!match(".") && ctx.getLexer().hasMore()) {
+      while (!match(".") && !isNextDivisionEofOrEop() && !isParagraph() && !isSection() && !isEndOfProgram()) {
         consume();
       }
       optional(".");
diff --git a/server/parser/src/main/java/org/eclipse/lsp/cobol/core/hw/antlradapter/ProcedureDivisionAntlrAdapter.java b/server/parser/src/main/java/org/eclipse/lsp/cobol/core/hw/antlradapter/ProcedureDivisionAntlrAdapter.java
index 76294972b5..46ca92cc0b 100644
--- a/server/parser/src/main/java/org/eclipse/lsp/cobol/core/hw/antlradapter/ProcedureDivisionAntlrAdapter.java
+++ b/server/parser/src/main/java/org/eclipse/lsp/cobol/core/hw/antlradapter/ProcedureDivisionAntlrAdapter.java
@@ -99,7 +99,7 @@ private ProcedureDivisionBodyContext createProcedureDivisionBodyContext(Procedur
 
       if (node instanceof Statement) {
         assureParagraphsCtx(genStack, pdbCtx, node);
-        ParserRuleContext s = parseStatement((Statement) node);
+        ParserRuleContext s = parseSentence((Statement) node);
         lastToken = (CommonToken) s.stop;
         s.setParent(genStack.peek());
         genStack.peek().addChild(s);
@@ -199,7 +199,7 @@ private void handleSectionNode(LinkedList<ParserRuleContext> genStack, CstNode n
     genStack.push(paragraphsContext);
   }
 
-  private ParserRuleContext parseStatement(Statement node) {
+  private ParserRuleContext parseSentence(Statement node) {
     Token startToken = findStartToken(node).get();
     String input = generatePrefix(charStream, startToken) + node.toText();
     CobolProcedureDivisionLexer antlrLexer =