diff options
author | Eugene Burmako <xeno.by@gmail.com> | 2012-08-04 09:42:25 +0200 |
---|---|---|
committer | Eugene Burmako <xeno.by@gmail.com> | 2012-08-04 09:42:25 +0200 |
commit | 509cc5287fe03f576ebaa44d4e875e3836fe8b7f (patch) | |
tree | 4da095d388868e00dd57d043e132815e3616b3e3 /src/library | |
parent | ec4a9fb5251bed30f4d99091d66190c1bd9daa03 (diff) | |
download | scala-509cc5287fe03f576ebaa44d4e875e3836fe8b7f.tar.gz scala-509cc5287fe03f576ebaa44d4e875e3836fe8b7f.tar.bz2 scala-509cc5287fe03f576ebaa44d4e875e3836fe8b7f.zip |
staticTpe => staticType, actualTpe => actualType
Diffstat (limited to 'src/library')
-rw-r--r-- | src/library/scala/reflect/base/Exprs.scala | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/library/scala/reflect/base/Exprs.scala b/src/library/scala/reflect/base/Exprs.scala index 8e429afb21..ea975bba52 100644 --- a/src/library/scala/reflect/base/Exprs.scala +++ b/src/library/scala/reflect/base/Exprs.scala @@ -14,8 +14,8 @@ trait Exprs { self: Universe => def in[U <: Universe with Singleton](otherMirror: MirrorOf[U]): U # Expr[T] def tree: Tree - def staticTpe: Type - def actualTpe: Type + def staticType: Type + def actualType: Type def splice: T val value: T @@ -24,7 +24,7 @@ trait Exprs { self: Universe => override def canEqual(x: Any) = x.isInstanceOf[Expr[_]] override def equals(x: Any) = x.isInstanceOf[Expr[_]] && this.mirror == x.asInstanceOf[Expr[_]].mirror && this.tree == x.asInstanceOf[Expr[_]].tree override def hashCode = mirror.hashCode * 31 + tree.hashCode - override def toString = "Expr["+staticTpe+"]("+tree+")" + override def toString = "Expr["+staticType+"]("+tree+")" } object Expr { @@ -43,8 +43,8 @@ trait Exprs { self: Universe => // [Eugene++] this is important // !!! remove when we have improved type inference for singletons // search for .type] to find other instances - lazy val staticTpe: Type = implicitly[AbsTypeTag[T]].tpe - def actualTpe: Type = treeType(tree) + lazy val staticType: Type = implicitly[AbsTypeTag[T]].tpe + def actualType: Type = treeType(tree) def splice: T = throw new UnsupportedOperationException(""" |the function you're calling has not been spliced by the compiler. |