diff options
| author | Den Shabalin <den.shabalin@gmail.com> | 2013-08-28 13:55:27 +0200 |
|---|---|---|
| committer | Den Shabalin <den.shabalin@gmail.com> | 2013-09-05 14:35:06 +0200 |
| commit | 9f03b67f5ff85dfcb7a7dbe25234c0428cb25175 (patch) | |
| tree | 885a41525f20ffbbeead64f31ff1f381d753f8b4 | |
| parent | 50855467525c92f9fb87bcc5aab50831608b88f7 (diff) | |
| download | scala-9f03b67f5ff85dfcb7a7dbe25234c0428cb25175.tar.gz scala-9f03b67f5ff85dfcb7a7dbe25234c0428cb25175.tar.bz2 scala-9f03b67f5ff85dfcb7a7dbe25234c0428cb25175.zip | |
rename mkAnnotationCtor into mkAnnotation
4 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/reflect/quasiquotes/Reifiers.scala b/src/compiler/scala/tools/reflect/quasiquotes/Reifiers.scala index 900237b00d..fe51098f05 100644 --- a/src/compiler/scala/tools/reflect/quasiquotes/Reifiers.scala +++ b/src/compiler/scala/tools/reflect/quasiquotes/Reifiers.scala @@ -198,11 +198,11 @@ trait Reifiers { self: Quasiquotes => val x: TermName = c.freshName() val xToAnnotationCtor = Function( List(ValDef(Modifiers(PARAM), x, TypeTree(), EmptyTree)), - mirrorBuildCall(nme.mkAnnotationCtor, Ident(x), reify(args))) + mirrorBuildCall(nme.mkAnnotation, Ident(x), reify(args))) Apply(Select(tree, nme.map), List(xToAnnotationCtor)) } { case AnnotPlaceholder(tree, _: TreeLocation, _, args) => - mirrorBuildCall(nme.mkAnnotationCtor, tree, reify(args)) + mirrorBuildCall(nme.mkAnnotation, tree, reify(args)) case other => reify(other) } diff --git a/src/reflect/scala/reflect/api/BuildUtils.scala b/src/reflect/scala/reflect/api/BuildUtils.scala index c568cf74c0..e401325dbc 100644 --- a/src/reflect/scala/reflect/api/BuildUtils.scala +++ b/src/reflect/scala/reflect/api/BuildUtils.scala @@ -76,7 +76,7 @@ private[reflect] trait BuildUtils { self: Universe => def setSymbol[T <: Tree](tree: T, sym: Symbol): T - def mkAnnotationCtor(tree: Tree, args: List[Tree]): Tree + def mkAnnotation(tree: Tree, args: List[Tree]): Tree val FlagsAsBits: FlagsAsBitsExtractor diff --git a/src/reflect/scala/reflect/internal/BuildUtils.scala b/src/reflect/scala/reflect/internal/BuildUtils.scala index cdebfe52f8..dc3be59acd 100644 --- a/src/reflect/scala/reflect/internal/BuildUtils.scala +++ b/src/reflect/scala/reflect/internal/BuildUtils.scala @@ -69,7 +69,7 @@ trait BuildUtils { self: SymbolTable => def setSymbol[T <: Tree](tree: T, sym: Symbol): T = { tree.setSymbol(sym); tree } - def mkAnnotationCtor(tree: Tree, args: List[Tree]): Tree = tree match { + def mkAnnotation(tree: Tree, args: List[Tree]): Tree = tree match { case ident: Ident => Apply(self.Select(New(ident), nme.CONSTRUCTOR: TermName), args) case call @ Apply(Select(New(ident: Ident), nme.CONSTRUCTOR), _) => if (args.nonEmpty) diff --git a/src/reflect/scala/reflect/internal/StdNames.scala b/src/reflect/scala/reflect/internal/StdNames.scala index 7a2287664a..4fd35e1f24 100644 --- a/src/reflect/scala/reflect/internal/StdNames.scala +++ b/src/reflect/scala/reflect/internal/StdNames.scala @@ -681,7 +681,7 @@ trait StdNames { val materializeWeakTypeTag: NameType = "materializeWeakTypeTag" val materializeTypeTag: NameType = "materializeTypeTag" val moduleClass : NameType = "moduleClass" - val mkAnnotationCtor: NameType = "mkAnnotationCtor" + val mkAnnotation: NameType = "mkAnnotation" val ne: NameType = "ne" val newArray: NameType = "newArray" val newFreeTerm: NameType = "newFreeTerm" |