summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2011-03-24 16:55:40 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2011-03-24 16:55:40 +0000
commit67b09c4f9ff31213fc3578ca3d10b811540a10f5 (patch)
tree6ced7d96655ece7df87842ebbd3d3686268902bb
parent6c398fa52bfa7a0de1179d6657a8429c6d82e36e (diff)
downloadscala-67b09c4f9ff31213fc3578ca3d10b811540a10f5.tar.gz
scala-67b09c4f9ff31213fc3578ca3d10b811540a10f5.tar.bz2
scala-67b09c4f9ff31213fc3578ca3d10b811540a10f5.zip
Merged revisions 24570 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r24570 | odersky | 2011-03-24 17:54:16 +0100 (Thu, 24 Mar 2011) | 1 line Moved Dynamic support to -Xexperimental. ........
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Typers.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index d2d9257989..b5e58a9dae 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -3493,7 +3493,7 @@ trait Typers extends Modes {
// try to expand according to Dynamic rules.
- if (qual.tpe.widen.typeSymbol isNonBottomSubClass DynamicClass) {
+ if (settings.Xexperimental.value && (qual.tpe.widen.typeSymbol isNonBottomSubClass DynamicClass)) {
var dynInvoke = Apply(Select(qual, nme.applyDynamic), List(Literal(Constant(name.decode))))
context.tree match {
case Apply(tree1, args) if tree1 eq tree =>