6502/millfork
1
0
Fork 0
mirror of https://github.com/KarolS/millfork.git synced 2025-08-07 12:25:40 +00:00
Code Issues Projects Releases Wiki Activity

Better handling for invalid statements inside segment blocks

Browse Source
This commit is contained in:
Karol Stasiak
2019-10-31 12:11:05 +01:00
parent e3b3c36924
commit 33405ffcd6
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/scala/millfork/parser/MfParser.scala
View File

@@ -630,20 +630,26 @@ abstract class MfParser[T](fileId: String, input: String, currentDirectory: Stri
} yield Seq(UnionDefinitionStatement(name, fields).pos(p)) } yield Seq(UnionDefinitionStatement(name, fields).pos(p))
val segmentBlock: P[Seq[BankedDeclarationStatement]] = for { val segmentBlock: P[Seq[BankedDeclarationStatement]] = for {
bankName <- "segment" ~ AWS ~ "(" ~ AWS ~ identifier ~ AWS ~ ")" ~ AWS ~ "{" ~/ AWS (_, bankName) <- "segment" ~ AWS ~ "(" ~ AWS ~ position("segment name") ~ identifier ~ AWS ~ ")" ~ AWS ~ "{" ~/ AWS
body <- locatableDefinition.rep(sep = EOL) body <- locatableDefinition.rep(sep = EOL)
_ <- AWS ~ "}" ~/ Pass _ <- AWS ~ "}" ~/ Pass
} yield { } yield {
body.flatten.map{ stmt => body.flatten.map { stmt =>
if (stmt.bank.isEmpty) stmt.withChangedBank(bankName) if (stmt.bank.isEmpty) stmt.withChangedBank(bankName)
else stmt else stmt
} }
} }
def locatableDefinition: P[Seq[BankedDeclarationStatement]] = segmentBlock | arrayDefinition | functionDefinition | globalVariableDefinition
def checkForNonlocatableDefinitions: P[Seq[BankedDeclarationStatement]] =
((StringIn("alias", "enum", "struct", "union", "import").! ~ SWS) ~/ position()).map{ x =>
log.fatal(s"`${x._1}` statements are not allowed inside segment blocks", Some(x._2))
}
def locatableDefinition: P[Seq[BankedDeclarationStatement]] = checkForNonlocatableDefinitions | segmentBlock | arrayDefinition | functionDefinition | globalVariableDefinition
val program: Parser[Program] = for { val program: Parser[Program] = for {
_ <- Start ~/ AWS ~/ Pass _ <- Start ~/ AWS ~/ position("top level statement")
definitions <- (importStatement | aliasDefinition | enumDefinition | structDefinition | unionDefinition | locatableDefinition).rep(sep = EOL) definitions <- (importStatement | aliasDefinition | enumDefinition | structDefinition | unionDefinition | locatableDefinition).rep(sep = EOL)
_ <- AWS ~ End _ <- AWS ~ End
} yield Program(definitions.flatten.toList) } yield Program(definitions.flatten.toList)