diff options
| author | Martin Odersky <odersky@gmail.com> | 2011-02-03 21:27:08 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2011-02-03 21:27:08 +0000 |
| commit | 8d9ecb70eb119756f2761bc2b5d89f7d2703f3e6 (patch) | |
| tree | a30fecbb2f61ccee76b32ca95c3bcbc31a040650 /src | |
| parent | 8fb1b1aaffa5167bb7f6986ddcd06f9f4436b2bf (diff) | |
| download | scala-8d9ecb70eb119756f2761bc2b5d89f7d2703f3e6.tar.gz scala-8d9ecb70eb119756f2761bc2b5d89f7d2703f3e6.tar.bz2 scala-8d9ecb70eb119756f2761bc2b5d89f7d2703f3e6.zip | |
invokeDynamic -> applyDynamic
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/StdNames.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/Dynamic.scala | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/StdNames.scala b/src/compiler/scala/tools/nsc/symtab/StdNames.scala index 7d8adb8ef9..ec545fa4c6 100644 --- a/src/compiler/scala/tools/nsc/symtab/StdNames.scala +++ b/src/compiler/scala/tools/nsc/symtab/StdNames.scala @@ -212,7 +212,7 @@ trait StdNames extends reflect.generic.StdNames with NameManglers { val head: NameType = "head" val identity: NameType = "identity" val inlinedEquals: NameType = "inlinedEquals" - val invokeDynamic: NameType = "invokeDynamic" + val applyDynamic: NameType = "applyDynamic" val isArray: NameType = "isArray" val isDefinedAt: NameType = "isDefinedAt" val isEmpty: NameType = "isEmpty" diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index ce0673196a..396bb5ca0e 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -3488,7 +3488,7 @@ trait Typers extends Modes { // try to expand according to Dynamic rules. if (qual.tpe.widen.typeSymbol isNonBottomSubClass DynamicClass) { - var dynInvoke = Apply(Select(qual, nme.invokeDynamic), List(Literal(Constant(name.decode)))) + var dynInvoke = Apply(Select(qual, nme.applyDynamic), List(Literal(Constant(name.decode)))) context.tree match { case Apply(tree1, args) if tree1 eq tree => ; diff --git a/src/library/scala/Dynamic.scala b/src/library/scala/Dynamic.scala index 2a1cabb51c..a8b1e9cab8 100644 --- a/src/library/scala/Dynamic.scala +++ b/src/library/scala/Dynamic.scala @@ -11,7 +11,7 @@ trait Dynamic { * @param name The name of the invoked method * @param args The arguments to the method */ - def invokeDynamic(name: String)(args: Any*): Any + def applyDynamic(name: String)(args: Any*): Any /** Returns the underlying value typed as an instance of type T * @param T The target type |