diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/01-lexical-syntax.md | 2 | ||||
| -rw-r--r-- | spec/03-types.md | 4 | ||||
| -rw-r--r-- | spec/05-classes-and-objects.md | 14 | ||||
| -rw-r--r-- | spec/06-expressions.md | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/spec/01-lexical-syntax.md b/spec/01-lexical-syntax.md index 945dedf99b..3972961f58 100644 --- a/spec/01-lexical-syntax.md +++ b/spec/01-lexical-syntax.md @@ -59,7 +59,7 @@ idrest ::= {letter | digit} [‘_’ op] There are three ways to form an identifier. First, an identifier can start with a letter which can be followed by an arbitrary sequence of -letters and digits. This may be followed by underscore ‘_’ +letters and digits. This may be followed by underscore `‘_‘` characters and another string composed of either letters and digits or of operator characters. Second, an identifier can start with an operator character followed by an arbitrary sequence of operator characters. diff --git a/spec/03-types.md b/spec/03-types.md index d067d45ab2..5658e15f44 100644 --- a/spec/03-types.md +++ b/spec/03-types.md @@ -167,8 +167,8 @@ SimpleType ::= SimpleType TypeArgs TypeArgs ::= ‘[’ Types ‘]’ ``` -A parameterized type $T[ U_1 , \ldots , U_n ]$ consists of a type -designator $T$ and type parameters $U_1 , \ldots , U_n$ where +A parameterized type $T[ T_1 , \ldots , T_n ]$ consists of a type +designator $T$ and type parameters $T_1 , \ldots , T_n$ where $n \geq 1$. $T$ must refer to a type constructor which takes $n$ type parameters $a_1 , \ldots , a_n$. diff --git a/spec/05-classes-and-objects.md b/spec/05-classes-and-objects.md index fd20d6ae2c..8681c93193 100644 --- a/spec/05-classes-and-objects.md +++ b/spec/05-classes-and-objects.md @@ -526,7 +526,7 @@ case the member is called _qualified private_. Class-private or object-private members may not be abstract, and may not have `protected` or `override` modifiers. -#### `protected` +### `protected` The `protected` modifier applies to class member definitions. Protected members of a class can be accessed from within - the template of the defining class, @@ -557,14 +557,14 @@ legal if the prefix is `this` or `$O$.this`, for some class $O$ enclosing the reference. In addition, the restrictions for unqualified `protected` apply. -#### `override` +### `override` The `override` modifier applies to class member definitions or declarations. It is mandatory for member definitions or declarations that override some other concrete member definition in a parent class. If an `override` modifier is given, there must be at least one overridden member definition or declaration (either concrete or abstract). -#### `abstract override` +### `abstract override` The `override` modifier has an additional significance when combined with the `abstract` modifier. That modifier combination is only allowed for value members of traits. @@ -579,7 +579,7 @@ influence the concept whether a member is concrete or abstract. A member is _abstract_ if only a declaration is given for it; it is _concrete_ if a full definition is given. -#### `abstract` +### `abstract` The `abstract` modifier is used in class definitions. It is redundant for traits, and mandatory for all other classes which have incomplete members. Abstract classes cannot be @@ -592,7 +592,7 @@ The `abstract` modifier can also be used in conjunction with `override` for class member definitions. In that case the previous discussion applies. -#### `final` +### `final` The `final` modifier applies to class member definitions and to class definitions. A `final` class member definition may not be overridden in subclasses. A `final` class may not be inherited by @@ -604,13 +604,13 @@ an explicit `final` modifier, even if they are defined in a final class or object. `final` may not be applied to incomplete members, and it may not be combined in one modifier list with `sealed`. -#### `sealed` +### `sealed` The `sealed` modifier applies to class definitions. A `sealed` class may not be directly inherited, except if the inheriting template is defined in the same source file as the inherited class. However, subclasses of a sealed class can be inherited anywhere. -#### `lazy` +### `lazy` The `lazy` modifier applies to value definitions. A `lazy` value is initialized the first time it is accessed (which might never happen at all). Attempting to access a lazy value during its diff --git a/spec/06-expressions.md b/spec/06-expressions.md index bb6cc2a89a..133ec3c8e5 100644 --- a/spec/06-expressions.md +++ b/spec/06-expressions.md @@ -1122,7 +1122,7 @@ is `scala.Nothing`. ## Try Expressions ```ebnf -Expr1 ::= `try' `{' Block `}' [`catch' `{' CaseClauses `}'] +Expr1 ::= `try' (`{' Block `}' | Expr) [`catch' `{' CaseClauses `}'] [`finally' Expr] ``` |