6502/millfork
1
0
Fork 0
mirror of https://github.com/KarolS/millfork.git synced 2025-01-01 06:29:53 +00:00
Code Issues Projects Releases Wiki Activity

Change encodeOneChar to encodeDigit

Browse Source
This commit is contained in:
Karol Stasiak 2020-03-31 18:48:11 +02:00
parent 542474e920
commit ceef57ed18
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/millfork/Platform.scala
View File

@ -295,8 +295,8 @@ object Platform {
val builtInFeatures = builtInCpuFeatures(cpu) ++ Map(
"ENCODING_SAME" -> toLong(codec.name == srcCodec.name),
"DECIMALS_SAME" -> toLong(codec.stringTerminator == srcCodec.stringTerminator && ('0' to '9').forall{c =>
codec.encodeOneChar(c) == srcCodec.encodeOneChar(c)
"DECIMALS_SAME" -> toLong(codec.stringTerminator == srcCodec.stringTerminator && (0 to 9).forall{c =>
codec.encodeDigit(c) == srcCodec.encodeDigit(c)
}),
"ENCCONV_SUPPORTED" -> toLong((codec.name, srcCodec.name) match {
case (TextCodec.Petscii.name, TextCodec.CbmScreencodes.name) |

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

@ -21,13 +21,17 @@ sealed trait TextCodec {
def decode(by: Int): Char
// encodes one char from BMP, without any lookup tables, conversions, and stuff
// useful only for things like ASCII digits
def encodeOneChar(c: Char): List[Int]
// encodes one decimal digit to one byte
def encodeDigit(digit: Int): List[Int]
def dump(): Unit = {
(0 until 256).map(decode).zipWithIndex.grouped(32).map(row => row.head._2.toHexString + "\t" + row.map(_._1).mkString("")).foreach(println(_))
}
{
// sanity check:
(0 to 9) foreach encodeDigit
}
}
class UnicodeTextCodec(override val name: String, val charset: Charset, override val stringTerminator: List[Int]) extends TextCodec {
@ -109,9 +113,7 @@ class UnicodeTextCodec(override val name: String, val charset: Charset, override
}
}
def encodeOneChar(c: Char): List[Int] = {
c.toString.getBytes(charset).map(_.&(0xff)).toList
}
def encodeDigit(digit: Int): List[Int] = digit.toString.getBytes(charset).map(_.toInt.&(0xff)).toList
override def decode(by: Int): Char = {
if (by >= 0x20 && by <= 0x7E) by.toChar
@ -255,7 +257,11 @@ class TableTextCodec(override val name: String,
if (index < map.length) map(index) else TextCodec.NotAChar
}
override def encodeOneChar(c: Char): List[Int] = List(map.indexOf(c.toInt))
override def encodeDigit(digit: Int): List[Int] = {
val i = map.indexOf(digit + '0'.toInt)
if (i < 0) throw new IllegalStateException(s"For some reason, there is no digit $digit in the $name encoding?")
List(i)
}
}
object TextCodec {