6502/millfork
1
0
Fork 0
mirror of https://github.com/KarolS/millfork.git synced 2025-01-12 03:30:09 +00:00
Code Issues Projects Releases Wiki Activity

Text codec improvements

Browse Source
This commit is contained in:
Karol Stasiak 2018-12-19 22:27:15 +01:00
parent 60666a6467
commit 8582f0974d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,7 +60,7 @@ abstract class MfParser[T](fileId: String, input: String, currentDirectory: Stri
val charAtom: P[LiteralExpression] = for {
p <- position()
c <- "'" ~/ CharPred(c => c >= ' ' && !invalidCharLiteralTypes(Character.getType(c))).! ~/ "'"
c <- "'" ~/ CharPred(c => c >= ' ' && c != '\'' && !invalidCharLiteralTypes(Character.getType(c))).rep.! ~/ "'"
((co, zt), lenient) <- HWS ~ codec
} yield {
if (zt) {

6
src/main/scala/millfork/parser/TextCodec.scala
View File

@ -95,7 +95,7 @@ class TextCodec(val name: String,
}
private def encodeEscapeSequence(log: Logger, escSeq: String, position: Option[Position], lenient: Boolean): List[Int] = {
if (escSeq.length == 3 && (escSeq(0) == 'X' || escSeq(0) == 'x')){
if (escSeq.length == 3 && (escSeq(0) == 'X' || escSeq(0) == 'x' || escSeq(0) == '$')){
try {
return List(Integer.parseInt(escSeq.tail, 16))
} catch {
@ -326,7 +326,7 @@ object TextCodec {
"left" -> List(8),
"right" -> List(9),
"white" -> List(0x10, 7),
"black" -> List(0x10, 0),
"black" -> List(0x10, 8),
"red" -> List(0x10, 2),
"blue" -> List(0x10, 1),
"green" -> List(0x10, 4),
@ -334,7 +334,7 @@ object TextCodec {
"purple" -> List(0x10, 3),
"yellow" -> List(0x10, 6),
"bgwhite" -> List(0x11, 7),
"bgblack" -> List(0x11, 0),
"bgblack" -> List(0x11, 8),
"bgred" -> List(0x11, 2),
"bgblue" -> List(0x11, 1),
"bggreen" -> List(0x11, 4),