Skip to content

Commit 1359e5c

Browse files
Daniel Parvinjskeet
authored andcommitted
Incorporated feedback
1 parent ffaeef0 commit 1359e5c

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

standard/classes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1089,7 +1089,7 @@ A type declared within a class or struct is called a ***nested type***. A type t
10891089
10901090
#### 15.3.9.2 Fully qualified name
10911091
1092-
The fully qualified name ([§7.8.3](basic-concepts.md#783-fully-qualified-names)) for a nested type declaration is `S.N` where `S` is the fully qualified name of the type declarationin which type `N` is declared and `N` is the unqualified name ([§7.8.2](basic-concepts.md#782-unqualified-names)) of the nested type declaration (including any *generic_dimension_specifier* ([§12.8.18](expressions.md#12817-the-typeof-operator))).
1092+
The fully qualified name ([§7.8.3](basic-concepts.md#783-fully-qualified-names)) for a nested type declaration is `S.N` where `S` is the fully qualified name of the type declaration in which type `N` is declared and `N` is the unqualified name ([§7.8.2](basic-concepts.md#782-unqualified-names)) of the nested type declaration (including any *generic_dimension_specifier* ([§12.8.18](expressions.md#12817-the-typeof-operator))).
10931093
10941094
#### 15.3.9.3 Declared accessibility
10951095
@@ -3837,7 +3837,7 @@ Once a particular non-ref-valued property or non-ref-valued indexer has been sel
38373837
>
38383838
> *end example*
38393839
3840-
Once a particular ref-valued property or ref-valued indexer has been selected--whether the usage is as a value, the target of a simple assignment, or the target of a compound assignment--the accessibility domain of the get accessor involved is used to determine if that usage is valid.
3840+
Once a particular ref-valued property or ref-valued indexer has been selected---whether the usage is as a value, the target of a simple assignment, or the target of a compound assignment---the accessibility domain of the get accessor involved is used to determine if that usage is valid.
38413841
38423842
An accessor that is used to implement an interface shall not have an *accessor_modifier*. If only one accessor is used to implement an interface, the other accessor may be declared with an *accessor_modifier*:
38433843
@@ -4521,7 +4521,7 @@ binary_operator_declarator
45214521
45224522
overloadable_binary_operator
45234523
: '+' | '-' | '*' | '/' | '%' | '&' | '|' | '^' | '<<'
4524-
| '>>' | '==' | '!=' | '>' | '<' | '>=' | '<='
4524+
| right_shift | '==' | '!=' | '>' | '<' | '>=' | '<='
45254525
;
45264526
45274527
conversion_operator_declarator

standard/conversions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -661,8 +661,8 @@ Once a most-specific user-defined conversion operator has been identified, the a
661661
Evaluation of a user-defined conversion never involves more than one user-defined or lifted conversion operator. In other words, a conversion from type `S` to type `T` will never first execute a user-defined conversion from `S` to `X` and then execute a user-defined conversion from `X` to `T`.
662662
663663
- Exact definitions of evaluation of user-defined implicit or explicit conversions are given in the following subclauses. The definitions make use of the following terms:
664-
- If a standard implicit conversion ([§10.4.2](conversions.md#1042-standard-implicit-conversions)) exists from a type `A` to a type `B`, and if neither `A` nor `B` are *interface_type* `S`, then `A` is said to be ***encompassed by*** `B`, and `B` is said to ***encompass*** `A`.
665-
- If a standard implicit conversion ([§10.4.2](conversions.md#1042-standard-implicit-conversions)) exists from an expression `E` to a type `B`, and if neither `B` nor the type of `E` (if it has one) are *interface_type* `S`, then `E` is said to be *encompassed by* `B`, and `B` is said to *encompass* `E`.
664+
- If a standard implicit conversion ([§10.4.2](conversions.md#1042-standard-implicit-conversions)) exists from a type `A` to a type `B`, and if neither `A` nor `B` are *interface_type*s, then `A` is said to be ***encompassed by*** `B`, and `B` is said to ***encompass*** `A`.
665+
- If a standard implicit conversion ([§10.4.2](conversions.md#1042-standard-implicit-conversions)) exists from an expression `E` to a type `B`, and if neither `B` nor the type of `E` (if it has one) are *interface_type*s, then `E` is said to be *encompassed by* `B`, and `B` is said to *encompass* `E`.
666666
- The ***most-encompassing type*** in a set of types is the one type that encompasses all other types in the set. If no single type encompasses all other types, then the set has no most-encompassing type. In more intuitive terms, the most-encompassing type is thelargesttype in the setthe one type to which each of the other types can be implicitly converted.
667667
- The ***most-encompassed type*** in a set of types is the one type that is encompassed by all other types in the set. If no single type is encompassed by all other types, then the set has no most-encompassed type. In more intuitive terms, the most-encompassed type is thesmallesttype in the setthe one type that can be implicitly converted to each of the other types.
668668

standard/expressions.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,9 @@ The precedence of an operator is established by the definition of its associated
156156
> | [§12.12](expressions.md#1212-relational-and-type-testing-operators) | Equality | `==` `!=` |
157157
> | [§12.13](expressions.md#1213-logical-operators) | Logical AND | `&` |
158158
> | [§12.13](expressions.md#1213-logical-operators) | Logical XOR | `^` |
159-
> | [§12.13](expressions.md#1213-logical-operators) | Logical OR | <code>&#124;</code> |
159+
> | [§12.13](expressions.md#1213-logical-operators) | Logical OR | `\|` |
160160
> | [§12.14](expressions.md#1214-conditional-logical-operators) | Conditional AND | `&&` |
161-
> | [§12.14](expressions.md#1214-conditional-logical-operators) | Conditional OR | <code>&#124;&#124;</code> |
161+
> | [§12.14](expressions.md#1214-conditional-logical-operators) | Conditional OR | `\|\|` |
162162
> | [§12.15](expressions.md#1215-the-null-coalescing-operator) and [§12.16](expressions.md#1216-the-throw-expression-operator) | Null coalescing and throw expression | `??` `throw x` |
163163
> | [§12.18](expressions.md#1218-conditional-operator) | Conditional | `?:` |
164164
> | [§12.21](expressions.md#1221-assignment-operators) and [§12.19](expressions.md#1219-anonymous-function-expressions) | Assignment and lambda expression | `=` `= ref` `*=` `/=` `%=` `+=` `-=` `<<=` `>>=` `&=` `^=` `\|=` `=>` |
@@ -2661,8 +2661,7 @@ A collection initializer consists of a sequence of element initializers, enclose
26612661
26622662
The collection object to which a collection initializer is applied shall be of a type that implements `System.Collections.IEnumerable` or a compile-time error occurs. For each specified element in order from left to right, normal member lookup is applied to find a member named `Add`. If the result of the member lookup is not a method group, a compile-time error occurs. Otherwise, overload resolution is applied with the expression list of the element initializer as the argument list, and the collection initializer invokes the resulting method. Thus, the collection object shall contain an applicable instance or extension method with the name `Add` for each element initializer.
26632663
2664-
> *Example*:
2665-
> The following shows a class that represents a contact with a name and a list of phone numbers, and the creation and initialization of a `List<Contact>`:
2664+
> *Example*: The following shows a class that represents a contact with a name and a list of phone numbers, and the creation and initialization of a `List<Contact>`:
26662665
>
26672666
> <!-- Example: {template:"standalone-lib", name:"CollectionInitializers2"} -->
26682667
> ```csharp

0 commit comments

Comments
 (0)