diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-04-19 09:56:39 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-04-19 09:56:39 +0100 |
commit | ab0a96586fd54858106cb6ac112d61eb657426f6 (patch) | |
tree | 86bbf2601069f6b0007dc181c824ef706d08c60d /crates/ra_parser/src/syntax_kind | |
parent | d55f1136d6444b1f50b9092c36a976d0e1c26202 (diff) | |
parent | a6d51e09610989821aaf79871bcab0661c9b0f74 (diff) |
Merge #1148
1148: Add token_tree_to_xxx functions r=matklad a=edwin0cheng
<del>As discus in PR #1147 , this PR added a `mbe::MacroKind` .
Currently only 2 kind of macro are supported, `SourceFile` and `Block`.</del>
Added following functions for `tt::TokenTree` and `ast::Node` conversion:
* token_tree_to_expr
* token_tree_to_pat
* token_tree_to_ty
* token_tree_to_macro_stmts
* token_tree_to_macro_items
And added two new syntax kind:
* MACRO_ITEMS
* MACRO_STMTS
Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'crates/ra_parser/src/syntax_kind')
-rw-r--r-- | crates/ra_parser/src/syntax_kind/generated.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs index 498b0e164..6f984aea1 100644 --- a/crates/ra_parser/src/syntax_kind/generated.rs +++ b/crates/ra_parser/src/syntax_kind/generated.rs | |||
@@ -233,6 +233,8 @@ pub enum SyntaxKind { | |||
233 | ARG_LIST, | 233 | ARG_LIST, |
234 | TYPE_BOUND, | 234 | TYPE_BOUND, |
235 | TYPE_BOUND_LIST, | 235 | TYPE_BOUND_LIST, |
236 | MACRO_ITEMS, | ||
237 | MACRO_STMTS, | ||
236 | // Technical kind so that we can cast from u16 safely | 238 | // Technical kind so that we can cast from u16 safely |
237 | #[doc(hidden)] | 239 | #[doc(hidden)] |
238 | __LAST, | 240 | __LAST, |
@@ -592,6 +594,8 @@ impl SyntaxKind { | |||
592 | ARG_LIST => &SyntaxInfo { name: "ARG_LIST" }, | 594 | ARG_LIST => &SyntaxInfo { name: "ARG_LIST" }, |
593 | TYPE_BOUND => &SyntaxInfo { name: "TYPE_BOUND" }, | 595 | TYPE_BOUND => &SyntaxInfo { name: "TYPE_BOUND" }, |
594 | TYPE_BOUND_LIST => &SyntaxInfo { name: "TYPE_BOUND_LIST" }, | 596 | TYPE_BOUND_LIST => &SyntaxInfo { name: "TYPE_BOUND_LIST" }, |
597 | MACRO_ITEMS => &SyntaxInfo { name: "MACRO_ITEMS" }, | ||
598 | MACRO_STMTS => &SyntaxInfo { name: "MACRO_STMTS" }, | ||
595 | TOMBSTONE => &SyntaxInfo { name: "TOMBSTONE" }, | 599 | TOMBSTONE => &SyntaxInfo { name: "TOMBSTONE" }, |
596 | EOF => &SyntaxInfo { name: "EOF" }, | 600 | EOF => &SyntaxInfo { name: "EOF" }, |
597 | __LAST => &SyntaxInfo { name: "__LAST" }, | 601 | __LAST => &SyntaxInfo { name: "__LAST" }, |