Skip to content
This repository was archived by the owner on Sep 1, 2020. It is now read-only.

Commit 639f0b4

Browse files
committed
Fix 8 typos (j-l)
1 parent 1b09e12 commit 639f0b4

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

src/build/InnerObjectTestGen.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ object Contexts extends Enumeration {
2222
* object, or equivalent).
2323
*
2424
* Usage: TestGen <nr of levels>
25-
* - by default it's 2 leves. Currently, 3-level deep uncovers bugs in the type checker.
25+
* - by default it's 2 levels. Currently, 3-level deep uncovers bugs in the type checker.
2626
*
2727
* @author Iulian Dragos
2828
*/

src/compiler/scala/tools/nsc/backend/jvm/BCodeIdiomatic.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ abstract class BCodeIdiomatic extends SubComponent {
439439
else { emitTypeBased(JCodeMethodN.returnOpcodes, tk) }
440440
}
441441

442-
/* Emits one of tableswitch or lookoupswitch.
442+
/* Emits one of tableswitch or lookupswitch.
443443
*
444444
* can-multi-thread
445445
*/

src/compiler/scala/tools/nsc/backend/jvm/BTypes.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ abstract class BTypes {
940940
*/
941941
def jvmWiseLUB(other: ClassBType): Either[NoClassBTypeInfo, ClassBType] = {
942942
def isNotNullOrNothing(c: ClassBType) = !c.isNullType && !c.isNothingType
943-
assert(isNotNullOrNothing(this) && isNotNullOrNothing(other), s"jvmWiseLub for null or nothing: $this - $other")
943+
assert(isNotNullOrNothing(this) && isNotNullOrNothing(other), s"jvmWiseLUB for null or nothing: $this - $other")
944944

945945
tryEither {
946946
val res: ClassBType = (this.isInterface.orThrow, other.isInterface.orThrow) match {
@@ -965,7 +965,7 @@ abstract class BTypes {
965965
firstCommonSuffix(this :: this.superClassesTransitive.orThrow, other :: other.superClassesTransitive.orThrow)
966966
}
967967

968-
assert(isNotNullOrNothing(res), s"jvmWiseLub computed: $res")
968+
assert(isNotNullOrNothing(res), s"jvmWiseLUB computed: $res")
969969
Right(res)
970970
}
971971
}

src/repl/scala/tools/nsc/interpreter/JavapClass.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -747,15 +747,15 @@ object JavapClass {
747747
// on second thought, we don't care about lambda method classes, just the impl methods
748748
val rev =
749749
res flatMap {
750-
case x @ closure(_, "lambda", _, _) => labdaMethod(x, target)
751-
//target.member flatMap (_ => labdaMethod(x, target)) getOrElse s"${target.name}#$$anonfun"
750+
case x @ closure(_, "lambda", _, _) => lambdaMethod(x, target)
751+
//target.member flatMap (_ => lambdaMethod(x, target)) getOrElse s"${target.name}#$$anonfun"
752752
case x => Some(x)
753753
}
754754
rev
755755
}
756756
// given C$lambda$$g$n for member g and n in 1..N, find the C.accessor$x
757757
// and the C.$anonfun$x it forwards to.
758-
def labdaMethod(lambda: String, target: Target): Option[String] = {
758+
def lambdaMethod(lambda: String, target: Target): Option[String] = {
759759
import scala.tools.asm.ClassReader
760760
import scala.tools.asm.Opcodes.INVOKESTATIC
761761
import scala.tools.asm.tree.{ ClassNode, MethodInsnNode }

test/files/neg/t5120.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ object Test {
1212
str.x1.length
1313
}
1414
}
15-
// another way demonstrating the same underlying problem, as reported by roman kalukiewicz
15+
// another way demonstrating the same underlying problem, as reported by Roman Kalukiewicz
1616

1717
class Holder[_T](_f1 : _T, _f2 : _T) {
1818
type T = _T

0 commit comments

Comments
 (0)