merged code in file src/compiler/scala/tools/ns...

merged code in file src/compiler/scala/tools/nsc/util/ClassPath.scala

1 files changed, 93 insertions, 97 deletions

diff --git a/src/compiler/scala/tools/nsc/util/ClassPath.scala b/src/compiler/scala/tools/nsc/util/ClassPath.scala
index 92b00aae65..a7abccf67c 100644
--- a/src/compiler/scala/tools/nsc/util/ClassPath.scala
+++ b/src/compiler/scala/tools/nsc/util/ClassPath.scala
@@ -8,116 +8,110 @@
 
 // $Id$
 
-package scala.tools.nsc.util;
+package scala.tools.nsc.util
 
-import scala.tools.util.AbstractFile;
-import scala.collection.mutable.ArrayBuffer;
-import java.io.FileNotFoundException;
-import java.io.File;
-import java.util.StringTokenizer;
+import scala.collection.mutable.ArrayBuffer
+import scala.tools.util.AbstractFile
+
+import java.io.File
+import java.io.FileNotFoundException
+import java.util.StringTokenizer
 
 /** Richer classpath abstraction than files.
  *  Roughly based on Eclipse's classpath abstractions.
  *
  *  @author Sean McDirmid
  */
-class ClassPath(onlyPresentation : Boolean) {
-  def this() = this(false);
+class ClassPath(onlyPresentation: Boolean) {
 
+  def this() = this(false)
 
-  class Source(val location : AbstractFile, val compile : Boolean) {
+  class Source(val location: AbstractFile, val compile: Boolean) {
     // assert(location           != null, "cannot find source location");
     // assert(location.getFile() != null, "cannot find source location " + " " + location + " " + location.getClass());
-    override def toString() : String = "" + location + " " + compile;
+    override def toString(): String = "" + location + " " + compile
   }
 
   abstract class Entry(val location: AbstractFile) {
     // assert(location           != null, "cannot find classpath location");
     // assert(location.getFile() != null, "cannot find classpath location " + " " + location + " " + location.getClass());
-    def source   : Source;
-    override def toString() = location.toString();
+    def source: Source
+    override def toString() = location.toString()
   }
 
-
-  class Output(location0 : AbstractFile, val sourceFile : AbstractFile) extends Entry(location0) {
-    def source = if (sourceFile != null) new Source(sourceFile, true); else null;
+  class Output(location0: AbstractFile, val sourceFile: AbstractFile) extends Entry(location0) {
+    def source = if (sourceFile != null) new Source(sourceFile, true) else null
   }
 
   class Library(location0: AbstractFile) extends Entry(location0) {
-    def doc : AbstractFile = null;
-    def sourceFile : AbstractFile = null;
+    def doc: AbstractFile = null;
+    def sourceFile: AbstractFile = null;
     def source = if (sourceFile == null) null else new Source(sourceFile, false);
   }
 
-
-  class Context(val entries : List[Entry]) {
-    def find(name : String, isDir : boolean) : Context = if (isPackage) {
-      def find0(entries : List[Entry]) : Context = {
-      	if (entries.isEmpty) new Context(Nil);
-      	else {
-      	  val ret = find0(entries.tail);
-      	  val head = entries.head;
-      	  val clazz = if (head.location == null) null;
-      	              else head.location.lookupPath(name + (if (!isDir) ".class" else ""), isDir);
-
-
-      	  val source0 = if (head.source == null) null; else {
-      	    val source1 = head.source.location.lookupPath(name + (if (isDir) "" else ".scala"), isDir);
-      	      if (source1 == null && !isDir && clazz != null) head.source.location;
-      	      else source1;
-      	  }
-      	  if (clazz == null && source0 == null) ret;
-      	  else {
-      	    val entry = new Entry(clazz) {
-      	      override def source =
-            		if (source0 == null) null;
-            		else new Source(source0, head.source.compile);
-      	    };
-      	    new Context(entry :: ret.entries);
-      	  }
-      	}
+  class Context(val entries: List[Entry]) {
+    def find(name: String, isDir: boolean) : Context = if (isPackage) {
+      def find0(entries: List[Entry]) : Context = {
+        if (entries.isEmpty) new Context(Nil);
+        else {
+          val ret = find0(entries.tail);
+          val head = entries.head;
+          val clazz = if (head.location == null) null;
+                      else head.location.lookupPath(name + (if (!isDir) ".class" else ""), isDir);
+
+          val source0 = if (head.source == null) null; else {
+            val source1 = head.source.location.lookupPath(
+              name + (if (isDir) "" else ".scala"), isDir);
+            if (source1 == null && !isDir && clazz != null) head.source.location;
+            else source1;
+          }
+          if (clazz == null && source0 == null) ret;
+          else {
+            val entry = new Entry(clazz) {
+              override def source =
+                if (source0 == null) null
+                else new Source(source0, head.source.compile)
+            }
+            new Context(entry :: ret.entries)
+          }
+        }
       }
       val ret = find0(entries);
       if (false && this.toString().indexOf("scala") != -1)
         System.err.println("FIND " + name + " in " + this + " => " + ret);
 
       if (ret.entries.isEmpty) {
-        System.err.println("BAD_FILE: " + name + " in " + this);
-        null;
+        System.err.println("BAD_FILE: " + name + " in " + this)
+        null
       } else ret;
     } else null;
 
-
-    def isPackage = {
-    	if (entries.isEmpty) false;
-    	else if (entries.head.location != null) entries.head.location.isDirectory();
-    	else entries.head.source.location.isDirectory();
-    }
-
-    def name = {
-    	if (entries.isEmpty) "<none>";
-    	else {
-    		val head = entries.head;
-
-	      val name = if (head.location != null) head.location.getName() else head.source.location.getName();
-	      if (isPackage) name;
-	      else name.substring(0, name.length() - (".class").length());
-    	}
-    }
+    def isPackage: Boolean =
+      if (entries.isEmpty) false
+      else if (entries.head.location != null) entries.head.location.isDirectory()
+      else entries.head.source.location.isDirectory()
+
+    def name =
+      if (entries.isEmpty) "<none>";
+      else {
+        val head = entries.head;
+        val name = if (head.location != null) head.location.getName() else head.source.location.getName();
+        if (isPackage) name;
+        else name.substring(0, name.length() - (".class").length());
+      }
 
     override def toString(): String = toString(entries);
 
-    def toString(entry : Entry): String =
-    	((if (entry.location == null) "<none>";
-    	  else entry.location.toString()) +
-    	 (if (entry.source == null) ""; else " with_source=" + entry.source.location.toString()));
+    def toString(entry: Entry): String =
+      ((if (entry.location == null) "<none>";
+        else entry.location.toString()) +
+       (if (entry.source == null) ""; else " with_source=" + entry.source.location.toString()));
 
     def toString(entries0: List[Entry]): String =
-      if (entries0.isEmpty) "";
-      else toString(entries0.head) + ":::" + toString(entries0.tail);
+      if (entries0.isEmpty) ""
+      else toString(entries0.head) + ":::" + toString(entries0.tail)
 
     def isSourceFile = {
-
       def head = entries.head;
       def clazz = head.location;
       def source = if (head.source == null) null else head.source.location;
@@ -133,35 +127,30 @@ class ClassPath(onlyPresentation : Boolean) {
     }
 
     def sourceFile = if (entries.head.source != null && !entries.head.source.location.isDirectory())
-    	entries.head.source.location else null;
+      entries.head.source.location else null;
 
-    def  classFile = if (!isSourceFile) entries.head       .location else null;
+    def classFile = if (!isSourceFile) entries.head.location else null;
 
-    def sourcePath = if (!isSourceFile && entries.head.source != null) entries.head.source.location else null;
+    def sourcePath =
+      if (!isSourceFile && entries.head.source != null) entries.head.source.location
+      else null;
 
     def validPackage(name: String): Boolean =
-      if (name.equals("META-INF")) false;
-      else if (name.startsWith(".")) false;
-      else true;
+      ! (name.equals("META-INF") || name.startsWith("."))
   }
-  class Build {
-    val entries = new ArrayBuffer[Entry];
 
+  class Build {
+    val entries = new ArrayBuffer[Entry]
 
-    def root = new Context(entries.toList);
+    def root = new Context(entries.toList)
 
-		def lookupPath(path : String, isDir : Boolean) = {
-      val txt = root.find(path, isDir);
-      if (txt.entries.isEmpty) null;
-      else txt.entries.head.location;
+    def this(classpath: String) = {
+      this()
+      addFilesInPath(classpath)
     }
 
-    def this(classpath : String) = {
-      this();
-      addFilesInPath(classpath);
-    }
-
-    def this(classpath : String, source : String, output : String, boot : String, extdirs : String) = {
+    def this(classpath: String, source: String, output: String,
+             boot: String, extdirs: String) = {
       this();
       //System.err.println("BOOT: " + boot);
       //System.err.println("CLAS: " + classpath);
@@ -170,7 +159,7 @@ class ClassPath(onlyPresentation : Boolean) {
 
       addArchivesInExtDirPath(extdirs);
       val clazzes = AbstractFile.getDirectory(output);
-      if (clazzes          == null) throw new FileNotFoundException("output location \"" + output + "\" not found");
+      if (clazzes == null) throw new FileNotFoundException("output location \"" + output + "\" not found");
 
       val strtok = new StringTokenizer(source, File.pathSeparator);
       if (!strtok.hasMoreTokens()) {
@@ -180,31 +169,38 @@ class ClassPath(onlyPresentation : Boolean) {
         val sources = AbstractFile.getDirectory(strtok.nextToken());
         val output0 = (new Output(clazzes, sources));
         //System.err.println("OUTPUT: " + output);
-        entries += output0;
+        entries += output0
       }
       addFilesInPath(classpath);
       //System.err.println("CLASSPATH: " + root);
     }
-    def library(classes : String, sources : String) = {
+
+    def lookupPath(path: String, isDir: Boolean) = {
+      val ctx = root.find(path, isDir)
+      if (ctx.entries.isEmpty) null
+      else ctx.entries.head.location
+    }
+
+    def library(classes: String, sources: String) = {
       assert(classes != null);
       val location = AbstractFile.getDirectory(classes);
       val sourceFile0 = (if (sources != null) AbstractFile.getDirectory(sources) else null);
       class Library0 extends Library(location) {
-				override def sourceFile = sourceFile0;
+        override def sourceFile = sourceFile0
       }
       entries += new Library0()
     }
 
     private def addFilesInPath(path: String) = {
-      val strtok = new StringTokenizer(path, File.pathSeparator);
+      val strtok = new StringTokenizer(path, File.pathSeparator)
       while (strtok.hasMoreTokens()) {
-				val file = AbstractFile.getDirectory(strtok.nextToken());
-				if (file != null) entries += (new Library(file));
+        val file = AbstractFile.getDirectory(strtok.nextToken())
+        if (file != null) entries += (new Library(file))
       }
     }
 
     private def addArchivesInExtDirPath(path: String) = {
-      val strtok = new StringTokenizer(path, File.pathSeparator);
+      val strtok = new StringTokenizer(path, File.pathSeparator)
       while (strtok.hasMoreTokens()) {
         val file = AbstractFile.getDirectory(strtok.nextToken());
         val files = (if (file != null) file.list() else null);