added flag into context to activate support for block comments

Author: raydac

jcp/src/main/java/com/igormaznitsa/jcp/containers/FileInfoContainer.java

@@ -532,7 +532,8 @@ public PreprocessingState preprocessFile(final PreprocessingState state,
             // Output the tail of the string to the output stream without comments and macroses
             final String text =
                 extractDoubleDollarPrefixedDirective(leftTrimmedString, false, context);
-            if (isDoubleDollarBlockPrefixed(leftTrimmedString, context.isAllowWhitespaces())) {
+            if (context.isAllowsBlocks() &&
+                isDoubleDollarBlockPrefixed(leftTrimmedString, context.isAllowWhitespaces())) {
               textBlockBuffer.append(
                   extractDoubleDollarPrefixedDirective(leftTrimmedString, true, context));
               if (doPrintLn) {
@@ -551,7 +552,8 @@ public PreprocessingState preprocessFile(final PreprocessingState state,
             final String text =
                 extractSingleDollarPrefixedDirective(stringToBeProcessed, false, context);
 
-            if (isDollarBlockPrefixed(stringToBeProcessed, context.isAllowWhitespaces())) {
+            if (context.isAllowsBlocks() &&
+                isDollarBlockPrefixed(stringToBeProcessed, context.isAllowWhitespaces())) {
               textBlockBuffer.append(
                   extractSingleDollarPrefixedDirective(stringToBeProcessed, true, context));
               if (doPrintLn) {

jcp/src/main/java/com/igormaznitsa/jcp/context/PreprocessorContext.java

@@ -106,6 +106,7 @@ public class PreprocessorContext {
   private boolean preserveIndents = false;
   private boolean keepAttributes = false;
   private boolean unknownVariableAsFalse = false;
+  private boolean allowsBlocks = false;
   private File target;
   private Set<String> extensions = new HashSet<>(DEFAULT_PROCESSING_EXTENSIONS);
   private Set<String> excludeExtensions = new HashSet<>(DEFAULT_EXCLUDED_EXTENSIONS);
@@ -166,6 +167,7 @@ public PreprocessorContext(final PreprocessorContext context) {
     this.excludeExtensions.addAll(context.excludeExtensions);
 
     this.unknownVariableAsFalse = context.unknownVariableAsFalse;
+    this.allowsBlocks = context.allowsBlocks;
 
     this.preprocessorExtension = context.getPreprocessorExtension();
     this.sourceEncoding = context.getSourceEncoding();

jcp/src/test/java/com/igormaznitsa/jcp/directives/AbstractDirectiveHandlerAcceptanceTest.java

@@ -27,7 +27,6 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 
-
 import com.igormaznitsa.jcp.containers.FileInfoContainer;
 import com.igormaznitsa.jcp.containers.TextFileDataContainer;
 import com.igormaznitsa.jcp.context.PreprocessingState;
@@ -187,6 +186,7 @@ private PreprocessorContext internalPreprocessAndMatch(final File srcfile,
                                                          final PreprocessorExtension extension,
                                                          final PreprocessorLogger logger,
                                                          final boolean keepLines,
+                                                         final boolean allowBlocks,
                                                          final VariablePair... globalVariables)
       throws Exception {
     assertNotNull("Preprocessing text is null", preprocessingText);
@@ -200,6 +200,7 @@ private PreprocessorContext internalPreprocessAndMatch(final File srcfile,
     context.setDryRun(true);
     context.setSources(Collections.singletonList(srcfile.getParent()));
     context.setKeepLines(keepLines);
+    context.setAllowsBlocks(allowBlocks);
     context.setPreprocessorExtension(extension);
 
     setGlobalVars(context, globalVariables);
@@ -283,10 +284,20 @@ private PreprocessorContext preprocessString(final String text, final List<Strin
     final List<String> preprocessingPart = parseStringForLines(text);
     return internalPreprocessAndMatch(THIS_CLASS_FILE, preprocessingPart,
         preprocessedText == null ? new ArrayList<>() : preprocessedText, null, ext, null, false,
+        false,
         globalVars);
   }
 
   public PreprocessorContext assertFilePreprocessing(final String testFileName, boolean keepLines, final PreprocessorExtension ext, final PreprocessorLogger logger, final VariablePair... globalVars) throws Exception {
+    return this.assertFilePreprocessing(testFileName, keepLines, false, ext, logger, globalVars);
+  }
+
+  public PreprocessorContext assertFilePreprocessing(final String testFileName, boolean keepLines,
+                                                     boolean allowsBlocks,
+                                                     final PreprocessorExtension ext,
+                                                     final PreprocessorLogger logger,
+                                                     final VariablePair... globalVars)
+      throws Exception {
     final File file = new File(getClass().getResource(testFileName).toURI());
 
     if (!file.exists() || !file.isFile()) {
@@ -324,6 +335,6 @@ public PreprocessorContext assertFilePreprocessing(final String testFileName, bo
     }
 
     return internalPreprocessAndMatch(file, preprocessingPart, new ArrayList<>(), etalonPart, ext,
-        logger, keepLines, globalVars);
+        logger, keepLines, allowsBlocks, globalVars);
   }
 }

jcp/src/test/java/com/igormaznitsa/jcp/directives/SpecialDirectivesBlockTest.java

@@ -27,7 +27,7 @@ public class SpecialDirectivesBlockTest extends AbstractDirectiveHandlerAcceptan
 
   @Override
   public void testExecution() throws Exception {
-    assertFilePreprocessing("directive_special_block.txt", false, null, null);
+    assertFilePreprocessing("directive_special_block.txt", false, true, null, null);
   }
 
   @Override