diff options
| -rw-r--r-- | src/build/InnerObjectTestGen.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/BCodeIdiomatic.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/BTypes.scala | 4 | ||||
| -rw-r--r-- | src/repl/scala/tools/nsc/interpreter/JavapClass.scala | 6 | ||||
| -rw-r--r-- | test/files/neg/t5120.scala | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/build/InnerObjectTestGen.scala b/src/build/InnerObjectTestGen.scala index b66112609c..e0b889c969 100644 --- a/src/build/InnerObjectTestGen.scala +++ b/src/build/InnerObjectTestGen.scala @@ -22,7 +22,7 @@ object Contexts extends Enumeration { * object, or equivalent). * * Usage: TestGen <nr of levels> - * - by default it's 2 leves. Currently, 3-level deep uncovers bugs in the type checker. + * - by default it's 2 levels. Currently, 3-level deep uncovers bugs in the type checker. * * @author Iulian Dragos */ diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BCodeIdiomatic.scala b/src/compiler/scala/tools/nsc/backend/jvm/BCodeIdiomatic.scala index 8f2a17a2bf..eb0da7caef 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/BCodeIdiomatic.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/BCodeIdiomatic.scala @@ -439,7 +439,7 @@ abstract class BCodeIdiomatic extends SubComponent { else { emitTypeBased(JCodeMethodN.returnOpcodes, tk) } } - /* Emits one of tableswitch or lookoupswitch. + /* Emits one of tableswitch or lookupswitch. * * can-multi-thread */ diff --git a/src/compiler/scala/tools/nsc/backend/jvm/BTypes.scala b/src/compiler/scala/tools/nsc/backend/jvm/BTypes.scala index 176292669c..0b3444100c 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/BTypes.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/BTypes.scala @@ -940,7 +940,7 @@ abstract class BTypes { */ def jvmWiseLUB(other: ClassBType): Either[NoClassBTypeInfo, ClassBType] = { def isNotNullOrNothing(c: ClassBType) = !c.isNullType && !c.isNothingType - assert(isNotNullOrNothing(this) && isNotNullOrNothing(other), s"jvmWiseLub for null or nothing: $this - $other") + assert(isNotNullOrNothing(this) && isNotNullOrNothing(other), s"jvmWiseLUB for null or nothing: $this - $other") tryEither { val res: ClassBType = (this.isInterface.orThrow, other.isInterface.orThrow) match { @@ -965,7 +965,7 @@ abstract class BTypes { firstCommonSuffix(this :: this.superClassesTransitive.orThrow, other :: other.superClassesTransitive.orThrow) } - assert(isNotNullOrNothing(res), s"jvmWiseLub computed: $res") + assert(isNotNullOrNothing(res), s"jvmWiseLUB computed: $res") Right(res) } } diff --git a/src/repl/scala/tools/nsc/interpreter/JavapClass.scala b/src/repl/scala/tools/nsc/interpreter/JavapClass.scala index 1ccade2172..c240ab027a 100644 --- a/src/repl/scala/tools/nsc/interpreter/JavapClass.scala +++ b/src/repl/scala/tools/nsc/interpreter/JavapClass.scala @@ -747,15 +747,15 @@ object JavapClass { // on second thought, we don't care about lambda method classes, just the impl methods val rev = res flatMap { - case x @ closure(_, "lambda", _, _) => labdaMethod(x, target) - //target.member flatMap (_ => labdaMethod(x, target)) getOrElse s"${target.name}#$$anonfun" + case x @ closure(_, "lambda", _, _) => lambdaMethod(x, target) + //target.member flatMap (_ => lambdaMethod(x, target)) getOrElse s"${target.name}#$$anonfun" case x => Some(x) } rev } // given C$lambda$$g$n for member g and n in 1..N, find the C.accessor$x // and the C.$anonfun$x it forwards to. - def labdaMethod(lambda: String, target: Target): Option[String] = { + def lambdaMethod(lambda: String, target: Target): Option[String] = { import scala.tools.asm.ClassReader import scala.tools.asm.Opcodes.INVOKESTATIC import scala.tools.asm.tree.{ ClassNode, MethodInsnNode } diff --git a/test/files/neg/t5120.scala b/test/files/neg/t5120.scala index f28b2cfb4f..0df67bc09b 100644 --- a/test/files/neg/t5120.scala +++ b/test/files/neg/t5120.scala @@ -12,7 +12,7 @@ object Test { str.x1.length } } -// another way demonstrating the same underlying problem, as reported by roman kalukiewicz +// another way demonstrating the same underlying problem, as reported by Roman Kalukiewicz class Holder[_T](_f1 : _T, _f2 : _T) { type T = _T |