Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-08-14 22:27:48 +00:00
Code Issues Projects Releases Wiki Activity

add unit test for the string encoders special handling of 0x0000 and 0x8000-0x80ff

Browse Source
This commit is contained in:
Irmen de Jong
2022-03-25 18:26:23 +01:00
parent 7424f1f768
commit 3e44620966
3 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
codeCore/src/prog8/code/target/Encoder.kt
View File

@@ -9,7 +9,7 @@ import prog8.code.target.cbm.IsoEncoding
import prog8.code.target.cbm.PetsciiEncoding import prog8.code.target.cbm.PetsciiEncoding
internal object Encoder: IStringEncoding { object Encoder: IStringEncoding {
override fun encodeString(str: String, encoding: Encoding): List<UByte> { override fun encodeString(str: String, encoding: Encoding): List<UByte> {
val coded = when(encoding) { val coded = when(encoding) {
Encoding.PETSCII -> PetsciiEncoding.encodePetscii(str, true) Encoding.PETSCII -> PetsciiEncoding.encodePetscii(str, true)

23
compiler/test/TestStringEncodings.kt
View File

@@ -8,8 +8,12 @@ import io.kotest.core.spec.style.FunSpec
import io.kotest.matchers.shouldBe import io.kotest.matchers.shouldBe
import io.kotest.matchers.shouldNotBe import io.kotest.matchers.shouldNotBe
import io.kotest.matchers.string.shouldContain import io.kotest.matchers.string.shouldContain
import prog8.ast.antlr.unescape
import prog8.code.core.Encoding
import prog8.code.core.Position
import prog8.code.target.C64Target import prog8.code.target.C64Target
import prog8.code.target.Cx16Target import prog8.code.target.Cx16Target
import prog8.code.target.Encoder
import prog8.code.target.cbm.AtasciiEncoding import prog8.code.target.cbm.AtasciiEncoding
import prog8.code.target.cbm.IsoEncoding import prog8.code.target.cbm.IsoEncoding
import prog8.code.target.cbm.PetsciiEncoding import prog8.code.target.cbm.PetsciiEncoding
@@ -210,6 +214,24 @@ class TestStringEncodings: FunSpec({
} }
} }
test("special pass-through") {
val passthroughEscaped= """\x00\x1b\x99\xff"""
val passthrough = unescape(passthroughEscaped, Position.DUMMY)
passthrough.length shouldBe 4
passthrough[0] shouldBe '\u8000'
passthrough[1] shouldBe '\u801b'
passthrough[2] shouldBe '\u8099'
passthrough[3] shouldBe '\u80ff'
var encoded = Encoder.encodeString(passthrough, Encoding.PETSCII)
encoded shouldBe listOf<UByte>(0u, 0x1bu, 0x99u, 0xffu)
encoded = Encoder.encodeString(passthrough, Encoding.ATASCII)
encoded shouldBe listOf<UByte>(0u, 0x1bu, 0x99u, 0xffu)
encoded = Encoder.encodeString(passthrough, Encoding.SCREENCODES)
encoded shouldBe listOf<UByte>(0u, 0x1bu, 0x99u, 0xffu)
encoded = Encoder.encodeString(passthrough, Encoding.ISO)
encoded shouldBe listOf<UByte>(0u, 0x1bu, 0x99u, 0xffu)
}
test("invalid encoding immediately errors the parser") { test("invalid encoding immediately errors the parser") {
val source=""" val source="""
main { main {
@@ -275,3 +297,4 @@ class TestStringEncodings: FunSpec({
compileText(Cx16Target(), false, source, writeAssembly = false) shouldNotBe null compileText(Cx16Target(), false, source, writeAssembly = false) shouldNotBe null
} }
}) })

1
docs/source/todo.rst
View File

@@ -3,7 +3,6 @@ TODO
For next release For next release
^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^
- add unit test for the string encoders special handling of 0x0000 and 0x8000-0x80ff
... ...