Rename FieldDef -> Field

This commit is contained in:
Aleksey Kladov 2020-07-30 16:49:13 +02:00
parent 6f8aa75329
commit 0a9e3ccc26
54 changed files with 219 additions and 228 deletions

View file

@ -78,30 +78,30 @@ TypeAlias =
StructDef =
Attr* Visibility? 'struct' Name GenericParamList? (
WhereClause? (RecordFieldDefList | ';')
| TupleFieldDefList WhereClause? ';'
WhereClause? (RecordFieldList | ';')
| TupleFieldList WhereClause? ';'
)
RecordFieldDefList =
'{' fields:RecordFieldDef* '}'
RecordFieldList =
'{' fields:RecordField* '}'
RecordFieldDef =
RecordField =
Attr* Visibility? Name ':' ascribed_type:TypeRef
TupleFieldDefList =
'(' fields:TupleFieldDef* ')'
TupleFieldList =
'(' fields:TupleField* ')'
TupleFieldDef =
TupleField =
Attr* Visibility? Name TypeRef
FieldDefList =
RecordFieldDefList
| TupleFieldDefList
FieldList =
RecordFieldList
| TupleFieldList
UnionDef =
Attr* Visibility? 'union' Name GenericParamList? WhereClause?
RecordFieldDefList
RecordFieldList
EnumDef =
Attr* Visibility? 'enum' Name GenericParamList? WhereClause?
@ -111,7 +111,7 @@ EnumVariantList =
'{' variants:EnumVariant* '}'
EnumVariant =
Attr* Visibility? Name FieldDefList ('=' Expr)?
Attr* Visibility? Name FieldList ('=' Expr)?
TraitDef =
Attr* Visibility? 'unsafe'? 'auto'? 'trait' Name GenericParamList