From e28dd856f6c0ccbd4094a73311a9c820f73913c4 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 30 Sep 2013 10:07:41 +0200 Subject: 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. --- src/dotty/tools/dotc/core/TyperState.scala | 1 + 1 file changed, 1 insertion(+) (limited to 'src/dotty/tools/dotc/core/TyperState.scala') 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() } -- cgit v1.2.3