- Removed class UniqueID (symbols have already ...

- Removed class UniqueID (symbols have already an internal unique
identifier)

6 files changed, 4 insertions, 39 deletions

diff --git a/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala b/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala
index 08d921ac73..8c71113613 100644
--- a/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala
+++ b/sources/scala/tools/scalac/ast/printer/TextTreePrinter.scala
@@ -111,7 +111,7 @@ class TextTreePrinter(writer: PrintWriter) with TreePrinter {
         else
           printString(sym.name.toString());
         if (scalac_Global.instance.uniqid)
-	  printString("#" + scalac_Global.instance.uniqueID.id(sym))
+	  printString("#" + sym.id)
       } else {
         printString(name.toString());
       }
diff --git a/sources/scalac/Global.java b/sources/scalac/Global.java
index 091eefe2c5..83d55f6c5b 100644
--- a/sources/scalac/Global.java
+++ b/sources/scalac/Global.java
@@ -109,10 +109,6 @@ public abstract class Global {
      */
     public final TreeGen treeGen;
 
-    /** the unique-id generator
-     */
-    public final UniqueID uniqueID;
-
     /** the global tree printer
      */
     public final PrintWriter writer;
@@ -253,7 +249,6 @@ public abstract class Global {
         this.target = interpret ? TARGET_INT : args.target.value.intern();
         this.separate = args.separate.value.equals("yes") ||
             args.separate.value.equals("default") && !this.target.equals(TARGET_INT);
-        this.uniqueID = new UniqueID();
         String printFile = args.printfile.value;
         OutputStream stream;
         try {
diff --git a/sources/scalac/symtab/SymbolNameWriter.java b/sources/scalac/symtab/SymbolNameWriter.java
index bd4b17c906..af57b23933 100644
--- a/sources/scalac/symtab/SymbolNameWriter.java
+++ b/sources/scalac/symtab/SymbolNameWriter.java
@@ -266,7 +266,7 @@ public class SymbolNameWriter {
     public String getSymbolName(Symbol symbol) {
         String name = symbol.name.toString();
         if (decode) name = NameTransformer.decode(name);
-        if (unique != 0) name =name+unique+Global.instance.uniqueID.id(symbol);
+        if (unique != 0) name = name + unique + symbol.id;
         return name;
     }
 
diff --git a/sources/scalac/symtab/SymbolTablePrinter.java b/sources/scalac/symtab/SymbolTablePrinter.java
index 89fe42d869..3edf77f8a7 100644
--- a/sources/scalac/symtab/SymbolTablePrinter.java
+++ b/sources/scalac/symtab/SymbolTablePrinter.java
@@ -318,7 +318,7 @@ public class SymbolTablePrinter {
 
     /** Prints the unique identifier of the given symbol */
     public SymbolTablePrinter printSymbolUniqueId(Symbol symbol) {
-        if (global.uniqid) print('#').print(global.uniqueID.id(symbol));
+        if (global.uniqid) print('#').print(symbol.id);
         return this;
     }
 
diff --git a/sources/scalac/util/Debug.java b/sources/scalac/util/Debug.java
index 990489798d..f6b776a112 100644
--- a/sources/scalac/util/Debug.java
+++ b/sources/scalac/util/Debug.java
@@ -202,7 +202,7 @@ public class SymbolDebugger implements Debugger {
         buffer.append(symbol.name);
         if (Global.instance.uniqid) {
             buffer.append('#');
-            buffer.append(Global.instance.uniqueID.id(symbol));
+            buffer.append(symbol.id);
         }
         if (symbol.isConstructor()) {
             buffer.append('(');
diff --git a/sources/scalac/util/UniqueID.java b/sources/scalac/util/UniqueID.java
deleted file mode 100644
index 59e31a9de6..0000000000
--- a/sources/scalac/util/UniqueID.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*     ____ ____  ____ ____  ______                                     *\
-**    / __// __ \/ __// __ \/ ____/    SOcos COmpiles Scala             **
-**  __\_ \/ /_/ / /__/ /_/ /\_ \       (c) 2002, LAMP/EPFL              **
-** /_____/\____/\___/\____/____/                                        **
-**                                                                      **
-\*                                                                      */
-
-// $Id$
-
-package scalac.util;
-
-import java.util.*;
-
-/**
- * Class to assign unique and small numbers to objects, based on their
- * identity.
- *
- * @author Michel Schinz
- * @version 1.0
- */
-
-public class UniqueID {
-    protected Map ids = new HashMap();
-
-    public int id(Object obj) {
-        if (! ids.containsKey(obj))
-            ids.put(obj, new Integer(ids.size()));
-        return ((Integer)ids.get(obj)).intValue();
-    }
-}