Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2024-10-18 16:24:26 +00:00
Code Issues Projects Releases Wiki Activity

petscii now use Result instead of Either

Browse Source
This commit is contained in:
Irmen de Jong 2021-10-13 23:22:46 +02:00
parent aaff484306
commit e63cf660c6
3 changed files with 1068 additions and 1068 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/src/prog8/compiler/target/ICompilationTarget.kt
View File

@ -1,5 +1,6 @@
package prog8.compiler.target package prog8.compiler.target
import com.github.michaelbull.result.fold
import prog8.ast.IMemSizer import prog8.ast.IMemSizer
import prog8.ast.Program import prog8.ast.Program
import prog8.ast.base.* import prog8.ast.base.*
@ -75,8 +76,8 @@ internal object C64Target: ICompilationTarget {
override fun encodeString(str: String, altEncoding: Boolean): List<Short> { override fun encodeString(str: String, altEncoding: Boolean): List<Short> {
val coded = if (altEncoding) Petscii.encodeScreencode(str, true) else Petscii.encodePetscii(str, true) val coded = if (altEncoding) Petscii.encodeScreencode(str, true) else Petscii.encodePetscii(str, true)
return coded.fold( return coded.fold(
{ throw it }, failure = { throw it },
{ it } success = { it }
) )
} }
override fun decodeString(bytes: List<Short>, altEncoding: Boolean) = override fun decodeString(bytes: List<Short>, altEncoding: Boolean) =
@ -103,8 +104,8 @@ internal object Cx16Target: ICompilationTarget {
override fun encodeString(str: String, altEncoding: Boolean): List<Short> { override fun encodeString(str: String, altEncoding: Boolean): List<Short> {
val coded= if (altEncoding) Petscii.encodeScreencode(str, true) else Petscii.encodePetscii(str, true) val coded= if (altEncoding) Petscii.encodeScreencode(str, true) else Petscii.encodePetscii(str, true)
return coded.fold( return coded.fold(
{ throw it }, failure = { throw it },
{ it} success = { it }
) )
} }
override fun decodeString(bytes: List<Short>, altEncoding: Boolean) = override fun decodeString(bytes: List<Short>, altEncoding: Boolean) =

32
compiler/src/prog8/compiler/target/cbm/Petscii.kt
View File

@ -1,9 +1,9 @@
package prog8.compiler.target.cbm package prog8.compiler.target.cbm
import prog8.Either import com.github.michaelbull.result.Err
import com.github.michaelbull.result.Ok
import com.github.michaelbull.result.Result
import prog8.ast.antlr.escape import prog8.ast.antlr.escape
import prog8.left
import prog8.right
import java.io.CharConversionException import java.io.CharConversionException
object Petscii { object Petscii {
@ -1065,7 +1065,7 @@ object Petscii {
else -> chr else -> chr
} }
fun encodePetscii(text: String, lowercase: Boolean = false): Either<CharConversionException, List<Short>> { fun encodePetscii(text: String, lowercase: Boolean = false): Result<List<Short>, CharConversionException> {
fun encodeChar(chr3: Char, lowercase: Boolean): Short { fun encodeChar(chr3: Char, lowercase: Boolean): Short {
val chr = replaceSpecial(chr3) val chr = replaceSpecial(chr3)
val screencode = if(lowercase) encodingPetsciiLowercase[chr] else encodingPetsciiUppercase[chr] val screencode = if(lowercase) encodingPetsciiLowercase[chr] else encodingPetsciiUppercase[chr]
@ -1083,7 +1083,7 @@ object Petscii {
} }
return try { return try {
right(text.map { Ok(text.map {
try { try {
encodeChar(it, lowercase) encodeChar(it, lowercase)
} catch (x: CharConversionException) { } catch (x: CharConversionException) {
@ -1091,7 +1091,7 @@ object Petscii {
} }
}) })
} catch(cx: CharConversionException) { } catch(cx: CharConversionException) {
left(cx) Err(cx)
} }
} }
@ -1107,7 +1107,7 @@ object Petscii {
}.joinToString("") }.joinToString("")
} }
fun encodeScreencode(text: String, lowercase: Boolean = false): Either<CharConversionException, List<Short>> { fun encodeScreencode(text: String, lowercase: Boolean = false): Result<List<Short>, CharConversionException> {
fun encodeChar(chr3: Char, lowercase: Boolean): Short { fun encodeChar(chr3: Char, lowercase: Boolean): Short {
val chr = replaceSpecial(chr3) val chr = replaceSpecial(chr3)
val screencode = if(lowercase) encodingScreencodeLowercase[chr] else encodingScreencodeUppercase[chr] val screencode = if(lowercase) encodingScreencodeLowercase[chr] else encodingScreencodeUppercase[chr]
@ -1125,7 +1125,7 @@ object Petscii {
} }
return try { return try {
right(text.map { Ok(text.map {
try { try {
encodeChar(it, lowercase) encodeChar(it, lowercase)
} catch (x: CharConversionException) { } catch (x: CharConversionException) {
@ -1133,7 +1133,7 @@ object Petscii {
} }
}) })
} catch(cx: CharConversionException) { } catch(cx: CharConversionException) {
left(cx) Err(cx)
} }
} }
@ -1149,7 +1149,7 @@ object Petscii {
}.joinToString("") }.joinToString("")
} }
fun petscii2scr(petscii_code: Short, inverseVideo: Boolean): Either<CharConversionException, Short> { fun petscii2scr(petscii_code: Short, inverseVideo: Boolean): Result<Short, CharConversionException> {
val code = when { val code = when {
petscii_code <= 0x1f -> petscii_code + 128 petscii_code <= 0x1f -> petscii_code + 128
petscii_code <= 0x3f -> petscii_code.toInt() petscii_code <= 0x3f -> petscii_code.toInt()
@ -1159,14 +1159,14 @@ object Petscii {
petscii_code <= 0xbf -> petscii_code - 64 petscii_code <= 0xbf -> petscii_code - 64
petscii_code <= 0xfe -> petscii_code - 128 petscii_code <= 0xfe -> petscii_code - 128
petscii_code == 255.toShort() -> 95 petscii_code == 255.toShort() -> 95
else -> return left(CharConversionException("petscii code out of range")) else -> return Err(CharConversionException("petscii code out of range"))
} }
if(inverseVideo) if(inverseVideo)
return right((code or 0x80).toShort()) return Ok((code or 0x80).toShort())
return right(code.toShort()) return Ok(code.toShort())
} }
fun scr2petscii(screencode: Short): Either<CharConversionException, Short> { fun scr2petscii(screencode: Short): Result<Short, CharConversionException> {
val petscii = when { val petscii = when {
screencode <= 0x1f -> screencode + 64 screencode <= 0x1f -> screencode + 64
screencode <= 0x3f -> screencode.toInt() screencode <= 0x3f -> screencode.toInt()
@ -1177,8 +1177,8 @@ object Petscii {
screencode <= 0xbf -> screencode - 128 screencode <= 0xbf -> screencode - 128
screencode <= 0xfe -> screencode - 64 screencode <= 0xfe -> screencode - 64
screencode == 255.toShort() -> 191 screencode == 255.toShort() -> 191
else -> return left(CharConversionException("screencode out of range")) else -> return Err(CharConversionException("screencode out of range"))
} }
return right(petscii.toShort()) return Ok(petscii.toShort())
} }
} }

47
compiler/test/TestPetscii.kt
View File

@ -1,5 +1,6 @@
package prog8tests package prog8tests
import com.github.michaelbull.result.Ok
import org.hamcrest.MatcherAssert.assertThat import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo import org.hamcrest.Matchers.equalTo
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
@ -9,8 +10,6 @@ import prog8.ast.base.Position
import prog8.ast.expressions.NumericLiteralValue import prog8.ast.expressions.NumericLiteralValue
import prog8.ast.expressions.StringLiteralValue import prog8.ast.expressions.StringLiteralValue
import prog8.compiler.target.cbm.Petscii import prog8.compiler.target.cbm.Petscii
import prog8.left
import prog8.right
import kotlin.test.* import kotlin.test.*
@ -19,8 +18,8 @@ class TestPetscii {
@Test @Test
fun testZero() { fun testZero() {
assertThat(Petscii.encodePetscii("\u0000", true), equalTo(right(listOf<Short>(0)))) assertThat(Petscii.encodePetscii("\u0000", true), equalTo(Ok(listOf<Short>(0))))
assertThat(Petscii.encodePetscii("\u0000", false), equalTo(right(listOf<Short>(0)))) assertThat(Petscii.encodePetscii("\u0000", false), equalTo(Ok(listOf<Short>(0))))
assertThat(Petscii.decodePetscii(listOf(0), true), equalTo("\u0000")) assertThat(Petscii.decodePetscii(listOf(0), true), equalTo("\u0000"))
assertThat(Petscii.decodePetscii(listOf(0), false), equalTo("\u0000")) assertThat(Petscii.decodePetscii(listOf(0), false), equalTo("\u0000"))
} }
@ -28,11 +27,11 @@ class TestPetscii {
@Test @Test
fun testLowercase() { fun testLowercase() {
assertThat(Petscii.encodePetscii("hello WORLD 123 @!£", true), equalTo( assertThat(Petscii.encodePetscii("hello WORLD 123 @!£", true), equalTo(
right(listOf<Short>(72, 69, 76, 76, 79, 32, 0xd7, 0xcf, 0xd2, 0xcc, 0xc4, 32, 49, 50, 51, 32, 64, 33, 0x5c)))) Ok(listOf<Short>(72, 69, 76, 76, 79, 32, 0xd7, 0xcf, 0xd2, 0xcc, 0xc4, 32, 49, 50, 51, 32, 64, 33, 0x5c))))
assertThat(Petscii.encodePetscii("\uf11a", true), equalTo(right(listOf<Short>(0x12)))) // reverse vid assertThat(Petscii.encodePetscii("\uf11a", true), equalTo(Ok(listOf<Short>(0x12)))) // reverse vid
assertThat(Petscii.encodePetscii("✓", true), equalTo(right(listOf<Short>(0xfa)))) assertThat(Petscii.encodePetscii("✓", true), equalTo(Ok(listOf<Short>(0xfa))))
assertThat("expect lowercase error fallback", Petscii.encodePetscii("π", true), equalTo(right(listOf<Short>(255)))) assertThat("expect lowercase error fallback", Petscii.encodePetscii("π", true), equalTo(Ok(listOf<Short>(255))))
assertThat("expect lowercase error fallback", Petscii.encodePetscii("♥", true), equalTo(right(listOf<Short>(0xd3)))) assertThat("expect lowercase error fallback", Petscii.encodePetscii("♥", true), equalTo(Ok(listOf<Short>(0xd3))))
assertThat(Petscii.decodePetscii(listOf(72, 0xd7, 0x5c, 0xfa, 0x12), true), equalTo("hW£✓\uF11A")) assertThat(Petscii.decodePetscii(listOf(72, 0xd7, 0x5c, 0xfa, 0x12), true), equalTo("hW£✓\uF11A"))
assertFailsWith<ArrayIndexOutOfBoundsException> { Petscii.decodePetscii(listOf(-1), true) } assertFailsWith<ArrayIndexOutOfBoundsException> { Petscii.decodePetscii(listOf(-1), true) }
@ -42,11 +41,11 @@ class TestPetscii {
@Test @Test
fun testUppercase() { fun testUppercase() {
assertThat(Petscii.encodePetscii("HELLO 123 @!£"), equalTo( assertThat(Petscii.encodePetscii("HELLO 123 @!£"), equalTo(
right(listOf<Short>(72, 69, 76, 76, 79, 32, 49, 50, 51, 32, 64, 33, 0x5c)))) Ok(listOf<Short>(72, 69, 76, 76, 79, 32, 49, 50, 51, 32, 64, 33, 0x5c))))
assertThat(Petscii.encodePetscii("\uf11a"), equalTo(right(listOf<Short>(0x12)))) // reverse vid assertThat(Petscii.encodePetscii("\uf11a"), equalTo(Ok(listOf<Short>(0x12)))) // reverse vid
assertThat(Petscii.encodePetscii("♥"), equalTo(right(listOf<Short>(0xd3)))) assertThat(Petscii.encodePetscii("♥"), equalTo(Ok(listOf<Short>(0xd3))))
assertThat(Petscii.encodePetscii("π"), equalTo(right(listOf<Short>(0xff)))) assertThat(Petscii.encodePetscii("π"), equalTo(Ok(listOf<Short>(0xff))))
assertThat("expecting fallback", Petscii.encodePetscii("✓"), equalTo(right(listOf<Short>(250)))) assertThat("expecting fallback", Petscii.encodePetscii("✓"), equalTo(Ok(listOf<Short>(250))))
assertThat(Petscii.decodePetscii(listOf(72, 0x5c, 0xd3, 0xff)), equalTo("H£♥π")) assertThat(Petscii.decodePetscii(listOf(72, 0x5c, 0xd3, 0xff)), equalTo("H£♥π"))
assertFailsWith<ArrayIndexOutOfBoundsException> { Petscii.decodePetscii(listOf(-1)) } assertFailsWith<ArrayIndexOutOfBoundsException> { Petscii.decodePetscii(listOf(-1)) }
@ -56,11 +55,11 @@ class TestPetscii {
@Test @Test
fun testScreencodeLowercase() { fun testScreencodeLowercase() {
assertThat(Petscii.encodeScreencode("hello WORLD 123 @!£", true), equalTo( assertThat(Petscii.encodeScreencode("hello WORLD 123 @!£", true), equalTo(
right(listOf<Short>(0x08, 0x05, 0x0c, 0x0c, 0x0f, 0x20, 0x57, 0x4f, 0x52, 0x4c, 0x44, 0x20, 0x31, 0x32, 0x33, 0x20, 0x00, 0x21, 0x1c)) Ok(listOf<Short>(0x08, 0x05, 0x0c, 0x0c, 0x0f, 0x20, 0x57, 0x4f, 0x52, 0x4c, 0x44, 0x20, 0x31, 0x32, 0x33, 0x20, 0x00, 0x21, 0x1c))
)) ))
assertThat(Petscii.encodeScreencode("✓", true), equalTo(right(listOf<Short>(0x7a)))) assertThat(Petscii.encodeScreencode("✓", true), equalTo(Ok(listOf<Short>(0x7a))))
assertThat("expect fallback", Petscii.encodeScreencode("♥", true), equalTo(right(listOf<Short>(83)))) assertThat("expect fallback", Petscii.encodeScreencode("♥", true), equalTo(Ok(listOf<Short>(83))))
assertThat("expect fallback", Petscii.encodeScreencode("π", true), equalTo(right(listOf<Short>(94)))) assertThat("expect fallback", Petscii.encodeScreencode("π", true), equalTo(Ok(listOf<Short>(94))))
assertThat(Petscii.decodeScreencode(listOf(0x08, 0x57, 0x1c, 0x7a), true), equalTo("hW£✓")) assertThat(Petscii.decodeScreencode(listOf(0x08, 0x57, 0x1c, 0x7a), true), equalTo("hW£✓"))
assertFailsWith<ArrayIndexOutOfBoundsException> { Petscii.decodeScreencode(listOf(-1), true) } assertFailsWith<ArrayIndexOutOfBoundsException> { Petscii.decodeScreencode(listOf(-1), true) }
@ -70,12 +69,12 @@ class TestPetscii {
@Test @Test
fun testScreencodeUppercase() { fun testScreencodeUppercase() {
assertThat(Petscii.encodeScreencode("WORLD 123 @!£"), equalTo( assertThat(Petscii.encodeScreencode("WORLD 123 @!£"), equalTo(
right(listOf<Short>(0x17, 0x0f, 0x12, 0x0c, 0x04, 0x20, 0x31, 0x32, 0x33, 0x20, 0x00, 0x21, 0x1c)))) Ok(listOf<Short>(0x17, 0x0f, 0x12, 0x0c, 0x04, 0x20, 0x31, 0x32, 0x33, 0x20, 0x00, 0x21, 0x1c))))
assertThat(Petscii.encodeScreencode("♥"), equalTo(right(listOf<Short>(0x53)))) assertThat(Petscii.encodeScreencode("♥"), equalTo(Ok(listOf<Short>(0x53))))
assertThat(Petscii.encodeScreencode("π"), equalTo(right(listOf<Short>(0x5e)))) assertThat(Petscii.encodeScreencode("π"), equalTo(Ok(listOf<Short>(0x5e))))
assertThat(Petscii.encodeScreencode("HELLO"), equalTo(right(listOf<Short>(8, 5, 12, 12, 15)))) assertThat(Petscii.encodeScreencode("HELLO"), equalTo(Ok(listOf<Short>(8, 5, 12, 12, 15))))
assertThat("expecting fallback", Petscii.encodeScreencode("hello"), equalTo(right(listOf<Short>(8, 5, 12, 12, 15)))) assertThat("expecting fallback", Petscii.encodeScreencode("hello"), equalTo(Ok(listOf<Short>(8, 5, 12, 12, 15))))
assertThat("expecting fallback", Petscii.encodeScreencode("✓"), equalTo(right(listOf<Short>(122)))) assertThat("expecting fallback", Petscii.encodeScreencode("✓"), equalTo(Ok(listOf<Short>(122))))
assertThat(Petscii.decodeScreencode(listOf(0x17, 0x1c, 0x53, 0x5e)), equalTo("W£♥π")) assertThat(Petscii.decodeScreencode(listOf(0x17, 0x1c, 0x53, 0x5e)), equalTo("W£♥π"))
assertFailsWith<ArrayIndexOutOfBoundsException> { Petscii.decodeScreencode(listOf(-1)) } assertFailsWith<ArrayIndexOutOfBoundsException> { Petscii.decodeScreencode(listOf(-1)) }