Merge pull request #1079 from dotty-staging/fix-#435

DarkDimius · DarkDimius · commit 259cf1e2234a · 2016-02-12T17:23:58.000+01:00
Fix #435
diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala
@@ -1068,7 +1068,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
     val packageContext =
       if (pkg is Package) ctx.fresh.setOwner(pkg.moduleClass).setTree(tree)
       else {
-        ctx.error(d"$pkg is not a package", tree.pos)
+        ctx.error(d"$pkg is already defined, cannot be a package", tree.pos)
         ctx
       }
     val stats1 = typedStats(tree.stats, pkg.moduleClass)(packageContext)

Original file line number	Diff line number	Diff line change
`@@ -1068,7 +1068,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit`
`1068`	`1068`	`val packageContext =`
`1069`	`1069`	`if (pkg is Package) ctx.fresh.setOwner(pkg.moduleClass).setTree(tree)`
`1070`	`1070`	`else {`
`1071`		`- ctx.error(d"$pkg is not a package", tree.pos)`
	`1071`	`+ ctx.error(d"$pkg is already defined, cannot be a package", tree.pos)`
`1072`	`1072`	`ctx`
`1073`	`1073`	`}`
`1074`	`1074`	`val stats1 = typedStats(tree.stats, pkg.moduleClass)(packageContext)`