summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimirNik <vladimir.nikolaev9@gmail.com>2014-02-20 00:51:07 +0400
committerVladimirNik <vladimir.nikolaev9@gmail.com>2014-02-20 01:23:27 +0400
commit68e5d133eb2233f7365b583d0915832f15288fff (patch)
treef36167656e0fad766420590006ed5c92bdfa6d6b
parent0f2ce9254b63eda76de218d1236318b697e6d4f7 (diff)
downloadscala-68e5d133eb2233f7365b583d0915832f15288fff.tar.gz
scala-68e5d133eb2233f7365b583d0915832f15288fff.tar.bz2
scala-68e5d133eb2233f7365b583d0915832f15288fff.zip
fixes for wrappingIntoTerm
-rw-r--r--src/reflect/scala/reflect/internal/Trees.scala1
-rw-r--r--test/files/run/t7185.check4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/reflect/scala/reflect/internal/Trees.scala b/src/reflect/scala/reflect/internal/Trees.scala
index 78a40707e5..9dc4baee32 100644
--- a/src/reflect/scala/reflect/internal/Trees.scala
+++ b/src/reflect/scala/reflect/internal/Trees.scala
@@ -1690,7 +1690,6 @@ trait Trees extends api.Trees {
val tree1 = build.SyntacticBlock(tree0 :: Nil)
op(tree1) match {
case Block(tree2 :: Nil, Literal(Constant(()))) if neededWrapping => tree2
- case Block(Nil, tree2) => tree2
case tree2 => tree2
}
}
diff --git a/test/files/run/t7185.check b/test/files/run/t7185.check
index 2b4adf36b4..ebf85b731f 100644
--- a/test/files/run/t7185.check
+++ b/test/files/run/t7185.check
@@ -24,7 +24,9 @@ tree: reflect.runtime.universe.Apply =
scala> {val tb = reflect.runtime.currentMirror.mkToolBox(); tb.typecheck(tree): Any}
res0: Any =
{
- $read.O.apply()
+ {
+ $read.O.apply()
+ }
}
scala>