From 63192699763427f5fba6fa209fd9da0783489d50 Mon Sep 17 00:00:00 2001 From: Irmen de Jong Date: Sat, 20 Feb 2021 02:55:06 +0100 Subject: [PATCH] underscore '_' is now also mapped to petscii, to the graphical symbol --- .../src/prog8/compiler/target/c64/Petscii.kt | 12 ++++++------ examples/test.p8 | 16 +--------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/compiler/src/prog8/compiler/target/c64/Petscii.kt b/compiler/src/prog8/compiler/target/c64/Petscii.kt index 07f2f2086..915891208 100644 --- a/compiler/src/prog8/compiler/target/c64/Petscii.kt +++ b/compiler/src/prog8/compiler/target/c64/Petscii.kt @@ -172,7 +172,7 @@ object Petscii { '\u258c', // ▌ 0xA1 -> LEFT HALF BLOCK '\u2584', // ▄ 0xA2 -> LOWER HALF BLOCK '\u2594', // ▔ 0xA3 -> UPPER ONE EIGHTH BLOCK - '\u2581', // ▁ 0xA4 -> LOWER ONE EIGHTH BLOCK + '_', // ▁ 0xA4 -> LOWER ONE EIGHTH BLOCK '\u258f', // ▏ 0xA5 -> LEFT ONE EIGHTH BLOCK '\u2592', // ▒ 0xA6 -> MEDIUM SHADE '\u2595', // ▕ 0xA7 -> RIGHT ONE EIGHTH BLOCK @@ -236,7 +236,7 @@ object Petscii { '\u258c', // ▌ 0xE1 -> LEFT HALF BLOCK '\u2584', // ▄ 0xE2 -> LOWER HALF BLOCK '\u2594', // ▔ 0xE3 -> UPPER ONE EIGHTH BLOCK - '\u2581', // ▁ 0xE4 -> LOWER ONE EIGHTH BLOCK + '_', // ▁ 0xE4 -> LOWER ONE EIGHTH BLOCK '\u258f', // ▏ 0xE5 -> LEFT ONE EIGHTH BLOCK '\u2592', // ▒ 0xE6 -> MEDIUM SHADE '\u2595', // ▕ 0xE7 -> RIGHT ONE EIGHTH BLOCK @@ -431,7 +431,7 @@ object Petscii { '\u258c', // ▌ 0xA1 -> LEFT HALF BLOCK '\u2584', // ▄ 0xA2 -> LOWER HALF BLOCK '\u2594', // ▔ 0xA3 -> UPPER ONE EIGHTH BLOCK - '\u2581', // ▁ 0xA4 -> LOWER ONE EIGHTH BLOCK + '_', // ▁ 0xA4 -> LOWER ONE EIGHTH BLOCK '\u258f', // ▏ 0xA5 -> LEFT ONE EIGHTH BLOCK '\u2592', // ▒ 0xA6 -> MEDIUM SHADE '\u2595', // ▕ 0xA7 -> RIGHT ONE EIGHTH BLOCK @@ -495,7 +495,7 @@ object Petscii { '\u258c', // ▌ 0xE1 -> LEFT HALF BLOCK '\u2584', // ▄ 0xE2 -> LOWER HALF BLOCK '\u2594', // ▔ 0xE3 -> UPPER ONE EIGHTH BLOCK - '\u2581', // ▁ 0xE4 -> LOWER ONE EIGHTH BLOCK + '_', // ▁ 0xE4 -> LOWER ONE EIGHTH BLOCK '\u258f', // ▏ 0xE5 -> LEFT ONE EIGHTH BLOCK '\u2592', // ▒ 0xE6 -> MEDIUM SHADE '\u2595', // ▕ 0xE7 -> RIGHT ONE EIGHTH BLOCK @@ -626,7 +626,7 @@ object Petscii { '\u258c', // ▌ 0x61 -> LEFT HALF BLOCK '\u2584', // ▄ 0x62 -> LOWER HALF BLOCK '\u2594', // ▔ 0x63 -> UPPER ONE EIGHTH BLOCK - '\u2581', // ▁ 0x64 -> LOWER ONE EIGHTH BLOCK + '_', // ▁ 0x64 -> LOWER ONE EIGHTH BLOCK '\u258f', // ▏ 0x65 -> LEFT ONE EIGHTH BLOCK '\u2592', // ▒ 0x66 -> MEDIUM SHADE '\u2595', // ▕ 0x67 -> RIGHT ONE EIGHTH BLOCK @@ -885,7 +885,7 @@ object Petscii { '\u258c', // ▌ 0x61 -> LEFT HALF BLOCK '\u2584', // ▄ 0x62 -> LOWER HALF BLOCK '\u2594', // ▔ 0x63 -> UPPER ONE EIGHTH BLOCK - '\u2581', // ▁ 0x64 -> LOWER ONE EIGHTH BLOCK + '_', // ▁ 0x64 -> LOWER ONE EIGHTH BLOCK '\u258f', // ▏ 0x65 -> LEFT ONE EIGHTH BLOCK '\u2592', // ▒ 0x66 -> MEDIUM SHADE '\u2595', // ▕ 0x67 -> RIGHT ONE EIGHTH BLOCK diff --git a/examples/test.p8 b/examples/test.p8 index 8690f039e..4226eac39 100644 --- a/examples/test.p8 +++ b/examples/test.p8 @@ -5,20 +5,6 @@ main { sub start() { - ubyte rr = bla(1,true,2) - txt.print_ub(rr) - txt.nl() - rr = bla(1,false,2) - txt.print_ub(rr) - } - - asmsub bla(ubyte aa @A, ubyte cc @Pc, ubyte bb @Y) -> ubyte @A{ - %asm {{ - bcc + - lda #10 - bne end -+ lda #20 -end rts - }} + txt.print("Foo_bar\n") } }