Skip to content

Commit b09c2e8

Browse files
committed
Merge pull request #332 from olhotak/pr-spelling
correct spelling mistakes in (some) comments
2 parents 647617d + 3f62950 commit b09c2e8

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/dotty/tools/dotc/core/TypeComparer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class TypeComparer(initctx: Context) extends DotClass with ConstraintHandling wi
4141
result
4242
}
4343

44-
/** For stastics: count how many isSubTypes are part of succesful comparisons */
44+
/** For statistics: count how many isSubTypes are part of successful comparisons */
4545
private var successCount = 0
4646
private var totalCount = 0
4747

src/dotty/tools/dotc/core/Types.scala

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ object Types {
593593
}
594594

595595
/** Is this type close enough to that type so that members
596-
* with the two type would override each other?d
596+
* with the two types would override each other?
597597
* This means:
598598
* - Either both types are polytypes with the same number of
599599
* type parameters and their result types match after renaming
@@ -680,14 +680,14 @@ object Types {
680680
case _ => this
681681
}
682682

683-
/** Widen type if it is unstable (i.e. an EpxprType, or Termref to unstable symbol */
683+
/** Widen type if it is unstable (i.e. an ExprType, or TermRef to unstable symbol */
684684
final def widenIfUnstable(implicit ctx: Context): Type = stripTypeVar match {
685685
case tp: ExprType => tp.resultType.widenIfUnstable
686686
case tp: TermRef if !tp.symbol.isStable => tp.underlying.widenIfUnstable
687687
case _ => this
688688
}
689689

690-
/** Follow aliases and derefernces LazyRefs and instantiated TypeVars until type
690+
/** Follow aliases and dereferences LazyRefs and instantiated TypeVars until type
691691
* is no longer alias type, LazyRef, or instantiated type variable.
692692
*/
693693
final def dealias(implicit ctx: Context): Type = this match {
@@ -706,7 +706,7 @@ object Types {
706706
case tp => tp
707707
}
708708

709-
/** Peform successive widenings and dealiasings until none can be applied anymore */
709+
/** Perform successive widenings and dealiasings until none can be applied anymore */
710710
final def widenDealias(implicit ctx: Context): Type = {
711711
val res = this.widen.dealias
712712
if (res eq this) res else res.widenDealias
@@ -928,9 +928,9 @@ object Types {
928928
}
929929

930930
/** Same as `subst` but follows aliases as a fallback. When faced with a reference
931-
* to an alias type, where normal substiution does not yield a new type, the
931+
* to an alias type, where normal substitution does not yield a new type, the
932932
* substitution is instead applied to the alias. If that yields a new type,
933-
* this type is returned, outherwise the original type (not the alias) is returned.
933+
* this type is returned, otherwise the original type (not the alias) is returned.
934934
* A use case for this method is if one wants to substitute the type parameters
935935
* of a class and also wants to substitute any parameter accessors that alias
936936
* the type parameters.
@@ -1153,7 +1153,7 @@ object Types {
11531153
def map(tm: TypeMap)(implicit ctx: Context): ProtoType
11541154
}
11551155

1156-
/** Implementations of this trait cache the resukts of `narrow`. */
1156+
/** Implementations of this trait cache the results of `narrow`. */
11571157
trait NarrowCached extends Type {
11581158
private var myNarrow: TermRef = null
11591159
override def narrow(implicit ctx: Context): TermRef = {
@@ -1194,7 +1194,7 @@ object Types {
11941194
* timing dependent. It should only be used if the outcome of the
11951195
* essential computation does not depend on the symbol being present or not.
11961196
* It's currently used to take an optimized path in substituters and
1197-
* type accumulators, as well as to be safe in diagnostiic printing.
1197+
* type accumulators, as well as to be safe in diagnostic printing.
11981198
* Normally, it's better to use `symbol`, not `currentSymbol`.
11991199
*/
12001200
def currentSymbol(implicit ctx: Context) =
@@ -2587,7 +2587,7 @@ object Types {
25872587
/** The type of an import clause tree */
25882588
case class ImportType(expr: Tree) extends UncachedGroundType
25892589

2590-
/** Sentinal for "missing type" */
2590+
/** Sentinel for "missing type" */
25912591
case object NoType extends CachedGroundType {
25922592
override def exists = false
25932593
override def computeHash = hashSeed

0 commit comments

Comments
 (0)