Move root package name check to Typer

dwijnand · Aug 8, 2023 · 052afd8 · 052afd8
1 parent 990d112
commit 052afd8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -1071,10 +1071,6 @@ object Parsers {
         nme.ERROR
       }
 
-    def checkNotRoot(name: Name): name.type =
-      if name == nme.ROOTPKG then syntaxError(em"Illegal use of root package name.")
-      name
-
     /** Accept identifier and return Ident with its name as a term name. */
     def termIdent(): Ident =
       makeIdent(in.token, in.offset, ident())
@@ -3602,13 +3598,6 @@ object Parsers {
         case _ =>
           first :: Nil
       }
-
-      def checkForRoot(trees: List[Tree]): Unit = for tree <- trees do tree match
-        case IdPattern(id, _) => checkNotRoot(id.name)
-        case Tuple(trees) => checkForRoot(trees)
-        case _ =>
-      checkForRoot(lhs)
-
       val tpt = typedOpt()
       val rhs =
         if tpt.isEmpty || in.token == EQUALS then
@@ -3689,7 +3678,7 @@ object Parsers {
       else {
         val mods1 = addFlag(mods, Method)
         val ident = termIdent()
-        var name = checkNotRoot(ident.name).asTermName
+        var name = ident.name.asTermName
         val paramss =
           if in.featureEnabled(Feature.clauseInterleaving) then
             // If you are making interleaving stable manually, please refer to the PR introducing it instead, section "How to make non-experimental"

diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -2472,6 +2472,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
 
   def typedValDef(vdef: untpd.ValDef, sym: Symbol)(using Context): Tree = {
     val ValDef(name, tpt, _) = vdef
+    if name == nme.ROOTPKG then report.error(em"Illegal use of root package name.", vdef)
     completeAnnotations(vdef, sym)
     if (sym.isOneOf(GivenOrImplicit)) checkImplicitConversionDefOK(sym)
     if sym.is(Module) then checkNoModuleClash(sym)
@@ -2505,6 +2506,7 @@ class Typer(@constructorOnly nestingLevel: Int = 0) extends Namer
       // hence we special case it until `erased` is no longer experimental.
       sym.setFlag(Erased)
     val DefDef(name, paramss, tpt, _) = ddef
+    if name == nme.ROOTPKG then report.error(em"Illegal use of root package name.", ddef)
     completeAnnotations(ddef, sym)
     val paramss1 = paramss.nestedMapConserve(typed(_)).asInstanceOf[List[ParamClause]]
     for case ValDefs(vparams) <- paramss1 do