added support of space chars after zero quotation with FLAG_ZERO_QUOTATION_ALLOWS_WHITESPACE_CHAR

Author: raydac

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.igormaznitsa</groupId>
     <artifactId>java-prolog-parser</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2-SNAPHOT</version>
     <packaging>jar</packaging>
 
     <name>Edinburgh Prolog parser</name>
@@ -64,19 +64,19 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.4.2</version>
+            <version>5.5.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.4.2</version>
+            <version>5.5.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.28.2</version>
+            <version>3.0.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -140,7 +140,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.1.0</version>
+                        <version>3.1.1</version>
                         <configuration>
                             <failOnError>true</failOnError>
                             <show>protected</show>

src/main/java/com/igormaznitsa/prologparser/ParserContext.java

@@ -61,6 +61,11 @@ public interface ParserContext {
    * Recognize '.'(_,_) as a list term.
    */
   int FLAG_DOT2_AS_LIST = 32;
+  /**
+   * White-space char is allowed in zero quotation mode.
+   * @since 2.0.2
+   */
+  int FLAG_ZERO_QUOTATION_ALLOWS_WHITESPACE_CHAR = 64;
 
   /**
    * Check that the context contains an operator starts with some string

src/main/java/com/igormaznitsa/prologparser/tokenizer/Tokenizer.java

@@ -54,6 +54,7 @@ public final class Tokenizer {
   private final StringBuilderEx insideCharBuffer;
   private final boolean blockCommentsAllowed;
   private final boolean zeroSingleQuotationAllowed;
+  private final boolean zeroQuotationAllowsWhitespaceChar;
   private final Reader reader;
   private final PrologParser parser;
   private final Koi7CharOpMap metaOperators;
@@ -76,6 +77,7 @@ public Tokenizer(final PrologParser parser, final Koi7CharOpMap metaOperators, f
     final int maxAllowedCharBufferSize = parser.getContext() == null ? Integer.MAX_VALUE : parser.getContext().getMaxTokenizerBufferLength();
     this.blockCommentsAllowed = parser.getContext() != null && ((parser.getContext().getFlags() & ParserContext.FLAG_BLOCK_COMMENTS) != 0);
     this.zeroSingleQuotationAllowed = parser.getContext() != null && ((parser.getContext().getFlags() & ParserContext.FLAG_ZERO_QUOTATION_CHARCODE) != 0);
+    this.zeroQuotationAllowsWhitespaceChar = parser.getContext() != null && ((parser.getContext().getFlags() & ParserContext.FLAG_ZERO_QUOTATION_ALLOWS_WHITESPACE_CHAR) != 0);
 
     this.strBuf = new StringBuilderEx(32, maxAllowedCharBufferSize);
     this.specCharBuf = new StringBuilderEx(8, maxAllowedCharBufferSize);
@@ -865,15 +867,15 @@ state, getLastTokenLine(),
                       theChar = chr;
                     }
                     if (charCodeAsInt) {
-                      if (Character.isWhitespace(chr)) {
+                      if (Character.isWhitespace(chr) && !this.zeroQuotationAllowsWhitespaceChar) {
                         throw new PrologParserException("Unexpected whitespace char: 0x" + Integer.toHexString(chr), this.prevLine, this.prevPos);
                       } else {
-                        return new TokenizerResult(
-                            new PrologInt(theChar),
-                            state,
-                            getLastTokenLine(),
-                            getLastTokenPos()
-                        );
+                      return new TokenizerResult(
+                          new PrologInt(theChar),
+                          state,
+                          getLastTokenLine(),
+                          getLastTokenPos()
+                      );
                       }
                     } else {
                       strBuffer.append(theChar);

src/test/java/com/igormaznitsa/prologparser/AbstractIntegrationTest.java

@@ -56,6 +56,13 @@ public PrologParser parseEd(final String str) {
     return parseEd(str, parserContext);
   }
 
+  public PrologParser parseEd(final String str, final int parseFlags) {
+    final ParserContext parserContext = mock(ParserContext.class);
+    when(parserContext.getMaxTokenizerBufferLength()).thenReturn(1024);
+    when(parserContext.getFlags()).thenReturn(parseFlags);
+    return parseEd(str, parserContext);
+  }
+
   public PrologParser parseEd(final String str, final ParserContext context) {
     return parseEd(new StringReader(str), context);
   }
@@ -84,7 +91,7 @@ public void assertReadTerms(final int expected, final String resource, final Lis
   }
 
   public void assertReadTerms(final int expected, final String resource, final Op... ops) {
-    final ParserContext defaultContext = of(ParserContext.FLAG_BLOCK_COMMENTS, ops);
+    final ParserContext defaultContext = of(ParserContext.FLAG_BLOCK_COMMENTS | ParserContext.FLAG_ZERO_QUOTATION_CHARCODE | ParserContext.FLAG_ZERO_QUOTATION_ALLOWS_WHITESPACE_CHAR, ops);
     try (Reader reader = new InputStreamReader(getClass().getResourceAsStream(resource), StandardCharsets.UTF_8)) {
       final PrologParser parser = parseEd(reader, defaultContext);
       assertEquals(expected, parser.stream().count());