From 3ca9038d08dd4a528ae15ee93d44fc7f1392de4e Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Mon, 17 Feb 2014 12:08:28 +0100 Subject: Revert "SI-5920 enables default and named args in macros" This reverts commit a02e053a5dec134f7c7dc53a2c1091039218237d. That commit lead to an error compiling Specs2: [info] [warn] /localhome/jenkinsdbuild/workspace/Community-2.11.x-retronym/dbuild-0.7.1-M1/target-0.7.1-M1/project-builds/specs2-aaa8091b47a34817ca90134ace8b09a9e0f854e9/core/src/test/scala/org/specs2/text/EditDistanceSpec.scala:6: Unused import [info] [warn] import DiffShortener._ [info] [warn] ^ [info] [error] /localhome/jenkinsdbuild/workspace/Community-2.11.x-retronym/dbuild-0.7.1-M1/target-0.7.1-M1/project-builds/specs2-aaa8091b47a34817ca90134ace8b09a9e0f854e9/core/src/test/scala/org/specs2/text/LinesContentDifferenceSpec.scala:7: exception during macro expansion: [info] [error] java.lang.UnsupportedOperationException: Position.point on NoPosition [info] [error] at scala.reflect.internal.util.Position.fail(Position.scala:53) [info] [error] at scala.reflect.internal.util.UndefinedPosition.point(Position.scala:131) [info] [error] at scala.reflect.internal.util.UndefinedPosition.point(Position.scala:126) [info] [error] at org.specs2.reflect.Macros$.sourceOf(Macros.scala:25) [info] [error] at org.specs2.reflect.Macros$.stringExpr(Macros.scala:19) --- test/files/neg/t7157.check | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) (limited to 'test/files/neg/t7157.check') 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 -- cgit v1.2.3