summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-05-01 15:22:52 +0200
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-05-02 12:30:30 +0200
commit9df576db2d315fca23ece4af822b130ae15d032d (patch)
tree1e512c4377a4b5e699a289c0851c2fd0b7030992 /src/compiler
parent1b8dc120dd156e34e43132134dfa1f228cd1f497 (diff)
downloadscala-9df576db2d315fca23ece4af822b130ae15d032d.tar.gz
scala-9df576db2d315fca23ece4af822b130ae15d032d.tar.bz2
scala-9df576db2d315fca23ece4af822b130ae15d032d.zip
partial fun synth typing under correct pt
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index b827f2ac1a..b55406761d 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -2320,7 +2320,7 @@ trait Typers extends Modes with Adaptations with Taggings {
anonClass setInfo ClassInfoType(parents, newScope, anonClass)
methodSym setInfoAndEnter MethodType(paramSyms, resTp)
- DefDef(methodSym, methodBodyTyper.virtualizedMatch(match_, mode, pt))
+ DefDef(methodSym, methodBodyTyper.virtualizedMatch(match_, mode, resTp))
}
}
@@ -2359,7 +2359,7 @@ trait Typers extends Modes with Adaptations with Taggings {
match_ setType B1.tpe
// the default uses applyOrElse's first parameter since the scrut's type has been widened
- val body = methodBodyTyper.virtualizedMatch(match_ withAttachment DefaultOverrideMatchAttachment(REF(default) APPLY (REF(x))), mode, pt)
+ val body = methodBodyTyper.virtualizedMatch(match_ withAttachment DefaultOverrideMatchAttachment(REF(default) APPLY (REF(x))), mode, B1.tpe)
DefDef(methodSym, body)
}
@@ -2377,7 +2377,7 @@ trait Typers extends Modes with Adaptations with Taggings {
methodSym setInfoAndEnter MethodType(paramSyms, BooleanClass.tpe)
val match_ = methodBodyTyper.typedMatch(selector, casesTrue, mode, BooleanClass.tpe)
- val body = methodBodyTyper.virtualizedMatch(match_ withAttachment DefaultOverrideMatchAttachment(FALSE_typed), mode, pt)
+ val body = methodBodyTyper.virtualizedMatch(match_ withAttachment DefaultOverrideMatchAttachment(FALSE_typed), mode, BooleanClass.tpe)
DefDef(methodSym, body)
}