From 7254471b0b3aeadb35df99b61f5a00e18abc00ae Mon Sep 17 00:00:00 2001 From: schinz Date: Wed, 12 Mar 2003 14:18:22 +0000 Subject: - do not generate Java-compatible class for mod... - do not generate Java-compatible class for modules when a class with the same name as the module exists --- sources/scalac/backend/jvm/GenJVM.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sources/scalac/backend/jvm/GenJVM.java b/sources/scalac/backend/jvm/GenJVM.java index ba38f31e45..1454c7afaa 100644 --- a/sources/scalac/backend/jvm/GenJVM.java +++ b/sources/scalac/backend/jvm/GenJVM.java @@ -1188,9 +1188,13 @@ class JVMGenerator { updateClassContext(); } + protected HashSet seenClasses = new HashSet(); protected void leaveClass(Symbol cSym) { - if (Modifiers.Helper.isModClass(cSym.flags)) - dumpModuleMainClass(currClass); + if (Modifiers.Helper.isModClass(cSym.flags)) { + if (!seenClasses.contains(cSym.fullName())) + dumpModuleMainClass(currClass); + } else + seenClasses.add(cSym.fullName()); addScalaAttr(currClass); JavaClass cls = currClass.getJavaClass(); -- cgit v1.2.3