refactoring

Author: raydac

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

@@ -22,13 +22,19 @@
 package com.igormaznitsa.prologparser;
 
 import java.io.Reader;
+import java.util.List;
 
 /**
  * Generic version of prolog parser.
  */
 public class GenericPrologParser extends PrologParser {
+
+  public GenericPrologParser(final Reader reader, final ParserContext context) {
+    this(reader, context, List.of());
+  }
+
   public GenericPrologParser(final Reader reader, final ParserContext context,
-                             final TokenizedCommentListener... tokenizedCommentListeners) {
+                             final List<TokenizedCommentListener> tokenizedCommentListeners) {
     super(reader, context, tokenizedCommentListeners);
   }
 }

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

@@ -69,11 +69,12 @@ public interface ParserContext {
    */
   int FLAG_ZERO_QUOTATION_ALLOWS_WHITESPACE_CHAR = 64;
   /**
-   * Return commentaries as atoms.
+   * Make notifications about parsed commentaries and provide them as atoms.
    *
+   * @see TokenizedCommentListener
    * @since 2.2.0
    */
-  int FLAG_COMMENTS_AS_ATOMS = 128;
+  int FLAG_COMMENTS_AWARENESS = 128;
 
   /**
    * Check that the context contains an operator starts with some string.

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

@@ -21,7 +21,6 @@
 
 package com.igormaznitsa.prologparser;
 
-import static com.igormaznitsa.prologparser.ParserContext.FLAG_COMMENTS_AS_ATOMS;
 import static com.igormaznitsa.prologparser.ParserContext.FLAG_DOT2_AS_LIST;
 import static com.igormaznitsa.prologparser.ParserContext.FLAG_NONE;
 import static com.igormaznitsa.prologparser.ParserContext.FLAG_VAR_AS_FUNCTOR;
@@ -103,25 +102,19 @@ public abstract class PrologParser implements Iterable<PrologTerm>, AutoCloseabl
 
   protected final ParserContext context;
   protected final int parserFlags;
-  private final boolean commentsAsAtoms;
   private final Tokenizer tokenizer;
   private boolean autoCloseReaderFlag;
   private final List<TokenizedCommentListener> commentTokenListeners;
 
   protected PrologParser(
       final Reader source,
       final ParserContext context,
-      final TokenizedCommentListener... tokenizedCommentListeners
+      final List<TokenizedCommentListener> tokenizedCommentListeners
   ) {
     this.context = context == null ? DefaultParserContext.of(ParserContext.FLAG_NONE) : context;
     this.parserFlags = context == null ? FLAG_NONE : context.getFlags();
-    this.commentsAsAtoms = (this.parserFlags & FLAG_COMMENTS_AS_ATOMS) != 0;
     this.tokenizer = new Tokenizer(this, META_OP_MAP, requireNonNull(source));
-    if (tokenizedCommentListeners.length == 0) {
-      this.commentTokenListeners = List.of();
-    } else {
-      this.commentTokenListeners = List.of(tokenizedCommentListeners);
-    }
+    this.commentTokenListeners = List.copyOf(tokenizedCommentListeners);
   }
 
   public static Op findBaseMetaOperator(final String text, final OpAssoc type) {

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_AS_ATOMS
+ * @see ParserContext#FLAG_COMMENTS_AWARENESS
  * @since 2.2.0
  */
 @FunctionalInterface

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

@@ -22,7 +22,7 @@
 package com.igormaznitsa.prologparser.tokenizer;
 
 import static com.igormaznitsa.prologparser.ParserContext.FLAG_BLOCK_COMMENTS;
-import static com.igormaznitsa.prologparser.ParserContext.FLAG_COMMENTS_AS_ATOMS;
+import static com.igormaznitsa.prologparser.ParserContext.FLAG_COMMENTS_AWARENESS;
 import static com.igormaznitsa.prologparser.ParserContext.FLAG_ZERO_QUOTATION_ALLOWS_WHITESPACE_CHAR;
 import static com.igormaznitsa.prologparser.ParserContext.FLAG_ZERO_QUOTATION_CHARCODE;
 import static com.igormaznitsa.prologparser.tokenizer.TokenizerState.ATOM;
@@ -85,7 +85,7 @@ public Tokenizer(final PrologParser parser, final Koi7CharOpMap metaOperators,
     final int maxAllowedCharBufferSize = parser.getContext() == null ? Integer.MAX_VALUE :
         parser.getContext().getMaxTokenizerBufferLength();
     this.returnCommentsAsToken = parser.getContext() != null
-        && ((parser.getContext().getFlags() & FLAG_COMMENTS_AS_ATOMS) != 0);
+        && ((parser.getContext().getFlags() & FLAG_COMMENTS_AWARENESS) != 0);
     this.blockCommentsAllowed = parser.getContext() != null
         && ((parser.getContext().getFlags() & FLAG_BLOCK_COMMENTS) != 0);
     this.zeroSingleQuotationAllowed = parser.getContext() != null

src/test/java/com/igormaznitsa/prologparser/exceptions/PrologParserExceptionTest.java

@@ -91,10 +91,8 @@ public void testNotificationAboutComments() throws Exception {
     try (final PrologParser parser = new GenericPrologParser(
         new StringReader("% Line1\nhello(/*HHH*/world/*End*/).% Ending comment\n[1,2,3]."),
         DefaultParserContext.of(
-            ParserContext.FLAG_BLOCK_COMMENTS | ParserContext.FLAG_COMMENTS_AS_ATOMS, Op.ISO),
-        (parser1, comment) -> {
-          foundComments.add(comment);
-        }
+            ParserContext.FLAG_BLOCK_COMMENTS | ParserContext.FLAG_COMMENTS_AWARENESS, Op.ISO),
+        List.of((parser1, comment) -> foundComments.add(comment))
     )) {
       parser.forEach(foundTerms::add);
     }

src/test/java/com/igormaznitsa/prologparser/tokenizer/TokenizerTest.java

@@ -57,7 +57,7 @@ private Tokenizer tokenizeOf(final String str, final boolean allowBlockComment,
     when(context.getMaxTokenizerBufferLength()).thenReturn(1024);
     when(context.getFlags()).thenReturn(
         (allowBlockComment ? ParserContext.FLAG_BLOCK_COMMENTS : ParserContext.FLAG_NONE)
-            | (commentsAsAtoms ? ParserContext.FLAG_COMMENTS_AS_ATOMS : ParserContext.FLAG_NONE)
+            | (commentsAsAtoms ? ParserContext.FLAG_COMMENTS_AWARENESS : ParserContext.FLAG_NONE)
     );
     return this.tokenizeOf(str, context);
   }