From 166fd02ba1628b0604ba49ce0e6347ca356f9141 Mon Sep 17 00:00:00 2001 From: James Iry Date: Wed, 30 Jan 2013 16:58:02 -0800 Subject: 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. --- src/scalap/scala/tools/scalap/Main.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/scalap') 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) -- cgit v1.2.3