From 8d482ca8bf4f87983e3bb1725a122d93009f5a8a Mon Sep 17 00:00:00 2001 From: Karol Stasiak Date: Sun, 25 Feb 2018 00:43:31 +0100 Subject: [PATCH] .ini parsing fix --- src/main/scala/millfork/CompilationOptions.scala | 2 +- src/main/scala/millfork/Platform.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/millfork/CompilationOptions.scala b/src/main/scala/millfork/CompilationOptions.scala index dce46541..6e94b850 100644 --- a/src/main/scala/millfork/CompilationOptions.scala +++ b/src/main/scala/millfork/CompilationOptions.scala @@ -33,7 +33,7 @@ case class CompilationOptions(platform: Platform, commandLineFlags: Map[Compilat if (platform.cpu == Cmos) { ErrorReporting.warn("Illegal opcodes enabled for CMOS architecture", this) } - if (platform.cpu == StrictRicoh || platform.cpu == Ricoh) { + if (platform.cpu == StrictRicoh || platform.cpu == StrictMos) { ErrorReporting.warn("Illegal opcodes enabled for strict architecture", this) } } diff --git a/src/main/scala/millfork/Platform.scala b/src/main/scala/millfork/Platform.scala index 1d05edf9..3e26588b 100644 --- a/src/main/scala/millfork/Platform.scala +++ b/src/main/scala/millfork/Platform.scala @@ -54,7 +54,7 @@ object Platform { conf.read(new StringReader(new String(bytes, StandardCharsets.UTF_8))) val cs = conf.getSection("compilation") - val cpu = Cpu.fromString(cs.get(classOf[String], "cpu", "strict")) + val cpu = Cpu.fromString(cs.get(classOf[String], "arch", "strict")) val flagOverrides = CompilationFlag.fromString.flatMap { case (k, f) => cs.get(classOf[String], k, "").toLowerCase match { case "" => None