From 8e3bec11ebd1fce78701670cf9189b5a9d0d68f8 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Wed, 22 Aug 2018 16:46:42 +0300 Subject: TypeParamList Owner --- crates/libsyntax2/src/grammar.ron | 50 +++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 12 deletions(-) (limited to 'crates/libsyntax2/src/grammar.ron') diff --git a/crates/libsyntax2/src/grammar.ron b/crates/libsyntax2/src/grammar.ron index 8e644d3c4..83b56c349 100644 --- a/crates/libsyntax2/src/grammar.ron +++ b/crates/libsyntax2/src/grammar.ron @@ -222,15 +222,27 @@ Grammar( ["modules", "Module"], ] ), - "FnDef": ( traits: ["NameOwner", "AttrsOwner"] ), + "FnDef": ( traits: [ + "NameOwner", + "TypeParamsOwner", + "AttrsOwner", + ] ), "StructDef": ( - traits: ["NameOwner", "AttrsOwner"], + traits: [ + "NameOwner", + "TypeParamsOwner", + "AttrsOwner", + ], collections: [ ["fields", "NamedField"] ] ), "NamedField": ( traits: ["NameOwner", "AttrsOwner"] ), - "EnumDef": ( traits: ["NameOwner", "AttrsOwner"] ), + "EnumDef": ( traits: [ + "NameOwner", + "TypeParamsOwner", + "AttrsOwner", + ] ), "TraitDef": ( traits: ["NameOwner", "AttrsOwner"] ), "Module": ( traits: ["NameOwner", "AttrsOwner"], @@ -238,16 +250,23 @@ Grammar( ["modules", "Module"] ] ), - "ConstDef": ( traits: ["NameOwner", "AttrsOwner"] ), - "StaticDef": ( traits: ["NameOwner", "AttrsOwner"] ), - "TypeDef": ( traits: ["NameOwner", "AttrsOwner"] ), + "ConstDef": ( traits: [ + "NameOwner", + "TypeParamsOwner", + "AttrsOwner", + ] ), + "StaticDef": ( traits: [ + "NameOwner", + "TypeParamsOwner", + "AttrsOwner", + ] ), + "TypeDef": ( traits: [ + "NameOwner", + "TypeParamsOwner", + "AttrsOwner", + ] ), "ImplItem": (), - "Name": (), - "NameRef": (), - "Attr": ( options: [ ["value", "TokenTree"] ] ), - "TokenTree": (), - "ParenType": (), "TupleType": (), "NeverType": (), @@ -280,7 +299,14 @@ Grammar( "NominalDef": ( enum: ["StructDef", "EnumDef"], - traits: [ "AttrsOwner" ], + traits: [ "AttrsOwner", "TypeParamsOwner" ], ), + + "Name": (), + "NameRef": (), + "Attr": ( options: [ ["value", "TokenTree"] ] ), + "TokenTree": (), + "TypeParamList": (), + "WhereClause": (), }, ) -- cgit v1.2.3