From 80ab3433d3376b7c44787d63af6e7b3217ae41d8 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 30 Aug 2018 20:37:33 +0300 Subject: complete imports --- crates/libsyntax2/src/ast/generated.rs | 85 +++++++++++++++++++++++++++++++++- crates/libsyntax2/src/grammar.ron | 26 +++++++++-- 2 files changed, 106 insertions(+), 5 deletions(-) (limited to 'crates/libsyntax2') diff --git a/crates/libsyntax2/src/ast/generated.rs b/crates/libsyntax2/src/ast/generated.rs index c2a22c8fc..1bb3b11d1 100644 --- a/crates/libsyntax2/src/ast/generated.rs +++ b/crates/libsyntax2/src/ast/generated.rs @@ -977,6 +977,7 @@ pub enum ModuleItem<'a> { ExternCrateItem(ExternCrateItem<'a>), ConstDef(ConstDef<'a>), StaticDef(StaticDef<'a>), + Module(Module<'a>), } impl<'a> AstNode<'a> for ModuleItem<'a> { @@ -991,6 +992,7 @@ impl<'a> AstNode<'a> for ModuleItem<'a> { EXTERN_CRATE_ITEM => Some(ModuleItem::ExternCrateItem(ExternCrateItem { syntax })), CONST_DEF => Some(ModuleItem::ConstDef(ConstDef { syntax })), STATIC_DEF => Some(ModuleItem::StaticDef(StaticDef { syntax })), + MODULE => Some(ModuleItem::Module(Module { syntax })), _ => None, } } @@ -1005,6 +1007,7 @@ impl<'a> AstNode<'a> for ModuleItem<'a> { ModuleItem::ExternCrateItem(inner) => inner.syntax(), ModuleItem::ConstDef(inner) => inner.syntax(), ModuleItem::StaticDef(inner) => inner.syntax(), + ModuleItem::Module(inner) => inner.syntax(), } } } @@ -1294,7 +1297,11 @@ impl<'a> AstNode<'a> for Path<'a> { fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax } } -impl<'a> Path<'a> {} +impl<'a> Path<'a> { + pub fn segment(self) -> Option> { + super::child_opt(self) + } +} // PathExpr #[derive(Debug, Clone, Copy)] @@ -1332,6 +1339,28 @@ impl<'a> AstNode<'a> for PathPat<'a> { impl<'a> PathPat<'a> {} +// PathSegment +#[derive(Debug, Clone, Copy)] +pub struct PathSegment<'a> { + syntax: SyntaxNodeRef<'a>, +} + +impl<'a> AstNode<'a> for PathSegment<'a> { + fn cast(syntax: SyntaxNodeRef<'a>) -> Option { + match syntax.kind() { + PATH_SEGMENT => Some(PathSegment { syntax }), + _ => None, + } + } + fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax } +} + +impl<'a> PathSegment<'a> { + pub fn name_ref(self) -> Option> { + super::child_opt(self) + } +} + // PathType #[derive(Debug, Clone, Copy)] pub struct PathType<'a> { @@ -1989,7 +2018,59 @@ impl<'a> AstNode<'a> for UseItem<'a> { fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax } } -impl<'a> UseItem<'a> {} +impl<'a> UseItem<'a> { + pub fn use_tree(self) -> Option> { + super::child_opt(self) + } +} + +// UseTree +#[derive(Debug, Clone, Copy)] +pub struct UseTree<'a> { + syntax: SyntaxNodeRef<'a>, +} + +impl<'a> AstNode<'a> for UseTree<'a> { + fn cast(syntax: SyntaxNodeRef<'a>) -> Option { + match syntax.kind() { + USE_TREE => Some(UseTree { syntax }), + _ => None, + } + } + fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax } +} + +impl<'a> UseTree<'a> { + pub fn path(self) -> Option> { + super::child_opt(self) + } + + pub fn use_tree_list(self) -> Option> { + super::child_opt(self) + } +} + +// UseTreeList +#[derive(Debug, Clone, Copy)] +pub struct UseTreeList<'a> { + syntax: SyntaxNodeRef<'a>, +} + +impl<'a> AstNode<'a> for UseTreeList<'a> { + fn cast(syntax: SyntaxNodeRef<'a>) -> Option { + match syntax.kind() { + USE_TREE_LIST => Some(UseTreeList { syntax }), + _ => None, + } + } + fn syntax(self) -> SyntaxNodeRef<'a> { self.syntax } +} + +impl<'a> UseTreeList<'a> { + pub fn use_trees(self) -> impl Iterator> + 'a { + super::children(self) + } +} // WhereClause #[derive(Debug, Clone, Copy)] diff --git a/crates/libsyntax2/src/grammar.ron b/crates/libsyntax2/src/grammar.ron index 0bb40f5ab..8267c2854 100644 --- a/crates/libsyntax2/src/grammar.ron +++ b/crates/libsyntax2/src/grammar.ron @@ -337,7 +337,7 @@ Grammar( ), "ModuleItem": ( enum: ["StructDef", "EnumDef", "FnDef", "TraitDef", "ImplItem", - "UseItem", "ExternCrateItem", "ConstDef", "StaticDef" ] + "UseItem", "ExternCrateItem", "ConstDef", "StaticDef", "Module" ] ), "TupleExpr": (), @@ -507,13 +507,33 @@ Grammar( "Param": ( options: [["pat", "Pat"]], ), - "UseItem": (), + "UseItem": ( + options: [["use_tree", "UseTree"]] + ), + "UseTree": ( + options: [ + ["path", "Path"], + ["use_tree_list", "UseTreeList"], + ] + ), + "UseTreeList": ( + collections: [["use_trees", "UseTree"]] + ), "ExternCrateItem": (), "ArgList": ( collections: [ ["args", "Expr"] ] ), - "Path": (), + "Path": ( + options: [ + ["segment", "PathSegment"] + ] + ), + "PathSegment": ( + options: [ + ["name_ref", "NameRef"] + ] + ), }, ) -- cgit v1.2.3