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

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

31 files changed, 37 insertions, 33 deletions

diff --git a/sources/scalac/Global.java b/sources/scalac/Global.java
index a5d26fdf4c..af9d69092f 100644
--- a/sources/scalac/Global.java
+++ b/sources/scalac/Global.java
@@ -9,8 +9,6 @@
 package scalac;
 
 import ch.epfl.lamp.util.CodePrinter;
-import ch.epfl.lamp.util.Position;
-import ch.epfl.lamp.util.SourceFile;
 
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -20,6 +18,9 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.*;
 
+import scala.tools.util.Position;
+import scala.tools.util.SourceFile;
+
 import scalac.ast.*;
 import scalac.ast.parser.*;
 import scalac.ast.printer.*;
diff --git a/sources/scalac/Unit.java b/sources/scalac/Unit.java
index 615d98ae87..5dc7f85089 100644
--- a/sources/scalac/Unit.java
+++ b/sources/scalac/Unit.java
@@ -8,8 +8,8 @@
 
 package scalac;
 
-import ch.epfl.lamp.util.SourceFile;
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
+import scala.tools.util.SourceFile;
 
 import scalac.ast.Tree;
 import scalac.atree.ARepository;
diff --git a/sources/scalac/ast/Tree.java.tmpl b/sources/scalac/ast/Tree.java.tmpl
index 6c61e2e254..937d9e212c 100644
--- a/sources/scalac/ast/Tree.java.tmpl
+++ b/sources/scalac/ast/Tree.java.tmpl
@@ -11,7 +11,7 @@ package scalac.ast;
 import java.io.StringWriter;
 import java.io.PrintWriter;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 
 import scalac.Global;
 import scalac.checkers.CheckTreeNodes;
diff --git a/sources/scalac/atree/ATreeTyper.java b/sources/scalac/atree/ATreeTyper.java
index 686ada1c2d..199dfc0a64 100644
--- a/sources/scalac/atree/ATreeTyper.java
+++ b/sources/scalac/atree/ATreeTyper.java
@@ -8,7 +8,7 @@
 
 package scalac.atree;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 
 import scalac.Global;
 import scalac.symtab.Definitions;
diff --git a/sources/scalac/backend/jvm/GenJVM.java b/sources/scalac/backend/jvm/GenJVM.java
index ebaf5e6362..66f9ecca2b 100644
--- a/sources/scalac/backend/jvm/GenJVM.java
+++ b/sources/scalac/backend/jvm/GenJVM.java
@@ -14,7 +14,8 @@ import java.util.*;
 
 import ch.epfl.lamp.fjbg.*;
 import ch.epfl.lamp.util.Pair;
-import ch.epfl.lamp.util.Position;
+
+import scala.tools.util.Position;
 
 import scalac.*;
 import scalac.ast.Tree;
diff --git a/sources/scalac/backend/msil/GenMSIL.java b/sources/scalac/backend/msil/GenMSIL.java
index af7108c4e2..41c3159a9f 100644
--- a/sources/scalac/backend/msil/GenMSIL.java
+++ b/sources/scalac/backend/msil/GenMSIL.java
@@ -34,9 +34,10 @@ import Scope.SymbolIterator;
 import scalac.backend.Primitive;
 import scalac.backend.Primitives;
 
+import scala.tools.util.Position;
+
 import ch.epfl.lamp.compiler.msil.*;
 import ch.epfl.lamp.compiler.msil.emit.*;
-import ch.epfl.lamp.util.Position;
 
 import Item.*;
 
