Skip to content

Fix typos from #4926 #4931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 11, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
} else {
// println(i"not an enum: ${t.symbol} / ${t.symbol.denot.owner} / ${t.symbol.denot.owner.isTerm} / ${t.symbol.denot.owner.flags}")
assert(toDenot(t.symbol).name.is(DefaultGetterName),
s"${toDenot(t.symbol).name.debugString}") // this should be default getter. do not emmit.
s"${toDenot(t.symbol).name.debugString}") // this should be default getter. do not emit.
}
case t: SeqLiteral =>
val arrAnnotV: AnnotationVisitor = av.visitArray(name)
Expand Down Expand Up @@ -626,7 +626,7 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma

def symbol: Symbol = a.tree.symbol

def args: List[Tree] = List.empty // those arguments to scala-defined annotations. they are never emmitted
def args: List[Tree] = List.empty // those arguments to scala-defined annotations. they are never emitted
}

def assocsFromApply(tree: Tree): List[(Name, Tree)] = {
Expand Down Expand Up @@ -986,7 +986,7 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma
def summaryString: String = tp.showSummary

def params: List[Symbol] =
Nil // backend uses this to emmit annotations on parameter lists of forwarders
Nil // backend uses this to emit annotations on parameter lists of forwarders
// to static methods of companion class
// in Dotty this link does not exists: there is no way to get from method type
// to inner symbols of DefDef
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/dotty/tools/dotc/core/tasty/TastyFormat.scala
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ object TastyFormat {

final val OBJECTCLASS = 23 // The name of an object class (or: module class) `<name>$`.

final val SIGNED = 63 // A pair of a name and a signature, used to idenitify
final val SIGNED = 63 // A pair of a name and a signature, used to identify
// possibly overloaded methods.
}
object NameTags extends NameTags
Expand Down
2 changes: 1 addition & 1 deletion doc-tool/src/dotty/tools/dottydoc/util/MemberLookup.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import model._
trait MemberLookup {
/** Performs a lookup based on the provided (pruned) query string
*
* Will return a `Tooltip` if unsucessful, otherwise a LinkToEntity or
* Will return a `Tooltip` if unsuccessful, otherwise a LinkToEntity or
* LinkToExternal
*/
def lookup(entity: Entity, packages: Map[String, Package], query: String): Option[Entity] = {
Expand Down
2 changes: 1 addition & 1 deletion tests/pos/sams.scala
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ object test {
// synthesizeSAMFunction where the sam type is not fully defined
class T {
trait F[T, U] { def apply(x: T): U }
// this is an inner trait, that will recieve an abstract $outer pointer. Not a SAM.
// this is an inner trait, that will receive an abstract $outer pointer. Not a SAM.
def app[T, U](x: T)(f: F[T, U]): U = f(x)
app(1)(x => List(x))
}
Expand Down