Change the logic of compiler directives preprocessor to move line content to be processed by grammar istead of removing it #116

Author: temanbrcom

com.ca.lsp.cobol/lsp-core-cobol-parser/src/main/java/com/ca/lsp/core/cobol/preprocessor/impl/CobolPreprocessorImpl.java

@@ -33,7 +33,7 @@
 import com.ca.lsp.core.cobol.preprocessor.sub.line.rewriter.impl.CobolInlineCommentEntriesNormalizerImpl;
 import com.ca.lsp.core.cobol.preprocessor.sub.line.rewriter.impl.CobolLineIndicatorProcessorImpl;
 import com.ca.lsp.core.cobol.preprocessor.sub.line.transformer.CobolLinesTransformation;
-import com.ca.lsp.core.cobol.preprocessor.sub.line.transformer.CobolUnsupportedFeaturesIgnorerImpl;
+import com.ca.lsp.core.cobol.preprocessor.sub.line.transformer.CobolCompilerDirectives;
 import com.ca.lsp.core.cobol.preprocessor.sub.line.transformer.ContinuationLineTransformation;
 import com.ca.lsp.core.cobol.preprocessor.sub.line.writer.CobolLineWriter;
 import com.ca.lsp.core.cobol.preprocessor.sub.line.writer.impl.CobolLineWriterImpl;
