diff options
| -rw-r--r-- | spec/02-identifiers-names-and-scopes.md | 2 | ||||
| -rw-r--r-- | spec/03-types.md | 4 | ||||
| -rw-r--r-- | spec/04-basic-declarations-and-definitions.md | 2 | ||||
| -rw-r--r-- | spec/06-expressions.md | 6 | ||||
| -rw-r--r-- | spec/08-pattern-matching.md | 4 | ||||
| -rw-r--r-- | spec/10-xml-expressions-and-patterns.md | 2 | ||||
| -rw-r--r-- | spec/12-the-scala-standard-library.md | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/spec/02-identifiers-names-and-scopes.md b/spec/02-identifiers-names-and-scopes.md index afa97c136c..62d326934f 100644 --- a/spec/02-identifiers-names-and-scopes.md +++ b/spec/02-identifiers-names-and-scopes.md @@ -71,7 +71,7 @@ The type of $e.x$ is the member type of the referenced entity in $T$. ### Example -Assume the following two definitions of a objects named `X` in packages `P` and `Q`. +Assume the following two definitions of objects named `X` in packages `P` and `Q`. ```scala package P { diff --git a/spec/03-types.md b/spec/03-types.md index 2cc5facc4e..d067d45ab2 100644 --- a/spec/03-types.md +++ b/spec/03-types.md @@ -821,7 +821,7 @@ the following holds: parameters by another, the result types as well as variances, lower and upper bounds of corresponding type parameters are equivalent. -[^congruence]: A congruence is an equivalence relation which is closed under formation of contexts +[^congruence]: A congruence is an equivalence relation which is closed under formation of contexts. [^implicit]: A method type is implicit if the parameter section that defines it starts with the `implicit` keyword. ### Conformance @@ -939,7 +939,7 @@ limit [^4]. The least upper bound or greatest lower bound might also not be unique. For instance `A with B` and `B with A` are both -greatest lower of `A` and `B`. If there are several +greatest lower bounds of `A` and `B`. If there are several least upper bounds or greatest lower bounds, the Scala compiler is free to pick any one of them. diff --git a/spec/04-basic-declarations-and-definitions.md b/spec/04-basic-declarations-and-definitions.md index ed7e4c625e..aca1c63d22 100644 --- a/spec/04-basic-declarations-and-definitions.md +++ b/spec/04-basic-declarations-and-definitions.md @@ -720,7 +720,7 @@ variable number of integer arguments. ```scala def sum(args: Int*) = { var result = 0 - for (arg <- args) result += arg * arg + for (arg <- args) result += arg result } ``` diff --git a/spec/06-expressions.md b/spec/06-expressions.md index 03b8065f4b..afd1492744 100644 --- a/spec/06-expressions.md +++ b/spec/06-expressions.md @@ -1571,7 +1571,7 @@ $T$ is a value type; if it is a method type we apply means finding a substitution $\sigma$ of types $T_i$ for the type parameters $a_i$ such that -- None of inferred types $T_i$ is a [singleton type](03-types.html#singleton-types) +- None of the inferred types $T_i$ is a [singleton type](03-types.html#singleton-types) - All type parameter bounds are respected, i.e. $\sigma L_i <: \sigma a_i$ and $\sigma a_i <: \sigma U_i$ for $i = 1 , \ldots , n$. - The expression's type conforms to the expected type, i.e. @@ -1608,7 +1608,7 @@ constraint system means finding a substitution $\sigma$ of types $T_i$ for the type parameters $a_i$ such that -- None of inferred types $T_i$ is a [singleton type](03-types.html#singleton-types) +- None of the inferred types $T_i$ is a [singleton type](03-types.html#singleton-types) - All type parameter bounds are respected, i.e. $\sigma L_i <: \sigma a_i$ and $\sigma a_i <: \sigma U_i$ for $i = 1 , \ldots , n$. - The method's result type $T'$ conforms to the expected type, i.e. $\sigma T' <: \sigma \mathit{pt}$. @@ -1750,7 +1750,7 @@ a sub-expression of parameterless method type, is not evaluated in the expanded ### Dynamic Member Selection The standard Scala library defines a trait `scala.Dynamic` which defines a member -\@invokeDynamic@ as follows: +`applyDynamic` as follows: ```scala package scala diff --git a/spec/08-pattern-matching.md b/spec/08-pattern-matching.md index 8e224de8d2..3538457b5c 100644 --- a/spec/08-pattern-matching.md +++ b/spec/08-pattern-matching.md @@ -115,7 +115,7 @@ type of the pattern. The pattern matches any value $v$ such that To resolve the syntactic overlap with a variable pattern, a stable identifier pattern may not be a simple name starting with a lower-case -letter. However, it is possible to enclose a such a variable name in +letter. However, it is possible to enclose such a variable name in backquotes; then it is treated as a stable identifier pattern. ###### Example @@ -283,7 +283,7 @@ shorthand for the constructor or extractor pattern $\mathit{op}(p, q_1 A pattern alternative `$p_1$ | $\ldots$ | $p_n$` consists of a number of alternative patterns $p_i$. All alternative patterns are type checked with the expected type of the pattern. They -may no bind variables other than wildcards. The alternative pattern +may not bind variables other than wildcards. The alternative pattern matches a value $v$ if at least one its alternatives matches $v$. ### XML Patterns diff --git a/spec/10-xml-expressions-and-patterns.md b/spec/10-xml-expressions-and-patterns.md index 069f499ce9..407b2b9a67 100644 --- a/spec/10-xml-expressions-and-patterns.md +++ b/spec/10-xml-expressions-and-patterns.md @@ -59,7 +59,7 @@ sequence of XML nodes (an instance of a subclass of `scala.Seq[scala.xml.Node]`). If an XML expression is an entity reference, CDATA section, processing -instructions or a comments, it is represented by an instance of the +instruction, or a comment, it is represented by an instance of the corresponding Scala runtime class. By default, beginning and trailing whitespace in element content is removed, diff --git a/spec/12-the-scala-standard-library.md b/spec/12-the-scala-standard-library.md index 2b3ac1742c..988d9804ec 100644 --- a/spec/12-the-scala-standard-library.md +++ b/spec/12-the-scala-standard-library.md @@ -332,7 +332,7 @@ The `toString` method returns `"()"`. ## Standard Reference Classes This section presents some standard Scala reference classes which are -treated in a special way in Scala compiler -- either Scala provides +treated in a special way by the Scala compiler -- either Scala provides syntactic sugar for them, or the Scala compiler generates special code for their operations. Other classes in the standard Scala library are documented in the Scala library documentation by HTML pages. |