wip: basic support preprocessors in hw parser

eclipse-che4z · Apr 18, 2024 · 974adb2 · 974adb2
1 parent ec77c48
commit 974adb2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 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
@@ -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
@@ -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/...c/main/java/org/eclipse/lsp/cobol/core/hw/antlradapter/ProcedureDivisionAntlrAdapter.java b/...c/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 =