diff options
| author | Martin Odersky <odersky@gmail.com> | 2015-12-15 15:51:02 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2015-12-15 17:51:23 +0100 |
| commit | 570cf0f84b0daa78a6234ead4b5b3c5b58b5db79 (patch) | |
| tree | 211a10fc0a5f64565ddbf7a6f087779f9793bd6a /src/dotty/tools/dotc/core/Types.scala | |
| parent | fd9d3f3944852da09278196ae69d99af37e7bb13 (diff) | |
| download | dotty-570cf0f84b0daa78a6234ead4b5b3c5b58b5db79.tar.gz dotty-570cf0f84b0daa78a6234ead4b5b3c5b58b5db79.tar.bz2 dotty-570cf0f84b0daa78a6234ead4b5b3c5b58b5db79.zip | |
Fix layout
Diffstat (limited to 'src/dotty/tools/dotc/core/Types.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/Types.scala | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/dotty/tools/dotc/core/Types.scala b/src/dotty/tools/dotc/core/Types.scala index 52a69e5fd..d1d202855 100644 --- a/src/dotty/tools/dotc/core/Types.scala +++ b/src/dotty/tools/dotc/core/Types.scala @@ -1550,23 +1550,23 @@ object Types { else { if (Config.splitProjections && isType) prefix match { - case prefix: AndType => - def isMissing(tp: Type) = tp match { - case tp: TypeRef => !tp.info.exists - case _ => false - } - val derived1 = derivedSelect(prefix.tp1) - val derived2 = derivedSelect(prefix.tp2) - return ( - if (isMissing(derived1)) derived2 - else if (isMissing(derived2)) derived1 - else prefix.derivedAndType(derived1, derived2)) - case prefix: OrType => - val derived1 = derivedSelect(prefix.tp1) - val derived2 = derivedSelect(prefix.tp2) - return prefix.derivedOrType(derived1, derived2) - case _ => - } + case prefix: AndType => + def isMissing(tp: Type) = tp match { + case tp: TypeRef => !tp.info.exists + case _ => false + } + val derived1 = derivedSelect(prefix.tp1) + val derived2 = derivedSelect(prefix.tp2) + return ( + if (isMissing(derived1)) derived2 + else if (isMissing(derived2)) derived1 + else prefix.derivedAndType(derived1, derived2)) + case prefix: OrType => + val derived1 = derivedSelect(prefix.tp1) + val derived2 = derivedSelect(prefix.tp2) + return prefix.derivedOrType(derived1, derived2) + case _ => + } val res = prefix.lookupRefined(name) if (res.exists) res else if (name == tpnme.hkApply && prefix.classNotLambda) { |