quotedStringWithEscapes() more forgiving to allow control chars

Author: fluentfuture

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

@@ -160,15 +160,14 @@ public static Parser<String> string(String value) {
    * @since 9.4
    */
   public static Parser<String> quotedStringWithEscapes(
-      char quoteChar, Function<? super Character, String> unescapeFunction) {
+      char quoteChar, Function<? super Character, ? extends CharSequence> unescapeFunction) {
     requireNonNull(unescapeFunction);
-    CharPredicate allowedChars = c -> !Character.isISOControl(c);
     checkArgument(quoteChar != '\\', "quoteChar cannot be '\\'");
-    checkArgument(allowedChars.test(quoteChar), "quoteChar cannot be %s", quoteChar);
+    checkArgument(!Character.isISOControl(quoteChar), "quoteChar cannot be a control character");
     String quoteString = Character.toString(quoteChar);
     return anyOf(
-            consecutive(isNot(quoteChar).and(isNot('\\')).and(allowedChars), "quoted chars"),
-            string("\\").then(single(allowedChars, "escaped char").map(unescapeFunction)))
+            consecutive(isNot(quoteChar).and(isNot('\\')), "quoted chars"),
+            string("\\").then(single(CharPredicate.ANY, "escaped char").map(unescapeFunction)))
         .zeroOrMore(joining())
         .immediatelyBetween(quoteString, quoteString);
   }

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

@@ -2329,12 +2329,6 @@ public void quotedStringWithEscapes_failures() {
     assertThrows(ParseException.class, () -> singleQuoted.parse("'foo")); // unclosed
     assertThrows(ParseException.class, () -> singleQuoted.parse("'foo'bar")); // leftover
     assertThrows(ParseException.class, () -> singleQuoted.parse("'foo\\")); // dangling escape
-    assertThrows(ParseException.class, () -> singleQuoted.parse("foo\n")); // literal newline
-    assertThrows(ParseException.class, () -> singleQuoted.parse("foo\r")); // CR
-    assertThrows(ParseException.class, () -> singleQuoted.parse("foo\t"));
-    assertThrows(ParseException.class, () -> singleQuoted.parse("\\\n")); // literal newline
-    assertThrows(ParseException.class, () -> singleQuoted.parse("\\\r")); // CR
-    assertThrows(ParseException.class, () -> singleQuoted.parse("\\\t"));
   }
 
   @Test