diff --git a/src/main/java/org/scijava/parsington/Literals.java b/src/main/java/org/scijava/parsington/Literals.java index f5997bd..1554db4 100644 --- a/src/main/java/org/scijava/parsington/Literals.java +++ b/src/main/java/org/scijava/parsington/Literals.java @@ -231,6 +231,8 @@ public static String parseString(final CharSequence s, final Position pos) { boolean escaped = false; final StringBuilder sb = new StringBuilder(); + // NB: Unescaped characters are appended in bulk, one segment at a time. + int start = index; while (true) { if (index >= s.length()) pos.die("Unclosed string literal"); final char c = s.charAt(index); @@ -249,6 +251,7 @@ public static String parseString(final CharSequence s, final Position pos) { } sb.append((char) Integer.parseInt(octal, 8)); index += octal.length(); + start = index; continue; } switch (c) { @@ -284,10 +287,16 @@ public static String parseString(final CharSequence s, final Position pos) { default: // invalid escape pos.die("Invalid escape sequence"); } + start = index + 1; + } + else if (c == '\\' && quote == '"') { + sb.append(s, start, index); // verbatim chars before the escape + escaped = true; + } + else if (c == quote) { + sb.append(s, start, index); // verbatim chars before the quote + break; } - else if (c == '\\' && quote == '"') escaped = true; - else if (c == quote) break; - else sb.append(c); index++; } pos.set(index + 1); diff --git a/src/test/java/org/scijava/parsington/LiteralsTest.java b/src/test/java/org/scijava/parsington/LiteralsTest.java index ea9b9a1..b3956dc 100644 --- a/src/test/java/org/scijava/parsington/LiteralsTest.java +++ b/src/test/java/org/scijava/parsington/LiteralsTest.java @@ -83,11 +83,29 @@ public void testParseString() { assertEquals("\123", Literals.parseString("\"\\123\"")); assertEquals("\377", Literals.parseString("\"\\377\"")); assertEquals("\1234", Literals.parseString("\"\\1234\"")); + // Test escape sequences adjacent to the closing quote. + assertEquals("ab\"", Literals.parseString("\"ab\\\"\"")); + assertEquals("ab\\", Literals.parseString("\"ab\\\\\"")); + assertEquals("ab\u9654", Literals.parseString("\"ab\\u9654\"")); + assertEquals("ab\12", Literals.parseString("\"ab\\12\"")); + // Test consecutive escape sequences with surrounding text. + assertEquals("\"\n\u9654\0x", Literals.parseString("\"\\\"\\n\\u9654\\0x\"")); + assertEquals("a\12b\1c", Literals.parseString("\"a\\12b\\1c\"")); + // Test empty strings. + assertEquals("", Literals.parseString("''")); + assertEquals("", Literals.parseString("\"\"")); + // Test that single-quoted strings are verbatim. + assertEquals("a\\nb\\", Literals.parseString("'a\\nb\\'")); + assertEquals("a\"b", Literals.parseString("'a\"b'")); + assertEquals("a'b", Literals.parseString("\"a'b\"")); // Test position final Position pos = new Position(); pos.set(2); assertEquals("cde", Literals.parseString("ab'cde'fg", pos)); assertEquals(7, pos.get()); + pos.set(2); + assertEquals("c\"d\te", Literals.parseString("ab\"c\\\"d\\te\"fg", pos)); + assertEquals(11, pos.get()); } @Test