1
0
mirror of https://gitlab.com/camelot/kickc.git synced 2024-12-26 03:32:23 +00:00

Separated ASM fragment system out from ASM base

This commit is contained in:
jespergravgaard 2017-10-17 09:47:25 +02:00
parent 1f4efe0a4f
commit 09ed57fb98
350 changed files with 9 additions and 8 deletions

View File

@ -1,6 +1,7 @@
package dk.camelot64.kickc.asm;
package dk.camelot64.kickc.fragment;
import dk.camelot64.kickc.NumberParser;
import dk.camelot64.kickc.asm.*;
import dk.camelot64.kickc.asm.parser.Asm6502BaseVisitor;
import dk.camelot64.kickc.asm.parser.Asm6502Parser;
import dk.camelot64.kickc.icl.*;
@ -25,7 +26,7 @@ public class AsmFragment {
private Map<String, Value> bindings;
/**
* The scope containing the fragment. Used when referenginv symbols defined in other scopes.
* The scope containing the fragment. Used when referencing symbols defined in other scopes.
*/
private ScopeRef scope;
@ -585,7 +586,7 @@ public class AsmFragment {
if (instruction != null) {
program.addLine(instruction);
} else {
throw new RuntimeException("Error parsing ASM fragment line in dk/camelot64/kickc/asm/fragment/" + signature + ".asm\n - Line: " + ctx.getText());
throw new RuntimeException("Error parsing ASM fragment line in dk/camelot64/kickc/fragment/asm/" + signature + ".asm\n - Line: " + ctx.getText());
}
return null;
}

View File

@ -1,4 +1,4 @@
package dk.camelot64.kickc.asm;
package dk.camelot64.kickc.fragment;
import dk.camelot64.kickc.asm.parser.Asm6502Lexer;
import dk.camelot64.kickc.asm.parser.Asm6502Parser;
@ -137,7 +137,7 @@ public class AsmFragmentManager {
*/
private static CharStream loadFragment(String signature) {
ClassLoader classLoader = AsmFragmentManager.class.getClassLoader();
URL fragmentUrl = classLoader.getResource("dk/camelot64/kickc/asm/fragment/" + signature + ".asm");
URL fragmentUrl = classLoader.getResource("dk/camelot64/kickc/fragment/asm/" + signature + ".asm");
if(fragmentUrl==null) {
return null;
}

Some files were not shown because too many files have changed in this diff Show More