diff options
author | paltherr <paltherr@epfl.ch> | 2004-05-17 08:53:43 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2004-05-17 08:53:43 +0000 |
commit | 8f463de49f685aa62fa678d7786961e0bee82a0d (patch) | |
tree | c86d5310d7c93b28f17271c55c4260682d458926 /sources | |
parent | 8571291ea2b123c5b4a3eb5694891d1800d4e311 (diff) | |
download | scala-8f463de49f685aa62fa678d7786961e0bee82a0d.tar.gz scala-8f463de49f685aa62fa678d7786961e0bee82a0d.tar.bz2 scala-8f463de49f685aa62fa678d7786961e0bee82a0d.zip |
- Fixed and optimized isStatic and isStaticOwner
Diffstat (limited to 'sources')
-rw-r--r-- | sources/scalac/symtab/Symbol.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sources/scalac/symtab/Symbol.java b/sources/scalac/symtab/Symbol.java index 0e052b424f..828a680e2e 100644 --- a/sources/scalac/symtab/Symbol.java +++ b/sources/scalac/symtab/Symbol.java @@ -539,12 +539,12 @@ public abstract class Symbol implements Modifiers, Kinds { /** Is this symbol static (i.e. with no outer instance)? */ public final boolean isStatic() { - return owner.isStaticOwner(); + return isRoot() || owner.isStaticOwner(); } /** Does this symbol denote a class that defines static symbols? */ public final boolean isStaticOwner() { - return isRoot() || (isStatic() && isModuleClass() + return isPackageClass() || (isStatic() && isModuleClass() // !!! remove later? translation does not work (yet?) && isJava()); } |