From 31a3bd9078c62c8975ef6508e0bcaa2b541e2f99 Mon Sep 17 00:00:00 2001 From: jespergravgaard Date: Thu, 8 Aug 2019 21:49:18 +0200 Subject: [PATCH] Added #pragma keyword. Closes #250 --- src/test/kc/encoding-literal-char.kc | 8 ++++---- src/test/kc/examples/sinsprites/sinus-sprites.kc | 2 +- src/test/kc/global-pc-multiple.kc | 4 ++-- src/test/kc/kc-ka-string-encoding.kc | 4 ++-- src/test/kc/platform-asm6502.kc | 2 +- src/test/kc/reserve-zp-global.kc | 2 +- src/test/kc/screen-center-distance.kc | 2 +- src/test/kc/string-encoding-unknown.kc | 2 +- src/test/kc/zeropage-exhausted.kc | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/test/kc/encoding-literal-char.kc b/src/test/kc/encoding-literal-char.kc index fc43f7fa6..2ef5f2801 100644 --- a/src/test/kc/encoding-literal-char.kc +++ b/src/test/kc/encoding-literal-char.kc @@ -1,15 +1,15 @@ // Tests encoding of literal chars -#encoding(petscii_mixed) +#pragma encoding(petscii_mixed) const char cpm = 'A'; const char[] spm = "A"; -#encoding(petscii_upper) +#pragma encoding(petscii_upper) const char cpu = 'A'; const char[] spu = "A"; -#encoding(screencode_mixed) +#pragma encoding(screencode_mixed) const char csm = 'A'; const char[] ssm = "A"; -#encoding(screencode_upper) +#pragma encoding(screencode_upper) const char csu = 'A'; const char[] ssu = "A"; diff --git a/src/test/kc/examples/sinsprites/sinus-sprites.kc b/src/test/kc/examples/sinsprites/sinus-sprites.kc index dbbb3405b..854e50d75 100644 --- a/src/test/kc/examples/sinsprites/sinus-sprites.kc +++ b/src/test/kc/examples/sinsprites/sinus-sprites.kc @@ -173,7 +173,7 @@ void gen_chargen_sprite(byte ch, byte* sprite) { } // Reserve zeropage addresses used by the BASIC FP operations -#reserve(0x07, 0x0d, 0x0e, 0x12) +#pragma reserve(0x07, 0x0d, 0x0e, 0x12) // Generate a sinus table using BASIC floats // - sintab is a pointer to the table to fill diff --git a/src/test/kc/global-pc-multiple.kc b/src/test/kc/global-pc-multiple.kc index 1d5ded8a5..5d1ffafd1 100644 --- a/src/test/kc/global-pc-multiple.kc +++ b/src/test/kc/global-pc-multiple.kc @@ -4,7 +4,7 @@ const byte* BGCOL = 0xd021; const byte* RASTER = 0xd012; -#pc(0x1000) +#pragma pc(0x1000) void main() { asm { sei } @@ -16,7 +16,7 @@ void main() { } } -#pc(0x2000) +#pragma pc(0x2000) void incScreen() { *BGCOL = *RASTER; diff --git a/src/test/kc/kc-ka-string-encoding.kc b/src/test/kc/kc-ka-string-encoding.kc index 6b0fdead7..30a9a97e3 100644 --- a/src/test/kc/kc-ka-string-encoding.kc +++ b/src/test/kc/kc-ka-string-encoding.kc @@ -1,5 +1,5 @@ -#reserve(0x16) -#encoding(petscii_mixed) +#pragma reserve(0x16) +#pragma encoding(petscii_mixed) char[] strTemp = "v=X"; int main(void){ strTemp[2] = 'e'; diff --git a/src/test/kc/platform-asm6502.kc b/src/test/kc/platform-asm6502.kc index 78bf32953..91b2e48de 100644 --- a/src/test/kc/platform-asm6502.kc +++ b/src/test/kc/platform-asm6502.kc @@ -1,6 +1,6 @@ // Tests the target platform ASM6502 -#target(asm6502) +#pragma target(asm6502) unsigned char[10] TABLE; diff --git a/src/test/kc/reserve-zp-global.kc b/src/test/kc/reserve-zp-global.kc index dde718ded..f2f3b04f3 100644 --- a/src/test/kc/reserve-zp-global.kc +++ b/src/test/kc/reserve-zp-global.kc @@ -1,6 +1,6 @@ // Demonstrates global directive reserving addresses on zeropage -#reserve(2,5) +#pragma reserve(2,5) void main() { const byte* SCREEN = $400; diff --git a/src/test/kc/screen-center-distance.kc b/src/test/kc/screen-center-distance.kc index 22bd2ccd7..a5ec64060 100644 --- a/src/test/kc/screen-center-distance.kc +++ b/src/test/kc/screen-center-distance.kc @@ -7,7 +7,7 @@ import "font-hex" import "time" import "print" -#reserve(08) +#pragma reserve(08) const byte* CHARSET = 0x2000; const byte* SCREEN = 0x2800; diff --git a/src/test/kc/string-encoding-unknown.kc b/src/test/kc/string-encoding-unknown.kc index 9e2cb3888..92b58f1d6 100644 --- a/src/test/kc/string-encoding-unknown.kc +++ b/src/test/kc/string-encoding-unknown.kc @@ -1,6 +1,6 @@ // Test setting an unknown encoding using the #encoding pragma -#encoding(ascii) +#pragma encoding(ascii) void main() { } diff --git a/src/test/kc/zeropage-exhausted.kc b/src/test/kc/zeropage-exhausted.kc index 53c6500ef..2656d33d0 100644 --- a/src/test/kc/zeropage-exhausted.kc +++ b/src/test/kc/zeropage-exhausted.kc @@ -1,7 +1,7 @@ // Tests warning when running out of zeropage-addresses for variables // Start by reserving most of zeropage (254 bytes) -#reserve(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254) +#pragma reserve(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254) // And then allocate a 2-byte-variable void main() {