1
0
mirror of https://gitlab.com/camelot/kickc.git synced 2025-08-08 13:25:12 +00:00

Fixed test on Windows.

This commit is contained in:
Jesper Gravgaard
2018-07-10 22:29:12 +02:00
parent cda0a9b498
commit dbcbe597c0

View File

@@ -148,7 +148,7 @@ public class Pass0GenerateStatementSequence extends KickCBaseVisitor<Object> {
Pattern p = Pattern.compile("\\{\\{[\\s]*(.*)[\\s]*\\}\\}", Pattern.DOTALL); Pattern p = Pattern.compile("\\{\\{[\\s]*(.*)[\\s]*\\}\\}", Pattern.DOTALL);
Matcher m = p.matcher(kasm); Matcher m = p.matcher(kasm);
if(m.find()) { if(m.find()) {
String kickAsmCode = m.group(1); String kickAsmCode = m.group(1).replaceAll("\r", "");
sequence.addStatement(new StatementKickAsm(kickAsmCode, new StatementSource(ctx))); sequence.addStatement(new StatementKickAsm(kickAsmCode, new StatementSource(ctx)));
} }
if(ctx.kasmParams()!=null) { if(ctx.kasmParams()!=null) {
@@ -164,7 +164,7 @@ public class Pass0GenerateStatementSequence extends KickCBaseVisitor<Object> {
resourceName = resourceName.substring(1, resourceName.length() - 1); resourceName = resourceName.substring(1, resourceName.length() - 1);
File resourceFile = Compiler.loadFile(resourceName, program); File resourceFile = Compiler.loadFile(resourceName, program);
program.addAsmResourceFile(resourceFile.toPath()); program.addAsmResourceFile(resourceFile.toPath());
program.getLog().append("Added resource "+resourceFile.getPath()); program.getLog().append("Added resource "+resourceFile.getPath().replace('\\', '/'));
} }
return null; return null;
} }