Do not skip packages in FirstTransform

DarkDimius · DarkDimius · commit 859a7fe21d4e · 2014-11-22T20:25:36.000+01:00
Packages also get a JavaDefined flag, but they shouldn't be removed by FirstTransform.
diff --git a/src/dotty/tools/dotc/transform/FirstTransform.scala b/src/dotty/tools/dotc/transform/FirstTransform.scala
@@ -86,7 +86,8 @@ class FirstTransform extends MiniPhaseTransform with IdentityDenotTransformer wi
       case stat => stat
     }
 
-    def skipJava(stats: List[Tree]): List[Tree] = stats.filter(t => !(t.symbol is Flags.JavaDefined))
+    def skipJava(stats: List[Tree]): List[Tree] = // packages get a JavaDefined flag. Dont skip them
+      stats.filter(t => !(t.symbol is(Flags.JavaDefined, Flags.Package)))
     
     addMissingCompanions(reorder(skipJava(stats)))
   }

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,8 @@ class FirstTransform extends MiniPhaseTransform with IdentityDenotTransformer wi`
`86`	`86`	`case stat => stat`
`87`	`87`	`}`
`88`	`88`
`89`		`- def skipJava(stats: List[Tree]): List[Tree] = stats.filter(t => !(t.symbol is Flags.JavaDefined))`
	`89`	`+ def skipJava(stats: List[Tree]): List[Tree] = // packages get a JavaDefined flag. Dont skip them`
	`90`	`+ stats.filter(t => !(t.symbol is(Flags.JavaDefined, Flags.Package)))`
`90`	`91`
`91`	`92`	`addMissingCompanions(reorder(skipJava(stats)))`
`92`	`93`	`}`