From dbcbe597c0c862885fa8f53596ed7054e9c707d5 Mon Sep 17 00:00:00 2001 From: Jesper Gravgaard Date: Tue, 10 Jul 2018 22:29:12 +0200 Subject: [PATCH] Fixed test on Windows. --- .../kickc/passes/Pass0GenerateStatementSequence.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java b/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java index f5635a8be..f3825cbab 100644 --- a/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java +++ b/src/main/java/dk/camelot64/kickc/passes/Pass0GenerateStatementSequence.java @@ -148,7 +148,7 @@ public class Pass0GenerateStatementSequence extends KickCBaseVisitor { Pattern p = Pattern.compile("\\{\\{[\\s]*(.*)[\\s]*\\}\\}", Pattern.DOTALL); Matcher m = p.matcher(kasm); if(m.find()) { - String kickAsmCode = m.group(1); + String kickAsmCode = m.group(1).replaceAll("\r", ""); sequence.addStatement(new StatementKickAsm(kickAsmCode, new StatementSource(ctx))); } if(ctx.kasmParams()!=null) { @@ -164,7 +164,7 @@ public class Pass0GenerateStatementSequence extends KickCBaseVisitor { resourceName = resourceName.substring(1, resourceName.length() - 1); File resourceFile = Compiler.loadFile(resourceName, program); program.addAsmResourceFile(resourceFile.toPath()); - program.getLog().append("Added resource "+resourceFile.getPath()); + program.getLog().append("Added resource "+resourceFile.getPath().replace('\\', '/')); } return null; }