refactoring

Author: raydac

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

@@ -25,9 +25,11 @@
 import com.igormaznitsa.prologparser.tokenizer.Op;
 import com.igormaznitsa.prologparser.tokenizer.PrologParser;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Stream;
@@ -36,21 +38,29 @@
 
 public class DefaultParserContext implements ParserContext {
 
+  private static final Op[] EMPTY = new Op[0];
   protected final Set<String> opPrefixes = new HashSet<>();
   protected final Map<String, OpContainer> opContainers = new HashMap<>();
-
   protected final int flags;
 
-  public DefaultParserContext(final int flags, final Op... operators) {
+  public DefaultParserContext(final int flags, final List<Op> operators) {
     this.flags = flags;
-    this.addOps(operators);
+    this.addOps(operators.toArray(EMPTY));
+  }
+
+  public DefaultParserContext(final int flags) {
+    this(flags, Collections.emptyList());
   }
 
   public static ParserContext of(final int flags) {
     return new DefaultParserContext(flags);
   }
 
   public static ParserContext of(final int flags, final Op... operators) {
+    return new DefaultParserContext(flags, Arrays.asList(operators));
+  }
+
+  public static ParserContext of(final int flags, final List<Op> operators) {
     return new DefaultParserContext(flags, operators);
   }
 

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

@@ -29,7 +29,10 @@
 import com.igormaznitsa.prologparser.terms.TermType;
 import com.igormaznitsa.prologparser.utils.AssertUtils;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -73,7 +76,7 @@ public final class Op extends SpecServiceCompound {
   /**
    * Set of operators for ISO Prolog standard.
    */
-  public static final Op[] ISO = {
+  public static final List<Op> ISO = Collections.unmodifiableList(Arrays.asList(
       ISO_CLAUSES,
       ISO_DIRECTIVES,
       ISO_OR,
@@ -92,22 +95,22 @@ public final class Op extends SpecServiceCompound {
       ISO_UNARY_MINUS,
       ISO_BITWISE_NEGATION,
       make(100, OpAssoc.XFX, "@")
-  };
+  ));
 
   /**
    * Set of operators is specific for GNU Prolog use.
    */
-  public static final Op[] GNU_SPECIFIC = {
+  public static final List<Op> GNU_SPECIFIC = Collections.unmodifiableList(Arrays.asList(
       GNU_STAR_THEN,
       GNU_DOUBLE_DOT,
       GNU_DIV_RDIV,
-      GNU_UNARY_PLUS,
-  };
+      GNU_UNARY_PLUS
+  ));
 
   /**
    * Set of operators is specific for SWI Prolog use
    */
-  public static final Op[] SWI_SPECIFIC = {
+  public static final List<Op> SWI_SPECIFIC = Collections.unmodifiableList(Arrays.asList(
       make(1150, OpAssoc.FX, "dynamic", "discontiguous", "initialization", "meta_predicate", "module_transparent", "multifile", "public", "thread_local", "thread_initialization", "volatile"),
       GNU_STAR_THEN,
       make(990, OpAssoc.FY, ":="),
@@ -118,35 +121,35 @@ public final class Op extends SpecServiceCompound {
       GNU_DIV_RDIV,
       GNU_UNARY_PLUS,
       make(1, OpAssoc.FX, "$")
-  };
+  ));
 
   /**
    * Set of operators for SWI Prolog.
    */
-  public static final Op[] SWI = Op.join(ISO, SWI_SPECIFIC);
+  public static final List<Op> SWI = Collections.unmodifiableList(Op.join(ISO, SWI_SPECIFIC));
 
   /**
    * Set of Finite Domain operators for GNU Prolog.
    */
-  public static final Op[] GNU_FD = {
+  public static final List<Op> GNU_FD = Collections.unmodifiableList(Arrays.asList(
       make(750, XFY, "#<=>", "#\\<=>"),
       make(740, XFY, "#==>", "#\\==>"),
       make(730, XFY, "##"),
       make(730, YFX, "#\\/", "#\\\\/"),
       make(720, YFX, "#/\\", "#\\/\\"),
       make(710, FY, "#\\"),
       make(700, XFX, "#=", "#\\=", "#<", "#=<", "#>", "#>=", "#=#", "#\\=#", "#<#", "#=<#", "#>#", "#>=#")
-  };
+  ));
 
   /**
    * Set of operators for GNU Prolog.
    */
-  public static final Op[] GNU = Op.join(ISO, GNU_SPECIFIC);
+  public static final List<Op> GNU = Collections.unmodifiableList(Op.join(ISO, GNU_SPECIFIC));
 
   /**
    * Set of Constraint Logic Programming operators for SWI Prolog.
    */
-  public static final Op[] SWI_CPL = {
+  public static final List<Op> SWI_CPL = Collections.unmodifiableList(Arrays.asList(
       make(300, FY, "~"),
       make(500, YFX, "#"),
       make(760, YFX, "#<==>"),
@@ -157,8 +160,8 @@ public final class Op extends SpecServiceCompound {
       make(720, YFX, "#/\\"),
       make(710, FY, "#\\"),
       make(700, XFX, "#>", "#<", "#>=", "#=<", "#=", "#\\=", "in", "ins"),
-      make(450, XFX, ".."),
-  };
+      make(450, XFX, "..")
+  ));
 
   public static final Op VIRTUAL_OPERATOR_BLOCK = makeSystem(-1, OpAssoc.FX, "()");
   public static final Op METAOPERATOR_COMMA = makeSystem(1000, OpAssoc.XFY, ",");
@@ -250,8 +253,12 @@ static Op makeSystem(final int precedence, final OpAssoc type, final String... n
         : new Op(precedence, type, ".system.", assertOpValidOpName(names));
   }
 
-  public static Op[] join(Op[]... args) {
-    return of(args).flatMap(Stream::of).toArray(Op[]::new);
+  public static List<Op> join(final List<Op>... args) {
+    final List<Op> result = new ArrayList<>();
+    for (final List<Op> l : args) {
+      result.addAll(l);
+    }
+    return result;
   }
 
   public static Op[] add(Op[] args, Op... ops) {

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

@@ -26,6 +26,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Random;
@@ -552,6 +553,10 @@ public void testOperatorHierarchy() {
     assertEquals("~ (A & B) <===> ~ A v ~ B", term.toString());
   }
 
+  private void assertReadTerms(final int expected, final String resource, final List<Op> ops) {
+    assertReadTerms(expected, resource, ops.toArray(new Op[0]));
+  }
+
   private void assertReadTerms(final int expected, final String resource, final Op... ops) {
     final ParserContext defaultContext = of(ParserContext.FLAG_BLOCK_COMMENTS, ops);
     try (Reader reader = new InputStreamReader(getClass().getResourceAsStream(resource), StandardCharsets.UTF_8)) {