luke/sbt
1
0
Fork 0
mirror of https://github.com/sbt/sbt.git synced 2026-08-22 06:07:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

move to compiler's built-in moduleSuffix method

Browse Source
This commit is contained in:
Mark Harrah
2013-04-26 18:52:16 -04:00
parent fb0a8c463b
commit 0e1f211fe5
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compile/interface/src/main/scala/xsbt/Analyzer.scala
+12 -4
View File
@@ -100,9 +100,6 @@ final class Analyzer(val global: CallbackGlobal) extends Compat
None None
} }
} }
// doesn't seem to be in 2.7.7, so copied from GenJVM to here
private def moduleSuffix(sym: Symbol) =
if (sym.hasFlag(Flags.MODULE) && !sym.isMethod && !sym.isImplClass && !sym.hasFlag(Flags.JAVA)) "$" else "";
private def flatname(s: Symbol, separator: Char) = private def flatname(s: Symbol, separator: Char) =
atPhase(currentRun.flattenPhase.next) { s fullName separator } atPhase(currentRun.flattenPhase.next) { s fullName separator }
@@ -136,18 +133,29 @@ abstract class Compat
def NullaryMethodType = NullaryMethodTpe def NullaryMethodType = NullaryMethodTpe
def MACRO = DummyValue def MACRO = DummyValue
// in 2.10, sym.moduleSuffix exists, but genJVM.moduleSuffix(Symbol) does not
def moduleSuffix(sym: Symbol): String = sourceCompatibilityOnly
} }
// in 2.9, NullaryMethodType was added to Type // in 2.9, NullaryMethodType was added to Type
object NullaryMethodTpe { object NullaryMethodTpe {
def unapply(t: Type): Option[Type] = None def unapply(t: Type): Option[Type] = None
} }
// before 2.10, sym.moduleSuffix doesn't exist, but genJVM.moduleSuffix does
private[this] implicit def symbolCompat(sym: Symbol): SymbolCompat = new SymbolCompat(sym)
private[this] final class SymbolCompat(sym: Symbol) {
def moduleSuffix = genJVM.moduleSuffix(sym)
}
val DummyValue = 0 val DummyValue = 0
def hasMacro(s: Symbol): Boolean = def hasMacro(s: Symbol): Boolean =
{ {
val MACRO = Flags.MACRO // will be DummyValue for versions before 2.10 val MACRO = Flags.MACRO // will be DummyValue for versions before 2.10
MACRO != DummyValue && s.hasFlag(MACRO) MACRO != DummyValue && s.hasFlag(MACRO)
} }
def moduleSuffix(s: Symbol): String = s.moduleSuffix
private[this] def sourceCompatibilityOnly: Nothing = throw new RuntimeException("For source compatibility only: should not get here.") private[this] def sourceCompatibilityOnly: Nothing = throw new RuntimeException("For source compatibility only: should not get here.")