summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc
diff options
context:
space:
mode:
authorJanek Bogucki <janekdb@gmail.com>2015-06-22 23:32:33 +0100
committerJanek Bogucki <janekdb@gmail.com>2015-06-22 23:32:33 +0100
commitada9fa0b91ddb64f6d15f7616b455247cbcf2243 (patch)
tree59e7e22f5f7c2b021ca42dc568d9cad8ce0b9875 /src/compiler/scala/tools/nsc
parent7f1336a2ffaf573dd71192932e7b599213e5a1d0 (diff)
downloadscala-ada9fa0b91ddb64f6d15f7616b455247cbcf2243.tar.gz
scala-ada9fa0b91ddb64f6d15f7616b455247cbcf2243.tar.bz2
scala-ada9fa0b91ddb64f6d15f7616b455247cbcf2243.zip
Fix 25 typos (g-i)
Diffstat (limited to 'src/compiler/scala/tools/nsc')
-rw-r--r--src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala2
-rw-r--r--src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala2
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Implicits.scala2
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Infer.scala2
-rwxr-xr-xsrc/compiler/scala/tools/nsc/util/DocStrings.scala2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala b/src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala
index 1b6631e7a4..8911a3a28c 100644
--- a/src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala
+++ b/src/compiler/scala/tools/nsc/backend/opt/DeadCodeElimination.scala
@@ -378,7 +378,7 @@ abstract class DeadCodeElimination extends SubComponent {
} else {
i match {
case NEW(REFERENCE(sym)) =>
- log(s"Eliminated instantation of $sym inside $m")
+ log(s"Eliminated instantiation of $sym inside $m")
case STORE_LOCAL(l) if clobbers contains ((bb, idx)) =>
// if an unused instruction was a clobber of a used store to a reference or array type
// then we'll replace it with the store of a null to make sure the reference is
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala
index ea46116976..438a71061e 100644
--- a/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala
@@ -599,7 +599,7 @@ abstract class ICodeReader extends ClassfileParser {
}
case JVM.invokedynamic =>
// TODO, this is just a place holder. A real implementation must parse the class constant entry
- debuglog("Found JVM invokedynamic instructionm, inserting place holder ICode INVOKE_DYNAMIC.")
+ debuglog("Found JVM invokedynamic instruction, inserting place holder ICode INVOKE_DYNAMIC.")
containsInvokeDynamic = true
val poolEntry = in.nextChar.toInt
in.skip(2)
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
index 5ecca5abce..80e06eb8fa 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
@@ -985,7 +985,7 @@ trait Implicits {
if (implicitInfoss.forall(_.isEmpty)) SearchFailure
else new ImplicitComputation(implicitInfoss, isLocalToCallsite) findBest()
- /** Produce an implicict info map, i.e. a map from the class symbols C of all parts of this type to
+ /** Produce an implicit info map, i.e. a map from the class symbols C of all parts of this type to
* the implicit infos in the companion objects of these class symbols C.
* The parts of a type is the smallest set of types that contains
* - the type itself
diff --git a/src/compiler/scala/tools/nsc/typechecker/Infer.scala b/src/compiler/scala/tools/nsc/typechecker/Infer.scala
index f9582a54ff..ea0a9bb243 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Infer.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Infer.scala
@@ -934,7 +934,7 @@ trait Infer extends Checkable {
def infer_s = map3(tparams, tvars, targs)((tparam, tvar, targ) => s"$tparam=$tvar/$targ") mkString ","
printTyping(tree, s"infer expr instance from pt=$pt, $infer_s")
- // SI-7899 infering by-name types is unsound. The correct behaviour is conditional because the hole is
+ // SI-7899 inferring by-name types is unsound. The correct behaviour is conditional because the hole is
// exploited in Scalaz (Free.scala), as seen in: run/t7899-regression.
def dropByNameIfStrict(tp: Type): Type = if (settings.inferByName) tp else dropByName(tp)
def targsStrict = if (targs eq null) null else targs mapConserve dropByNameIfStrict
diff --git a/src/compiler/scala/tools/nsc/util/DocStrings.scala b/src/compiler/scala/tools/nsc/util/DocStrings.scala
index 352816803f..4ff7067a21 100755
--- a/src/compiler/scala/tools/nsc/util/DocStrings.scala
+++ b/src/compiler/scala/tools/nsc/util/DocStrings.scala
@@ -184,7 +184,7 @@ object DocStrings {
extractSectionTag(str, section) -> section
}
- /** Extract the section tag, treating the section tag as an indentifier */
+ /** Extract the section tag, treating the section tag as an identifier */
def extractSectionTag(str: String, section: (Int, Int)): String =
str.substring(section._1, skipTag(str, section._1))