diff options
author | Dmitry Petrashko <dark@d-d.me> | 2015-05-15 16:04:40 +0200 |
---|---|---|
committer | Dmitry Petrashko <dark@d-d.me> | 2015-05-15 16:04:40 +0200 |
commit | 595f245880229fc2bf77a6ca759a537a5ce05a73 (patch) | |
tree | 437c7e48c700184ab07a4fd183d95faf12397865 /src/dotty/tools/backend/jvm | |
parent | 0679784bd8928e040e2c2d5ab0b57772209cef89 (diff) | |
parent | ea71c6f70f464a68a4c7afd6115ba82f31816a9f (diff) | |
download | dotty-595f245880229fc2bf77a6ca759a537a5ce05a73.tar.gz dotty-595f245880229fc2bf77a6ca759a537a5ce05a73.tar.bz2 dotty-595f245880229fc2bf77a6ca759a537a5ce05a73.zip |
Merge pull request #565 from retronym/topic/cleanups
Fix typos, scaladoc tags, and some minor code smells.
Diffstat (limited to 'src/dotty/tools/backend/jvm')
-rw-r--r-- | src/dotty/tools/backend/jvm/CollectEntryPoints.scala | 6 | ||||
-rw-r--r-- | src/dotty/tools/backend/jvm/DottyBackendInterface.scala | 2 | ||||
-rw-r--r-- | src/dotty/tools/backend/jvm/GenBCode.scala | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/dotty/tools/backend/jvm/CollectEntryPoints.scala b/src/dotty/tools/backend/jvm/CollectEntryPoints.scala index 513144bd6..80907fb99 100644 --- a/src/dotty/tools/backend/jvm/CollectEntryPoints.scala +++ b/src/dotty/tools/backend/jvm/CollectEntryPoints.scala @@ -40,7 +40,7 @@ class CollectEntryPoints extends MiniPhaseTransform { def phaseName: String = "Collect entry points" override def transformDefDef(tree: tpd.DefDef)(implicit ctx: Context, info: TransformerInfo): tpd.Tree = { - if ((tree.symbol ne NoSymbol) && CollectEntryPoints.isJavaEntyPoint(tree.symbol)) { + if ((tree.symbol ne NoSymbol) && CollectEntryPoints.isJavaEntryPoint(tree.symbol)) { ctx.genBCodePhase.asInstanceOf[GenBCode].registerEntryPoint(tree.symbol) } tree @@ -60,7 +60,7 @@ object CollectEntryPoints{ }) } - def isJavaEntyPoint(sym: Symbol)(implicit ctx: Context): Boolean = { + def isJavaEntryPoint(sym: Symbol)(implicit ctx: Context): Boolean = { import Types.MethodType val d = ctx.definitions val StringType = d.StringType @@ -105,7 +105,7 @@ object CollectEntryPoints{ failNoForwarder("companion contains its own main method (implementation restriction: no main is allowed, regardless of signature)") else if (companion.flags is Flags.Trait) failNoForwarder("companion is a trait") - // Now either succeeed, or issue some additional warnings for things which look like + // Now either succeed, or issue some additional warnings for things which look like // attempts to be java main methods. else (possibles exists(x=> isJavaMainMethod(x.symbol))) || { possibles exists { m => diff --git a/src/dotty/tools/backend/jvm/DottyBackendInterface.scala b/src/dotty/tools/backend/jvm/DottyBackendInterface.scala index b2f111dbe..855147ac4 100644 --- a/src/dotty/tools/backend/jvm/DottyBackendInterface.scala +++ b/src/dotty/tools/backend/jvm/DottyBackendInterface.scala @@ -617,7 +617,7 @@ class DottyBackendInterface()(implicit ctx: Context) extends BackendInterface{ def hasAnnotation(sym: Symbol): Boolean = false def shouldEmitForwarders: Boolean = //exitingPickler { !(sym.name.toString contains '$') (sym is Flags.Module) && !(sym is Flags.ImplClass) /// !sym.isNestedClass - def isJavaEntryPoint: Boolean = CollectEntryPoints.isJavaEntyPoint(sym) + def isJavaEntryPoint: Boolean = CollectEntryPoints.isJavaEntryPoint(sym) def isClassConstructor: Boolean = toDenot(sym).isClassConstructor diff --git a/src/dotty/tools/backend/jvm/GenBCode.scala b/src/dotty/tools/backend/jvm/GenBCode.scala index d7557acec..7729c3011 100644 --- a/src/dotty/tools/backend/jvm/GenBCode.scala +++ b/src/dotty/tools/backend/jvm/GenBCode.scala @@ -342,7 +342,7 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter tree match { case EmptyTree => () case PackageDef(_, stats) => stats foreach gen - case ValDef(name, tpt, rhs) => () // module val not emmited + case ValDef(name, tpt, rhs) => () // module val not emitted case cd: TypeDef => q1 add Item1(arrivalPos, cd, int.currentUnit) arrivalPos += 1 |