6502/millfork
1
0
Fork 0
mirror of https://github.com/KarolS/millfork.git synced 2024-06-12 06:29:34 +00:00
Code Issues Projects Releases Wiki Activity

Separated bytes parsing fix and "for" statement parsing fix

Browse Source
This commit is contained in:
Karol Stasiak 2018-01-07 23:28:26 +01:00
parent 8b086f6c2f
commit 2bc27fba75
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,10 +258,10 @@ case class MfParser(filename: String, input: String, currentDirectory: String, o
def mlLhsExpressionSimple: P[LhsExpression] = mlIndexedExpression | (position() ~ identifier).map { case (p, n) => VariableExpression(n).pos(p) }
def mlLhsExpression: P[LhsExpression] = {
val separated = position() ~ mlLhsExpressionSimple ~ HWS ~ ":" ~/ HWS ~ mlLhsExpressionSimple
separated.map { case (p, h, l) => SeparateBytesExpression(h, l).pos(p) } | mlLhsExpressionSimple
}
def mlLhsExpression: P[LhsExpression] = for {
(p, left) <- position() ~ mlLhsExpressionSimple
rightOpt <- (HWS ~ ":" ~/ HWS ~ mlLhsExpressionSimple).?
} yield rightOpt.fold(left)(right => SeparateBytesExpression(left, right).pos(p))
def mlParenExpr: P[Expression] = P("(" ~/ AWS ~/ mlExpression(nonStatementLevel) ~ AWS ~/ ")")
@ -357,7 +357,7 @@ case class MfParser(filename: String, input: String, currentDirectory: String, o
("down" ~/ HWS ~/ "to").!.map(_ => ForDirection.DownTo)
def forStatement: P[ExecutableStatement] = for {
identifier <- "for" ~ SWS ~/ identifier ~/ "," ~/ Pass
identifier <- "for" ~ SWS ~/ identifier ~/ HWS ~ "," ~/ HWS ~ Pass
start <- mlExpression(nonStatementLevel) ~ HWS ~ "," ~/ HWS ~/ Pass
direction <- forDirection ~/ HWS ~/ "," ~/ HWS ~/ Pass
end <- mlExpression(nonStatementLevel)