diff options
| author | Martin Odersky <odersky@gmail.com> | 2013-09-30 10:07:41 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2013-09-30 10:11:55 +0200 |
| commit | e28dd856f6c0ccbd4094a73311a9c820f73913c4 (patch) | |
| tree | 31acfaf5d391cb37db486c4bd585520bb228c165 /src/dotty/tools/dotc/core/TyperState.scala | |
| parent | 968b608ea6f2d42d48f30e311d6008600dad27a8 (diff) | |
| download | dotty-e28dd856f6c0ccbd4094a73311a9c820f73913c4.tar.gz dotty-e28dd856f6c0ccbd4094a73311a9c820f73913c4.tar.bz2 dotty-e28dd856f6c0ccbd4094a73311a9c820f73913c4.zip | |
Changed logic for merges in lub/glb
Now throws an exception for merge conflicts of types joint by |, a warning for types joint by &.
Exception is handled as in the case of CyclicRefernce.
Also: Added several typerState.checkConsistent for future debugging purposes.
Diffstat (limited to 'src/dotty/tools/dotc/core/TyperState.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/TyperState.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/dotty/tools/dotc/core/TyperState.scala b/src/dotty/tools/dotc/core/TyperState.scala index f7631fa22..4fcfa323e 100644 --- a/src/dotty/tools/dotc/core/TyperState.scala +++ b/src/dotty/tools/dotc/core/TyperState.scala @@ -78,6 +78,7 @@ extends TyperState(reporter) { targetState.instType = targetState.instType remove tvar } } + targetState.checkConsistent // !!! DEBUG reporter.flush() } |