diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-18 06:01:57 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-07-18 06:01:57 -0700 |
| commit | 79161ec9e2c8511f3b6d22c0e2f5b96da9565144 (patch) | |
| tree | 2a8144ebaf925e5d4a83b3e8c8b446fc827d0a2c | |
| parent | 35bfa20af51efeec6649386578ddc527fe5f97a6 (diff) | |
| parent | 9b6566e5d23f802532ed616c06256abcaaae70ee (diff) | |
| download | scala-79161ec9e2c8511f3b6d22c0e2f5b96da9565144.tar.gz scala-79161ec9e2c8511f3b6d22c0e2f5b96da9565144.tar.bz2 scala-79161ec9e2c8511f3b6d22c0e2f5b96da9565144.zip | |
Merge pull request #926 from scalamacros/topic/macro-classpaths
fixes a typo in macro classloaders
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Macros.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Macros.scala b/src/compiler/scala/tools/nsc/typechecker/Macros.scala index 322b9ebb25..b7043e58de 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Macros.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Macros.scala @@ -26,7 +26,7 @@ import java.lang.reflect.{Array => jArray, Method => jMethod} * def fooBar[T: c.TypeTag] * (c: scala.reflect.makro.Context) * (xs: c.Expr[List[T]]) - * : c.Tree = { + * : c.Expr[T] = { * ... * } * @@ -601,7 +601,7 @@ trait Macros extends scala.tools.reflect.FastTrack with Traces { if (settings.XmacroPrimaryClasspath.value != "") { macroLogVerbose("primary macro classloader: initializing from -Xmacro-primary-classpath: %s".format(settings.XmacroPrimaryClasspath.value)) - val classpath = toURLs(settings.XmacroFallbackClasspath.value) + val classpath = toURLs(settings.XmacroPrimaryClasspath.value) ScalaClassLoader.fromURLs(classpath, self.getClass.getClassLoader) } else { macroLogVerbose("primary macro classloader: initializing from -cp: %s".format(global.classPath.asURLs)) |