@@ -140,7 +140,7 @@ private CobolLineIndicatorProcessor createLineIndicatorProcessor() {
   }
 
   private CobolLinesTransformation createUnsupportedFeaturesProcessor() {
-    return new CobolUnsupportedFeaturesIgnorerImpl(listener);
+    return new CobolCompilerDirectives(listener);
   }
 
   private CobolLinesTransformation createContinuationLineProcessor(String documentURI) {

com.ca.lsp.cobol/lsp-core-cobol-parser/src/main/java/com/ca/lsp/core/cobol/preprocessor/sub/line/transformer/CobolUnsupportedFeaturesIgnorerImpl.java renamed to com.ca.lsp.cobol/lsp-core-cobol-parser/src/main/java/com/ca/lsp/core/cobol/preprocessor/sub/line/transformer/CobolCompilerDirectives.java

@@ -13,24 +13,37 @@
  */
 package com.ca.lsp.core.cobol.preprocessor.sub.line.transformer;
 
+import com.ca.lsp.core.cobol.parser.listener.PreprocessorListener;
+import com.ca.lsp.core.cobol.preprocessor.sub.CobolLine;
+
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.ca.lsp.core.cobol.parser.listener.PreprocessorListener;
-import com.ca.lsp.core.cobol.preprocessor.sub.CobolLine;
-
 /**
- * Preprocessor which removes lines that contains unsupported features
+ * This preprocessor transforms the lines containing the compiler directives is order to make them
+ * processable with grammar.
+ *
+ * The CBL (PROCESS) statement can be preceded by a sequence number in columns 1 through 6. The
+ * first character of the sequence number must be numeric, and CBL or PROCESS can begin in column 8
+ * or after; if a sequence number is not specified, CBL or PROCESS can begin in column 1 or after.
+ *
+ * The CBL (PROCESS) statement must end before or at column 72, and options cannot be continued
+ * across multiple CBL (PROCESS) statements. However, you can use more than one CBL (PROCESS)
+ * statement. Multiple CBL (PROCESS) statements must follow one another with no intervening
+ * statements of any other type.
+ *
+ * The CBL (PROCESS) statement must be placed before any comment lines or other
+ * compiler-directing statements.
  */
-public class CobolUnsupportedFeaturesIgnorerImpl implements CobolLinesTransformation {
+public class CobolCompilerDirectives implements CobolLinesTransformation {
 
   private static final Pattern COMPILER_DIRECTIVE_LINE =
-      Pattern.compile("(\\d.{0,6} +|\\s*)(CBL|PROCESS) .+");
+      Pattern.compile("(?i)(\\d.{0,6} +|\\s*)(CBL|PROCESS) .+");
 
   private PreprocessorListener listener;
 
-  public CobolUnsupportedFeaturesIgnorerImpl(PreprocessorListener listener) {
+  public CobolCompilerDirectives(PreprocessorListener listener) {
     this.listener = listener;
   }
 
@@ -44,7 +57,10 @@ private List<CobolLine> removeLinesWithCompilerDirectives(List<CobolLine> lines)
       CobolLine line = lines.get(i);
       Matcher matcher = COMPILER_DIRECTIVE_LINE.matcher(line.toString());
       if (matcher.matches()) {
-        lines.set(i, CobolLine.copyCobolLineWithEmptyContent(line));
+        String content =
+            line.serializeWithoutCommentArea().replaceAll("(?i)^.*(CBL|PROCESS)", "       CBL");
+        lines.set(i, CobolLine.copyCobolLineWithContentArea(content, line));
+
         listener.unregisterError(i + 1);
       } else break;
     }

com.ca.lsp.cobol/lsp-service-cobol/src/test/java/com/ca/lsp/cobol/usecases/TestNoErrorOnCompilerDirectives.java

@@ -45,30 +45,27 @@ public TestNoErrorOnCompilerDirectives() {
     super(null);
   }
 
-  private static final String CBL_WITHOUT_NUMBERS =
-      "  CBL DIR1,DIR2,DIR3,DIR4,DIR5,DIR6,DIR7,DIR8\r\n";
+  private static final String CBL_WITHOUT_NUMBERS = "  cbl LIB,QUOTE,NODYNAM,TEST(SEP)\r\n";
 
-  private static final String CBL_WITH_NUMBER =
-      "012345  CBL DIR1,DIR2,DIR3,DIR4,DIR5,DIR6,DIR7,DIR8\r\n";
+  private static final String CBL_WITH_NUMBER = "012345 CBL DATA(24),RMODE(24),NODYNAM\r\n";
 
-  private static final String PROCESS_WITHOUT_NUMBER =
-      "PROCESS DIR1,DIR2,DIR3,DIR4,DIR5,DIR6,DIR7,DIR8\r\n";
+  private static final String PROCESS_WITHOUT_NUMBER = "PROCESS DATA(24),RMODE(24),NODYNAM\r\n";
 
-  private static final String PROCESS_WITH_NUMBER =
-      "012345  PROCESS DIR1,DIR2,DIR3,DIR4,DIR5,DIR6,DIR7,DIR8\r\n";
+  private static final String PROCESS_WITH_NUMBER = "012345 PROCESS DATA(24),RMODE(24),NODYNAM\r\n";
 
-  private static final String PROCESS_WITHOUT_NUMBER_TYPO =
-      "PROESS DIR1,DIR2,DIR3,DIR4,DIR5,DIR6,DIR7,DIR8\r\n";
+  private static final String PROCESS_WITHOUT_NUMBER_TYPO = "PROESS DATA(24),RMODE(24),NODYNAM\r\n";
 
   private static final String PROCESS_WITH_NUMBER_TYPO =
-      "012345  PROESS DIR1,DIR2,DIR3,DIR4,DIR5,DIR6,DIR7,DIR8\r\n";
+      "012345 PROESS DATA(24),RMODE(24),NODYNAM\r\n";
 
   private static final String FOLLOWING_TEXT =
       "000000 Identification DIVISION.                                         23323232\r\n"
           + "002800 Program-ID.                                                      23323232\r\n"
           + "002800  HELLOWORLD.                                                     23323232\r\n"
           + "024200 PROCEDURE DIVISION .                                             CM1014.2\r\n";
 
+  private static final String COMMENT = "      * Comment\r\n";
+
   @Test
   public void testCorrectText() {
     setText("" + FOLLOWING_TEXT);
@@ -99,7 +96,6 @@ public void testProcessWithNumbers() {
     super.test();
   }
 
-  @Ignore("Feature is not yet supported")
   @Test
   public void testProcessWithoutNumbersWithTypo() {
     TestLanguageClient client =
@@ -109,11 +105,10 @@ public void testProcessWithoutNumbersWithTypo() {
 
     Range range = retrieveRange(client);
 
-    assertEquals(1, range.getStart().getLine());
+    assertEquals(0, range.getStart().getLine());
     assertEquals(7, range.getStart().getCharacter());
   }
 
-  @Ignore("Feature is not yet supported")
   @Test
   public void testProcessWithNumbersWithTypo() {
     TestLanguageClient client =
@@ -123,20 +118,20 @@ public void testProcessWithNumbersWithTypo() {
 
     Range range = retrieveRange(client);
 
-    assertEquals(1, range.getStart().getLine());
+    assertEquals(0, range.getStart().getLine());
     assertEquals(7, range.getStart().getCharacter());
   }
 
-  @Ignore("Feature is not yet supported")
+  @Ignore("Not yet implemented")
   @Test
   public void testLinesBeforeCblNotAllowed() {
-    TestLanguageClient client = startServerAndRunValidation(FOLLOWING_TEXT + CBL_WITH_NUMBER);
+    TestLanguageClient client = startServerAndRunValidation(COMMENT + CBL_WITH_NUMBER);
 
     waitForDiagnostics(client);
 
     Range range = retrieveRange(client);
 
-    assertEquals(4, range.getStart().getLine());
+    assertEquals(1, range.getStart().getLine());
     assertEquals(7, range.getStart().getCharacter());
   }