diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-11-16 16:25:49 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-11-16 16:25:49 -0800 |
| commit | 3acd3eb3ed957727757c9171b39f9f5bcdf34917 (patch) | |
| tree | 9cd34da810f29f858d46eb3f0f2a82a689948aeb /src/reflect | |
| parent | 52ec695a98608128be2429d813fc5a045a092988 (diff) | |
| parent | 768a4082a6090835afef34ee38c2c398da335b01 (diff) | |
| download | scala-3acd3eb3ed957727757c9171b39f9f5bcdf34917.tar.gz scala-3acd3eb3ed957727757c9171b39f9f5bcdf34917.tar.bz2 scala-3acd3eb3ed957727757c9171b39f9f5bcdf34917.zip | |
Merge pull request #1635 from paulp/slick-regression-2
Fix for overly eager package object initialization.
Diffstat (limited to 'src/reflect')
| -rw-r--r-- | src/reflect/scala/reflect/internal/Symbols.scala | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala index 0ad0275fba..eec780470e 100644 --- a/src/reflect/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala @@ -2468,6 +2468,14 @@ trait Symbols extends api.Symbols { self: SymbolTable => override def isMethod = this hasFlag METHOD override def isModule = this hasFlag MODULE override def isOverloaded = this hasFlag OVERLOADED + /*** !!! TODO: shouldn't we do something like the following: + override def isOverloaded = ( + if (this.isInitialized) + this hasFlag OVERLOADED + else + (infos ne null) && infos.info.isInstanceOf[OverloadedType] + ) + ***/ override def isPackage = this hasFlag PACKAGE override def isValueParameter = this hasFlag PARAM |