From 6a448198f80c6552f9219a5af531429629e6102f Mon Sep 17 00:00:00 2001 From: paltherr Date: Sat, 6 Mar 2004 13:10:49 +0000 Subject: - Replaced isGlobalModule by isModule && isStatic --- sources/scalac/typechecker/RefCheck.java | 2 +- sources/scalac/typechecker/RefCheckPhase.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sources/scalac') 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 -- cgit v1.2.3