diff options
| author | paltherr <paltherr@epfl.ch> | 2004-03-06 13:10:49 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2004-03-06 13:10:49 +0000 |
| commit | 6a448198f80c6552f9219a5af531429629e6102f (patch) | |
| tree | 8fec103aac12ca00b9524eb0e1998f896e8400f1 | |
| parent | 0f9736d44951282642796e0df2a26b9dd73ca5a3 (diff) | |
| download | scala-6a448198f80c6552f9219a5af531429629e6102f.tar.gz scala-6a448198f80c6552f9219a5af531429629e6102f.tar.bz2 scala-6a448198f80c6552f9219a5af531429629e6102f.zip | |
- Replaced isGlobalModule by isModule && isStatic
| -rw-r--r-- | sources/scala/tools/scalai/Compiler.java | 2 | ||||
| -rw-r--r-- | sources/scalac/typechecker/RefCheck.java | 2 | ||||
| -rw-r--r-- | sources/scalac/typechecker/RefCheckPhase.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sources/scala/tools/scalai/Compiler.java b/sources/scala/tools/scalai/Compiler.java index 0d1c5f1b4b..66fdfea75a 100644 --- a/sources/scala/tools/scalai/Compiler.java +++ b/sources/scala/tools/scalai/Compiler.java @@ -288,7 +288,7 @@ public class Compiler { case ClassDef(_, _, _, _, _, _): sources.put(tree, source); environment.insertClassDef(symbol, (Tree.ClassDef)tree); - if (symbol.isModuleClass() && symbol.module().isGlobalModule()) { + if (symbol.isModuleClass() && symbol.isStatic()) { environment.insertVariable(symbol.module(), Variable.Module(new CodePromise(new ModuleBuilder(this, source, symbol.module())), null)); } return; diff --git a/sources/scalac/typechecker/RefCheck.java b/sources/scalac/typechecker/RefCheck.java index f36fbcce36..4beeabe7e5 100644 --- a/sources/scalac/typechecker/RefCheck.java +++ b/sources/scalac/typechecker/RefCheck.java @@ -525,7 +525,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds { private Tree[] transformModule(Tree tree, int mods, Name name, Tree tpe, Tree.Template templ) { Symbol sym = tree.symbol(); Tree cdef = gen.ClassDef(sym.moduleClass(), templ); - if (sym.isGlobalModule()) return new Tree[]{cdef}; + if (sym.isStatic()) return new Tree[]{cdef}; Tree alloc = gen.New(gen.mkApply__(gen.mkPrimaryConstructorLocalRef(tree.pos, sym.moduleClass()))); { // var m$: T = null; diff --git a/sources/scalac/typechecker/RefCheckPhase.java b/sources/scalac/typechecker/RefCheckPhase.java index 98127904a3..e46ac290f9 100644 --- a/sources/scalac/typechecker/RefCheckPhase.java +++ b/sources/scalac/typechecker/RefCheckPhase.java @@ -27,7 +27,7 @@ public class RefCheckPhase extends Phase { } public Type transformInfo(Symbol sym, Type tp) { - if (sym.isModule() && !sym.isPackage() && !sym.isGlobalModule()) { + if (sym.isModule() && !sym.isStatic()) { return Type.PolyType(Symbol.EMPTY_ARRAY, tp); } else |