- Moved Position and SourceFile from ch.epfl.la...

- Moved Position and SourceFile from ch.epfl.lamp.util to
scala.tools.util

12 files changed, 13 insertions, 12 deletions

diff --git a/sources/scalac/symtab/Definitions.java b/sources/scalac/symtab/Definitions.java
index 3c49e4b24b..2e1400529c 100644
--- a/sources/scalac/symtab/Definitions.java
+++ b/sources/scalac/symtab/Definitions.java
@@ -8,7 +8,7 @@
 
 package scalac.symtab;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 
 import scalac.Global;
 import scalac.atree.ATreeTyper;
diff --git a/sources/scalac/symtab/SourceCompleter.java b/sources/scalac/symtab/SourceCompleter.java
index acacb8a337..fad727cfac 100644
--- a/sources/scalac/symtab/SourceCompleter.java
+++ b/sources/scalac/symtab/SourceCompleter.java
@@ -8,7 +8,7 @@
 
 package scalac.symtab;
 
-import ch.epfl.lamp.util.SourceFile;
+import scala.tools.util.SourceFile;
 
 import scalac.*;
 import scalac.ast.parser.*;
diff --git a/sources/scalac/symtab/Symbol.java b/sources/scalac/symtab/Symbol.java
index 8940370fb2..38967af3ae 100644
--- a/sources/scalac/symtab/Symbol.java
+++ b/sources/scalac/symtab/Symbol.java
@@ -10,7 +10,8 @@
 
 package scalac.symtab;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
+
 import scalac.ApplicationError;
 import scalac.Global;
 import scalac.Phase;
diff --git a/sources/scalac/symtab/Type.java b/sources/scalac/symtab/Type.java
index 11665b7a14..2c15e6a58c 100644
--- a/sources/scalac/symtab/Type.java
+++ b/sources/scalac/symtab/Type.java
@@ -11,7 +11,7 @@ package scalac.symtab;
 
 import java.util.HashMap;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 import scalac.ApplicationError;
 import scalac.atree.AConstant;
 import scalac.util.*;
diff --git a/sources/scalac/symtab/classfile/AttributeParser.java b/sources/scalac/symtab/classfile/AttributeParser.java
index be3617e900..903d8e5805 100644
--- a/sources/scalac/symtab/classfile/AttributeParser.java
+++ b/sources/scalac/symtab/classfile/AttributeParser.java
@@ -8,7 +8,7 @@
 
 package scalac.symtab.classfile;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 import scalac.*;
 import scalac.atree.AConstant;
 import scalac.symtab.*;
diff --git a/sources/scalac/symtab/classfile/CLRClassParser.java b/sources/scalac/symtab/classfile/CLRClassParser.java
index 61ac4c83e7..db2a85164e 100644
--- a/sources/scalac/symtab/classfile/CLRClassParser.java
+++ b/sources/scalac/symtab/classfile/CLRClassParser.java
@@ -19,7 +19,7 @@ import scalac.util.Name;
 import scalac.util.Names;
 import scalac.util.Debug;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 import ch.epfl.lamp.compiler.msil.*;
 
 public class CLRClassParser extends SymbolLoader {
diff --git a/sources/scalac/symtab/classfile/ClassfileParser.java b/sources/scalac/symtab/classfile/ClassfileParser.java
index 22d88eeee8..795d8e9584 100644
--- a/sources/scalac/symtab/classfile/ClassfileParser.java
+++ b/sources/scalac/symtab/classfile/ClassfileParser.java
@@ -8,7 +8,7 @@
 
 package scalac.symtab.classfile;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 import scalac.*;
 import scalac.util.*;
 import scalac.symtab.*;
diff --git a/sources/scalac/symtab/classfile/JavaTypeCreator.java b/sources/scalac/symtab/classfile/JavaTypeCreator.java
index 64417a7a8b..c5fb665696 100644
--- a/sources/scalac/symtab/classfile/JavaTypeCreator.java
+++ b/sources/scalac/symtab/classfile/JavaTypeCreator.java
@@ -8,7 +8,7 @@
 
 package scalac.symtab.classfile;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 import scalac.atree.AConstant;
 import scalac.util.Debug;
 import scalac.util.Name;
diff --git a/sources/scalac/symtab/classfile/PackageParser.java b/sources/scalac/symtab/classfile/PackageParser.java
index a805f0c1c2..3181702de5 100644
--- a/sources/scalac/symtab/classfile/PackageParser.java
+++ b/sources/scalac/symtab/classfile/PackageParser.java
@@ -13,7 +13,7 @@ import java.util.Iterator;
 import java.util.HashMap;
 import java.util.HashSet;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 
 import scalac.Global;
 import scalac.symtab.Scope;
diff --git a/sources/scalac/symtab/classfile/Pickle.java b/sources/scalac/symtab/classfile/Pickle.java
index 682d94ede9..fcf3143da7 100644
--- a/sources/scalac/symtab/classfile/Pickle.java
+++ b/sources/scalac/symtab/classfile/Pickle.java
@@ -8,7 +8,7 @@
 
 package scalac.symtab.classfile;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 import java.util.HashMap;
 import java.io.*;
 import scalac.Global;
diff --git a/sources/scalac/symtab/classfile/Signatures.java b/sources/scalac/symtab/classfile/Signatures.java
index 3aad3593d4..cd724af2b7 100644
--- a/sources/scalac/symtab/classfile/Signatures.java
+++ b/sources/scalac/symtab/classfile/Signatures.java
@@ -8,7 +8,7 @@
 
 package scalac.symtab.classfile;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 import scalac.Global;
 import scalac.symtab.Symbol;
 import scalac.symtab.Type;
diff --git a/sources/scalac/symtab/classfile/UnPickle.java b/sources/scalac/symtab/classfile/UnPickle.java
index e6cf6d3afc..db5edbeacc 100644
--- a/sources/scalac/symtab/classfile/UnPickle.java
+++ b/sources/scalac/symtab/classfile/UnPickle.java
@@ -11,10 +11,10 @@ package scalac.symtab.classfile;
 import java.util.HashMap;
 import java.io.IOException;
 import java.io.PrintStream;
+import scala.tools.util.Position;
 import scalac.*;
 import scalac.atree.AConstant;
 import scalac.util.*;
-import ch.epfl.lamp.util.Position;
 import scalac.symtab.*;
 import Symbol.*;
 import Type.*;