diff options
-rw-r--r-- | sources/scala/tools/scalai/ExpressionCompiler.java | 2 | ||||
-rw-r--r-- | sources/scalac/symtab/Symbol.java | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/sources/scala/tools/scalai/ExpressionCompiler.java b/sources/scala/tools/scalai/ExpressionCompiler.java index 95967bc386..0983b56339 100644 --- a/sources/scala/tools/scalai/ExpressionCompiler.java +++ b/sources/scala/tools/scalai/ExpressionCompiler.java @@ -152,7 +152,7 @@ public class ExpressionCompiler { invoke.target = Code.Load(Code.Null, variable); context.insertVariable(symbol, variable); Code module = template.getSymbol().isModuleClass() - && template.getSymbol().module().isGlobalModule() + && template.getSymbol().isStatic() ? Code.Store( Code.Null, context.lookupVariable(template.getSymbol().module()), diff --git a/sources/scalac/symtab/Symbol.java b/sources/scalac/symtab/Symbol.java index 65fe1882b9..d57d8f8a09 100644 --- a/sources/scalac/symtab/Symbol.java +++ b/sources/scalac/symtab/Symbol.java @@ -395,25 +395,11 @@ public abstract class Symbol implements Modifiers, Kinds { return kind == VAL && (flags & MODUL) != 0; } - /** Does this symbol denote a global module? */ - public final boolean isGlobalModule() { - return isModule() && (owner().isPackage() - //|| owner().isGlobalModule() // add later? translation does not work (yet?) - ); - } - /** Does this symbol denote a module class? */ public final boolean isModuleClass() { return kind == CLASS && (flags & MODUL) != 0; } - /** Does this symbol denote a global module class? */ - public final boolean isGlobalModuleClass() { - return isModuleClass() && (owner.isPackage() - //|| owner().isGlobalModuleClass() // add later? translation does not work (yet?) - ); - } - /** Does this symbol denote a class? */ public final boolean isClass() { return kind == CLASS && (flags & PACKAGE) == 0; |