diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-08-12 12:10:03 -0700 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-08-12 12:10:03 -0700 |
| commit | 8589deb4b4da4664fb79e6e371f33e0b71298f5f (patch) | |
| tree | a440502564318287a741035bb0542793869121ac /src/reflect | |
| parent | e5c99b1b754e14e7a445b1585c9f195c853fb7df (diff) | |
| parent | 0e819626c2640a25e6d50f7b07ca1d00997d14bc (diff) | |
| download | scala-8589deb4b4da4664fb79e6e371f33e0b71298f5f.tar.gz scala-8589deb4b4da4664fb79e6e371f33e0b71298f5f.tar.bz2 scala-8589deb4b4da4664fb79e6e371f33e0b71298f5f.zip | |
Merge pull request #2812 from xeno-by/topic/defdef-name-now-termname
DefDef.name is now TermName again
Diffstat (limited to 'src/reflect')
| -rw-r--r-- | src/reflect/scala/reflect/api/Trees.scala | 6 | ||||
| -rw-r--r-- | src/reflect/scala/reflect/internal/Trees.scala | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/reflect/scala/reflect/api/Trees.scala b/src/reflect/scala/reflect/api/Trees.scala index f7a6a68946..443f34ccae 100644 --- a/src/reflect/scala/reflect/api/Trees.scala +++ b/src/reflect/scala/reflect/api/Trees.scala @@ -572,8 +572,8 @@ trait Trees { self: Universe => * @group Extractors */ abstract class DefDefExtractor { - def apply(mods: Modifiers, name: Name, tparams: List[TypeDef], vparamss: List[List[ValDef]], tpt: Tree, rhs: Tree): DefDef - def unapply(defDef: DefDef): Option[(Modifiers, Name, List[TypeDef], List[List[ValDef]], Tree, Tree)] + def apply(mods: Modifiers, name: TermName, tparams: List[TypeDef], vparamss: List[List[ValDef]], tpt: Tree, rhs: Tree): DefDef + def unapply(defDef: DefDef): Option[(Modifiers, TermName, List[TypeDef], List[List[ValDef]], Tree, Tree)] } /** The API that all def defs support @@ -584,7 +584,7 @@ trait Trees { self: Universe => def mods: Modifiers /** @inheritdoc */ - def name: Name + def name: TermName /** The type parameters of the method. */ def tparams: List[TypeDef] diff --git a/src/reflect/scala/reflect/internal/Trees.scala b/src/reflect/scala/reflect/internal/Trees.scala index ceb3b383d7..df1ba1e2ea 100644 --- a/src/reflect/scala/reflect/internal/Trees.scala +++ b/src/reflect/scala/reflect/internal/Trees.scala @@ -312,7 +312,7 @@ trait Trees extends api.Trees { self: SymbolTable => case class ValDef(mods: Modifiers, name: TermName, tpt: Tree, rhs: Tree) extends ValOrDefDef with ValDefApi object ValDef extends ValDefExtractor - case class DefDef(mods: Modifiers, name: Name, tparams: List[TypeDef], + case class DefDef(mods: Modifiers, name: TermName, tparams: List[TypeDef], vparamss: List[List[ValDef]], tpt: Tree, rhs: Tree) extends ValOrDefDef with DefDefApi object DefDef extends DefDefExtractor |