diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-09-30 10:58:42 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-09-30 10:58:42 +1000 |
commit | a026fd5e08d32d25e44add76384f823d35183c4f (patch) | |
tree | a9deedeb96ec09780de1870e1cfd7ed13e5e6e8c /test/files/neg | |
parent | 344151f17b04bf75d6ebafec6aa4229dfe6cbf09 (diff) | |
parent | 2cfac1a3516850a40728fefd8f808613d2e83f84 (diff) | |
download | scala-a026fd5e08d32d25e44add76384f823d35183c4f.tar.gz scala-a026fd5e08d32d25e44add76384f823d35183c4f.tar.bz2 scala-a026fd5e08d32d25e44add76384f823d35183c4f.zip |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20140930
Diffstat (limited to 'test/files/neg')
-rw-r--r-- | test/files/neg/macro-invalidret.check | 3 | ||||
-rw-r--r-- | test/files/neg/macro-invalidret/Impls_1.scala | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/test/files/neg/macro-invalidret.check b/test/files/neg/macro-invalidret.check index 568cc7c570..ebdc8ec7da 100644 --- a/test/files/neg/macro-invalidret.check +++ b/test/files/neg/macro-invalidret.check @@ -19,8 +19,7 @@ Macros_Test_2.scala:7: warning: macro defs must have explicitly specified return def foo6 = macro Impls.foo6 ^ Macros_Test_2.scala:14: error: exception during macro expansion: -scala.NotImplementedError: an implementation is missing - at scala.Predef$.$qmark$qmark$qmark(Predef.scala:225) +java.lang.NullPointerException at Impls$.foo3(Impls_1.scala:7) foo3 diff --git a/test/files/neg/macro-invalidret/Impls_1.scala b/test/files/neg/macro-invalidret/Impls_1.scala index 434aeef10f..a52e8d8f39 100644 --- a/test/files/neg/macro-invalidret/Impls_1.scala +++ b/test/files/neg/macro-invalidret/Impls_1.scala @@ -4,7 +4,7 @@ import scala.reflect.runtime.{universe => ru} object Impls { def foo1(c: Context) = 2 def foo2(c: Context) = ru.Literal(ru.Constant(42)) - def foo3(c: Context) = ??? + def foo3(c: Context) = throw null def foo5(c: Context) = c.universe.Literal(c.universe.Constant(42)) def foo6(c: Context) = c.Expr[Int](c.universe.Literal(c.universe.Constant(42))) } |