WORD -> word(), DIGITS -> digits()

Author: fluentfuture

dot-parse/src/main/java/com/google/common/labs/parse/Parser.java

@@ -64,20 +64,6 @@
  * subject to stack overflow error on maliciously crafted input (think of 10K left parens).
  */
 public abstract class Parser<T> {
-  /**
-   * One or more regex {@code \w+} characters.
-   *
-   * @since 9.4
-   */
-  public static final Parser<String> WORD = consecutive(CharPredicate.WORD, "word");
-
-  /**
-   * One or more regex {@code \d+} characters.
-   *
-   * @since 9.4
-   */
-  public static final Parser<String> DIGITS = consecutive(CharPredicate.range('0', '9'), "digits");
-
   /**
    * Only use in context where input consumption is guaranteed. Do not use within a loop, like
    * atLeastOnce(), zeroOrMore()!
@@ -129,6 +115,24 @@ private static Parser<Void> skipConsecutive(CharPredicate matcher, String name)
     };
   }
 
+  /**
+   * One or more regex {@code \w+} characters.
+   *
+   * @since 9.4
+   */
+  public static Parser<String> word() {
+    return consecutive(CharPredicate.WORD, "word");
+  }
+
+  /**
+   * One or more regex {@code \d+} characters.
+   *
+   * @since 9.4
+   */
+  public static Parser<String> digits() {
+    return consecutive(CharPredicate.range('0', '9'), "digits");
+  }
+
   /** Matches a literal {@code string}. */
   public static Parser<String> string(String value) {
     checkArgument(value.length() > 0, "value cannot be empty");

dot-parse/src/test/java/com/google/common/labs/parse/MiniSearchTest.java

@@ -1,6 +1,6 @@
 package com.google.common.labs.parse;
 
-import static com.google.common.labs.parse.Parser.WORD;
+import static com.google.common.labs.parse.Parser.word;
 import static com.google.common.truth.Truth.assertThat;
 
 import java.util.Set;
@@ -66,7 +66,7 @@ static SearchCriteria parse(String input) {
 
       // A search term is either quoted, or unquoted (but cannot be a keyword)
       Parser<Term> unquoted =
-          WORD.suchThat(w -> !keywords.contains(w), "search term").map(Term::new);
+          word().suchThat(w -> !keywords.contains(w), "search term").map(Term::new);
       Parser<Term> quoted = Parser.quotedStringWithEscapes('"', Object::toString).map(Term::new);
 
       // Leaf-level search term can be a quoted, unquoted term, or a sub-criteria inside parentheses.