summaryrefslogtreecommitdiff
path: root/src/scalap
diff options
context:
space:
mode:
authorJames Iry <jamesiry@gmail.com>2013-01-30 16:58:02 -0800
committerJames Iry <jamesiry@gmail.com>2013-01-30 16:59:48 -0800
commit166fd02ba1628b0604ba49ce0e6347ca356f9141 (patch)
tree334a1ef7964a8a714e884b0104a698fba08ea761 /src/scalap
parentd24f341f081aef296d174ea54d0579976eeaae98 (diff)
downloadscala-166fd02ba1628b0604ba49ce0e6347ca356f9141.tar.gz
scala-166fd02ba1628b0604ba49ce0e6347ca356f9141.tar.bz2
scala-166fd02ba1628b0604ba49ce0e6347ca356f9141.zip
SI-6669 Add . to the default scalap classpath
The default classpath for scalap did not include '.' which made it behave differently from javap in an annoying way. This commit adds it to the default. Also included is a test to make sure it's in the default but does not corrupt a user specified classpath.
Diffstat (limited to 'src/scalap')
-rw-r--r--src/scalap/scala/tools/scalap/Main.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/scalap/scala/tools/scalap/Main.scala b/src/scalap/scala/tools/scalap/Main.scala
index 7c84279699..90f8cb8d71 100644
--- a/src/scalap/scala/tools/scalap/Main.scala
+++ b/src/scalap/scala/tools/scalap/Main.scala
@@ -184,7 +184,7 @@ object Main extends Main {
val cparg = List("-classpath", "-cp") map (arguments getArgument _) reduceLeft (_ orElse _)
val path = cparg match {
case Some(cp) => new JavaClassPath(DefaultJavaContext.classesInExpandedPath(cp), DefaultJavaContext)
- case _ => PathResolver.fromPathString("")
+ case _ => PathResolver.fromPathString(".") // include '.' in the default classpath SI-6669
}
// print the classpath if output is verbose
if (verbose)