Skip to content

Commit 67610fa

Browse files
committed
more errors encountered while proofreading
These changes were inadverdently left off.
1 parent f55aed9 commit 67610fa

File tree

2 files changed

+11
-24
lines changed

2 files changed

+11
-24
lines changed

standard/expressions.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,10 +249,10 @@ Given a type `T` and an operation `operator «op»(A)`, where «op» is an ove
249249

250250
**This subclause is informative.**
251251

252-
§12.4.7 and its subclauses are a summary of the combined affect of:
253-
- the rules for implicit numeric conversions ([§11.2.3](conversions.md#1123-Implicit-numeric-conversions));
252+
[§12.4.7](expressions.md#1247-numeric-promotions) and its subclauses are a summary of the combined affect of:
253+
- the rules for implicit numeric conversions ([§11.2.3](conversions.md#1123-implicit-numeric-conversions));
254254
- the rules for better conversion ([§12.6.4.6](expressions.md#12646-better-conversion-target)); and
255-
- the available arithmetic ([§12.9](expressions.md#129-arithmetic-operators)), relational ([§12.11](expressions.md#1211-relational-and-type-testing-operators)), and integral logical ([§12.12.2](expressions.md#12122-Integer-logical-operators)) operators.
255+
- the available arithmetic ([§12.9](expressions.md#129-arithmetic-operators)), relational ([§12.11](expressions.md#1211-relational-and-type-testing-operators)), and integral logical ([§12.12.2](expressions.md#12122-integer-logical-operators)) operators.
256256

257257
Numeric promotion consists of automatically performing certain implicit conversions of the operands of the predefined unary and binary numeric operators. Numeric promotion is not a distinct mechanism, but rather an effect of applying overload resolution to the predefined operators. Numeric promotion specifically does not affect evaluation of user-defined operators, although user-defined operators can be implemented to exhibit similar effects.
258258

@@ -1747,7 +1747,7 @@ A member initializer that specifies an object initializer after the equals sign
17471747

17481748
A member initializer that specifies a collection initializer after the equals sign is an initialization of an embedded collection. Instead of assigning a new collection to the field or property, the elements given in the initializer are added to the collection referenced by the field or property. The field or property shall be of a collection type that satisfies the requirements specified in [§12.7.11.4](expressions.md#127114-collection-initializers).
17491749

1750-
> *Example*:The following class represents a point with two coordinates:
1750+
> *Example*: The following class represents a point with two coordinates:
17511751
> ```csharp
17521752
> public class Point
17531753
> {

standard/statements.md

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,30 +1083,17 @@ The `try` statement provides a mechanism for catching exceptions that occur duri
10831083
10841084
```ANTLR
10851085
try_statement
1086-
: 'try' block catch_clauses
1087-
| 'try' block catch_clauses? finally_clause
1086+
: 'try' block catch_clause+
1087+
| 'try' block finally_clause
1088+
| 'try' block catch_clause+ finally_clause
10881089
;
10891090
10901091
catch_clauses
1091-
: specific_catch_clauses
1092-
| specific_catch_clauses? general_catch_clause
1092+
: 'catch' exception_specifier? block
10931093
;
10941094
1095-
specific_catch_clauses
1096-
: specific_catch_clause
1097-
| specific_catch_clauses specific_catch_clause
1098-
;
1099-
1100-
specific_catch_clause
1101-
: 'catch' '(' type identifier? ')' block
1102-
;
1103-
1104-
general_catch_clause
1105-
: 'catch' block
1106-
;
1107-
1108-
finally_clause
1109-
: 'finally' block
1095+
exception_specifier
1096+
: '(' type identifier? ')'
11101097
;
11111098
```
11121099
@@ -1126,7 +1113,7 @@ A `catch` clause that specifies neither an exception type nor an exception varia
11261113
11271114
> *Note*: Some programming languages might support exceptions that are not representable as an object derived from `System.Exception`, although such exceptions could never be generated by C# code. A general `catch` clause might be used to catch such exceptions. Thus, a general `catch` clause is semantically different from one that specifies the type `System.Exception`, in that the former might also catch exceptions from other languages. *end note*
11281115
1129-
In order to locate a handler for an exception, `catch` clauses are examined in lexical order. A compile-time error occurs if a `catch` clause specifies a type that is the same as, or is derived from, a type that was specified in an earlier `catch` clause for the same try.
1116+
In order to locate a handler for an exception, `catch` clauses are examined in lexical order. A compile-time error occurs if a `catch` clause specifies a type that is the same as, or is derived from, a type that was specified in an earlier `catch` clause for the same try.
11301117
11311118
> *Note*: Without this restriction, it would be possible to write unreachable `catch` clauses. *end note*
11321119

0 commit comments

Comments
 (0)