[create-pull-request] automated change (#907)

Co-authored-by: jskeet <[email protected]>

Author: github-actions[bot]

standard/README.md

@@ -566,6 +566,8 @@
     - [§15.8.4](classes.md#1584-static-and-instance-events)  Static and instance events
     - [§15.8.5](classes.md#1585-virtual-sealed-override-and-abstract-accessors)  Virtual, sealed, override, and abstract accessors
   - [§15.9](classes.md#159-indexers)  Indexers
+    - [§15.9.1](classes.md#1591-general)  General
+    - [§15.9.2](classes.md#1592-indexer-and-property-differences)  Indexer and Property Differences
   - [§15.10](classes.md#1510-operators)  Operators
     - [§15.10.1](classes.md#15101-general)  General
     - [§15.10.2](classes.md#15102-unary-operators)  Unary operators

standard/grammar.md

@@ -1516,7 +1516,7 @@ declaration_statement
 
 // Source: §13.6.2 Local variable declarations
 local_variable_declaration
-    : ('ref' 'readonly'?)? local_variable_type local_variable_declarators
+    : ref_kind? local_variable_type local_variable_declarators
     ;
 
 local_variable_type
@@ -1555,16 +1555,18 @@ constant_declarator
 
 // Source: §13.6.4 Local function declarations
 local_function_declaration
-    : local_function_header local_function_body
+    : local_function_modifier* return_type local_function_header local_function_body
+    | ref_kind ref_return_type local_function_header ref_local_function_body
     ;
 
 local_function_header
-    : local_function_modifier* ('ref' 'readonly'?)? return_type identifier type_parameter_list?
-        '(' formal_parameter_list? ')' type_parameter_constraints_clause*
+    : identifier '(' formal_parameter_list? ')'
+    | identifier type_parameter_list '(' formal_parameter_list? ')' type_parameter_constraints_clause*
     ;
+
 local_function_modifier
     : 'async'
-    | 'unsafe'
+    | unsafe_modifier   // unsafe code support
     ;
 
 local_function_body
@@ -1573,6 +1575,11 @@ local_function_body
     | '=>' expression ';'
     ;
 
+ref_local_function_body
+    : block
+    | '=>' 'ref' variable_reference ';'
+    ;
+
 // Source: §13.7 Expression statements
 expression_statement
     : statement_expression ';'
@@ -1668,7 +1675,7 @@ statement_expression_list
 
 // Source: §13.9.5 The foreach statement
 foreach_statement
-    : 'foreach' '(' ('ref' 'readonly'?)? local_variable_type identifier 'in' 
+    : 'foreach' '(' ref_kind? local_variable_type identifier 'in' 
       expression ')' embedded_statement
     ;
 
@@ -1978,16 +1985,35 @@ variable_declarator
 
 // Source: §15.6.1 General
 method_declaration
-    : method_header method_body
+    : attributes? method_modifiers return_type method_header method_body
+    | attributes? ref_method_modifiers ref_kind ref_return_type method_header ref_method_body
+    ;
+
+method_modifiers
+    : method_modifier* 'partial'?
+    ;
+
+ref_kind
+    : 'ref'
+    | 'ref' 'readonly'
+    ;
+
+ref_method_modifiers
+    : ref_method_modifier*
     ;
 
 method_header
-    : attributes? method_modifier* 'partial'? ('ref' 'readonly'?)?
-      return_type member_name  type_parameter_list? 
-      '(' formal_parameter_list? ')' type_parameter_constraints_clause*
+    : member_name '(' formal_parameter_list? ')'
+    | member_name type_parameter_list '(' formal_parameter_list? ')' type_parameter_constraints_clause*
     ;
 
 method_modifier
+    : ref_method_modifier
+    | 'async'
+    | unsafe_modifier   // unsafe code support
+    ;
+
+ref_method_modifier
     : 'new'
     | 'public'
     | 'protected'
@@ -1999,15 +2025,17 @@ method_modifier
     | 'override'
     | 'abstract'
     | 'extern'
-    | 'async'
-    | unsafe_modifier   // unsafe code support
     ;
 
 return_type
-    : type
+    : ref_return_type
     | 'void'
     ;
 
+ref_return_type
+    : type
+    ;
+
 member_name
     : identifier
     | interface_type '.' identifier
@@ -2020,6 +2048,12 @@ method_body
     | ';'
     ;
 
+ref_method_body
+    : block
+    | '=>' 'ref' variable_reference ';'
+    | ';'
+    ;
+
 // Source: §15.6.2.1 General
 formal_parameter_list
     : fixed_parameters
@@ -2056,8 +2090,8 @@ parameter_array
 
 // Source: §15.7.1 General
 property_declaration
-    : attributes? property_modifier* ('ref' 'readonly'?)? type 
-      member_name property_body
+    : attributes? property_modifier* type member_name property_body
+    | attributes? property_modifier* ref_kind type member_name ref_property_body
     ;    
 
 property_modifier
@@ -2084,6 +2118,11 @@ property_initializer
     : '=' variable_initializer ';'
     ;
 
+ref_property_body
+    : '{' ref_get_accessor_declaration '}'
+    | '=>' 'ref' variable_reference ';'
+    ;
+
 // Source: §15.7.3 Accessors
 accessor_declarations
     : get_accessor_declaration set_accessor_declaration?
@@ -2114,6 +2153,16 @@ accessor_body
     | ';' 
     ;
 
+ref_get_accessor_declaration
+    : attributes? accessor_modifier? 'get' ref_accessor_body
+    ;
+    
+ref_accessor_body
+    : block
+    | '=>' 'ref' variable_reference ';'
+    | ';'
+    ;
+
 // Source: §15.8.1 General
 event_declaration
     : attributes? event_modifier* 'event' type variable_declarators ';'
@@ -2149,9 +2198,10 @@ remove_accessor_declaration
     : attributes? 'remove' block
     ;
 
-// Source: §15.9 Indexers
+// Source: §15.9.1 General
 indexer_declaration
     : attributes? indexer_modifier* indexer_declarator indexer_body
+    | attributes? indexer_modifier* ref_kind indexer_declarator ref_indexer_body
     ;
 
 indexer_modifier
@@ -2169,15 +2219,20 @@ indexer_modifier
     ;
 
 indexer_declarator
-    : ('ref' 'readonly'?)? type 'this' '[' formal_parameter_list ']'
-    | ('ref' 'readonly'?)? type interface_type '.' 'this' '[' formal_parameter_list ']'
+    : type 'this' '[' formal_parameter_list ']'
+    | type interface_type '.' 'this' '[' formal_parameter_list ']'
     ;
 
 indexer_body
     : '{' accessor_declarations '}' 
     | '=>' expression ';'
     ;  
 
+ref_indexer_body
+    : '{' ref_get_accessor_declaration '}'
+    | '=>' 'ref' variable_reference ';'
+    ;
+
 // Source: §15.10.1 General
 operator_declaration
     : attributes? operator_modifier+ operator_declarator operator_body
@@ -2404,32 +2459,43 @@ interface_member_declaration
 
 // Source: §18.4.2 Interface methods
 interface_method_declaration
-    : attributes? 'new'? return_type identifier type_parameter_list?
-      '(' formal_parameter_list? ')' type_parameter_constraints_clause* ';'
+    : attributes? 'new'? return_type interface_method_header
+    | attributes? 'new'? ref_kind ref_return_type interface_method_header
+    ;
+
+interface_method_header
+    : identifier '(' formal_parameter_list? ')' ';'
+    | identifier type_parameter_list '(' formal_parameter_list? ')' type_parameter_constraints_clause* ';'
     ;
 
 // Source: §18.4.3 Interface properties
 interface_property_declaration
     : attributes? 'new'? type identifier '{' interface_accessors '}'
+    | attributes? 'new'? ref_kind type identifier '{' ref_interface_accessor '}'
     ;
 
-// Source: §18.4.3 Interface properties
 interface_accessors
     : attributes? 'get' ';'
     | attributes? 'set' ';'
     | attributes? 'get' ';' attributes? 'set' ';'
     | attributes? 'set' ';' attributes? 'get' ';'
     ;
 
+ref_interface_accessor
+    : attributes? 'get' ';'
+    ;
+
 // Source: §18.4.4 Interface events
 interface_event_declaration
     : attributes? 'new'? 'event' type identifier ';'
     ;
 
 // Source: §18.4.5 Interface indexers
-interface_indexer_declaration:
-    attributes? 'new'? type 'this' '[' formal_parameter_list ']'
-    '{' interface_accessors '}'
+interface_indexer_declaration
+    : attributes? 'new'? type 'this' '[' formal_parameter_list ']'
+      '{' interface_accessors '}'
+    | attributes? 'new'? ref_kind type 'this' '[' formal_parameter_list ']'
+      '{' ref_interface_accessor '}'
     ;
 
 // Source: §19.2 Enum declarations
@@ -2472,17 +2538,26 @@ enum_member_declaration
 
 // Source: §20.2 Delegate declarations
 delegate_declaration
-    : attributes? delegate_modifier* 'delegate' ('ref' 'readonly'?)? return_type identifier variant_type_parameter_list?
-      '(' formal_parameter_list? ')' type_parameter_constraints_clause* ';'
+    : attributes? delegate_modifier* 'delegate' return_type delegate_header
+    | attributes? ref_delegate_modifier* 'delegate' ref_kind ref_return_type delegate_header
+    ;
+
+delegate_header
+    : identifier '(' formal_parameter_list? ')' ';'
+    | identifier variant_type_parameter_list '(' formal_parameter_list? ')' type_parameter_constraints_clause* ';'
     ;
     
 delegate_modifier
+    : ref_delegate_modifier
+    | unsafe_modifier   // unsafe code support
+    ;
+
+ref_delegate_modifier
     : 'new'
     | 'public'
     | 'protected'
     | 'internal'
     | 'private'
-    | unsafe_modifier   // unsafe code support
     ;
 
 // Source: §22.3 Attribute specification