diff --git a/src/main/java/dk/camelot64/kickc/Compiler.java b/src/main/java/dk/camelot64/kickc/Compiler.java index 48826bbe5..42617164d 100644 --- a/src/main/java/dk/camelot64/kickc/Compiler.java +++ b/src/main/java/dk/camelot64/kickc/Compiler.java @@ -57,7 +57,7 @@ public class Compiler { } final CharStream fileStream = CharStreams.fromPath(file.toPath()); imported.add(file.getAbsolutePath()); - program.getLog().append("PARSING "+file.getAbsolutePath()); + program.getLog().append("PARSING "+file.getPath()); program.getLog().append(fileStream.toString()); KickCLexer lexer = new KickCLexer(fileStream); KickCParser parser = new KickCParser(new CommonTokenStream(lexer)); diff --git a/src/test/java/dk/camelot64/kickc/test/TestErrors.java b/src/test/java/dk/camelot64/kickc/test/TestErrors.java deleted file mode 100644 index e1dd12559..000000000 --- a/src/test/java/dk/camelot64/kickc/test/TestErrors.java +++ /dev/null @@ -1,61 +0,0 @@ -package dk.camelot64.kickc.test; - -import dk.camelot64.kickc.Compiler; -import dk.camelot64.kickc.model.CompileError; -import dk.camelot64.kickc.model.Program; -import junit.framework.TestCase; -import org.antlr.v4.runtime.CharStream; -import org.antlr.v4.runtime.CharStreams; - -import java.io.IOException; -import java.net.URISyntaxException; - -/** - * Some failing tests highlighting errors/problems in KickC - */ -public class TestErrors extends TestCase { - - ReferenceHelper helper; - - String testPath; - - public TestErrors() throws IOException { - testPath = "src/test/java/dk/camelot64/kickc/test/"; - helper = new ReferenceHelper("dk/camelot64/kickc/test/ref/"); - } - - public void testNoCast() throws IOException, URISyntaxException { - compileAndCompare("nocast"); - } - - public void testInlineAsmParam() throws IOException, URISyntaxException { - compileAndCompare("inline-asm-param"); - } - - public void testForRangeSymbolic() throws IOException, URISyntaxException { - String filename = "forrangesymbolic"; - compileAndCompare(filename); - } - - private void compileAndCompare(String filename) throws IOException, URISyntaxException { - TestErrors tester = new TestErrors(); - tester.testFile(filename); - } - - private void testFile(String fileName) throws IOException, URISyntaxException { - System.out.println("Testing output for " + fileName); - Compiler compiler = new Compiler(); - compiler.addImportPath(testPath); - Program program = compiler.compile(fileName); - boolean success = true; - success &= helper.testOutput(fileName, ".asm", program.getAsm().toString(false)); - success &= helper.testOutput(fileName, ".sym", program.getScope().getSymbolTableContents(program)); - success &= helper.testOutput(fileName, ".cfg", program.getGraph().toString(program)); - success &= helper.testOutput(fileName, ".log", program.getLog().toString()); - if (!success) { - fail("Output does not match reference!"); - } - } - - -} \ No newline at end of file diff --git a/src/test/java/dk/camelot64/kickc/test/ref/arrays-init.log b/src/test/java/dk/camelot64/kickc/test/ref/arrays-init.log index 19ddc5c81..45fa7fcc2 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/arrays-init.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/arrays-init.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/arrays-init.kc +PARSING src/test/java/dk/camelot64/kickc/test/arrays-init.kc byte[3] b; byte[] c = {'c', 'm', 'l'}; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/asm-clobber.log b/src/test/java/dk/camelot64/kickc/test/ref/asm-clobber.log index 55d9da587..c1ff9fa2d 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/asm-clobber.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/asm-clobber.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/asm-clobber.kc +PARSING src/test/java/dk/camelot64/kickc/test/asm-clobber.kc // Tests that inline ASM clobbering is taken into account when assigning registers byte* SCREEN = $0400; void main() { diff --git a/src/test/java/dk/camelot64/kickc/test/ref/bitmap-bresenham.log b/src/test/java/dk/camelot64/kickc/test/ref/bitmap-bresenham.log index 76b031925..c9a3cd1ae 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/bitmap-bresenham.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/bitmap-bresenham.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/bitmap-bresenham.kc +PARSING src/test/java/dk/camelot64/kickc/test/bitmap-bresenham.kc byte* COLS = $d800; byte* BGCOL = $d020; byte* FGCOL = $d021; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/bitmap-plotter.log b/src/test/java/dk/camelot64/kickc/test/ref/bitmap-plotter.log index 0b2af6fd7..75c6cd3e3 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/bitmap-plotter.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/bitmap-plotter.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/bitmap-plotter.kc +PARSING src/test/java/dk/camelot64/kickc/test/bitmap-plotter.kc byte* D011 = $d011; byte RST8 = %10000000; byte ECM = %01000000; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/bresenham.log b/src/test/java/dk/camelot64/kickc/test/ref/bresenham.log index c20782eed..1d67b42ef 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/bresenham.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/bresenham.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/bresenham.kc +PARSING src/test/java/dk/camelot64/kickc/test/bresenham.kc byte STAR = 81; byte[40*25] SCREEN = $0400; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/bresenhamarr.log b/src/test/java/dk/camelot64/kickc/test/ref/bresenhamarr.log index 4617b0f08..7805e4e9d 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/bresenhamarr.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/bresenhamarr.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/bresenhamarr.kc +PARSING src/test/java/dk/camelot64/kickc/test/bresenhamarr.kc void main() { byte STAR = 81; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/callconstparam.log b/src/test/java/dk/camelot64/kickc/test/ref/callconstparam.log index 002bd8310..aa680ddda 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/callconstparam.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/callconstparam.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/callconstparam.kc +PARSING src/test/java/dk/camelot64/kickc/test/callconstparam.kc // Multiple calls with different (constant?) parameters should yield different values at runtime // Currently the same constant parameter is passed on every call. // Reason: Multiple versioned parameter constants x0#0, x0#1 are only output as a single constant in the ASM .const x0 = 0 diff --git a/src/test/java/dk/camelot64/kickc/test/ref/casting.log b/src/test/java/dk/camelot64/kickc/test/ref/casting.log index 839b59811..8faa8de66 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/casting.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/casting.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/casting.kc +PARSING src/test/java/dk/camelot64/kickc/test/casting.kc byte* SCREEN = $0400; byte* SCREEN2 = SCREEN+40*3; byte* SCREEN3 = SCREEN+40*6; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/chargen.log b/src/test/java/dk/camelot64/kickc/test/ref/chargen.log index 223447eb9..dba46e527 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/chargen.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/chargen.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/chargen.kc +PARSING src/test/java/dk/camelot64/kickc/test/chargen.kc byte* PROCPORT = $01; byte* CHARGEN = $d000; byte* SCREEN = $0400; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/const-identification.log b/src/test/java/dk/camelot64/kickc/test/ref/const-identification.log index 018d0760e..520f75e08 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/const-identification.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/const-identification.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/const-identification.kc +PARSING src/test/java/dk/camelot64/kickc/test/const-identification.kc const byte* plots = $1000; const byte* SCREEN = $0400; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/constabsmin.log b/src/test/java/dk/camelot64/kickc/test/ref/constabsmin.log index d78d04ee8..b69face74 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/constabsmin.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/constabsmin.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/constabsmin.kc +PARSING src/test/java/dk/camelot64/kickc/test/constabsmin.kc const byte* SCREEN = $0400; void main() { diff --git a/src/test/java/dk/camelot64/kickc/test/ref/constant-string-concat.log b/src/test/java/dk/camelot64/kickc/test/ref/constant-string-concat.log index 1666a96d7..3fa079042 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/constant-string-concat.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/constant-string-concat.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/constant-string-concat.kc +PARSING src/test/java/dk/camelot64/kickc/test/constant-string-concat.kc // Concatenates string constants in different ways void main() { byte[] s = "e"+"l"; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/constantmin.log b/src/test/java/dk/camelot64/kickc/test/ref/constantmin.log index 1b1a1f2fc..644014e2a 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/constantmin.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/constantmin.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/constantmin.kc +PARSING src/test/java/dk/camelot64/kickc/test/constantmin.kc const byte* SCREEN = $0400; const byte STAR = 81; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/constants.log b/src/test/java/dk/camelot64/kickc/test/ref/constants.log index 883302d7e..dc85cd65a 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/constants.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/constants.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/constants.kc +PARSING src/test/java/dk/camelot64/kickc/test/constants.kc import "print.kc" const byte* BGCOL = $d021; const byte GREEN = 5; @@ -60,7 +60,7 @@ void assert_sbyte(byte* msg, signed byte b, signed byte c) { } Importing print.kc -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/print.kc +PARSING src/test/java/dk/camelot64/kickc/test/print.kc byte* line_cursor = $0400; byte* char_cursor = line_cursor; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/double-import.log b/src/test/java/dk/camelot64/kickc/test/ref/double-import.log index 7e5d623e1..09a68da5c 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/double-import.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/double-import.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/double-import.kc +PARSING src/test/java/dk/camelot64/kickc/test/double-import.kc import "imported" import "imported" @@ -6,7 +6,7 @@ void main() { *BGCOL = RED; } Importing imported -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/imported.kc +PARSING src/test/java/dk/camelot64/kickc/test/imported.kc const byte *BGCOL = $d021; const byte RED = 2; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/fibmem.log b/src/test/java/dk/camelot64/kickc/test/ref/fibmem.log index 352c60fe8..345782f94 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/fibmem.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/fibmem.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/fibmem.kc +PARSING src/test/java/dk/camelot64/kickc/test/fibmem.kc byte[15] fibs = $1100; void main() { diff --git a/src/test/java/dk/camelot64/kickc/test/ref/fillscreen.log b/src/test/java/dk/camelot64/kickc/test/ref/fillscreen.log index 70eb1cc28..4320a0d4e 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/fillscreen.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/fillscreen.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/fillscreen.kc +PARSING src/test/java/dk/camelot64/kickc/test/fillscreen.kc byte *SCREEN = $0400; void main() { diff --git a/src/test/java/dk/camelot64/kickc/test/ref/flipper-rex2.log b/src/test/java/dk/camelot64/kickc/test/ref/flipper-rex2.log index dfe72e687..cdf6c8620 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/flipper-rex2.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/flipper-rex2.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/flipper-rex2.kc +PARSING src/test/java/dk/camelot64/kickc/test/flipper-rex2.kc byte[16*16] buffer1; byte[16*16] buffer2; byte *RASTER = $d012; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/forclassicmin.log b/src/test/java/dk/camelot64/kickc/test/ref/forclassicmin.log index 82e0a62bc..72fa3c213 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/forclassicmin.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/forclassicmin.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/forclassicmin.kc +PARSING src/test/java/dk/camelot64/kickc/test/forclassicmin.kc // Minimal classic for() loop diff --git a/src/test/java/dk/camelot64/kickc/test/ref/forincrementassign.log b/src/test/java/dk/camelot64/kickc/test/ref/forincrementassign.log index 37c723261..80eb44c35 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/forincrementassign.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/forincrementassign.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/forincrementassign.kc +PARSING src/test/java/dk/camelot64/kickc/test/forincrementassign.kc // Classic for() does not allow assignment as increment, eg. for(byte i=0;i<40;i=i+2) {} // The following should give a program rendering a char on every second char of the first line - but results in a syntax error diff --git a/src/test/java/dk/camelot64/kickc/test/ref/forrangemin.log b/src/test/java/dk/camelot64/kickc/test/ref/forrangemin.log index 023054eb4..8782cc472 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/forrangemin.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/forrangemin.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/forrangemin.kc +PARSING src/test/java/dk/camelot64/kickc/test/forrangemin.kc // Minimal range based for() loop diff --git a/src/test/java/dk/camelot64/kickc/test/ref/halfscii.log b/src/test/java/dk/camelot64/kickc/test/ref/halfscii.log index c451d93fb..7e59fbb14 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/halfscii.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/halfscii.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/halfscii.kc +PARSING src/test/java/dk/camelot64/kickc/test/halfscii.kc byte* SCREEN = $0400; byte* CHARSET = $2000; byte* CHARGEN = $D000; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/ifmin.log b/src/test/java/dk/camelot64/kickc/test/ref/ifmin.log index f1609bf9a..7e79ec4dc 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/ifmin.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/ifmin.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/ifmin.kc +PARSING src/test/java/dk/camelot64/kickc/test/ifmin.kc // Minimal if() test byte* SCREEN = $0400; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/immzero.log b/src/test/java/dk/camelot64/kickc/test/ref/immzero.log index 63103caab..7804a792d 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/immzero.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/immzero.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/immzero.kc +PARSING src/test/java/dk/camelot64/kickc/test/immzero.kc // Tests that immediate zero values are reused - even when assigning to words void main() { byte i = 0; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/importing.log b/src/test/java/dk/camelot64/kickc/test/ref/importing.log index ccc0ffc06..273035240 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/importing.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/importing.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/importing.kc +PARSING src/test/java/dk/camelot64/kickc/test/importing.kc import "imported.kc" void main() { @@ -7,7 +7,7 @@ void main() { *BGCOL = RED; } Importing imported.kc -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/imported.kc +PARSING src/test/java/dk/camelot64/kickc/test/imported.kc const byte *BGCOL = $d021; const byte RED = 2; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/incd020.log b/src/test/java/dk/camelot64/kickc/test/ref/incd020.log index 94eae1400..5417e951f 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/incd020.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/incd020.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/incd020.kc +PARSING src/test/java/dk/camelot64/kickc/test/incd020.kc // Incrementing / decrementing pointer content should result in code modifying the memory location - eg. inc $d020. // Currently it does not but instead leads to just reading the value a few times. diff --git a/src/test/java/dk/camelot64/kickc/test/ref/incrementinarray.log b/src/test/java/dk/camelot64/kickc/test/ref/incrementinarray.log index aaa317645..b4f242013 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/incrementinarray.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/incrementinarray.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/incrementinarray.kc +PARSING src/test/java/dk/camelot64/kickc/test/incrementinarray.kc import "print.kc" byte[] txt = "camelot@"; @@ -13,7 +13,7 @@ void main() { } Importing print.kc -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/print.kc +PARSING src/test/java/dk/camelot64/kickc/test/print.kc byte* line_cursor = $0400; byte* char_cursor = line_cursor; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/inline-asm.log b/src/test/java/dk/camelot64/kickc/test/ref/inline-asm.log index 18fbac387..481339bc3 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/inline-asm.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/inline-asm.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/inline-asm.kc +PARSING src/test/java/dk/camelot64/kickc/test/inline-asm.kc void main() { asm { diff --git a/src/test/java/dk/camelot64/kickc/test/ref/inline-assignment.log b/src/test/java/dk/camelot64/kickc/test/ref/inline-assignment.log index f3115a0f5..c39f47eb8 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/inline-assignment.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/inline-assignment.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/inline-assignment.kc +PARSING src/test/java/dk/camelot64/kickc/test/inline-assignment.kc const byte* SCREEN = $400; void main() { diff --git a/src/test/java/dk/camelot64/kickc/test/ref/inline-string.log b/src/test/java/dk/camelot64/kickc/test/ref/inline-string.log index 8ec989568..dc9fa65b8 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/inline-string.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/inline-string.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/inline-string.kc +PARSING src/test/java/dk/camelot64/kickc/test/inline-string.kc // Inline Strings in method calls are automatically converted to local constant variables byte[] st = "..."; - generating an ASM .text). byte[] msg1 = "message 1 @"; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/inline-word.log b/src/test/java/dk/camelot64/kickc/test/ref/inline-word.log index 812f5e81b..1e7087b57 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/inline-word.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/inline-word.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/inline-word.kc +PARSING src/test/java/dk/camelot64/kickc/test/inline-word.kc const byte* SCREEN = $400; void main() { diff --git a/src/test/java/dk/camelot64/kickc/test/ref/inlinearrayproblem.log b/src/test/java/dk/camelot64/kickc/test/ref/inlinearrayproblem.log index 59bc7f452..eb13ae5e3 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/inlinearrayproblem.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/inlinearrayproblem.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/inlinearrayproblem.kc +PARSING src/test/java/dk/camelot64/kickc/test/inlinearrayproblem.kc // Arrays / strings allocated inline destroy functions (because they are allocated where the call enters. // The following places the text at the start of the main-function - and JSR's straight into the text - not the code. diff --git a/src/test/java/dk/camelot64/kickc/test/ref/inmem-const-array.log b/src/test/java/dk/camelot64/kickc/test/ref/inmem-const-array.log index 6e2ab1a49..bfbcb7594 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/inmem-const-array.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/inmem-const-array.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/inmem-const-array.kc +PARSING src/test/java/dk/camelot64/kickc/test/inmem-const-array.kc byte WHITE = 1; byte RED = 2; byte GREEN = 5; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/inmemarray.log b/src/test/java/dk/camelot64/kickc/test/ref/inmemarray.log index 96794e115..c389c4394 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/inmemarray.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/inmemarray.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/inmemarray.kc +PARSING src/test/java/dk/camelot64/kickc/test/inmemarray.kc byte* SCREEN = $0400; byte[] TXT = { 3, 1, 13, 5, 12, 15, 20, 32}; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/inmemstring.log b/src/test/java/dk/camelot64/kickc/test/ref/inmemstring.log index a53d2e17f..b8858120c 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/inmemstring.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/inmemstring.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/inmemstring.kc +PARSING src/test/java/dk/camelot64/kickc/test/inmemstring.kc byte* SCREEN = $0400; byte[] TEXT = "camelot "; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/iterarray.log b/src/test/java/dk/camelot64/kickc/test/ref/iterarray.log index db46e3cd3..e22491650 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/iterarray.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/iterarray.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/iterarray.kc +PARSING src/test/java/dk/camelot64/kickc/test/iterarray.kc void main() { byte[16] buf = $1100; byte i = 5; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/literals.log b/src/test/java/dk/camelot64/kickc/test/ref/literals.log index 420a950e9..78358ca87 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/literals.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/literals.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/literals.kc +PARSING src/test/java/dk/camelot64/kickc/test/literals.kc byte* SCREEN = $0400; byte char = 'a'; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/liverange-call-problem.log b/src/test/java/dk/camelot64/kickc/test/ref/liverange-call-problem.log index 7327dd295..0b2ad8688 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/liverange-call-problem.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/liverange-call-problem.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/liverange-call-problem.kc +PARSING src/test/java/dk/camelot64/kickc/test/liverange-call-problem.kc // Live ranges were not functioning properly, when multiple method calls were chained - each modifying different vars. // w1 and w2 ended up having the same zero-page register as their live range was not propagated properly diff --git a/src/test/java/dk/camelot64/kickc/test/ref/liverange.log b/src/test/java/dk/camelot64/kickc/test/ref/liverange.log index bae6799d0..8f25b237e 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/liverange.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/liverange.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/liverange.kc +PARSING src/test/java/dk/camelot64/kickc/test/liverange.kc byte i=0; void main() { diff --git a/src/test/java/dk/camelot64/kickc/test/ref/local-string.log b/src/test/java/dk/camelot64/kickc/test/ref/local-string.log index 53d3ff47a..89b955895 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/local-string.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/local-string.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/local-string.kc +PARSING src/test/java/dk/camelot64/kickc/test/local-string.kc // Local constant strings are placed at the start of the method. This means the generated ASM jumps / calls straignt into the constant string void main() { byte* screen = $0400; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/loopmin.log b/src/test/java/dk/camelot64/kickc/test/ref/loopmin.log index f65d3d71b..a6009c69f 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/loopmin.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/loopmin.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/loopmin.kc +PARSING src/test/java/dk/camelot64/kickc/test/loopmin.kc void main() { byte i=10; byte s=0; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/loopnest.log b/src/test/java/dk/camelot64/kickc/test/ref/loopnest.log index eef3bd5f3..a31cd3b7a 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/loopnest.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/loopnest.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/loopnest.kc +PARSING src/test/java/dk/camelot64/kickc/test/loopnest.kc byte* SCREEN = $0400; void main() { diff --git a/src/test/java/dk/camelot64/kickc/test/ref/loopnest2.log b/src/test/java/dk/camelot64/kickc/test/ref/loopnest2.log index f665e873f..4835b2df8 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/loopnest2.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/loopnest2.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/loopnest2.kc +PARSING src/test/java/dk/camelot64/kickc/test/loopnest2.kc byte* SCREEN = $0400; void main() { diff --git a/src/test/java/dk/camelot64/kickc/test/ref/loopsplit.log b/src/test/java/dk/camelot64/kickc/test/ref/loopsplit.log index ee3bc7a14..96c21fee7 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/loopsplit.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/loopsplit.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/loopsplit.kc +PARSING src/test/java/dk/camelot64/kickc/test/loopsplit.kc void main() { byte i=100; byte s=0; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/modglobal.log b/src/test/java/dk/camelot64/kickc/test/ref/modglobal.log index 7f7e8d4d4..73c58bae7 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/modglobal.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/modglobal.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/modglobal.kc +PARSING src/test/java/dk/camelot64/kickc/test/modglobal.kc byte cnt = 0; byte cnt2 = 0; byte cnt3 = 0; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/modglobalmin.log b/src/test/java/dk/camelot64/kickc/test/ref/modglobalmin.log index d65110157..6a648d429 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/modglobalmin.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/modglobalmin.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/modglobalmin.kc +PARSING src/test/java/dk/camelot64/kickc/test/modglobalmin.kc byte cnt = 0; byte[256] SCREEN=$0400; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/multiply.log b/src/test/java/dk/camelot64/kickc/test/ref/multiply.log index f573a98fb..b1bc57452 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/multiply.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/multiply.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/multiply.kc +PARSING src/test/java/dk/camelot64/kickc/test/multiply.kc // Implementation of the Seriously Fast Multiplication // See http://codebase64.org/doku.php?id=base:seriously_fast_multiplication // Utilizes the fact that a*b = ((a+b)/2)^2 - ((a-b)/2)^2 diff --git a/src/test/java/dk/camelot64/kickc/test/ref/overlap-allocation-2.log b/src/test/java/dk/camelot64/kickc/test/ref/overlap-allocation-2.log index abc902a8b..cbb4ac4f7 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/overlap-allocation-2.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/overlap-allocation-2.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/overlap-allocation-2.kc +PARSING src/test/java/dk/camelot64/kickc/test/overlap-allocation-2.kc // Two levels of functions to test that register allocation handles live ranges and call-ranges optimally to allocate the fewest possible ZP-variables byte* SCREEN = $0400; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/overlap-allocation.log b/src/test/java/dk/camelot64/kickc/test/ref/overlap-allocation.log index 968e6d5fb..b6318e7f6 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/overlap-allocation.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/overlap-allocation.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/overlap-allocation.kc +PARSING src/test/java/dk/camelot64/kickc/test/overlap-allocation.kc // Allocates ZP to j/k-variables even though all of i, j, k could be allocates to x and be more efficient. // Reason: Pass4RegisterUpliftCombinations.isAllocationOverlapping() believes i/j/k variables overlaps insode plot() byte* SCREEN = $0400; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/print-problem.log b/src/test/java/dk/camelot64/kickc/test/ref/print-problem.log index 293fcaf19..5b45f747e 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/print-problem.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/print-problem.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/print-problem.kc +PARSING src/test/java/dk/camelot64/kickc/test/print-problem.kc byte* SCREEN= $400; byte line = $40; byte char = line; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/printmsg.log b/src/test/java/dk/camelot64/kickc/test/ref/printmsg.log index 574da7af7..5d09c6ee2 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/printmsg.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/printmsg.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/printmsg.kc +PARSING src/test/java/dk/camelot64/kickc/test/printmsg.kc import "print" byte[] msg = "hello world! @"; @@ -15,7 +15,7 @@ void main() { } Importing print -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/print.kc +PARSING src/test/java/dk/camelot64/kickc/test/print.kc byte* line_cursor = $0400; byte* char_cursor = line_cursor; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/ptr-complex.log b/src/test/java/dk/camelot64/kickc/test/ref/ptr-complex.log index 905184616..25fb67c0f 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/ptr-complex.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/ptr-complex.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/ptr-complex.kc +PARSING src/test/java/dk/camelot64/kickc/test/ptr-complex.kc // Test some complex pointers void main() { diff --git a/src/test/java/dk/camelot64/kickc/test/ref/ptrtest.log b/src/test/java/dk/camelot64/kickc/test/ref/ptrtest.log index 026adcdbc..e856c1fd7 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/ptrtest.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/ptrtest.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/ptrtest.kc +PARSING src/test/java/dk/camelot64/kickc/test/ptrtest.kc // Test all types of pointers void main() { diff --git a/src/test/java/dk/camelot64/kickc/test/ref/ptrtestmin.log b/src/test/java/dk/camelot64/kickc/test/ref/ptrtestmin.log index 0ee338e0e..07ae53a86 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/ptrtestmin.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/ptrtestmin.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/ptrtestmin.kc +PARSING src/test/java/dk/camelot64/kickc/test/ptrtestmin.kc // Test all types of pointers void main() { diff --git a/src/test/java/dk/camelot64/kickc/test/ref/scroll-clobber.log b/src/test/java/dk/camelot64/kickc/test/ref/scroll-clobber.log index abf8ef807..fc26ace7e 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/scroll-clobber.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/scroll-clobber.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/scroll-clobber.kc +PARSING src/test/java/dk/camelot64/kickc/test/scroll-clobber.kc byte* SCREEN = $0400; byte* SCROLL = $d016; byte[] TEXT = "01234567@"; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/scroll.log b/src/test/java/dk/camelot64/kickc/test/ref/scroll.log index 41f129629..201db070b 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/scroll.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/scroll.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/scroll.kc +PARSING src/test/java/dk/camelot64/kickc/test/scroll.kc byte* SCREEN = $0400; byte* RASTER = $d012; byte* BGCOL = $d020; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/scrollbig.log b/src/test/java/dk/camelot64/kickc/test/ref/scrollbig.log index d6266cbc1..025e87344 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/scrollbig.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/scrollbig.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/scrollbig.kc +PARSING src/test/java/dk/camelot64/kickc/test/scrollbig.kc // An 8x8 char letter scroller byte* PROCPORT = $01; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/signed-bytes.log b/src/test/java/dk/camelot64/kickc/test/ref/signed-bytes.log index 145ff1a80..c7c50bbd2 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/signed-bytes.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/signed-bytes.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/signed-bytes.kc +PARSING src/test/java/dk/camelot64/kickc/test/signed-bytes.kc void main() { byte* screen = $0400; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/signed-words.log b/src/test/java/dk/camelot64/kickc/test/ref/signed-words.log index e9cafd630..189049f00 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/signed-words.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/signed-words.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/signed-words.kc +PARSING src/test/java/dk/camelot64/kickc/test/signed-words.kc import "c64" const byte* SCREEN = $0400; @@ -73,7 +73,7 @@ void anim() { } Importing c64 -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/c64.kc +PARSING src/test/java/dk/camelot64/kickc/test/c64.kc const byte* PROCPORT = $01; const byte* CHARGEN = $d000; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/sinus-basic.log b/src/test/java/dk/camelot64/kickc/test/ref/sinus-basic.log index 8cb5c176c..a54ac228d 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/sinus-basic.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/sinus-basic.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/sinus-basic.kc +PARSING src/test/java/dk/camelot64/kickc/test/sinus-basic.kc import "print" import "basic-floats" @@ -24,7 +24,7 @@ void main() { } Importing print -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/print.kc +PARSING src/test/java/dk/camelot64/kickc/test/print.kc byte* line_cursor = $0400; byte* char_cursor = line_cursor; @@ -77,7 +77,7 @@ Adding pre/post-modifier (byte*) print_str::str ← ++ (byte*) print_str::str Adding pre/post-modifier (byte*) char_cursor ← ++ (byte*) char_cursor Adding pre/post-modifier (byte*) print_cls::sc ← ++ (byte*) print_cls::sc Importing basic-floats -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/basic-floats.kc +PARSING src/test/java/dk/camelot64/kickc/test/basic-floats.kc // Library wrapping the BASIC floating point functions // See https://www.c64-wiki.com/wiki/Floating_point_arithmetic // See http://www.pagetable.com/c64rom/c64rom_sc.html diff --git a/src/test/java/dk/camelot64/kickc/test/ref/sinus-sprites.log b/src/test/java/dk/camelot64/kickc/test/ref/sinus-sprites.log index 9ebc19185..bf9f646de 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/sinus-sprites.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/sinus-sprites.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/sinus-sprites.kc +PARSING src/test/java/dk/camelot64/kickc/test/sinus-sprites.kc import "c64" import "basic-floats" import "print" @@ -217,7 +217,7 @@ void gen_sintab(byte* sintab, byte length, byte min, byte max) { } Importing c64 -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/c64.kc +PARSING src/test/java/dk/camelot64/kickc/test/c64.kc const byte* PROCPORT = $01; const byte* CHARGEN = $d000; @@ -245,7 +245,7 @@ const byte WHITE = 1; const byte RED = 2; Importing basic-floats -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/basic-floats.kc +PARSING src/test/java/dk/camelot64/kickc/test/basic-floats.kc // Library wrapping the BASIC floating point functions // See https://www.c64-wiki.com/wiki/Floating_point_arithmetic // See http://www.pagetable.com/c64rom/c64rom_sc.html @@ -524,7 +524,7 @@ void mulFACby10() { } Importing print -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/print.kc +PARSING src/test/java/dk/camelot64/kickc/test/print.kc byte* line_cursor = $0400; byte* char_cursor = line_cursor; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/summin.log b/src/test/java/dk/camelot64/kickc/test/ref/summin.log index f82be91a2..3e14fb689 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/summin.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/summin.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/summin.kc +PARSING src/test/java/dk/camelot64/kickc/test/summin.kc byte* screen = $0400; void main() { diff --git a/src/test/java/dk/camelot64/kickc/test/ref/true-inline-words.log b/src/test/java/dk/camelot64/kickc/test/ref/true-inline-words.log index 735d90d61..66d693f68 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/true-inline-words.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/true-inline-words.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/true-inline-words.kc +PARSING src/test/java/dk/camelot64/kickc/test/true-inline-words.kc void main() { byte[] bs = { 'c', 'm' }; // constant byte array diff --git a/src/test/java/dk/camelot64/kickc/test/ref/unused-method.log b/src/test/java/dk/camelot64/kickc/test/ref/unused-method.log index 8263fd5db..f141ea3af 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/unused-method.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/unused-method.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/unused-method.kc +PARSING src/test/java/dk/camelot64/kickc/test/unused-method.kc void main() { byte* screen = $0400; screen[0] = 1; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/unused-vars.log b/src/test/java/dk/camelot64/kickc/test/ref/unused-vars.log index 84181db88..790ff2398 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/unused-vars.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/unused-vars.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/unused-vars.kc +PARSING src/test/java/dk/camelot64/kickc/test/unused-vars.kc // used vars const byte* SCREEN = $0400; byte b=2>>1; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/useglobal.log b/src/test/java/dk/camelot64/kickc/test/ref/useglobal.log index fcf7f4972..bf4fa0520 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/useglobal.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/useglobal.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/useglobal.kc +PARSING src/test/java/dk/camelot64/kickc/test/useglobal.kc // Tests procedures using global variables (should not fail) byte* SCREEN = $0400; void main() { diff --git a/src/test/java/dk/camelot64/kickc/test/ref/voronoi.log b/src/test/java/dk/camelot64/kickc/test/ref/voronoi.log index a079f7121..236a5aaa9 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/voronoi.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/voronoi.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/voronoi.kc +PARSING src/test/java/dk/camelot64/kickc/test/voronoi.kc // The screen byte *SCREEN = $0400; byte *COLORS = $D800; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/wordexpr.log b/src/test/java/dk/camelot64/kickc/test/ref/wordexpr.log index 6f8b63666..b9b16d223 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/wordexpr.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/wordexpr.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/wordexpr.kc +PARSING src/test/java/dk/camelot64/kickc/test/wordexpr.kc // Expressions based on bytes but resulting in words are as words - eg. b = b + 40*8; void main() { word b = 0; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/zpparammin.log b/src/test/java/dk/camelot64/kickc/test/ref/zpparammin.log index 4e3adf917..51221d7f3 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/zpparammin.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/zpparammin.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/zpparammin.kc +PARSING src/test/java/dk/camelot64/kickc/test/zpparammin.kc byte* SCREEN = $0400; byte* SCREEN2 = $0400+40; diff --git a/src/test/java/dk/camelot64/kickc/test/ref/zpptr.log b/src/test/java/dk/camelot64/kickc/test/ref/zpptr.log index d73a73e35..97d6f822d 100644 --- a/src/test/java/dk/camelot64/kickc/test/ref/zpptr.log +++ b/src/test/java/dk/camelot64/kickc/test/ref/zpptr.log @@ -1,4 +1,4 @@ -PARSING /Users/jespergravgaard/c64/tmp/kickc/src/test/java/dk/camelot64/kickc/test/zpptr.kc +PARSING src/test/java/dk/camelot64/kickc/test/zpptr.kc void main() { byte* zpptr = $1000; for(byte j : 0..10) {