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

Improve error message for multiple operators at the same priority

Browse Source
This commit is contained in:
Karol Stasiak
2020-08-14 22:28:50 +02:00
parent 49816d18fe
commit b9cd18c3c8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -454,14 +454,14 @@ abstract class MfParser[T](fileId: String, input: String, currentDirectory: Stri
xs.separators.distinct match { xs.separators.distinct match {
case Nil => case Nil =>
if (xs.tail.nonEmpty) if (xs.tail.nonEmpty)
log.error("Too many different operators", xs.head.head._2.position) log.error("Too many different operators; consider using parentheses for disambiguation", xs.head.head._2.position)
p(xs.head, level + 1) p(xs.head, level + 1)
case List("+") | List("-") | List("+", "-") | List("-", "+") => case List("+") | List("-") | List("+", "-") | List("-", "+") =>
SumExpression(xs.toPairList("+").map { SumExpression(xs.toPairList("+").map {
case (op, value) => case (op, value) =>
if (value.count(_._1) > 0) { if (value.count(_._1) > 0) {
if (value.size == 1) { if (value.size == 1) {
log.error("Too many different operators", xs.head.head._2.position) log.error("Too many different operators; consider using parentheses for disambiguation", xs.head.head._2.position)
} }
(op == "+", p(value.map(p => (false, p._2)), level + 1)) (op == "+", p(value.map(p => (false, p._2)), level + 1))
} else { } else {
@@ -470,7 +470,7 @@ abstract class MfParser[T](fileId: String, input: String, currentDirectory: Stri
}, decimal = false).pos(list.head._2.position) }, decimal = false).pos(list.head._2.position)
case List("+'") | List("-'") | List("+'", "-'") | List("-'", "+'") => case List("+'") | List("-'") | List("+'", "-'") | List("-'", "+'") =>
SumExpression(xs.toPairList("+").map { case (op, value) => SumExpression(xs.toPairList("+").map { case (op, value) =>
if (value.exists(_._1)) log.error("Too many different operators", xs.head.head._2.position) if (value.exists(_._1)) log.error("Too many different operators; consider using parentheses for disambiguation", xs.head.head._2.position)
(op == "-'", p(value, level + 1)) (op == "-'", p(value, level + 1))
}, decimal = true).pos(list.head._2.position) }, decimal = true).pos(list.head._2.position)
case List(":") => case List(":") =>
@@ -490,7 +490,7 @@ abstract class MfParser[T](fileId: String, input: String, currentDirectory: Stri
case List(op) => case List(op) =>
FunctionCallExpression(op, xs.items.map(value => p(value, level + 1))).pos(list.head._2.position) FunctionCallExpression(op, xs.items.map(value => p(value, level + 1))).pos(list.head._2.position)
case _ => case _ =>
log.error("Too many different operators", xs.head.head._2.position) log.error("Too many different operators; consider using parentheses for disambiguation", xs.head.head._2.position)
LiteralExpression(0, 1) LiteralExpression(0, 1)
} }
} }