diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-04-17 06:10:29 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-04-17 06:10:29 +0100 |
commit | 0e35603069b4f3cee97641204b09d91fd723d01d (patch) | |
tree | 5ce7ba4ec6fbf9ce8a25bfe2877abc78dd4e9f45 /crates/ra_mbe/src/subtree_parser.rs | |
parent | 546d9be2a7bf7b3942c125f922a01321aea6ad26 (diff) | |
parent | 57e4122b890d56c11f9d74c1bdfed40f186331a4 (diff) |
Merge #1157
1157: Add mbe stmt matcher r=matklad a=edwin0cheng
Add `stmt` matcher in `ra_mbe` , and added corresponding `stmt()` parser in `ra_syntax`.
This PR also help PR #1148 for `MarcoKind::Items` parsing.
Note:
* According [the book](https://doc.rust-lang.org/reference/macros-by-example.html), mbe `stmt` matcher will only match statement without the trailing semicolon
* `item` is a valid statement.
Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'crates/ra_mbe/src/subtree_parser.rs')
-rw-r--r-- | crates/ra_mbe/src/subtree_parser.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crates/ra_mbe/src/subtree_parser.rs b/crates/ra_mbe/src/subtree_parser.rs index 13d5d2169..f075ce245 100644 --- a/crates/ra_mbe/src/subtree_parser.rs +++ b/crates/ra_mbe/src/subtree_parser.rs | |||
@@ -42,6 +42,10 @@ impl<'a> Parser<'a> { | |||
42 | self.parse(ra_parser::parse_pat) | 42 | self.parse(ra_parser::parse_pat) |
43 | } | 43 | } |
44 | 44 | ||
45 | pub fn parse_stmt(self) -> Option<tt::TokenTree> { | ||
46 | self.parse(|src, sink| ra_parser::parse_stmt(src, sink, false)) | ||
47 | } | ||
48 | |||
45 | fn parse<F>(self, f: F) -> Option<tt::TokenTree> | 49 | fn parse<F>(self, f: F) -> Option<tt::TokenTree> |
46 | where | 50 | where |
47 | F: FnOnce(&dyn TokenSource, &mut dyn TreeSink), | 51 | F: FnOnce(&dyn TokenSource, &mut dyn TreeSink), |