diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-11 20:19:41 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-11 20:19:41 -0700 |
commit | 0fbd4422b2030bd7ec6299d99cac2eaf9a4a0ea9 (patch) | |
tree | d757a0804d3e5edb29375023fa2660653c83e9af /src/reflect | |
parent | 80f77cc4d1bc5532afbe30cbc126cf13a3f24e7c (diff) | |
parent | e09e5a46f16387dbe4866546967c71a8840e26a1 (diff) | |
download | scala-0fbd4422b2030bd7ec6299d99cac2eaf9a4a0ea9.tar.gz scala-0fbd4422b2030bd7ec6299d99cac2eaf9a4a0ea9.tar.bz2 scala-0fbd4422b2030bd7ec6299d99cac2eaf9a4a0ea9.zip |
Merge pull request #3619 from huitseeker/issue/SI-8392
SI-8392 Guards QuasiquoteClass against non-availability in scala-reflect
Diffstat (limited to 'src/reflect')
-rw-r--r-- | src/reflect/scala/reflect/internal/Definitions.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/internal/Definitions.scala b/src/reflect/scala/reflect/internal/Definitions.scala index 558e1aa611..fa1694c527 100644 --- a/src/reflect/scala/reflect/internal/Definitions.scala +++ b/src/reflect/scala/reflect/internal/Definitions.scala @@ -501,7 +501,9 @@ trait Definitions extends api.StandardDefinitions { lazy val StringContextClass = requiredClass[scala.StringContext] - lazy val QuasiquoteClass = if (ApiUniverseClass != NoSymbol) getMember(ApiUniverseClass, tpnme.Quasiquote) else NoSymbol + // SI-8392 a reflection universe on classpath may not have + // quasiquotes, if e.g. crosstyping with -Xsource on + lazy val QuasiquoteClass = if (ApiUniverseClass != NoSymbol) getMemberIfDefined(ApiUniverseClass, tpnme.Quasiquote) else NoSymbol lazy val QuasiquoteClass_api = if (QuasiquoteClass != NoSymbol) getMember(QuasiquoteClass, tpnme.api) else NoSymbol lazy val QuasiquoteClass_api_apply = if (QuasiquoteClass_api != NoSymbol) getMember(QuasiquoteClass_api, nme.apply) else NoSymbol lazy val QuasiquoteClass_api_unapply = if (QuasiquoteClass_api != NoSymbol) getMember(QuasiquoteClass_api, nme.unapply) else NoSymbol |