6502/millfork
1
0
Fork 0
mirror of https://github.com/KarolS/millfork.git synced 2024-06-09 16:29:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix GraalVM NPE when getting a character name

Browse Source
This commit is contained in:
Karol Stasiak 2020-12-01 03:20:31 +01:00
parent 8dfad735ab
commit 52c9da36b8
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/scala/millfork/parser/MfParser.scala
View File

@ -30,6 +30,18 @@ abstract class MfParser[T](fileId: String, input: String, currentDirectory: Stri
val enableDebuggingOptions: Boolean = options.flag(CompilationFlag.EnableInternalTestSyntax)
private def getCharacterNameSafe(c: Char): String = {
try {
"U+%04X %s".format(c.toInt, Character.getName(c))
} catch {
case _: Throwable => c match {
case '\n' => "U+000A LINE FEED"
case '\r' => "U+000D CARRIAGE RETURN"
case _ => "U+%04X"
}
}
}
def toAst: Parsed[Program] = {
val parse = program.parse(input + "\n\n\n")
parse match {
@ -37,7 +49,7 @@ abstract class MfParser[T](fileId: String, input: String, currentDirectory: Stri
if (lastPosition.cursor >= 0 && lastPosition.cursor < input.length) {
val c = input(lastPosition.cursor)
if (c >= 0x100 || c < 0x20 || c == '`') {
log.error("Invalid character U+%04X %s".format(c.toInt, Character.getName(c)), Some(lastPosition))
log.error("Invalid character %s".format(getCharacterNameSafe(c)), Some(lastPosition))
Confusables.map.get(c) match {
case Some(ascii) =>
log.info(s"Did you mean: $ascii")