diff options
author | Eugene Burmako <xeno.by@gmail.com> | 2014-02-17 15:24:06 +0100 |
---|---|---|
committer | Eugene Burmako <xeno.by@gmail.com> | 2014-02-17 15:24:06 +0100 |
commit | 227808c11287fa4cd64afd750a8682d91a90a6e1 (patch) | |
tree | 7ce924d1a8067366a2186ffe986eeedcd9af0784 /test/files | |
parent | 540078412a67055f235b668fef95b1c4aec8210e (diff) | |
parent | 6152e9c3153a9c028066abf6b91f6bf105eacdfe (diff) | |
download | scala-227808c11287fa4cd64afd750a8682d91a90a6e1.tar.gz scala-227808c11287fa4cd64afd750a8682d91a90a6e1.tar.bz2 scala-227808c11287fa4cd64afd750a8682d91a90a6e1.zip |
Merge remote-tracking branch 'origin/master' into topic/palladium0
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/neg/macro-argc-mismatch.check | 49 | ||||
-rw-r--r-- | test/files/neg/macro-argc-mismatch/Macros_1.scala | 16 | ||||
-rw-r--r-- | test/files/neg/macro-argc-mismatch/Test_2.scala | 19 | ||||
-rw-r--r-- | test/files/neg/macro-invalidusage-badargs.check | 5 | ||||
-rw-r--r-- | test/files/neg/macro-qmarkqmarkqmark.check | 2 | ||||
-rw-r--r-- | test/files/neg/t7157.check | 36 | ||||
-rw-r--r-- | test/files/run/macro-expand-default-named.check | 56 | ||||
-rw-r--r-- | test/files/run/macro-expand-default-named/Impls_1.scala | 37 | ||||
-rw-r--r-- | test/files/run/macro-expand-default-named/Macros_Test_2.scala | 71 | ||||
-rw-r--r-- | test/files/run/macro-expand-ownerchain-a.check | 2 | ||||
-rw-r--r-- | test/files/run/macro-expand-ownerchain-a/Macros_1.scala | 11 | ||||
-rw-r--r-- | test/files/run/macro-expand-ownerchain-a/Test_2.scala | 4 | ||||
-rw-r--r-- | test/files/run/macro-invalidusage-partialapplication-with-tparams.check | 2 | ||||
-rw-r--r-- | test/files/run/macro-invalidusage-partialapplication.check | 2 | ||||
-rw-r--r-- | test/files/run/reify-repl-fail-gracefully.check | 2 |
15 files changed, 18 insertions, 296 deletions
diff --git a/test/files/neg/macro-argc-mismatch.check b/test/files/neg/macro-argc-mismatch.check deleted file mode 100644 index 617daa890c..0000000000 --- a/test/files/neg/macro-argc-mismatch.check +++ /dev/null @@ -1,49 +0,0 @@ -Test_2.scala:4: error: missing arguments for macro method one in object Macros - one - ^ -Test_2.scala:5: error: not enough arguments for macro method one: (x: Int)Unit. -Unspecified value parameter x. - one() - ^ -Test_2.scala:6: error: too many arguments for macro method one: (x: Int)Unit - one(2, 3) - ^ -Test_2.scala:7: error: not enough arguments for macro method one: (x: Int)Unit. -Unspecified value parameter x. - one()() - ^ -Test_2.scala:8: error: Unit does not take parameters - one(1)() - ^ -Test_2.scala:10: error: missing arguments for macro method two in object Macros - two - ^ -Test_2.scala:11: error: not enough arguments for macro method two: (x: Int)(y: Int)Unit. -Unspecified value parameter x. - two() - ^ -Test_2.scala:12: error: too many arguments for macro method two: (x: Int)(y: Int)Unit - two(2, 3) - ^ -Test_2.scala:13: error: not enough arguments for macro method two: (x: Int)(y: Int)Unit. -Unspecified value parameter x. - two()() - ^ -Test_2.scala:14: error: missing arguments for macro method two in object Macros - two(1) - ^ -Test_2.scala:15: error: not enough arguments for macro method two: (y: Int)Unit. -Unspecified value parameter y. - two(1)() - ^ -Test_2.scala:16: error: too many arguments for macro method two: (y: Int)Unit - two(1)(2, 3) - ^ -Test_2.scala:17: error: not enough arguments for macro method two: (y: Int)Unit. -Unspecified value parameter y. - two(1)()() - ^ -Test_2.scala:18: error: Unit does not take parameters - two(1)(1)() - ^ -14 errors found diff --git a/test/files/neg/macro-argc-mismatch/Macros_1.scala b/test/files/neg/macro-argc-mismatch/Macros_1.scala deleted file mode 100644 index 4dca644172..0000000000 --- a/test/files/neg/macro-argc-mismatch/Macros_1.scala +++ /dev/null @@ -1,16 +0,0 @@ -import scala.language.experimental.macros -import scala.reflect.macros.blackbox.Context - -object Macros { - def one(x: Int): Unit = macro oneImpl - def oneImpl(c: Context)(x: c.Tree) = { - import c.universe._ - q"()" - } - - def two(x: Int)(y: Int): Unit = macro twoImpl - def twoImpl(c: Context)(x: c.Tree)(y: c.Tree) = { - import c.universe._ - q"()" - } -} diff --git a/test/files/neg/macro-argc-mismatch/Test_2.scala b/test/files/neg/macro-argc-mismatch/Test_2.scala deleted file mode 100644 index 28f9c35654..0000000000 --- a/test/files/neg/macro-argc-mismatch/Test_2.scala +++ /dev/null @@ -1,19 +0,0 @@ -import Macros._ - -object Test extends App { - one - one() - one(2, 3) - one()() - one(1)() - - two - two() - two(2, 3) - two()() - two(1) - two(1)() - two(1)(2, 3) - two(1)()() - two(1)(1)() -}
\ No newline at end of file diff --git a/test/files/neg/macro-invalidusage-badargs.check b/test/files/neg/macro-invalidusage-badargs.check index 3fd3c53691..4c1115418b 100644 --- a/test/files/neg/macro-invalidusage-badargs.check +++ b/test/files/neg/macro-invalidusage-badargs.check @@ -3,14 +3,13 @@ Macros_Test_2.scala:5: error: type mismatch; required: Int foo("42") ^ -Macros_Test_2.scala:6: error: missing arguments for macro method foo in object Macros +Macros_Test_2.scala:6: error: too few argument lists for macro invocation foo ^ Macros_Test_2.scala:7: error: Int does not take parameters foo(4)(2) ^ -Macros_Test_2.scala:8: error: not enough arguments for macro method foo: (x: Int)Int. -Unspecified value parameter x. +Macros_Test_2.scala:8: error: macro applications do not support named and/or default arguments foo() ^ Macros_Test_2.scala:9: error: too many arguments for macro method foo: (x: Int)Int diff --git a/test/files/neg/macro-qmarkqmarkqmark.check b/test/files/neg/macro-qmarkqmarkqmark.check index b4f8ea905f..bc3e25edaf 100644 --- a/test/files/neg/macro-qmarkqmarkqmark.check +++ b/test/files/neg/macro-qmarkqmarkqmark.check @@ -1,7 +1,7 @@ macro-qmarkqmarkqmark.scala:5: error: macro implementation is missing foo1 ^ -macro-qmarkqmarkqmark.scala:8: error: missing arguments for macro method foo2 in object Macros +macro-qmarkqmarkqmark.scala:8: error: too few argument lists for macro invocation foo2 ^ macro-qmarkqmarkqmark.scala:9: error: macro implementation is missing diff --git a/test/files/neg/t7157.check b/test/files/neg/t7157.check index 3988460d4b..c6a7af9a23 100644 --- a/test/files/neg/t7157.check +++ b/test/files/neg/t7157.check @@ -7,8 +7,7 @@ Test_2.scala:6: error: too many arguments for macro method m1_0_0: ()Unit Test_2.scala:7: error: too many arguments for macro method m1_0_0: ()Unit m1_0_0(1, 2, 3) ^ -Test_2.scala:9: error: not enough arguments for macro method m1_1_1: (x: Int)Unit. -Unspecified value parameter x. +Test_2.scala:9: error: macro applications do not support named and/or default arguments m1_1_1() ^ Test_2.scala:11: error: too many arguments for macro method m1_1_1: (x: Int)Unit @@ -17,27 +16,22 @@ Test_2.scala:11: error: too many arguments for macro method m1_1_1: (x: Int)Unit Test_2.scala:12: error: too many arguments for macro method m1_1_1: (x: Int)Unit m1_1_1(1, 2, 3) ^ -Test_2.scala:14: error: not enough arguments for macro method m1_2_2: (x: Int, y: Int)Unit. -Unspecified value parameters x, y. +Test_2.scala:14: error: macro applications do not support named and/or default arguments m1_2_2() ^ -Test_2.scala:15: error: not enough arguments for macro method m1_2_2: (x: Int, y: Int)Unit. -Unspecified value parameter y. +Test_2.scala:15: error: macro applications do not support named and/or default arguments m1_2_2(1) ^ Test_2.scala:17: error: too many arguments for macro method m1_2_2: (x: Int, y: Int)Unit m1_2_2(1, 2, 3) ^ -Test_2.scala:24: error: not enough arguments for macro method m1_1_inf: (x: Int, y: Int*)Unit. -Unspecified value parameters x, y. +Test_2.scala:24: error: macro applications do not support named and/or default arguments m1_1_inf() ^ -Test_2.scala:29: error: not enough arguments for macro method m1_2_inf: (x: Int, y: Int, z: Int*)Unit. -Unspecified value parameters x, y, z. +Test_2.scala:29: error: macro applications do not support named and/or default arguments m1_2_inf() ^ -Test_2.scala:30: error: not enough arguments for macro method m1_2_inf: (x: Int, y: Int, z: Int*)Unit. -Unspecified value parameters y, z. +Test_2.scala:30: error: macro applications do not support named and/or default arguments m1_2_inf(1) ^ Test_2.scala:35: error: too many arguments for macro method m2_0_0: ()Unit @@ -49,8 +43,7 @@ Test_2.scala:36: error: too many arguments for macro method m2_0_0: ()Unit Test_2.scala:37: error: too many arguments for macro method m2_0_0: ()Unit m2_0_0()(1, 2, 3) ^ -Test_2.scala:39: error: not enough arguments for macro method m2_1_1: (x: Int)Unit. -Unspecified value parameter x. +Test_2.scala:39: error: macro applications do not support named and/or default arguments m2_1_1()() ^ Test_2.scala:41: error: too many arguments for macro method m2_1_1: (x: Int)Unit @@ -59,27 +52,22 @@ Test_2.scala:41: error: too many arguments for macro method m2_1_1: (x: Int)Unit Test_2.scala:42: error: too many arguments for macro method m2_1_1: (x: Int)Unit m2_1_1()(1, 2, 3) ^ -Test_2.scala:44: error: not enough arguments for macro method m2_2_2: (x: Int, y: Int)Unit. -Unspecified value parameters x, y. +Test_2.scala:44: error: macro applications do not support named and/or default arguments m2_2_2()() ^ -Test_2.scala:45: error: not enough arguments for macro method m2_2_2: (x: Int, y: Int)Unit. -Unspecified value parameter y. +Test_2.scala:45: error: macro applications do not support named and/or default arguments m2_2_2()(1) ^ Test_2.scala:47: error: too many arguments for macro method m2_2_2: (x: Int, y: Int)Unit m2_2_2()(1, 2, 3) ^ -Test_2.scala:54: error: not enough arguments for macro method m2_1_inf: (x: Int, y: Int*)Unit. -Unspecified value parameters x, y. +Test_2.scala:54: error: macro applications do not support named and/or default arguments m2_1_inf()() ^ -Test_2.scala:59: error: not enough arguments for macro method m2_2_inf: (x: Int, y: Int, z: Int*)Unit. -Unspecified value parameters x, y, z. +Test_2.scala:59: error: macro applications do not support named and/or default arguments m2_2_inf()() ^ -Test_2.scala:60: error: not enough arguments for macro method m2_2_inf: (x: Int, y: Int, z: Int*)Unit. -Unspecified value parameters y, z. +Test_2.scala:60: error: macro applications do not support named and/or default arguments m2_2_inf()(1) ^ 24 errors found diff --git a/test/files/run/macro-expand-default-named.check b/test/files/run/macro-expand-default-named.check deleted file mode 100644 index 2d75772572..0000000000 --- a/test/files/run/macro-expand-default-named.check +++ /dev/null @@ -1,56 +0,0 @@ -Test.this.one(2, -40) = 42 -Test.this.one(y = -40, x = 2) = 42 -Test.this.one(2, -40) = 42 -Test.this.one(100) = 140 -Test.this.one(y = 100) = -98 -Test.this.one(100) = 140 -Test.this.one() = 42 -Test.this.qualone.one(2, -40) = 42 -Test.this.qualone.one(y = -40, x = 2) = 42 -Test.this.qualone.one(2, -40) = 42 -Test.this.qualone.one(x = 100) = 140 -Test.this.qualone.one(y = 100) = -98 -Test.this.qualone.one(x = 100) = 140 -Test.this.qualone.one() = 42 -Test.this.onezero(2, -40)(1, 2) = 41 -Test.this.onezero(y = -40, x = 2)(z = 3, w = 4) = 41 -Test.this.onezero(2, -40)(5, 6) = 41 -Test.this.onezero(100)(7, 8) = 139 -Test.this.onezero(y = 100)(z = 9, w = 10) = -99 -Test.this.onezero(100)(11, 12) = 139 -Test.this.onezero()(13, 14) = 41 -Test.this.qualonezero.onezero(2, -40)(15, 16) = 41 -Test.this.qualonezero.onezero(y = -40, x = 2)(z = 17, w = 18) = 41 -Test.this.qualonezero.onezero(2, -40)(19, 20) = 41 -Test.this.qualonezero.onezero(x = 100)(z = 21, w = 22) = 139 -Test.this.qualonezero.onezero(y = 100)(z = 23, w = 24) = -99 -Test.this.qualonezero.onezero(x = 100)(z = 25, w = 26) = 139 -Test.this.qualonezero.onezero()(z = 27, w = 28) = 41 -Test.this.zeroone(1, 2)(2, -40) = 41 -Test.this.zeroone(x = 3, y = 4)(w = -40, z = 2) = 41 -Test.this.zeroone(5, 6)(2, -40) = 41 -Test.this.zeroone(x = 7, y = 8)(z = 100) = 139 -Test.this.zeroone(x = 9, y = 10)(w = 100) = -99 -Test.this.zeroone(x = 11, y = 12)(z = 100) = 139 -Test.this.zeroone(x = 13, y = 14)() = 41 -Test.this.qualzeroone.zeroone(15, 16)(2, -40) = 41 -Test.this.qualzeroone.zeroone(x = 17, y = 18)(w = -40, z = 2) = 41 -Test.this.qualzeroone.zeroone(19, 20)(2, -40) = 41 -Test.this.qualzeroone.zeroone(x = 21, y = 22)(z = 100) = 139 -Test.this.qualzeroone.zeroone(x = 23, y = 24)(w = 100) = -99 -Test.this.qualzeroone.zeroone(x = 25, y = 26)(z = 100) = 139 -Test.this.qualzeroone.zeroone(x = 27, y = 28)() = 41 -Test.this.oneone(2, -40)(2, -40) = 84 -Test.this.oneone(y = -40, x = 2)(w = -40, z = 2) = 84 -Test.this.oneone(2, -40)(2, -40) = 84 -Test.this.oneone(x = 100)(z = 100) = 280 -Test.this.oneone(y = 100)(w = 100) = -196 -Test.this.oneone(x = 100)(z = 100) = 280 -Test.this.oneone()() = 84 -Test.this.qualoneone.oneone(2, -40)(2, -40) = 84 -Test.this.qualoneone.oneone(y = -40, x = 2)(w = -40, z = 2) = 84 -Test.this.qualoneone.oneone(2, -40)(2, -40) = 84 -Test.this.qualoneone.oneone(x = 100)(z = 100) = 280 -Test.this.qualoneone.oneone(y = 100)(w = 100) = -196 -Test.this.qualoneone.oneone(x = 100)(z = 100) = 280 -Test.this.qualoneone.oneone()() = 84 diff --git a/test/files/run/macro-expand-default-named/Impls_1.scala b/test/files/run/macro-expand-default-named/Impls_1.scala deleted file mode 100644 index 73774cd56a..0000000000 --- a/test/files/run/macro-expand-default-named/Impls_1.scala +++ /dev/null @@ -1,37 +0,0 @@ -import scala.reflect.macros.blackbox.Context - -object Impls { - def one(c: Context)(x: c.Tree, y: c.Tree) = { - import c.universe._ - val x1 = x orElse q"2" - val y1 = y orElse q"-40" - q"println(${c.macroApplication.toString + " = "} + ($x1 - $y1))" - } - - def onezero(c: Context)(x: c.Tree, y: c.Tree)(z: c.Tree, w: c.Tree) = { - import c.universe._ - val x1 = x orElse q"2" - val y1 = y orElse q"-40" - val z1 = z - val w1 = w - q"println(${c.macroApplication.toString + " = "} + ($x1 - $y1 + $z1 - $w1))" - } - - def zeroone(c: Context)(x: c.Tree, y: c.Tree)(z: c.Tree, w: c.Tree) = { - import c.universe._ - val x1 = x - val y1 = y - val z1 = z orElse q"2" - val w1 = w orElse q"-40" - q"println(${c.macroApplication.toString + " = "} + ($x1 - $y1 + $z1 - $w1))" - } - - def oneone(c: Context)(x: c.Tree, y: c.Tree)(z: c.Tree, w: c.Tree) = { - import c.universe._ - val x1 = x orElse q"2" - val y1 = y orElse q"-40" - val z1 = z orElse q"2" - val w1 = w orElse q"-40" - q"println(${c.macroApplication.toString + " = "} + ($x1 - $y1 + $z1 - $w1))" - } -}
\ No newline at end of file diff --git a/test/files/run/macro-expand-default-named/Macros_Test_2.scala b/test/files/run/macro-expand-default-named/Macros_Test_2.scala deleted file mode 100644 index e58eddd9a3..0000000000 --- a/test/files/run/macro-expand-default-named/Macros_Test_2.scala +++ /dev/null @@ -1,71 +0,0 @@ -import scala.language.experimental.macros - -object Test extends App { - def one(x: Int = 2, y: Int = -40): Unit = macro Impls.one - one(2, -40) - one(y = -40, x = 2) - one(x = 2, y = -40) - one(x = 100) - one(y = 100) - one(100) - one() - var qualone = this - qualone.one(2, -40) - qualone.one(y = -40, x = 2) - qualone.one(x = 2, y = -40) - qualone.one(x = 100) - qualone.one(y = 100) - qualone.one(100) - qualone.one() - - def onezero(x: Int = 2, y: Int = -40)(z: Int, w: Int): Unit = macro Impls.onezero - onezero(2, -40)(1, 2) - onezero(y = -40, x = 2)(3, 4) - onezero(x = 2, y = -40)(5, 6) - onezero(x = 100)(7, 8) - onezero(y = 100)(9, 10) - onezero(100)(11, 12) - onezero()(13, 14) - var qualonezero = this - qualonezero.onezero(2, -40)(15, 16) - qualonezero.onezero(y = -40, x = 2)(17, 18) - qualonezero.onezero(x = 2, y = -40)(19, 20) - qualonezero.onezero(x = 100)(21, 22) - qualonezero.onezero(y = 100)(23, 24) - qualonezero.onezero(100)(25, 26) - qualonezero.onezero()(27, 28) - - def zeroone(x: Int, y: Int)(z: Int = 2, w: Int = -40): Unit = macro Impls.zeroone - zeroone(1, 2)(2, -40) - zeroone(3, 4)(w = -40, z = 2) - zeroone(5, 6)(z = 2, w = -40) - zeroone(7, 8)(z = 100) - zeroone(9, 10)(w = 100) - zeroone(11, 12)(100) - zeroone(13, 14)() - var qualzeroone = this - qualzeroone.zeroone(15, 16)(2, -40) - qualzeroone.zeroone(17, 18)(w = -40, z = 2) - qualzeroone.zeroone(19, 20)(z = 2, w = -40) - qualzeroone.zeroone(21, 22)(z = 100) - qualzeroone.zeroone(23, 24)(w = 100) - qualzeroone.zeroone(25, 26)(100) - qualzeroone.zeroone(27, 28)() - - def oneone(x: Int = 2, y: Int = -40)(z: Int = 2, w: Int = -40): Unit = macro Impls.oneone - oneone(2, -40)(2, -40) - oneone(y = -40, x = 2)(w = -40, z = 2) - oneone(x = 2, y = -40)(z = 2, w = -40) - oneone(x = 100)(z = 100) - oneone(y = 100)(w = 100) - oneone(100)(100) - oneone()() - var qualoneone = this - qualoneone.oneone(2, -40)(2, -40) - qualoneone.oneone(y = -40, x = 2)(w = -40, z = 2) - qualoneone.oneone(x = 2, y = -40)(z = 2, w = -40) - qualoneone.oneone(x = 100)(z = 100) - qualoneone.oneone(y = 100)(w = 100) - qualoneone.oneone(100)(100) - qualoneone.oneone()() -}
\ No newline at end of file diff --git a/test/files/run/macro-expand-ownerchain-a.check b/test/files/run/macro-expand-ownerchain-a.check deleted file mode 100644 index 51993f072d..0000000000 --- a/test/files/run/macro-expand-ownerchain-a.check +++ /dev/null @@ -1,2 +0,0 @@ -2 -2 diff --git a/test/files/run/macro-expand-ownerchain-a/Macros_1.scala b/test/files/run/macro-expand-ownerchain-a/Macros_1.scala deleted file mode 100644 index 0d11c24ad1..0000000000 --- a/test/files/run/macro-expand-ownerchain-a/Macros_1.scala +++ /dev/null @@ -1,11 +0,0 @@ -import scala.reflect.macros.whitebox._ -import scala.language.experimental.macros - -object Macros { - def impl(c: Context)(x: c.Tree, y: c.Tree) = { - import c.universe._ - q"println($x)" - } - - def foo(x: Int, y: Int): Unit = macro impl -}
\ No newline at end of file diff --git a/test/files/run/macro-expand-ownerchain-a/Test_2.scala b/test/files/run/macro-expand-ownerchain-a/Test_2.scala deleted file mode 100644 index 738afc75df..0000000000 --- a/test/files/run/macro-expand-ownerchain-a/Test_2.scala +++ /dev/null @@ -1,4 +0,0 @@ -object Test extends App { - Macros.foo(y = 1, x = ((x: Int) => x)(2)) - Macros.foo(y = 1, x = {val x = 2; x}) -}
\ No newline at end of file diff --git a/test/files/run/macro-invalidusage-partialapplication-with-tparams.check b/test/files/run/macro-invalidusage-partialapplication-with-tparams.check index f1061e00f7..6cbcb9e5af 100644 --- a/test/files/run/macro-invalidusage-partialapplication-with-tparams.check +++ b/test/files/run/macro-invalidusage-partialapplication-with-tparams.check @@ -1,3 +1,3 @@ reflective compilation has failed: -missing arguments for macro method foo in object Macros +too few argument lists for macro invocation diff --git a/test/files/run/macro-invalidusage-partialapplication.check b/test/files/run/macro-invalidusage-partialapplication.check index f1061e00f7..6cbcb9e5af 100644 --- a/test/files/run/macro-invalidusage-partialapplication.check +++ b/test/files/run/macro-invalidusage-partialapplication.check @@ -1,3 +1,3 @@ reflective compilation has failed: -missing arguments for macro method foo in object Macros +too few argument lists for macro invocation diff --git a/test/files/run/reify-repl-fail-gracefully.check b/test/files/run/reify-repl-fail-gracefully.check index c78d95dbed..29ccee3cc6 100644 --- a/test/files/run/reify-repl-fail-gracefully.check +++ b/test/files/run/reify-repl-fail-gracefully.check @@ -10,7 +10,7 @@ import scala.reflect.runtime.universe._ scala> scala> reify -<console>:12: error: missing arguments for macro method reify in class Universe +<console>:12: error: too few argument lists for macro invocation reify ^ |