language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use SubtreeWalker instread of flatten TtToken

Browse source
This commit is contained in:
Edwin Cheng 2019-04-08 15:58:02 +08:00
parent a7254201df
commit 2697ecaa64
4 changed files with 431 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ra_mbe/src/subtree_parser.rs
View file

@ -18,12 +18,12 @@ impl TreeSink for OffsetTokenSink {
pub(crate) struct Parser<'a> {
subtree: &'a tt::Subtree,
pos: &'a mut usize,
cur_pos: &'a mut usize,
}
impl<'a> Parser<'a> {
pub fn new(pos: &'a mut usize, subtree: &'a tt::Subtree) -> Parser<'a> {
Parser { pos, subtree }
pub fn new(cur_pos: &'a mut usize, subtree: &'a tt::Subtree) -> Parser<'a> {
Parser { cur_pos, subtree }
}
pub fn parse_path(self) -> Option<tt::TokenTree> {
@ -35,7 +35,7 @@ impl<'a> Parser<'a> {
F: FnOnce(&dyn TokenSource, &mut dyn TreeSink),
{
let mut src = SubtreeTokenSource::new(self.subtree);
src.advance(*self.pos, true);
src.start_from_nth(*self.cur_pos);
let mut sink = OffsetTokenSink { token_pos: 0 };
f(&src, &mut sink);
@ -44,7 +44,7 @@ impl<'a> Parser<'a> {
}
fn finish(self, parsed_token: usize, src: &mut SubtreeTokenSource) -> Option<tt::TokenTree> {
let res = src.bump_n(parsed_token, self.pos);
let res = src.bump_n(parsed_token, self.cur_pos);
let res: Vec<_> = res.into_iter().cloned().collect();
match res.len() {