Merge pull request #3385 from xeno-by/ticket/8158

fixes some typos and types

4 files changed, 53 insertions, 1 deletions

diff --git a/test/files/neg/t8158.check b/test/files/neg/t8158.check
new file mode 100644
index 0000000000..fa6b744ba5
--- /dev/null
+++ b/test/files/neg/t8158.check
@@ -0,0 +1,4 @@
+Test_2.scala:10: error: not enough patterns for <$anon: AnyRef> offering AnyRef{def isEmpty: Boolean; def get: $anon; def unapply(x: String): $anon}: expected 1, found 0
+      case X() =>
+           ^
+one error found
diff --git a/test/files/neg/t8158/Macros_1.scala b/test/files/neg/t8158/Macros_1.scala
new file mode 100644
index 0000000000..b84e3ed8d3
--- /dev/null
+++ b/test/files/neg/t8158/Macros_1.scala
@@ -0,0 +1,34 @@
+import scala.language.experimental.macros
+import scala.reflect.macros.whitebox.Context
+
+object Max {
+  def impl(c: Context)(any: c.Expr[Any]): c.Expr[Any] = {
+    import c.universe._
+    def fail(msg: String) = c.abort(c.enclosingPosition, msg)
+    val t = c.macroApplication match {
+      case q"$_.unapply($unargs)" =>
+        /* hangs
+        */
+        q"""
+          new {
+            def isEmpty = false
+            def get = this
+            def unapply(x: String) = this
+          }.unapply($unargs)
+        """
+        /*
+        if get returns Unit or Boolean:
+        wrong number of patterns for <$anon: AnyRef> offering Unit: expected 1, found 0
+        */
+        /* straightforward
+        q"""
+          new {
+            def unapply(x: String) = true
+          }.unapply($unargs)
+        """
+        */
+      case _ => fail("bad appl")
+    }
+    c.Expr[Any](t)
+  }
+}
\ No newline at end of file
diff --git a/test/files/neg/t8158/Test_2.scala b/test/files/neg/t8158/Test_2.scala
new file mode 100644
index 0000000000..f5ac6616bb
--- /dev/null
+++ b/test/files/neg/t8158/Test_2.scala
@@ -0,0 +1,14 @@
+import scala.language.experimental.macros
+
+object X {
+  def unapply(any: Any): Any = macro Max.impl
+}
+
+class BugTest {
+  def bug(): Unit = {
+    "any" match {
+      case X() =>
+      case _ => ???
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/files/run/t5256h.check b/test/files/run/t5256h.check
index 1a4a92a684..dc3e919897 100644
--- a/test/files/run/t5256h.check
+++ b/test/files/run/t5256h.check
@@ -3,5 +3,5 @@ Test.$anon$1
 java.lang.Object {
   final private val x: Int
   def x(): Int
-  def <init>(): java.lang.Object{def x(): Int}
+  def <init>(): $anon$1
 }