From b3bfe8becde58651ef37b3d0c96c99cc8b2ba3e3 Mon Sep 17 00:00:00 2001 From: Jared Davis Date: Tue, 28 Jul 2026 08:35:17 -0400 Subject: [PATCH 1/3] Alter parseString to accumulate StringBuilder appends vs individual chars --- .../java/org/scijava/parsington/Literals.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/scijava/parsington/Literals.java b/src/main/java/org/scijava/parsington/Literals.java index f5997bd..22620d5 100644 --- a/src/main/java/org/scijava/parsington/Literals.java +++ b/src/main/java/org/scijava/parsington/Literals.java @@ -231,6 +231,7 @@ public static String parseString(final CharSequence s, final Position pos) { boolean escaped = false; final StringBuilder sb = new StringBuilder(); + int startIndex = index; while (true) { if (index >= s.length()) pos.die("Unclosed string literal"); final char c = s.charAt(index); @@ -249,6 +250,7 @@ public static String parseString(final CharSequence s, final Position pos) { } sb.append((char) Integer.parseInt(octal, 8)); index += octal.length(); + startIndex = index; continue; } switch (c) { @@ -284,10 +286,20 @@ public static String parseString(final CharSequence s, final Position pos) { default: // invalid escape pos.die("Invalid escape sequence"); } + startIndex = index+1; + } + else if (c == '\\' && quote == '"') { + escaped = true; + if (index - startIndex > 0) { + sb.append(s, startIndex, index); // before the escape + } + startIndex = -1; + } else if (c == quote) { + if (startIndex != -1 && index - startIndex > 0) { + sb.append(s, startIndex, index); // last segment + } + break; } - else if (c == '\\' && quote == '"') escaped = true; - else if (c == quote) break; - else sb.append(c); index++; } pos.set(index + 1); From af8ff7bb118fb722efe4206d1622c0f2dc8c4c7c Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 17 Nov 2026 14:10:10 -0600 Subject: [PATCH 2/3] Simplify bulk appending of string literal segments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit An empty range append is a no-op, so the length checks are unnecessary. And since every escape sequence resets the segment start before the next backslash or quote is reached, the -1 sentinel is unnecessary too. Quick benchmark results (STRING token in LiteralsBenchmark): ┌─────────────────────────────────┬─────────────────┬────────────────┐ │ Version │ Time per call │ Change vs main │ ├─────────────────────────────────┼─────────────────┼────────────────┤ │ main (7f21508) │ 35.16 ± 0.16 ns │ — │ │ First commit alone (b3bfe8b) │ 32.12 ± 0.19 ns │ −8.6% │ │ With the tidy-ups (this commit) │ 27.35 ± 0.31 ns │ −22.2% │ └─────────────────────────────────┴─────────────────┴────────────────┘ Settings were the same each time: 3 forks, 5 warmup and 10 measured iterations of 2 seconds each, with the GC profiler on. Assisted-by: Claude Code (Opus 5.5) --- .../java/org/scijava/parsington/Literals.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/scijava/parsington/Literals.java b/src/main/java/org/scijava/parsington/Literals.java index 22620d5..1554db4 100644 --- a/src/main/java/org/scijava/parsington/Literals.java +++ b/src/main/java/org/scijava/parsington/Literals.java @@ -231,7 +231,8 @@ public static String parseString(final CharSequence s, final Position pos) { boolean escaped = false; final StringBuilder sb = new StringBuilder(); - int startIndex = index; + // 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); @@ -250,7 +251,7 @@ public static String parseString(final CharSequence s, final Position pos) { } sb.append((char) Integer.parseInt(octal, 8)); index += octal.length(); - startIndex = index; + start = index; continue; } switch (c) { @@ -286,18 +287,14 @@ public static String parseString(final CharSequence s, final Position pos) { default: // invalid escape pos.die("Invalid escape sequence"); } - startIndex = index+1; + start = index + 1; } else if (c == '\\' && quote == '"') { + sb.append(s, start, index); // verbatim chars before the escape escaped = true; - if (index - startIndex > 0) { - sb.append(s, startIndex, index); // before the escape - } - startIndex = -1; - } else if (c == quote) { - if (startIndex != -1 && index - startIndex > 0) { - sb.append(s, startIndex, index); // last segment - } + } + else if (c == quote) { + sb.append(s, start, index); // verbatim chars before the quote break; } index++; From d7a569b97d9d3b394b10f0c1575e0fc3f3aaef3e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 17 Nov 2026 14:10:10 -0600 Subject: [PATCH 3/3] Test more string literal edge cases Escapes adjacent to the closing quote, consecutive escapes, empty strings, verbatim single-quoted strings, and the final position after parsing a string containing escapes. Assisted-by: Claude Code (Opus 5.5) --- .../org/scijava/parsington/LiteralsTest.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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