diff options
Diffstat (limited to 'sources/scalac/symtab/classfile/PackageParser.java')
| -rw-r--r-- | sources/scalac/symtab/classfile/PackageParser.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sources/scalac/symtab/classfile/PackageParser.java b/sources/scalac/symtab/classfile/PackageParser.java index 1b29c7a0ef..9d62fb1009 100644 --- a/sources/scalac/symtab/classfile/PackageParser.java +++ b/sources/scalac/symtab/classfile/PackageParser.java @@ -66,11 +66,13 @@ public class PackageParser extends Type.LazyType { if (previous == Symbol.NONE || previous.isPackage()) return true; if (previous.pos != Position.NOPOS) return false; AbstractFile pf = (AbstractFile) symFile.get(previous); - if (!global.separate) { - if (f.getName().endsWith(".scala") && - pf.getName().endsWith(".class")) return true; - if (f.getName().endsWith(".class") && - pf.getName().endsWith(".scala")) return false; + if (f.getName().endsWith(".scala")) { + if (pf.getName().endsWith(".scala")) return false; + if (!global.separate) return true; + } + if (f.getName().endsWith(".class")) { + if (pf.getName().endsWith(".class")) return false; + if (!global.separate) return false; } return f.lastModified() > pf.lastModified(); } |