diff options
| author | Enno Runne <enno.runne@baymarkets.com> | 2017-02-16 21:11:16 +0100 |
|---|---|---|
| committer | Felix Mulder <felix.mulder@gmail.com> | 2017-02-20 16:50:09 +0100 |
| commit | 4352a4a97817edfbd4e936258050c17bfff187c3 (patch) | |
| tree | 3f86b6109f6db6ccf718758bc040527f76afb556 /compiler/src/dotty/tools/dotc/parsing/Parsers.scala | |
| parent | e668fd7eaf93a81d0409728664a0f2bda4a63761 (diff) | |
| download | dotty-4352a4a97817edfbd4e936258050c17bfff187c3.tar.gz dotty-4352a4a97817edfbd4e936258050c17bfff187c3.tar.bz2 dotty-4352a4a97817edfbd4e936258050c17bfff187c3.zip | |
Incorporated comments from @felixmulder
Diffstat (limited to 'compiler/src/dotty/tools/dotc/parsing/Parsers.scala')
| -rw-r--r-- | compiler/src/dotty/tools/dotc/parsing/Parsers.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala index 8f146e920..b46bc401d 100644 --- a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala +++ b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala @@ -404,13 +404,13 @@ object Parsers { var opStack: List[OpInfo] = Nil - def checkAssoc(offset: Int, op: Name, leftAssoc: Boolean, op2: Name) = - if (isLeftAssoc(op) != leftAssoc) - syntaxError(MixedLeftAndRightAssociativeOps(op, op2, leftAssoc), offset) + def checkAssoc(offset: Token, op1: Name, op2: Name, op2LeftAssoc: Boolean): Unit = + if (isLeftAssoc(op1) != op2LeftAssoc) + syntaxError(MixedLeftAndRightAssociativeOps(op1, op2, op2LeftAssoc), offset) def reduceStack(base: List[OpInfo], top: Tree, prec: Int, leftAssoc: Boolean, op2: Name): Tree = { if (opStack != base && precedence(opStack.head.operator.name) == prec) - checkAssoc(opStack.head.offset, opStack.head.operator.name, leftAssoc, op2) + checkAssoc(opStack.head.offset, opStack.head.operator.name, op2, leftAssoc) def recur(top: Tree): Tree = { if (opStack == base) top else { |