*** empty log message ***

1 files changed, 5 insertions, 13 deletions

diff --git a/sources/scalac/Global.java b/sources/scalac/Global.java
index c4ecc98a88..5c5b94ccc2 100644
--- a/sources/scalac/Global.java
+++ b/sources/scalac/Global.java
@@ -86,7 +86,7 @@ public class  Global {
 
     /** The set of currenttly compiled top-level symbols
      */
-    public HashSet/*Symbol*/ compiledNow = new HashSet();
+    public HashMap/*<Symbol,Sourcefile>*/ compiledNow = new HashMap();
 
     /** the current phase
      */
@@ -283,8 +283,10 @@ public class  Global {
         }
         if (reporter.errors() != 0) {
 	    imports.clear();
-	    for (Iterator it = compiledNow.iterator(); it.hasNext();) {
-		uninitialize((Symbol)it.next());
+	    for (Iterator it = compiledNow.keySet().iterator(); it.hasNext();) {
+		Symbol sym = (Symbol) it.next();
+		Sourcefile f = (Sourcefile) compiledNow.get(sym);
+		sym.reset(new SourceCompleter(this, f.filename));
 	    }
 	}
 	compiledNow.clear();
@@ -629,14 +631,4 @@ public class  Global {
         reporter.inform("[" + message + " in " +
                 (System.currentTimeMillis() - start) + "ms]");
     }
-
-    private void uninitialize(Symbol sym) {
-	if (sym instanceof ClassSymbol) {
-	    ClassSymbol clazz = (ClassSymbol)sym;
-	    if (clazz.sourcefile != null) {
-		clazz.reset(
-		    new SourceCompleter(this, clazz.sourcefile));
-	    }
-	}
-    }
 }