diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2012-04-25 15:49:27 +0300 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2012-04-25 15:49:27 +0300 |
| commit | bf621aa912ec76ba5794280b88f62d0861aa530d (patch) | |
| tree | 341740b7e7cbcb5e5d1ad7b30daa370b5f9085cd /src | |
| parent | e3634d0ae046d8b011d01665f27694407b7e7c04 (diff) | |
| download | scala-bf621aa912ec76ba5794280b88f62d0861aa530d.tar.gz scala-bf621aa912ec76ba5794280b88f62d0861aa530d.tar.bz2 scala-bf621aa912ec76ba5794280b88f62d0861aa530d.zip | |
fixes SI-5707
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/reflect/internal/Definitions.scala | 4 | ||||
| -rw-r--r-- | src/compiler/scala/reflect/internal/TreeInfo.scala | 2 | ||||
| -rw-r--r-- | src/library/scala/reflect/makro/Reifiers.scala | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/scala/reflect/internal/Definitions.scala b/src/compiler/scala/reflect/internal/Definitions.scala index 6cb935edad..2b6607e23e 100644 --- a/src/compiler/scala/reflect/internal/Definitions.scala +++ b/src/compiler/scala/reflect/internal/Definitions.scala @@ -493,8 +493,8 @@ trait Definitions extends reflect.api.StandardDefinitions { lazy val NoManifest = getRequiredModule("scala.reflect.NoManifest") lazy val ExprClass = getMember(getRequiredClass("scala.reflect.api.Exprs"), tpnme.Expr) - def ExprTree = getMemberClass(ExprClass, nme.tree) - def ExprTpe = getMemberClass(ExprClass, nme.tpe) + def ExprTree = getMember(ExprClass, nme.tree) + def ExprTpe = getMember(ExprClass, nme.tpe) def ExprEval = getMember(ExprClass, nme.eval) def ExprValue = getMember(ExprClass, nme.value) lazy val ExprModule = getMember(getRequiredClass("scala.reflect.api.Exprs"), nme.Expr) diff --git a/src/compiler/scala/reflect/internal/TreeInfo.scala b/src/compiler/scala/reflect/internal/TreeInfo.scala index 48dfe8bcfc..f4878139e9 100644 --- a/src/compiler/scala/reflect/internal/TreeInfo.scala +++ b/src/compiler/scala/reflect/internal/TreeInfo.scala @@ -602,7 +602,7 @@ abstract class TreeInfo { object ReifiedTree { def unapply(tree: Tree): Option[(Tree, List[Tree], Tree, Tree)] = tree match { - case reifee @ Block((mrDef @ ValDef(_, _, _, _)) :: symbolTable, Apply(Apply(_, List(tree)), List(Apply(_, List(tpe))))) if mrDef.name == nme.MIRROR_SHORT => + case reifee @ Block((mrDef @ ValDef(_, _, _, _)) :: symbolTable, Apply(Apply(_, List(tree)), List(Apply(_, tpe :: _)))) if mrDef.name == nme.MIRROR_SHORT => Some(reifee, symbolTable, tree, tpe) case _ => None diff --git a/src/library/scala/reflect/makro/Reifiers.scala b/src/library/scala/reflect/makro/Reifiers.scala index ae6669946c..b1de8d9957 100644 --- a/src/library/scala/reflect/makro/Reifiers.scala +++ b/src/library/scala/reflect/makro/Reifiers.scala @@ -74,4 +74,4 @@ trait Reifiers { case class ReificationError(var pos: reflect.api.Position, val msg: String) extends Throwable(msg) -case class UnexpectedReificationError(val pos: reflect.api.Position, val msg: String, val cause: Throwable = null) extends Throwable(msg)
\ No newline at end of file +case class UnexpectedReificationError(val pos: reflect.api.Position, val msg: String, val cause: Throwable = null) extends Throwable(msg, cause)
\ No newline at end of file |