6502/millfork
1
0
Fork 0
mirror of https://github.com/KarolS/millfork.git synced 2025-01-11 12:29:46 +00:00
Code Issues Projects Releases Wiki Activity

Allow comments after #endif and #else

Browse Source
This commit is contained in:
Karol Stasiak 2019-11-04 02:29:44 +01:00
parent 00841d685b
commit d906d8aab4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/scala/millfork/parser/Preprocessor.scala
View File

@ -23,6 +23,11 @@ object Preprocessor {
case class IfContext(hadEnabled: Boolean, hadElse: Boolean, enabledBefore: Boolean)
private def isNotEmpty(s: String): Boolean = {
val isEmpty = s.isEmpty || s.startsWith("//") || s.forall(_ == ';')
! isEmpty
}
def apply(options: CompilationOptions, shortFileName: String, lines: Seq[String]): PreprocessingResult = {
val platform = options.platform
val log = options.log
@ -104,7 +109,7 @@ object Preprocessor {
ifStack.push(IfContext(hadEnabled = false, hadElse = false, enabledBefore = false))
}
case "endif" =>
if (param != "") log.error("#endif shouldn't have a parameter", pos)
if (isNotEmpty(param)) log.error("#endif shouldn't have a parameter", pos)
if (ifStack.isEmpty) log.error("Unmatched #endif", pos)
else {
enabled = ifStack.pop().enabledBefore
@ -124,7 +129,7 @@ object Preprocessor {
}
}
case "else" =>
if (param != "") {
if (isNotEmpty(param)) {
log.error("#else shouldn't have a parameter", pos)
if (param.startsWith("if ")) {
log.error("Did you mean: #elseif")