diff --git a/sources/scalac/checkers/TreeChecker.java b/sources/scalac/checkers/TreeChecker.java
index 3c1368552c..4878873b51 100644
--- a/sources/scalac/checkers/TreeChecker.java
+++ b/sources/scalac/checkers/TreeChecker.java
@@ -13,7 +13,7 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.Stack;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 
 import scalac.Unit;
 import scalac.ast.Tree;
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.*;
diff --git a/sources/scalac/transformer/matching/Autom2Scala.java b/sources/scalac/transformer/matching/Autom2Scala.java
index 4c302b9c00..db742b8f5e 100644
--- a/sources/scalac/transformer/matching/Autom2Scala.java
+++ b/sources/scalac/transformer/matching/Autom2Scala.java
@@ -14,7 +14,7 @@ import Tree.*;
 import scalac.transformer.TransMatch.Matcher ;
 import java.util.* ;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 
 public class Autom2Scala  {
 
diff --git a/sources/scalac/transformer/matching/CodeFactory.java b/sources/scalac/transformer/matching/CodeFactory.java
index f860200a27..2e4f520b1a 100644
--- a/sources/scalac/transformer/matching/CodeFactory.java
+++ b/sources/scalac/transformer/matching/CodeFactory.java
@@ -8,7 +8,7 @@
 
 package scalac.transformer.matching;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 
 import scalac.*;
 import scalac.ast.*;
diff --git a/sources/scalac/transformer/matching/LeftTracerInScala.java b/sources/scalac/transformer/matching/LeftTracerInScala.java
index 5a407a7a88..05f4b32fa4 100644
--- a/sources/scalac/transformer/matching/LeftTracerInScala.java
+++ b/sources/scalac/transformer/matching/LeftTracerInScala.java
@@ -11,7 +11,7 @@ import scalac.transformer.TransMatch.Matcher ;
 
 import java.util.* ;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 
 public class LeftTracerInScala extends TracerInScala {
 
diff --git a/sources/scalac/transformer/matching/PatternMatcher.java b/sources/scalac/transformer/matching/PatternMatcher.java
index 380927676f..7ad0a31397 100644
--- a/sources/scalac/transformer/matching/PatternMatcher.java
+++ b/sources/scalac/transformer/matching/PatternMatcher.java
@@ -8,7 +8,7 @@
 
 package scalac.transformer.matching;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 import scalac.*;
 import scalac.ast.*;
 import scalac.atree.AConstant;
diff --git a/sources/scalac/transformer/matching/PatternNode.java b/sources/scalac/transformer/matching/PatternNode.java
index b1d871b9b5..cfa0d1b079 100644
--- a/sources/scalac/transformer/matching/PatternNode.java
+++ b/sources/scalac/transformer/matching/PatternNode.java
@@ -8,7 +8,7 @@
 
 package scalac.transformer.matching;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 import scalac.*;
 import scalac.ast.*;
 import scalac.atree.AConstant;
diff --git a/sources/scalac/transformer/matching/PatternNodeCreator.java b/sources/scalac/transformer/matching/PatternNodeCreator.java
index 3a0d7cf0b9..7d69c8f3e6 100644
--- a/sources/scalac/transformer/matching/PatternNodeCreator.java
+++ b/sources/scalac/transformer/matching/PatternNodeCreator.java
@@ -1,6 +1,6 @@
 package scalac.transformer.matching;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 
 import scalac.*;
 import scalac.ast.*;
diff --git a/sources/scalac/transformer/matching/RightTracerInScala.java b/sources/scalac/transformer/matching/RightTracerInScala.java
index c285c42c76..5f25e0a083 100644
--- a/sources/scalac/transformer/matching/RightTracerInScala.java
+++ b/sources/scalac/transformer/matching/RightTracerInScala.java
@@ -17,7 +17,7 @@ import Scope.SymbolIterator;
 import scalac.util.Name ;
 import scalac.util.Names ;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 
 public class RightTracerInScala extends TracerInScala  {
 
diff --git a/sources/scalac/transformer/matching/SequenceMatcher.java b/sources/scalac/transformer/matching/SequenceMatcher.java
index 78334e5c10..64443dd9f0 100644
--- a/sources/scalac/transformer/matching/SequenceMatcher.java
+++ b/sources/scalac/transformer/matching/SequenceMatcher.java
@@ -13,7 +13,7 @@ import scalac.symtab.* ;
 
 import java.util.* ;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 
 /** constructs a matcher for a sequence pattern. plays two roles in
  *  described in design pattern Builder.
diff --git a/sources/scalac/transformer/matching/TracerInScala.java b/sources/scalac/transformer/matching/TracerInScala.java
index 823a40ddc8..b40444980d 100644
--- a/sources/scalac/transformer/matching/TracerInScala.java
+++ b/sources/scalac/transformer/matching/TracerInScala.java
@@ -11,7 +11,7 @@ import scalac.transformer.TransMatch.Matcher ;
 
 import java.util.* ;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 
 
 /** 2do: factor common things of LeftTracerInScala and RightTracerInScala
diff --git a/sources/scalac/transformer/matching/WordAutomInScala.java b/sources/scalac/transformer/matching/WordAutomInScala.java
index dff5603bb6..11a8853404 100644
--- a/sources/scalac/transformer/matching/WordAutomInScala.java
+++ b/sources/scalac/transformer/matching/WordAutomInScala.java
@@ -8,7 +8,7 @@
 
 package scalac.transformer.matching;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 
 import scalac.*;
 import scalac.ast.Tree;
diff --git a/sources/scalac/util/OptionParser.java b/sources/scalac/util/OptionParser.java
index 2141107086..6294db9a20 100644
--- a/sources/scalac/util/OptionParser.java
+++ b/sources/scalac/util/OptionParser.java
@@ -8,7 +8,7 @@
 
 package scalac.util;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 
 import java.text.Format;
 import java.text.MessageFormat;
diff --git a/sources/scalac/util/Reporter.java b/sources/scalac/util/Reporter.java
index 56b794233d..d765ec98e1 100644
--- a/sources/scalac/util/Reporter.java
+++ b/sources/scalac/util/Reporter.java
@@ -14,7 +14,7 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.HashSet;
 
-import ch.epfl.lamp.util.Position;
+import scala.tools.util.Position;
 
 import scalac.ApplicationError;