summaryrefslogtreecommitdiff
path: root/src/reflect/scala/reflect/internal/Symbols.scala
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2014-03-06 14:12:56 -0800
committerEugene Burmako <xeno.by@gmail.com>2014-03-07 20:56:18 +0100
commit60aa5771ea92f91ed34778f90c04113e226d09ca (patch)
tree460f5f6ce0d107c8f90e12a4c720c9b9ed437fc8 /src/reflect/scala/reflect/internal/Symbols.scala
parent2dddb03b267770afcd0249ad700e55d53019e637 (diff)
downloadscala-60aa5771ea92f91ed34778f90c04113e226d09ca.tar.gz
scala-60aa5771ea92f91ed34778f90c04113e226d09ca.tar.bz2
scala-60aa5771ea92f91ed34778f90c04113e226d09ca.zip
SI-8367 revert SI-8192's change to primaryConstructor when isJavaDefined
this is some weird stuff
Diffstat (limited to 'src/reflect/scala/reflect/internal/Symbols.scala')
-rw-r--r--src/reflect/scala/reflect/internal/Symbols.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala
index 03d8f97831..595d638c28 100644
--- a/src/reflect/scala/reflect/internal/Symbols.scala
+++ b/src/reflect/scala/reflect/internal/Symbols.scala
@@ -1904,6 +1904,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
/** The next enclosing method. */
def enclMethod: Symbol = if (isSourceMethod) this else owner.enclMethod
+ /** The primary constructor of a class. */
def primaryConstructor: Symbol = NoSymbol
/** The self symbol (a TermSymbol) of a class with explicit self type, or else the
@@ -3188,8 +3189,7 @@ trait Symbols extends api.Symbols { self: SymbolTable =>
override def primaryConstructor = {
val c = info decl primaryConstructorName
- if (isJavaDefined) NoSymbol // need to force info before checking the flag
- else if (c.isOverloaded) c.alternatives.head else c
+ if (c.isOverloaded) c.alternatives.head else c
}
override def associatedFile = (