refactoring

Author: raydac

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

@@ -74,7 +74,7 @@ public interface ParserContext {
    * @see TokenizedCommentListener
    * @since 2.2.0
    */
-  int FLAG_COMMENTS_AWARENESS = 128;
+  int FLAG_COMMENTS_AS_ATOMS = 128;
 
   /**
    * Check that the context contains an operator starts with some string.
@@ -106,13 +106,16 @@ default int getMaxTokenizerBufferLength() {
   /**
    * get parser flags for the parser context.
    *
-   * @return flags as bit field
-   * @see ParserContext#FLAG_NONE
-   * @see ParserContext#FLAG_VAR_AS_FUNCTOR
-   * @see ParserContext#FLAG_BLOCK_COMMENTS
-   * @see ParserContext#FLAG_CURLY_BRACKETS
-   * @see ParserContext#FLAG_ZERO_QUOTATION_CHARCODE
-   * @see ParserContext#FLAG_ZERO_STRUCT
+   * @return flags as bit field combining flag options
+   * @see #FLAG_NONE
+   * @see #FLAG_BLOCK_COMMENTS
+   * @see #FLAG_CURLY_BRACKETS
+   * @see #FLAG_VAR_AS_FUNCTOR
+   * @see #FLAG_ZERO_STRUCT
+   * @see #FLAG_ZERO_QUOTATION_CHARCODE
+   * @see #FLAG_COMMENTS_AS_ATOMS
+   * @see #FLAG_DOT2_AS_LIST
+   * @see #FLAG_ZERO_QUOTATION_ALLOWS_WHITESPACE_CHAR
    */
   int getFlags();
 }

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

@@ -103,8 +103,8 @@ public abstract class PrologParser implements Iterable<PrologTerm>, AutoCloseabl
   protected final ParserContext context;
   protected final int parserFlags;
   private final Tokenizer tokenizer;
-  private boolean autoCloseReaderFlag;
   private final List<TokenizedCommentListener> commentTokenListeners;
+  private PrologTermReadResult deferredReadTerm;
 
   protected PrologParser(
       final Reader source,
@@ -149,17 +149,18 @@ public static Koi7CharOpMap findMetaOps() {
     return Koi7CharOpMap.copyOf(META_OP_MAP);
   }
 
+  private static boolean isComment(final TokenizerResult tokenizerResult) {
+    return tokenizerResult != null
+        && tokenizerResult.getResult().getType() == TermType.ATOM
+        && (tokenizerResult.getResult().getQuotation() == Quotation.COMMENT_LINE
+        || tokenizerResult.getResult().getQuotation() == Quotation.COMMENT_BLOCK);
+  }
+
   /**
-   * Set flag to close provided reader automatically during close.
+   * Access to the internal tokenizer, it is mainly for test purposes because parser makes reading into internal buffers.
    *
-   * @return the parser instance
-   * @see PrologParser#close()
+   * @return the internal tokenizer in use by the parser
    */
-  public PrologParser autoCloseReader() {
-    this.autoCloseReaderFlag = true;
-    return this;
-  }
-
   public Tokenizer getInternalTokenizer() {
     return this.tokenizer;
   }
@@ -180,15 +181,6 @@ public ParserContext getContext() {
     return context;
   }
 
-  private PrologTermReadResult deferredReadTerm;
-
-  private static boolean isComment(final TokenizerResult tokenizerResult) {
-    return tokenizerResult != null
-        && tokenizerResult.getResult().getType() == TermType.ATOM
-        && (tokenizerResult.getResult().getQuotation() == Quotation.COMMENT_LINE
-        || tokenizerResult.getResult().getQuotation() == Quotation.COMMENT_BLOCK);
-  }
-
   private void notifyCommentTokenListeners(final TokenizerResult commentToken) {
     for (final TokenizedCommentListener listener : this.commentTokenListeners) {
       listener.onCommentToken(this, commentToken);
@@ -688,7 +680,18 @@ private void checkForNull(final Object obj, final String message,
   @Override
   public void close() throws IOException {
     this.deferredReadTerm = null;
-    this.tokenizer.close(this.autoCloseReaderFlag);
+    this.tokenizer.close(this.isCloseReader());
+  }
+
+  /**
+   * Returns flag to close the base reader. By default the reader will be closed.
+   *
+   * @return true if close base reader during its close, false to not close reader
+   * @see PrologParser#close()
+   * @since 2.2.0
+   */
+  protected boolean isCloseReader() {
+    return true;
   }
 
   @Override

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

@@ -5,7 +5,7 @@
 /**
  * Listener gets notifications from parser for met parsed comments if detection flag is on
  *
- * @see ParserContext#FLAG_COMMENTS_AWARENESS
+ * @see ParserContext#FLAG_COMMENTS_AS_ATOMS
  * @since 2.2.0
  */
 @FunctionalInterface