From cfc4757a580c537425857ff849f3dc106d924092 Mon Sep 17 00:00:00 2001 From: Eugene Burmako Date: Thu, 12 Apr 2012 21:58:55 +0200 Subject: fixes petty macro tests --- ...cro-deprecate-dont-touch-backquotedidents.check | 22 +++--- ...cro-deprecate-dont-touch-backquotedidents.flags | 1 + ...cro-deprecate-dont-touch-backquotedidents.scala | 56 ++++++++++++++++ .../Macros_Bind_12.scala | 6 -- .../Macros_Class_4.scala | 3 - .../Macros_Class_5.scala | 3 - .../Macros_Def_13.scala | 3 - .../Macros_Object_6.scala | 3 - .../Macros_Object_7.scala | 3 - .../Macros_Package_10.scala | 3 - .../Macros_Package_11.scala | 3 - .../Macros_Trait_8.scala | 3 - .../Macros_Trait_9.scala | 3 - .../Macros_Type_3.scala | 3 - .../Macros_Val_1.scala | 3 - .../Macros_Var_2.scala | 3 - .../Main.scala | 2 - test/files/neg/macro-deprecate-idents.check | 78 ++++++++++------------ test/files/neg/macro-deprecate-idents.flags | 1 + test/files/neg/macro-deprecate-idents.scala | 56 ++++++++++++++++ .../macro-deprecate-idents/Macros_Bind_12.scala | 6 -- .../macro-deprecate-idents/Macros_Class_4.scala | 3 - .../macro-deprecate-idents/Macros_Class_5.scala | 3 - .../neg/macro-deprecate-idents/Macros_Def_13.scala | 3 - .../macro-deprecate-idents/Macros_Object_6.scala | 3 - .../macro-deprecate-idents/Macros_Object_7.scala | 3 - .../macro-deprecate-idents/Macros_Package_10.scala | 3 - .../macro-deprecate-idents/Macros_Package_11.scala | 3 - .../macro-deprecate-idents/Macros_Trait_8.scala | 3 - .../macro-deprecate-idents/Macros_Trait_9.scala | 3 - .../neg/macro-deprecate-idents/Macros_Type_3.scala | 3 - .../neg/macro-deprecate-idents/Macros_Val_1.scala | 3 - .../neg/macro-deprecate-idents/Macros_Var_2.scala | 3 - test/files/neg/macro-deprecate-idents/Main.scala | 2 - test/files/neg/macro-keyword-bind.check | 7 ++ test/files/neg/macro-keyword-bind.flags | 1 + test/files/neg/macro-keyword-bind.scala | 6 ++ test/files/neg/macro-keyword-class1.check | 4 ++ test/files/neg/macro-keyword-class1.flags | 1 + test/files/neg/macro-keyword-class1.scala | 3 + test/files/neg/macro-keyword-class2.check | 4 ++ test/files/neg/macro-keyword-class2.flags | 1 + test/files/neg/macro-keyword-class2.scala | 3 + test/files/neg/macro-keyword-object1.check | 4 ++ test/files/neg/macro-keyword-object1.flags | 1 + test/files/neg/macro-keyword-object1.scala | 3 + test/files/neg/macro-keyword-object2.check | 4 ++ test/files/neg/macro-keyword-object2.flags | 1 + test/files/neg/macro-keyword-object2.scala | 3 + test/files/neg/macro-keyword-package1.check | 4 ++ test/files/neg/macro-keyword-package1.flags | 1 + test/files/neg/macro-keyword-package1.scala | 3 + test/files/neg/macro-keyword-package2.check | 4 ++ test/files/neg/macro-keyword-package2.flags | 1 + test/files/neg/macro-keyword-package2.scala | 3 + test/files/neg/macro-keyword-trait1.check | 4 ++ test/files/neg/macro-keyword-trait1.flags | 1 + test/files/neg/macro-keyword-trait1.scala | 3 + test/files/neg/macro-keyword-trait2.check | 4 ++ test/files/neg/macro-keyword-trait2.flags | 1 + test/files/neg/macro-keyword-trait2.scala | 3 + test/files/neg/macro-keyword-type.check | 4 ++ test/files/neg/macro-keyword-type.flags | 1 + test/files/neg/macro-keyword-type.scala | 3 + test/files/neg/macro-keyword-val.check | 7 ++ test/files/neg/macro-keyword-val.flags | 1 + test/files/neg/macro-keyword-val.scala | 3 + test/files/neg/macro-keyword-var.check | 7 ++ test/files/neg/macro-keyword-var.flags | 1 + test/files/neg/macro-keyword-var.scala | 3 + test/files/neg/macro-keyword.check | 49 -------------- test/files/neg/macro-keyword.flags | 1 - test/files/neg/macro-keyword/Macros_Bind_12.scala | 6 -- test/files/neg/macro-keyword/Macros_Class_4.scala | 3 - test/files/neg/macro-keyword/Macros_Class_5.scala | 3 - test/files/neg/macro-keyword/Macros_Def_13.scala | 3 - test/files/neg/macro-keyword/Macros_Object_6.scala | 3 - test/files/neg/macro-keyword/Macros_Object_7.scala | 3 - .../neg/macro-keyword/Macros_Package_10.scala | 3 - .../neg/macro-keyword/Macros_Package_11.scala | 3 - test/files/neg/macro-keyword/Macros_Trait_8.scala | 3 - test/files/neg/macro-keyword/Macros_Trait_9.scala | 3 - test/files/neg/macro-keyword/Macros_Type_3.scala | 3 - test/files/neg/macro-keyword/Macros_Val_1.scala | 3 - test/files/neg/macro-keyword/Macros_Var_2.scala | 3 - 85 files changed, 268 insertions(+), 234 deletions(-) create mode 100644 test/files/neg/macro-deprecate-dont-touch-backquotedidents.flags create mode 100644 test/files/neg/macro-deprecate-dont-touch-backquotedidents.scala delete mode 100644 test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Bind_12.scala delete mode 100644 test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Class_4.scala delete mode 100644 test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Class_5.scala delete mode 100644 test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Def_13.scala delete mode 100644 test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Object_6.scala delete mode 100644 test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Object_7.scala delete mode 100644 test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Package_10.scala delete mode 100644 test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Package_11.scala delete mode 100644 test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Trait_8.scala delete mode 100644 test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Trait_9.scala delete mode 100644 test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Type_3.scala delete mode 100644 test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Val_1.scala delete mode 100644 test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Var_2.scala delete mode 100644 test/files/neg/macro-deprecate-dont-touch-backquotedidents/Main.scala create mode 100644 test/files/neg/macro-deprecate-idents.flags create mode 100644 test/files/neg/macro-deprecate-idents.scala delete mode 100644 test/files/neg/macro-deprecate-idents/Macros_Bind_12.scala delete mode 100644 test/files/neg/macro-deprecate-idents/Macros_Class_4.scala delete mode 100644 test/files/neg/macro-deprecate-idents/Macros_Class_5.scala delete mode 100644 test/files/neg/macro-deprecate-idents/Macros_Def_13.scala delete mode 100644 test/files/neg/macro-deprecate-idents/Macros_Object_6.scala delete mode 100644 test/files/neg/macro-deprecate-idents/Macros_Object_7.scala delete mode 100644 test/files/neg/macro-deprecate-idents/Macros_Package_10.scala delete mode 100644 test/files/neg/macro-deprecate-idents/Macros_Package_11.scala delete mode 100644 test/files/neg/macro-deprecate-idents/Macros_Trait_8.scala delete mode 100644 test/files/neg/macro-deprecate-idents/Macros_Trait_9.scala delete mode 100644 test/files/neg/macro-deprecate-idents/Macros_Type_3.scala delete mode 100644 test/files/neg/macro-deprecate-idents/Macros_Val_1.scala delete mode 100644 test/files/neg/macro-deprecate-idents/Macros_Var_2.scala delete mode 100644 test/files/neg/macro-deprecate-idents/Main.scala create mode 100644 test/files/neg/macro-keyword-bind.check create mode 100644 test/files/neg/macro-keyword-bind.flags create mode 100644 test/files/neg/macro-keyword-bind.scala create mode 100644 test/files/neg/macro-keyword-class1.check create mode 100644 test/files/neg/macro-keyword-class1.flags create mode 100644 test/files/neg/macro-keyword-class1.scala create mode 100644 test/files/neg/macro-keyword-class2.check create mode 100644 test/files/neg/macro-keyword-class2.flags create mode 100644 test/files/neg/macro-keyword-class2.scala create mode 100644 test/files/neg/macro-keyword-object1.check create mode 100644 test/files/neg/macro-keyword-object1.flags create mode 100644 test/files/neg/macro-keyword-object1.scala create mode 100644 test/files/neg/macro-keyword-object2.check create mode 100644 test/files/neg/macro-keyword-object2.flags create mode 100644 test/files/neg/macro-keyword-object2.scala create mode 100644 test/files/neg/macro-keyword-package1.check create mode 100644 test/files/neg/macro-keyword-package1.flags create mode 100644 test/files/neg/macro-keyword-package1.scala create mode 100644 test/files/neg/macro-keyword-package2.check create mode 100644 test/files/neg/macro-keyword-package2.flags create mode 100644 test/files/neg/macro-keyword-package2.scala create mode 100644 test/files/neg/macro-keyword-trait1.check create mode 100644 test/files/neg/macro-keyword-trait1.flags create mode 100644 test/files/neg/macro-keyword-trait1.scala create mode 100644 test/files/neg/macro-keyword-trait2.check create mode 100644 test/files/neg/macro-keyword-trait2.flags create mode 100644 test/files/neg/macro-keyword-trait2.scala create mode 100644 test/files/neg/macro-keyword-type.check create mode 100644 test/files/neg/macro-keyword-type.flags create mode 100644 test/files/neg/macro-keyword-type.scala create mode 100644 test/files/neg/macro-keyword-val.check create mode 100644 test/files/neg/macro-keyword-val.flags create mode 100644 test/files/neg/macro-keyword-val.scala create mode 100644 test/files/neg/macro-keyword-var.check create mode 100644 test/files/neg/macro-keyword-var.flags create mode 100644 test/files/neg/macro-keyword-var.scala delete mode 100644 test/files/neg/macro-keyword.check delete mode 100644 test/files/neg/macro-keyword.flags delete mode 100644 test/files/neg/macro-keyword/Macros_Bind_12.scala delete mode 100644 test/files/neg/macro-keyword/Macros_Class_4.scala delete mode 100644 test/files/neg/macro-keyword/Macros_Class_5.scala delete mode 100644 test/files/neg/macro-keyword/Macros_Def_13.scala delete mode 100644 test/files/neg/macro-keyword/Macros_Object_6.scala delete mode 100644 test/files/neg/macro-keyword/Macros_Object_7.scala delete mode 100644 test/files/neg/macro-keyword/Macros_Package_10.scala delete mode 100644 test/files/neg/macro-keyword/Macros_Package_11.scala delete mode 100644 test/files/neg/macro-keyword/Macros_Trait_8.scala delete mode 100644 test/files/neg/macro-keyword/Macros_Trait_9.scala delete mode 100644 test/files/neg/macro-keyword/Macros_Type_3.scala delete mode 100644 test/files/neg/macro-keyword/Macros_Val_1.scala delete mode 100644 test/files/neg/macro-keyword/Macros_Var_2.scala (limited to 'test/files') diff --git a/test/files/neg/macro-deprecate-dont-touch-backquotedidents.check b/test/files/neg/macro-deprecate-dont-touch-backquotedidents.check index c97be5d9f6..25df9a6a4a 100644 --- a/test/files/neg/macro-deprecate-dont-touch-backquotedidents.check +++ b/test/files/neg/macro-deprecate-dont-touch-backquotedidents.check @@ -1,14 +1,10 @@ -Macros_Package_10.scala:1: warning: in future versions of Scala "macro" will be a keyword. consider using a different name. -package `macro` +macro-deprecate-dont-touch-backquotedidents.scala:37: error: in future versions of Scala "macro" will be a keyword. consider using a different name. +package `macro` { ^ -Macros_Package_10.scala:3: warning: in future versions of Scala "macro" will be a keyword. consider using a different name. -package `macro`.bar - ^ -Macros_Package_11.scala:3: warning: in future versions of Scala "macro" will be a keyword. consider using a different name. -package `macro`.foo - ^ -Main.scala:2: error: Unmatched closing brace '}' ignored here -} -^ -three warnings found -one error found +macro-deprecate-dont-touch-backquotedidents.scala:38: error: in future versions of Scala "macro" will be a keyword. consider using a different name. + package `macro`.bar { + ^ +macro-deprecate-dont-touch-backquotedidents.scala:43: error: in future versions of Scala "macro" will be a keyword. consider using a different name. + package `macro`.foo { + ^ +three errors found diff --git a/test/files/neg/macro-deprecate-dont-touch-backquotedidents.flags b/test/files/neg/macro-deprecate-dont-touch-backquotedidents.flags new file mode 100644 index 0000000000..e8fb65d50c --- /dev/null +++ b/test/files/neg/macro-deprecate-dont-touch-backquotedidents.flags @@ -0,0 +1 @@ +-Xfatal-warnings \ No newline at end of file diff --git a/test/files/neg/macro-deprecate-dont-touch-backquotedidents.scala b/test/files/neg/macro-deprecate-dont-touch-backquotedidents.scala new file mode 100644 index 0000000000..dee2f1de3b --- /dev/null +++ b/test/files/neg/macro-deprecate-dont-touch-backquotedidents.scala @@ -0,0 +1,56 @@ +object Test1 { + val `macro` = ??? +} + +object Test2 { + var `macro` = ??? +} + +object Test3 { + type `macro` = Int +} + +package test4 { + class `macro` +} + +object Test5 { + class `macro` +} + +package test6 { + object `macro` +} + +object Test7 { + object `macro` +} + +package test8 { + trait `macro` +} + +object Test9 { + trait `macro` +} + +package `macro` { + package `macro`.bar { + } +} + +package foo { + package `macro`.foo { + } +} + +object Test12 { + val Some(`macro`) = Some(42) + `macro` match { + case `macro` => println(`macro`) + } +} + +object Test13 { + def `macro` = 2 +} \ No newline at end of file diff --git a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Bind_12.scala b/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Bind_12.scala deleted file mode 100644 index 97c07b04a0..0000000000 --- a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Bind_12.scala +++ /dev/null @@ -1,6 +0,0 @@ -object Test12 { - val Some(`macro`) = Some(42) - `macro` match { - case `macro` => println(`macro`) - } -} \ No newline at end of file diff --git a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Class_4.scala b/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Class_4.scala deleted file mode 100644 index f0037b5f82..0000000000 --- a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Class_4.scala +++ /dev/null @@ -1,3 +0,0 @@ -package test4 - -class `macro` diff --git a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Class_5.scala b/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Class_5.scala deleted file mode 100644 index a6d0903cbb..0000000000 --- a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Class_5.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test5 { - class `macro` -} diff --git a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Def_13.scala b/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Def_13.scala deleted file mode 100644 index 6af8e1d65e..0000000000 --- a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Def_13.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test13 { - def `macro` = 2 -} \ No newline at end of file diff --git a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Object_6.scala b/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Object_6.scala deleted file mode 100644 index 29dab017d2..0000000000 --- a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Object_6.scala +++ /dev/null @@ -1,3 +0,0 @@ -package test6 - -object `macro` diff --git a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Object_7.scala b/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Object_7.scala deleted file mode 100644 index 6cbcac55ca..0000000000 --- a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Object_7.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test7 { - object `macro` -} diff --git a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Package_10.scala b/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Package_10.scala deleted file mode 100644 index 4985d6691e..0000000000 --- a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Package_10.scala +++ /dev/null @@ -1,3 +0,0 @@ -package `macro` - -package `macro`.bar \ No newline at end of file diff --git a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Package_11.scala b/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Package_11.scala deleted file mode 100644 index 35ed610637..0000000000 --- a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Package_11.scala +++ /dev/null @@ -1,3 +0,0 @@ -package foo - -package `macro`.foo diff --git a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Trait_8.scala b/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Trait_8.scala deleted file mode 100644 index 7895cf9a43..0000000000 --- a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Trait_8.scala +++ /dev/null @@ -1,3 +0,0 @@ -package test8 - -trait `macro` diff --git a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Trait_9.scala b/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Trait_9.scala deleted file mode 100644 index 90ba2207b7..0000000000 --- a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Trait_9.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test9 { - trait `macro` -} diff --git a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Type_3.scala b/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Type_3.scala deleted file mode 100644 index 7a2196c9cd..0000000000 --- a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Type_3.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test3 { - type `macro` = Int -} \ No newline at end of file diff --git a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Val_1.scala b/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Val_1.scala deleted file mode 100644 index 9ad08b8ba0..0000000000 --- a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Val_1.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test1 { - val `macro` = ??? -} \ No newline at end of file diff --git a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Var_2.scala b/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Var_2.scala deleted file mode 100644 index 4fbe152e76..0000000000 --- a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Var_2.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test2 { - var `macro` = ??? -} \ No newline at end of file diff --git a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Main.scala b/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Main.scala deleted file mode 100644 index f5278d9e7e..0000000000 --- a/test/files/neg/macro-deprecate-dont-touch-backquotedidents/Main.scala +++ /dev/null @@ -1,2 +0,0 @@ -object Test extends App -} \ No newline at end of file diff --git a/test/files/neg/macro-deprecate-idents.check b/test/files/neg/macro-deprecate-idents.check index 5fa1dc84d0..bd685fc7b9 100644 --- a/test/files/neg/macro-deprecate-idents.check +++ b/test/files/neg/macro-deprecate-idents.check @@ -1,50 +1,46 @@ -Macros_Bind_12.scala:2: warning: in future versions of Scala "macro" will be a keyword. consider using a different name. - val Some(macro) = Some(42) - ^ -Macros_Bind_12.scala:4: warning: in future versions of Scala "macro" will be a keyword. consider using a different name. - case macro => println(macro) - ^ -Macros_Class_4.scala:3: warning: in future versions of Scala "macro" will be a keyword. consider using a different name. -class macro +macro-deprecate-idents.scala:2: error: in future versions of Scala "macro" will be a keyword. consider using a different name. + val macro = ??? ^ -Macros_Class_5.scala:2: warning: in future versions of Scala "macro" will be a keyword. consider using a different name. - class macro - ^ -Macros_Def_13.scala:2: warning: in future versions of Scala "macro" will be a keyword. consider using a different name. - def macro = 2 +macro-deprecate-idents.scala:6: error: in future versions of Scala "macro" will be a keyword. consider using a different name. + var macro = ??? ^ -Macros_Object_6.scala:3: warning: in future versions of Scala "macro" will be a keyword. consider using a different name. -object macro +macro-deprecate-idents.scala:10: error: in future versions of Scala "macro" will be a keyword. consider using a different name. + type macro = Int ^ -Macros_Object_7.scala:2: warning: in future versions of Scala "macro" will be a keyword. consider using a different name. - object macro - ^ -Macros_Package_10.scala:1: warning: in future versions of Scala "macro" will be a keyword. consider using a different name. -package macro +macro-deprecate-idents.scala:14: error: in future versions of Scala "macro" will be a keyword. consider using a different name. + class macro ^ -Macros_Package_10.scala:3: warning: in future versions of Scala "macro" will be a keyword. consider using a different name. -package macro.bar +macro-deprecate-idents.scala:18: error: in future versions of Scala "macro" will be a keyword. consider using a different name. + class macro ^ -Macros_Package_11.scala:3: warning: in future versions of Scala "macro" will be a keyword. consider using a different name. -package macro.foo +macro-deprecate-idents.scala:22: error: in future versions of Scala "macro" will be a keyword. consider using a different name. + object macro + ^ +macro-deprecate-idents.scala:26: error: in future versions of Scala "macro" will be a keyword. consider using a different name. + object macro + ^ +macro-deprecate-idents.scala:30: error: in future versions of Scala "macro" will be a keyword. consider using a different name. + trait macro ^ -Macros_Trait_8.scala:3: warning: in future versions of Scala "macro" will be a keyword. consider using a different name. -trait macro - ^ -Macros_Trait_9.scala:2: warning: in future versions of Scala "macro" will be a keyword. consider using a different name. +macro-deprecate-idents.scala:34: error: in future versions of Scala "macro" will be a keyword. consider using a different name. trait macro ^ -Macros_Type_3.scala:2: warning: in future versions of Scala "macro" will be a keyword. consider using a different name. - type macro = Int - ^ -Macros_Val_1.scala:2: warning: in future versions of Scala "macro" will be a keyword. consider using a different name. - val macro = ??? - ^ -Macros_Var_2.scala:2: warning: in future versions of Scala "macro" will be a keyword. consider using a different name. - var macro = ??? +macro-deprecate-idents.scala:37: error: in future versions of Scala "macro" will be a keyword. consider using a different name. +package macro { + ^ +macro-deprecate-idents.scala:38: error: in future versions of Scala "macro" will be a keyword. consider using a different name. + package macro.bar { + ^ +macro-deprecate-idents.scala:43: error: in future versions of Scala "macro" will be a keyword. consider using a different name. + package macro.foo { + ^ +macro-deprecate-idents.scala:48: error: in future versions of Scala "macro" will be a keyword. consider using a different name. + val Some(macro) = Some(42) + ^ +macro-deprecate-idents.scala:50: error: in future versions of Scala "macro" will be a keyword. consider using a different name. + case macro => println(macro) + ^ +macro-deprecate-idents.scala:55: error: in future versions of Scala "macro" will be a keyword. consider using a different name. + def macro = 2 ^ -Main.scala:2: error: Unmatched closing brace '}' ignored here -} -^ -15 warnings found -one error found +15 errors found diff --git a/test/files/neg/macro-deprecate-idents.flags b/test/files/neg/macro-deprecate-idents.flags new file mode 100644 index 0000000000..e8fb65d50c --- /dev/null +++ b/test/files/neg/macro-deprecate-idents.flags @@ -0,0 +1 @@ +-Xfatal-warnings \ No newline at end of file diff --git a/test/files/neg/macro-deprecate-idents.scala b/test/files/neg/macro-deprecate-idents.scala new file mode 100644 index 0000000000..23c398e341 --- /dev/null +++ b/test/files/neg/macro-deprecate-idents.scala @@ -0,0 +1,56 @@ +object Test1 { + val macro = ??? +} + +object Test2 { + var macro = ??? +} + +object Test3 { + type macro = Int +} + +package test4 { + class macro +} + +object Test5 { + class macro +} + +package test6 { + object macro +} + +object Test7 { + object macro +} + +package test8 { + trait macro +} + +object Test9 { + trait macro +} + +package macro { + package macro.bar { + } +} + +package foo { + package macro.foo { + } +} + +object Test12 { + val Some(macro) = Some(42) + macro match { + case macro => println(macro) + } +} + +object Test13 { + def macro = 2 +} \ No newline at end of file diff --git a/test/files/neg/macro-deprecate-idents/Macros_Bind_12.scala b/test/files/neg/macro-deprecate-idents/Macros_Bind_12.scala deleted file mode 100644 index a3b1553348..0000000000 --- a/test/files/neg/macro-deprecate-idents/Macros_Bind_12.scala +++ /dev/null @@ -1,6 +0,0 @@ -object Test12 { - val Some(macro) = Some(42) - macro match { - case macro => println(macro) - } -} \ No newline at end of file diff --git a/test/files/neg/macro-deprecate-idents/Macros_Class_4.scala b/test/files/neg/macro-deprecate-idents/Macros_Class_4.scala deleted file mode 100644 index 8635d1f4f6..0000000000 --- a/test/files/neg/macro-deprecate-idents/Macros_Class_4.scala +++ /dev/null @@ -1,3 +0,0 @@ -package test4 - -class macro diff --git a/test/files/neg/macro-deprecate-idents/Macros_Class_5.scala b/test/files/neg/macro-deprecate-idents/Macros_Class_5.scala deleted file mode 100644 index af24a489d0..0000000000 --- a/test/files/neg/macro-deprecate-idents/Macros_Class_5.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test5 { - class macro -} diff --git a/test/files/neg/macro-deprecate-idents/Macros_Def_13.scala b/test/files/neg/macro-deprecate-idents/Macros_Def_13.scala deleted file mode 100644 index f4e25bfdfc..0000000000 --- a/test/files/neg/macro-deprecate-idents/Macros_Def_13.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test13 { - def macro = 2 -} \ No newline at end of file diff --git a/test/files/neg/macro-deprecate-idents/Macros_Object_6.scala b/test/files/neg/macro-deprecate-idents/Macros_Object_6.scala deleted file mode 100644 index 66eb494e6b..0000000000 --- a/test/files/neg/macro-deprecate-idents/Macros_Object_6.scala +++ /dev/null @@ -1,3 +0,0 @@ -package test6 - -object macro diff --git a/test/files/neg/macro-deprecate-idents/Macros_Object_7.scala b/test/files/neg/macro-deprecate-idents/Macros_Object_7.scala deleted file mode 100644 index 6f5b9ceacd..0000000000 --- a/test/files/neg/macro-deprecate-idents/Macros_Object_7.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test7 { - object macro -} diff --git a/test/files/neg/macro-deprecate-idents/Macros_Package_10.scala b/test/files/neg/macro-deprecate-idents/Macros_Package_10.scala deleted file mode 100644 index 52d3fbabf6..0000000000 --- a/test/files/neg/macro-deprecate-idents/Macros_Package_10.scala +++ /dev/null @@ -1,3 +0,0 @@ -package macro - -package macro.bar \ No newline at end of file diff --git a/test/files/neg/macro-deprecate-idents/Macros_Package_11.scala b/test/files/neg/macro-deprecate-idents/Macros_Package_11.scala deleted file mode 100644 index a68ebd935f..0000000000 --- a/test/files/neg/macro-deprecate-idents/Macros_Package_11.scala +++ /dev/null @@ -1,3 +0,0 @@ -package foo - -package macro.foo diff --git a/test/files/neg/macro-deprecate-idents/Macros_Trait_8.scala b/test/files/neg/macro-deprecate-idents/Macros_Trait_8.scala deleted file mode 100644 index e32d4c1385..0000000000 --- a/test/files/neg/macro-deprecate-idents/Macros_Trait_8.scala +++ /dev/null @@ -1,3 +0,0 @@ -package test8 - -trait macro diff --git a/test/files/neg/macro-deprecate-idents/Macros_Trait_9.scala b/test/files/neg/macro-deprecate-idents/Macros_Trait_9.scala deleted file mode 100644 index 243a54abe6..0000000000 --- a/test/files/neg/macro-deprecate-idents/Macros_Trait_9.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test9 { - trait macro -} diff --git a/test/files/neg/macro-deprecate-idents/Macros_Type_3.scala b/test/files/neg/macro-deprecate-idents/Macros_Type_3.scala deleted file mode 100644 index 30e523bcaf..0000000000 --- a/test/files/neg/macro-deprecate-idents/Macros_Type_3.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test3 { - type macro = Int -} \ No newline at end of file diff --git a/test/files/neg/macro-deprecate-idents/Macros_Val_1.scala b/test/files/neg/macro-deprecate-idents/Macros_Val_1.scala deleted file mode 100644 index 96f57acb30..0000000000 --- a/test/files/neg/macro-deprecate-idents/Macros_Val_1.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test1 { - val macro = ??? -} \ No newline at end of file diff --git a/test/files/neg/macro-deprecate-idents/Macros_Var_2.scala b/test/files/neg/macro-deprecate-idents/Macros_Var_2.scala deleted file mode 100644 index a79dda6dc2..0000000000 --- a/test/files/neg/macro-deprecate-idents/Macros_Var_2.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test2 { - var macro = ??? -} \ No newline at end of file diff --git a/test/files/neg/macro-deprecate-idents/Main.scala b/test/files/neg/macro-deprecate-idents/Main.scala deleted file mode 100644 index f5278d9e7e..0000000000 --- a/test/files/neg/macro-deprecate-idents/Main.scala +++ /dev/null @@ -1,2 +0,0 @@ -object Test extends App -} \ No newline at end of file diff --git a/test/files/neg/macro-keyword-bind.check b/test/files/neg/macro-keyword-bind.check new file mode 100644 index 0000000000..1f74cfe5cd --- /dev/null +++ b/test/files/neg/macro-keyword-bind.check @@ -0,0 +1,7 @@ +macro-keyword-bind.scala:2: error: illegal start of simple pattern + val Some(macro) = Some(42) + ^ +macro-keyword-bind.scala:6: error: ')' expected but '}' found. +} +^ +two errors found diff --git a/test/files/neg/macro-keyword-bind.flags b/test/files/neg/macro-keyword-bind.flags new file mode 100644 index 0000000000..7fea2ff901 --- /dev/null +++ b/test/files/neg/macro-keyword-bind.flags @@ -0,0 +1 @@ +-Xmacros \ No newline at end of file diff --git a/test/files/neg/macro-keyword-bind.scala b/test/files/neg/macro-keyword-bind.scala new file mode 100644 index 0000000000..a3b1553348 --- /dev/null +++ b/test/files/neg/macro-keyword-bind.scala @@ -0,0 +1,6 @@ +object Test12 { + val Some(macro) = Some(42) + macro match { + case macro => println(macro) + } +} \ No newline at end of file diff --git a/test/files/neg/macro-keyword-class1.check b/test/files/neg/macro-keyword-class1.check new file mode 100644 index 0000000000..d8983180ef --- /dev/null +++ b/test/files/neg/macro-keyword-class1.check @@ -0,0 +1,4 @@ +macro-keyword-class1.scala:3: error: identifier expected but 'macro' found. +class macro + ^ +one error found diff --git a/test/files/neg/macro-keyword-class1.flags b/test/files/neg/macro-keyword-class1.flags new file mode 100644 index 0000000000..7fea2ff901 --- /dev/null +++ b/test/files/neg/macro-keyword-class1.flags @@ -0,0 +1 @@ +-Xmacros \ No newline at end of file diff --git a/test/files/neg/macro-keyword-class1.scala b/test/files/neg/macro-keyword-class1.scala new file mode 100644 index 0000000000..8635d1f4f6 --- /dev/null +++ b/test/files/neg/macro-keyword-class1.scala @@ -0,0 +1,3 @@ +package test4 + +class macro diff --git a/test/files/neg/macro-keyword-class2.check b/test/files/neg/macro-keyword-class2.check new file mode 100644 index 0000000000..0e4d11bcc4 --- /dev/null +++ b/test/files/neg/macro-keyword-class2.check @@ -0,0 +1,4 @@ +macro-keyword-class2.scala:2: error: identifier expected but 'macro' found. + class macro + ^ +one error found diff --git a/test/files/neg/macro-keyword-class2.flags b/test/files/neg/macro-keyword-class2.flags new file mode 100644 index 0000000000..7fea2ff901 --- /dev/null +++ b/test/files/neg/macro-keyword-class2.flags @@ -0,0 +1 @@ +-Xmacros \ No newline at end of file diff --git a/test/files/neg/macro-keyword-class2.scala b/test/files/neg/macro-keyword-class2.scala new file mode 100644 index 0000000000..af24a489d0 --- /dev/null +++ b/test/files/neg/macro-keyword-class2.scala @@ -0,0 +1,3 @@ +object Test5 { + class macro +} diff --git a/test/files/neg/macro-keyword-object1.check b/test/files/neg/macro-keyword-object1.check new file mode 100644 index 0000000000..cfbd06ffd6 --- /dev/null +++ b/test/files/neg/macro-keyword-object1.check @@ -0,0 +1,4 @@ +macro-keyword-object1.scala:3: error: identifier expected but 'macro' found. +object macro + ^ +one error found diff --git a/test/files/neg/macro-keyword-object1.flags b/test/files/neg/macro-keyword-object1.flags new file mode 100644 index 0000000000..7fea2ff901 --- /dev/null +++ b/test/files/neg/macro-keyword-object1.flags @@ -0,0 +1 @@ +-Xmacros \ No newline at end of file diff --git a/test/files/neg/macro-keyword-object1.scala b/test/files/neg/macro-keyword-object1.scala new file mode 100644 index 0000000000..66eb494e6b --- /dev/null +++ b/test/files/neg/macro-keyword-object1.scala @@ -0,0 +1,3 @@ +package test6 + +object macro diff --git a/test/files/neg/macro-keyword-object2.check b/test/files/neg/macro-keyword-object2.check new file mode 100644 index 0000000000..ede31f13e5 --- /dev/null +++ b/test/files/neg/macro-keyword-object2.check @@ -0,0 +1,4 @@ +macro-keyword-object2.scala:2: error: identifier expected but 'macro' found. + object macro + ^ +one error found diff --git a/test/files/neg/macro-keyword-object2.flags b/test/files/neg/macro-keyword-object2.flags new file mode 100644 index 0000000000..7fea2ff901 --- /dev/null +++ b/test/files/neg/macro-keyword-object2.flags @@ -0,0 +1 @@ +-Xmacros \ No newline at end of file diff --git a/test/files/neg/macro-keyword-object2.scala b/test/files/neg/macro-keyword-object2.scala new file mode 100644 index 0000000000..6f5b9ceacd --- /dev/null +++ b/test/files/neg/macro-keyword-object2.scala @@ -0,0 +1,3 @@ +object Test7 { + object macro +} diff --git a/test/files/neg/macro-keyword-package1.check b/test/files/neg/macro-keyword-package1.check new file mode 100644 index 0000000000..22c1e11ded --- /dev/null +++ b/test/files/neg/macro-keyword-package1.check @@ -0,0 +1,4 @@ +macro-keyword-package1.scala:1: error: identifier expected but 'macro' found. +package macro + ^ +one error found diff --git a/test/files/neg/macro-keyword-package1.flags b/test/files/neg/macro-keyword-package1.flags new file mode 100644 index 0000000000..7fea2ff901 --- /dev/null +++ b/test/files/neg/macro-keyword-package1.flags @@ -0,0 +1 @@ +-Xmacros \ No newline at end of file diff --git a/test/files/neg/macro-keyword-package1.scala b/test/files/neg/macro-keyword-package1.scala new file mode 100644 index 0000000000..52d3fbabf6 --- /dev/null +++ b/test/files/neg/macro-keyword-package1.scala @@ -0,0 +1,3 @@ +package macro + +package macro.bar \ No newline at end of file diff --git a/test/files/neg/macro-keyword-package2.check b/test/files/neg/macro-keyword-package2.check new file mode 100644 index 0000000000..0cb542a85d --- /dev/null +++ b/test/files/neg/macro-keyword-package2.check @@ -0,0 +1,4 @@ +macro-keyword-package2.scala:3: error: identifier expected but 'macro' found. +package macro.foo + ^ +one error found diff --git a/test/files/neg/macro-keyword-package2.flags b/test/files/neg/macro-keyword-package2.flags new file mode 100644 index 0000000000..7fea2ff901 --- /dev/null +++ b/test/files/neg/macro-keyword-package2.flags @@ -0,0 +1 @@ +-Xmacros \ No newline at end of file diff --git a/test/files/neg/macro-keyword-package2.scala b/test/files/neg/macro-keyword-package2.scala new file mode 100644 index 0000000000..a68ebd935f --- /dev/null +++ b/test/files/neg/macro-keyword-package2.scala @@ -0,0 +1,3 @@ +package foo + +package macro.foo diff --git a/test/files/neg/macro-keyword-trait1.check b/test/files/neg/macro-keyword-trait1.check new file mode 100644 index 0000000000..9586a62e08 --- /dev/null +++ b/test/files/neg/macro-keyword-trait1.check @@ -0,0 +1,4 @@ +macro-keyword-trait1.scala:3: error: identifier expected but 'macro' found. +trait macro + ^ +one error found diff --git a/test/files/neg/macro-keyword-trait1.flags b/test/files/neg/macro-keyword-trait1.flags new file mode 100644 index 0000000000..7fea2ff901 --- /dev/null +++ b/test/files/neg/macro-keyword-trait1.flags @@ -0,0 +1 @@ +-Xmacros \ No newline at end of file diff --git a/test/files/neg/macro-keyword-trait1.scala b/test/files/neg/macro-keyword-trait1.scala new file mode 100644 index 0000000000..e32d4c1385 --- /dev/null +++ b/test/files/neg/macro-keyword-trait1.scala @@ -0,0 +1,3 @@ +package test8 + +trait macro diff --git a/test/files/neg/macro-keyword-trait2.check b/test/files/neg/macro-keyword-trait2.check new file mode 100644 index 0000000000..40aa764378 --- /dev/null +++ b/test/files/neg/macro-keyword-trait2.check @@ -0,0 +1,4 @@ +macro-keyword-trait2.scala:2: error: identifier expected but 'macro' found. + trait macro + ^ +one error found diff --git a/test/files/neg/macro-keyword-trait2.flags b/test/files/neg/macro-keyword-trait2.flags new file mode 100644 index 0000000000..7fea2ff901 --- /dev/null +++ b/test/files/neg/macro-keyword-trait2.flags @@ -0,0 +1 @@ +-Xmacros \ No newline at end of file diff --git a/test/files/neg/macro-keyword-trait2.scala b/test/files/neg/macro-keyword-trait2.scala new file mode 100644 index 0000000000..243a54abe6 --- /dev/null +++ b/test/files/neg/macro-keyword-trait2.scala @@ -0,0 +1,3 @@ +object Test9 { + trait macro +} diff --git a/test/files/neg/macro-keyword-type.check b/test/files/neg/macro-keyword-type.check new file mode 100644 index 0000000000..4a7481114c --- /dev/null +++ b/test/files/neg/macro-keyword-type.check @@ -0,0 +1,4 @@ +macro-keyword-type.scala:2: error: identifier expected but 'macro' found. + type macro = Int + ^ +one error found diff --git a/test/files/neg/macro-keyword-type.flags b/test/files/neg/macro-keyword-type.flags new file mode 100644 index 0000000000..7fea2ff901 --- /dev/null +++ b/test/files/neg/macro-keyword-type.flags @@ -0,0 +1 @@ +-Xmacros \ No newline at end of file diff --git a/test/files/neg/macro-keyword-type.scala b/test/files/neg/macro-keyword-type.scala new file mode 100644 index 0000000000..30e523bcaf --- /dev/null +++ b/test/files/neg/macro-keyword-type.scala @@ -0,0 +1,3 @@ +object Test3 { + type macro = Int +} \ No newline at end of file diff --git a/test/files/neg/macro-keyword-val.check b/test/files/neg/macro-keyword-val.check new file mode 100644 index 0000000000..0dc4c030a9 --- /dev/null +++ b/test/files/neg/macro-keyword-val.check @@ -0,0 +1,7 @@ +macro-keyword-val.scala:2: error: illegal start of simple pattern + val macro = ??? + ^ +macro-keyword-val.scala:3: error: '=' expected but '}' found. +} +^ +two errors found diff --git a/test/files/neg/macro-keyword-val.flags b/test/files/neg/macro-keyword-val.flags new file mode 100644 index 0000000000..7fea2ff901 --- /dev/null +++ b/test/files/neg/macro-keyword-val.flags @@ -0,0 +1 @@ +-Xmacros \ No newline at end of file diff --git a/test/files/neg/macro-keyword-val.scala b/test/files/neg/macro-keyword-val.scala new file mode 100644 index 0000000000..96f57acb30 --- /dev/null +++ b/test/files/neg/macro-keyword-val.scala @@ -0,0 +1,3 @@ +object Test1 { + val macro = ??? +} \ No newline at end of file diff --git a/test/files/neg/macro-keyword-var.check b/test/files/neg/macro-keyword-var.check new file mode 100644 index 0000000000..96d02e0052 --- /dev/null +++ b/test/files/neg/macro-keyword-var.check @@ -0,0 +1,7 @@ +macro-keyword-var.scala:2: error: illegal start of simple pattern + var macro = ??? + ^ +macro-keyword-var.scala:3: error: '=' expected but '}' found. +} +^ +two errors found diff --git a/test/files/neg/macro-keyword-var.flags b/test/files/neg/macro-keyword-var.flags new file mode 100644 index 0000000000..7fea2ff901 --- /dev/null +++ b/test/files/neg/macro-keyword-var.flags @@ -0,0 +1 @@ +-Xmacros \ No newline at end of file diff --git a/test/files/neg/macro-keyword-var.scala b/test/files/neg/macro-keyword-var.scala new file mode 100644 index 0000000000..a79dda6dc2 --- /dev/null +++ b/test/files/neg/macro-keyword-var.scala @@ -0,0 +1,3 @@ +object Test2 { + var macro = ??? +} \ No newline at end of file diff --git a/test/files/neg/macro-keyword.check b/test/files/neg/macro-keyword.check deleted file mode 100644 index fd63db951c..0000000000 --- a/test/files/neg/macro-keyword.check +++ /dev/null @@ -1,49 +0,0 @@ -Macros_Bind_12.scala:2: error: illegal start of simple pattern - val Some(macro) = Some(42) - ^ -Macros_Bind_12.scala:6: error: ')' expected but '}' found. -} -^ -Macros_Class_4.scala:3: error: identifier expected but 'macro' found. -class macro - ^ -Macros_Class_5.scala:2: error: identifier expected but 'macro' found. - class macro - ^ -Macros_Def_13.scala:2: error: identifier expected but 'macro' found. - def macro = 2 - ^ -Macros_Object_6.scala:3: error: identifier expected but 'macro' found. -object macro - ^ -Macros_Object_7.scala:2: error: identifier expected but 'macro' found. - object macro - ^ -Macros_Package_10.scala:1: error: identifier expected but 'macro' found. -package macro - ^ -Macros_Package_11.scala:3: error: identifier expected but 'macro' found. -package macro.foo - ^ -Macros_Trait_8.scala:3: error: identifier expected but 'macro' found. -trait macro - ^ -Macros_Trait_9.scala:2: error: identifier expected but 'macro' found. - trait macro - ^ -Macros_Type_3.scala:2: error: identifier expected but 'macro' found. - type macro = Int - ^ -Macros_Val_1.scala:2: error: illegal start of simple pattern - val macro = ??? - ^ -Macros_Val_1.scala:3: error: '=' expected but '}' found. -} -^ -Macros_Var_2.scala:2: error: illegal start of simple pattern - var macro = ??? - ^ -Macros_Var_2.scala:3: error: '=' expected but '}' found. -} -^ -16 errors found diff --git a/test/files/neg/macro-keyword.flags b/test/files/neg/macro-keyword.flags deleted file mode 100644 index 7fea2ff901..0000000000 --- a/test/files/neg/macro-keyword.flags +++ /dev/null @@ -1 +0,0 @@ --Xmacros \ No newline at end of file diff --git a/test/files/neg/macro-keyword/Macros_Bind_12.scala b/test/files/neg/macro-keyword/Macros_Bind_12.scala deleted file mode 100644 index a3b1553348..0000000000 --- a/test/files/neg/macro-keyword/Macros_Bind_12.scala +++ /dev/null @@ -1,6 +0,0 @@ -object Test12 { - val Some(macro) = Some(42) - macro match { - case macro => println(macro) - } -} \ No newline at end of file diff --git a/test/files/neg/macro-keyword/Macros_Class_4.scala b/test/files/neg/macro-keyword/Macros_Class_4.scala deleted file mode 100644 index 8635d1f4f6..0000000000 --- a/test/files/neg/macro-keyword/Macros_Class_4.scala +++ /dev/null @@ -1,3 +0,0 @@ -package test4 - -class macro diff --git a/test/files/neg/macro-keyword/Macros_Class_5.scala b/test/files/neg/macro-keyword/Macros_Class_5.scala deleted file mode 100644 index af24a489d0..0000000000 --- a/test/files/neg/macro-keyword/Macros_Class_5.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test5 { - class macro -} diff --git a/test/files/neg/macro-keyword/Macros_Def_13.scala b/test/files/neg/macro-keyword/Macros_Def_13.scala deleted file mode 100644 index f4e25bfdfc..0000000000 --- a/test/files/neg/macro-keyword/Macros_Def_13.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test13 { - def macro = 2 -} \ No newline at end of file diff --git a/test/files/neg/macro-keyword/Macros_Object_6.scala b/test/files/neg/macro-keyword/Macros_Object_6.scala deleted file mode 100644 index 66eb494e6b..0000000000 --- a/test/files/neg/macro-keyword/Macros_Object_6.scala +++ /dev/null @@ -1,3 +0,0 @@ -package test6 - -object macro diff --git a/test/files/neg/macro-keyword/Macros_Object_7.scala b/test/files/neg/macro-keyword/Macros_Object_7.scala deleted file mode 100644 index 6f5b9ceacd..0000000000 --- a/test/files/neg/macro-keyword/Macros_Object_7.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test7 { - object macro -} diff --git a/test/files/neg/macro-keyword/Macros_Package_10.scala b/test/files/neg/macro-keyword/Macros_Package_10.scala deleted file mode 100644 index 52d3fbabf6..0000000000 --- a/test/files/neg/macro-keyword/Macros_Package_10.scala +++ /dev/null @@ -1,3 +0,0 @@ -package macro - -package macro.bar \ No newline at end of file diff --git a/test/files/neg/macro-keyword/Macros_Package_11.scala b/test/files/neg/macro-keyword/Macros_Package_11.scala deleted file mode 100644 index a68ebd935f..0000000000 --- a/test/files/neg/macro-keyword/Macros_Package_11.scala +++ /dev/null @@ -1,3 +0,0 @@ -package foo - -package macro.foo diff --git a/test/files/neg/macro-keyword/Macros_Trait_8.scala b/test/files/neg/macro-keyword/Macros_Trait_8.scala deleted file mode 100644 index e32d4c1385..0000000000 --- a/test/files/neg/macro-keyword/Macros_Trait_8.scala +++ /dev/null @@ -1,3 +0,0 @@ -package test8 - -trait macro diff --git a/test/files/neg/macro-keyword/Macros_Trait_9.scala b/test/files/neg/macro-keyword/Macros_Trait_9.scala deleted file mode 100644 index 243a54abe6..0000000000 --- a/test/files/neg/macro-keyword/Macros_Trait_9.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test9 { - trait macro -} diff --git a/test/files/neg/macro-keyword/Macros_Type_3.scala b/test/files/neg/macro-keyword/Macros_Type_3.scala deleted file mode 100644 index 30e523bcaf..0000000000 --- a/test/files/neg/macro-keyword/Macros_Type_3.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test3 { - type macro = Int -} \ No newline at end of file diff --git a/test/files/neg/macro-keyword/Macros_Val_1.scala b/test/files/neg/macro-keyword/Macros_Val_1.scala deleted file mode 100644 index 96f57acb30..0000000000 --- a/test/files/neg/macro-keyword/Macros_Val_1.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test1 { - val macro = ??? -} \ No newline at end of file diff --git a/test/files/neg/macro-keyword/Macros_Var_2.scala b/test/files/neg/macro-keyword/Macros_Var_2.scala deleted file mode 100644 index a79dda6dc2..0000000000 --- a/test/files/neg/macro-keyword/Macros_Var_2.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test2 { - var macro = ??? -} \ No newline at end of file -- cgit v1.2.3 From f1c6714e22e70ecba2aa595bf592b916be82deb4 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Thu, 12 Apr 2012 20:35:05 +0100 Subject: Fix for SI-5535. --- .../scala/tools/nsc/interpreter/MemberHandlers.scala | 2 +- test/files/run/t5535.check | 20 ++++++++++++++++++++ test/files/run/t5535.scala | 10 ++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 test/files/run/t5535.check create mode 100644 test/files/run/t5535.scala (limited to 'test/files') diff --git a/src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala b/src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala index 68bfeafbc6..099034fe97 100644 --- a/src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala +++ b/src/compiler/scala/tools/nsc/interpreter/MemberHandlers.scala @@ -120,7 +120,7 @@ trait MemberHandlers { private def vparamss = member.vparamss private def isMacro = member.mods.hasFlag(scala.reflect.internal.Flags.MACRO) // true if not a macro and 0-arity - override def definesValue = !isMacro && (vparamss.isEmpty || vparamss.head.isEmpty) + override def definesValue = !isMacro && (vparamss.isEmpty || vparamss.head.isEmpty && vparamss.tail.isEmpty) override def resultExtractionCode(req: Request) = if (mods.isPublic) codegenln(name, ": ", req.typeOf(name)) else "" } diff --git a/test/files/run/t5535.check b/test/files/run/t5535.check new file mode 100644 index 0000000000..8da9829b78 --- /dev/null +++ b/test/files/run/t5535.check @@ -0,0 +1,20 @@ +Type in expressions to have them evaluated. +Type :help for more information. + +scala> + +scala> def h()(i: Int) = 1 + i +h: ()(i: Int)Int + +scala> println(h()(5)) +6 + +scala> val f = h() _ +f: Int => Int = + +scala> println(f(10)) +11 + +scala> + +scala> diff --git a/test/files/run/t5535.scala b/test/files/run/t5535.scala new file mode 100644 index 0000000000..7bc12f3470 --- /dev/null +++ b/test/files/run/t5535.scala @@ -0,0 +1,10 @@ +import scala.tools.partest.ReplTest + +object Test extends ReplTest { + def code = """ +def h()(i: Int) = 1 + i +println(h()(5)) +val f = h() _ +println(f(10)) + """ +} -- cgit v1.2.3 From 08505bd4ec1216be7913607b84e54942f9153329 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Thu, 12 Apr 2012 20:57:11 +0100 Subject: Workaround for SI-5583. Somehow type args to be applied arrive in the specialized subclass where type args are no longer applicable. Log and discard. --- .../tools/nsc/transform/SpecializeTypes.scala | 22 +++++++++++++++------- test/files/run/t5583.check | 20 ++++++++++++++++++++ test/files/run/t5583.scala | 11 +++++++++++ 3 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 test/files/run/t5583.check create mode 100644 test/files/run/t5583.scala (limited to 'test/files') diff --git a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala index 12d2513756..b85ae26cf1 100644 --- a/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala +++ b/src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala @@ -1327,7 +1327,7 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { } } else super.transform(tree) - case TypeApply(Select(qual, name), targs) + case TypeApply(sel @ Select(qual, name), targs) if (!specializedTypeVars(symbol.info).isEmpty && name != nme.CONSTRUCTOR) => debuglog("checking typeapp for rerouting: " + tree + " with sym.tpe: " + symbol.tpe + " tree.tpe: " + tree.tpe) val qual1 = transform(qual) @@ -1341,14 +1341,22 @@ abstract class SpecializeTypes extends InfoTransform with TypingTransformers { val residualTargs = symbol.info.typeParams zip targs collect { case (tvar, targ) if !env.contains(tvar) || !isPrimitiveValueClass(env(tvar).typeSymbol) => targ } + if (specMember.info.typeParams.isEmpty) { + // See SI-5583. Don't know why it happens now if it didn't before. + if (residualTargs.nonEmpty) + log("!!! Type args to be applied, but symbol says no parameters: " + ((specMember.defString, residualTargs))) - ifDebug(assert(residualTargs.length == specMember.info.typeParams.length, - "residual: %s, tparams: %s, env: %s".format(residualTargs, symbol.info.typeParams, env)) - ) + localTyper.typed(sel) + } + else { + ifDebug(assert(residualTargs.length == specMember.info.typeParams.length, + "residual: %s, tparams: %s, env: %s".format(residualTargs, specMember.info.typeParams, env)) + ) - val tree1 = gen.mkTypeApply(Select(qual1, specMember), residualTargs) - debuglog("rewrote " + tree + " to " + tree1) - localTyper.typedOperator(atPos(tree.pos)(tree1)) // being polymorphic, it must be a method + val tree1 = gen.mkTypeApply(Select(qual1, specMember), residualTargs) + debuglog("rewrote " + tree + " to " + tree1) + localTyper.typedOperator(atPos(tree.pos)(tree1)) // being polymorphic, it must be a method + } case None => super.transform(tree) } diff --git a/test/files/run/t5583.check b/test/files/run/t5583.check new file mode 100644 index 0000000000..39b969fbe7 --- /dev/null +++ b/test/files/run/t5583.check @@ -0,0 +1,20 @@ +Type in expressions to have them evaluated. +Type :help for more information. + +scala> + +scala> var s = 0 +s: Int = 0 + +scala> for (i <- 1 to 10) {s += i} + +scala> for (i <- 1 to 10) {s += i} + +scala> for (i <- 1 to 10) {s += i} + +scala> println(s) +165 + +scala> + +scala> diff --git a/test/files/run/t5583.scala b/test/files/run/t5583.scala new file mode 100644 index 0000000000..8561a5946f --- /dev/null +++ b/test/files/run/t5583.scala @@ -0,0 +1,11 @@ +import scala.tools.partest.ReplTest + +object Test extends ReplTest { + def code = """ +var s = 0 +for (i <- 1 to 10) {s += i} +for (i <- 1 to 10) {s += i} +for (i <- 1 to 10) {s += i} +println(s) + """ +} -- cgit v1.2.3 From 004a54ca46ddb0fda6e28c02bc4bc20ccf5601b0 Mon Sep 17 00:00:00 2001 From: Eugene Burmako Date: Thu, 12 Apr 2012 23:07:21 +0200 Subject: fixes petty macro tests --- test/files/neg/macro-invalidsig-params-badvarargs/Test_2.scala | 2 +- test/files/neg/macro-invalidsig-params-namemismatch/Test_2.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'test/files') diff --git a/test/files/neg/macro-invalidsig-params-badvarargs/Test_2.scala b/test/files/neg/macro-invalidsig-params-badvarargs/Test_2.scala index cbd6232073..fa50ac4f73 100644 --- a/test/files/neg/macro-invalidsig-params-badvarargs/Test_2.scala +++ b/test/files/neg/macro-invalidsig-params-badvarargs/Test_2.scala @@ -1,4 +1,4 @@ object Test extends App { import Macros._ - foo(42) + foo(42, 100) } \ No newline at end of file diff --git a/test/files/neg/macro-invalidsig-params-namemismatch/Test_2.scala b/test/files/neg/macro-invalidsig-params-namemismatch/Test_2.scala index cbd6232073..fa50ac4f73 100644 --- a/test/files/neg/macro-invalidsig-params-namemismatch/Test_2.scala +++ b/test/files/neg/macro-invalidsig-params-namemismatch/Test_2.scala @@ -1,4 +1,4 @@ object Test extends App { import Macros._ - foo(42) + foo(42, 100) } \ No newline at end of file -- cgit v1.2.3 From 983f414dd32752ff2dbca5a4637b0978b31d35a7 Mon Sep 17 00:00:00 2001 From: Dominik Gruntz Date: Fri, 13 Apr 2012 00:51:39 +0200 Subject: SI-5510: string interpolation: parser no longer hangs on unclosed string --- .../scala/tools/nsc/ast/parser/Scanners.scala | 10 ++++++++-- test/files/neg/t5510.check | 19 +++++++++++++++++++ test/files/neg/t5510.scala | 7 +++++++ 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 test/files/neg/t5510.check create mode 100644 test/files/neg/t5510.scala (limited to 'test/files') diff --git a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala index 81d81a4fb7..ce38f034cf 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala @@ -231,6 +231,12 @@ trait Scanners extends ScannersCommon { lastOffset -= 1 } if (inStringInterpolation) fetchStringPart() else fetchToken() + if(token == ERROR) { + if (inMultiLineInterpolation) + sepRegions = sepRegions.tail.tail + else if (inStringInterpolation) + sepRegions = sepRegions.tail + } } else { this copyFrom next next.token = EMPTY @@ -328,7 +334,7 @@ trait Scanners extends ScannersCommon { putChar(ch) nextChar() getIdentRest() - if (ch == '"' && token == IDENTIFIER && settings.Xexperimental.value) + if (ch == '"' && token == IDENTIFIER) token = INTERPOLATIONID case '<' => // is XMLSTART? val last = if (charOffset >= 2) buf(charOffset - 2) else ' ' @@ -697,7 +703,7 @@ trait Scanners extends ScannersCommon { do { putChar(ch) nextRawChar() - } while (Character.isUnicodeIdentifierPart(ch)) + } while (ch != SU && Character.isUnicodeIdentifierPart(ch)) next.token = IDENTIFIER next.name = newTermName(cbuf.toString) cbuf.clear() diff --git a/test/files/neg/t5510.check b/test/files/neg/t5510.check new file mode 100644 index 0000000000..f74e424dc4 --- /dev/null +++ b/test/files/neg/t5510.check @@ -0,0 +1,19 @@ +t5510.scala:2: error: unclosed string literal + val s1 = s"xxx + ^ +t5510.scala:3: error: unclosed string literal + val s2 = s"xxx $x + ^ +t5510.scala:4: error: unclosed string literal + val s3 = s"xxx $$ + ^ +t5510.scala:5: error: unclosed string literal + val s4 = ""s" + ^ +t5510.scala:6: error: unclosed multi-line string literal + val s5 = ""s""" $s1 $s2 s" + ^ +t5510.scala:7: error: Missing closing brace `}' assumed here +} + ^ +6 errors found diff --git a/test/files/neg/t5510.scala b/test/files/neg/t5510.scala new file mode 100644 index 0000000000..12630eb2cd --- /dev/null +++ b/test/files/neg/t5510.scala @@ -0,0 +1,7 @@ +object Test { + val s1 = s"xxx + val s2 = s"xxx $x + val s3 = s"xxx $$ + val s4 = ""s" + val s5 = ""s""" $s1 $s2 s" +} -- cgit v1.2.3 From 20cd7cc077491ad4da4aace7376fddc2c05f4186 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Fri, 13 Apr 2012 03:23:54 +0100 Subject: Fix for failing test. --- test/files/neg/t5510.check | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/files') diff --git a/test/files/neg/t5510.check b/test/files/neg/t5510.check index f74e424dc4..60da3bed40 100644 --- a/test/files/neg/t5510.check +++ b/test/files/neg/t5510.check @@ -13,7 +13,7 @@ t5510.scala:5: error: unclosed string literal t5510.scala:6: error: unclosed multi-line string literal val s5 = ""s""" $s1 $s2 s" ^ -t5510.scala:7: error: Missing closing brace `}' assumed here +t5510.scala:7: error: '}' expected but eof found. } - ^ + ^ 6 errors found -- cgit v1.2.3