ChomeNS/brigadier
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

StringReader: allow more escapes like JSON

Browse source
This commit is contained in:
Mary Strodl 2021-04-28 10:31:30 -04:00
parent cf754c4ef6
commit 134099a39d
No known key found for this signature in database
GPG key ID: 23B7FC1590D8E30E
2 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/main/java/com/mojang/brigadier/StringReader.java
View file

@ -200,8 +200,37 @@ public class StringReader implements ImmutableStringReader {
while (canRead()) { while (canRead()) {
final char c = read(); final char c = read();
if (escaped) { if (escaped) {
if (c == terminator || c == SYNTAX_ESCAPE) { Character mogrified = null;
result.append(c); if (c == terminator) {
mogrified = terminator;
} else {
// Adapted from section 9 of ECMA-404:
switch (c) {
case SYNTAX_ESCAPE:
mogrified = SYNTAX_ESCAPE;
break;
case '/':
mogrified = '/';
break;
case 'b':
mogrified = '\b';
break;
case 'f':
mogrified = '\f';
break;
case 'n':
mogrified = '\n';
break;
case 'r':
mogrified = '\r';
break;
case 't':
mogrified = '\t';
break;
}
}
if(mogrified != null) {
result.append(mogrified);
escaped = false; escaped = false;
} else { } else {
setCursor(getCursor() - 1); setCursor(getCursor() - 1);

9
src/test/java/com/mojang/brigadier/StringReaderTest.java
View file

@ -214,9 +214,10 @@ public class StringReaderTest {
@Test @Test
public void readQuotedString_withEscapedEscapes() throws Exception { public void readQuotedString_withEscapedEscapes() throws Exception {
final StringReader reader = new StringReader("\"\\\\o/\""); final String original = "\"\\n\\\\o/\"";
assertThat(reader.readQuotedString(), equalTo("\\o/")); final StringReader reader = new StringReader(original);
assertThat(reader.getRead(), equalTo("\"\\\\o/\"")); assertThat(reader.readQuotedString(), equalTo("\n\\o/"));
assertThat(reader.getRead(), equalTo(original));
assertThat(reader.getRemaining(), equalTo("")); assertThat(reader.getRemaining(), equalTo(""));
} }
@ -585,4 +586,4 @@ public class StringReaderTest {
assertThat(ex.getCursor(), is(0)); assertThat(ex.getCursor(), is(0));
} }
} }
} }