fixes petty macro tests

Author: xeno-by

src/compiler/scala/tools/nsc/typechecker/Typers.scala

@@ -2745,7 +2745,7 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser {
             val lencmp = compareLengths(args, formals)
 
             def checkNotMacro() = {
-              if (fun.symbol != null && fun.symbol.filter(sym => sym != null && sym.isTermMacro) != NoSymbol)
+              if (fun.symbol != null && fun.symbol.filter(sym => sym != null && sym.isTermMacro && !sym.isErroneous) != NoSymbol)
                 duplErrorTree(NamedAndDefaultArgumentsNotSupportedForMacros(tree, fun))
             }
 
@@ -4574,7 +4574,7 @@ trait Typers extends Modes with Adaptations with PatMatVirtualiser {
           // A: solely for robustness reasons. this mechanism might change in the future, which might break unprotected code
           val expr1 = context.withMacrosDisabled(typed1(expr, mode, pt))
           expr1 match {
-            case macroDef if macroDef.symbol.isTermMacro =>
+            case macroDef if macroDef.symbol != null && macroDef.symbol.isTermMacro && !macroDef.symbol.isErroneous =>
               MacroEtaError(expr1)
             case _ =>
               typedEta(checkDead(expr1))

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

test/files/neg/macro-deprecate-dont-touch-backquotedidents.flags

@@ -0,0 +1 @@
+-Xfatal-warnings

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
+}

test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Bind_12.scala

@@ -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

test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Class_4.scala

@@ -0,0 +1 @@
+-Xfatal-warnings

test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Class_5.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
+}

test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Def_13.scala

@@ -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

test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Object_6.scala

@@ -0,0 +1,4 @@
+macro-keyword-class1.scala:3: error: identifier expected but 'macro' found.
+class macro
+      ^
+one error found

test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Object_7.scala

@@ -0,0 +1 @@
+-Xmacros

test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Package_10.scala

@@ -0,0 +1,4 @@
+macro-keyword-class2.scala:2: error: identifier expected but 'macro' found.
+  class macro
+        ^
+one error found

test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Package_11.scala

@@ -0,0 +1 @@
+-Xmacros

test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Trait_8.scala

@@ -0,0 +1,4 @@
+macro-keyword-object1.scala:3: error: identifier expected but 'macro' found.
+object macro
+       ^
+one error found

test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Trait_9.scala

@@ -0,0 +1 @@
+-Xmacros

test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Type_3.scala

@@ -0,0 +1,4 @@
+macro-keyword-object2.scala:2: error: identifier expected but 'macro' found.
+  object macro
+         ^
+one error found

test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Val_1.scala

@@ -0,0 +1 @@
+-Xmacros

test/files/neg/macro-deprecate-dont-touch-backquotedidents/Macros_Var_2.scala

@@ -0,0 +1,4 @@
+macro-keyword-package1.scala:1: error: identifier expected but 'macro' found.
+package macro
+        ^
+one error found

test/files/neg/macro-deprecate-dont-touch-backquotedidents/Main.scala

@@ -0,0 +1 @@
+-Xmacros

test/files/neg/macro-deprecate-idents.check

@@ -0,0 +1,4 @@
+macro-keyword-package2.scala:3: error: identifier expected but 'macro' found.
+package macro.foo
+        ^
+one error found

test/files/neg/macro-deprecate-idents.flags

@@ -0,0 +1 @@
+-Xmacros

test/files/neg/macro-deprecate-idents.scala

@@ -0,0 +1,4 @@
+macro-keyword-trait1.scala:3: error: identifier expected but 'macro' found.
+trait macro
+      ^
+one error found

test/files/neg/macro-deprecate-idents/Macros_Def_13.scala

@@ -0,0 +1 @@
+-Xmacros

test/files/neg/macro-deprecate-idents/Main.scala

@@ -0,0 +1,4 @@
+macro-keyword-trait2.scala:2: error: identifier expected but 'macro' found.
+  trait macro
+        ^
+one error found

test/files/neg/macro-keyword-bind.check

@@ -0,0 +1 @@
+-Xmacros