summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaltherr <paltherr@epfl.ch>2004-03-06 15:27:16 +0000
committerpaltherr <paltherr@epfl.ch>2004-03-06 15:27:16 +0000
commitc06bdb684a0dfcacb1a78ba4518380cdd44c8de9 (patch)
tree25da435d5d5878765e51bcf57065543346fe6b2d
parent5f190711102439575bdb85ecd312723dcbea414a (diff)
downloadscala-c06bdb684a0dfcacb1a78ba4518380cdd44c8de9.tar.gz
scala-c06bdb684a0dfcacb1a78ba4518380cdd44c8de9.tar.bz2
scala-c06bdb684a0dfcacb1a78ba4518380cdd44c8de9.zip
- Removed methods Global.isGlobalModule and Glo...
- Removed methods Global.isGlobalModule and Global.isGlobalModuleClass
-rw-r--r--sources/scala/tools/scalai/ExpressionCompiler.java2
-rw-r--r--sources/scalac/symtab/Symbol.java14
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;