AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-18 20:05:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

command reader: allow single quote

Browse Source
This commit is contained in:
Bixilon 2022-05-18 23:23:55 +02:00
parent 5f2b5fd847
commit fbcbc5d0ee
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/de/bixilon/minosoft/commands/util/CommandReader.kt
View File

@ -159,7 +159,7 @@ open class CommandReader(val string: String) {
if (!canPeekNext()) {
return null
}
unsafeRead(STRING_QUOTE)
val quoteStart = unsafeRead(STRING_QUOTE, STRING_SINGLE_QUOTE)
val string = StringBuilder()
var skipNextChar = false
while (true) {
@ -174,14 +174,14 @@ open class CommandReader(val string: String) {
continue
}
if (skipNextChar) {
if (read != STRING_QUOTE) {
if (read != quoteStart) {
throw UnexpectedBackslashError(this, start, pointer, read)
}
string.append('"')
skipNextChar = false
continue
}
if (read == STRING_QUOTE) {
if (read == quoteStart) {
return string.toString()
}
string.appendCodePoint(read)
@ -191,7 +191,7 @@ open class CommandReader(val string: String) {
fun readString(): String? {
skipWhitespaces()
val start = peekNext() ?: return null
if (start == STRING_QUOTE) {
if (start == STRING_QUOTE || start == STRING_SINGLE_QUOTE) {
return readQuotedString()
}
return readUnquotedString()
@ -265,5 +265,6 @@ open class CommandReader(val string: String) {
companion object {
const val STRING_QUOTE = '"'.code
const val STRING_SINGLE_QUOTE = '\''.code
}
}