diff options
author | Martin Odersky <odersky@gmail.com> | 2013-05-14 12:40:53 +0200 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2013-05-14 12:40:53 +0200 |
commit | 348dd53f384be31ec674814f9b9d97e89664b522 (patch) | |
tree | 2b8cc974b3422ee470df8a36cbe32126396d3182 /src/dotty/tools/dotc/printing | |
parent | fec318dedaa10bf7ffaebd7aaf4a99e05ac0312a (diff) | |
download | dotty-348dd53f384be31ec674814f9b9d97e89664b522.tar.gz dotty-348dd53f384be31ec674814f9b9d97e89664b522.tar.bz2 dotty-348dd53f384be31ec674814f9b9d97e89664b522.zip |
Made precedence common between parsers and printers
Diffstat (limited to 'src/dotty/tools/dotc/printing')
-rw-r--r-- | src/dotty/tools/dotc/printing/Printers.scala | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/dotty/tools/dotc/printing/Printers.scala b/src/dotty/tools/dotc/printing/Printers.scala index 6a2f98250..59e89ee9d 100644 --- a/src/dotty/tools/dotc/printing/Printers.scala +++ b/src/dotty/tools/dotc/printing/Printers.scala @@ -7,6 +7,7 @@ import Constants._, Annotations._, StdNames._, Denotations._, SymDenotations._, import Texts._ import java.lang.Integer.toOctalString import scala.annotation.switch +import parsing.{precedence, minPrec, maxPrec} trait Printers { this: Context => @@ -23,12 +24,12 @@ object Printers { if (nested.value < value) "(" ~ text ~ ")" else text } - val DotPrec = new Precedence(4) - val AndPrec = new Precedence(3) - val OrPrec = new Precedence(2) - val WithPrec = new Precedence(1) - val LeftArrowPrec = new Precedence(1) - val GlobalPrec = new Precedence(0) + val DotPrec = new Precedence(maxPrec) + val AndPrec = new Precedence(precedence(nme.raw.AMP)) + val OrPrec = new Precedence(precedence(nme.raw.BAR)) + val WithPrec = new Precedence(precedence(nme.WITHkw)) + val LeftArrowPrec = WithPrec + val GlobalPrec = new Precedence(minPrec) abstract class Printer { @@ -494,7 +495,9 @@ object Printers { super.toText(tp, prec) } - override def toText[T >: Untyped](tree: Tree[T]): Text = super.toText(tree) + override def toText[T >: Untyped](tree: Tree[T]): Text = toText(tree, GlobalPrec) + + def toText[T >: Untyped](tree: Tree[T], prec: Precedence): Text = ??? override protected def polyParamName(name: TypeName): TypeName = name.unexpandedName() |