diff options
| author | Martin Odersky <odersky@gmail.com> | 2013-09-16 17:56:17 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2013-09-16 17:56:17 +0200 |
| commit | dba4f1ec3dc5f489056284aab63c771cdd32561c (patch) | |
| tree | ab6af09b871c2a01741fd5bbe874a1e19a3fddea /src/dotty/tools/dotc/core/TyperState.scala | |
| parent | 682cf32cbe5cebeccf9ea10caf43e74c9cecc7c0 (diff) | |
| download | dotty-dba4f1ec3dc5f489056284aab63c771cdd32561c.tar.gz dotty-dba4f1ec3dc5f489056284aab63c771cdd32561c.tar.bz2 dotty-dba4f1ec3dc5f489056284aab63c771cdd32561c.zip | |
Bug fixes and improvements in error diagnostics.
Main refactoring: lub/glb moves to type comparers.
Diffstat (limited to 'src/dotty/tools/dotc/core/TyperState.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/TyperState.scala | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/dotty/tools/dotc/core/TyperState.scala b/src/dotty/tools/dotc/core/TyperState.scala index 21dc73579..d14f6c24b 100644 --- a/src/dotty/tools/dotc/core/TyperState.scala +++ b/src/dotty/tools/dotc/core/TyperState.scala @@ -96,14 +96,17 @@ extends TyperState(reporter) { } override def toText(printer: Printer): Text = { + val header: Text = "Typer state:" val undetVarsText = - " undetVars = (" ~ - Text(undetVars map (_.toText(printer)), ", ") ~ ")" + " undetVars: " ~ + Text(undetVars map (_.toText(printer)), ", ") ~ "." + val constrainedText = + " constrained types: " ~ constraint.constrainedTypesText(printer) ~ "." val constraintText = - " constraint = " ~ constraint.toText(printer) + " constraint: " ~ constraint.constraintText(3, printer) val instTypeText = - " instType = (" ~ - Text(instType.map2((k, v) => s"${k.toText(printer)} -> ${v.toText(printer)}"), ", ") ~ ")" - Text.lines(List(undetVarsText, constraintText, instTypeText)) + " instType: " ~ + Text(instType.map2((k, v) => s"${k.toText(printer)} -> ${v.toText(printer)}"), ", ") ~ "." + Text.lines(List(header, undetVarsText, constrainedText, constraintText, instTypeText)) } } |