nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-12 01:47:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed infintite loop bug

Browse Source
This commit is contained in:
Edwin Cheng 2019-04-08 19:21:07 +08:00
parent 184e9ea230
commit c785c7312d
1 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
crates/ra_mbe/src/subtree_source.rs
View File

@ -237,34 +237,13 @@ pub(crate) trait Querier {
pub(crate) struct WalkerOwner<'a> { pub(crate) struct WalkerOwner<'a> {
walker: RefCell<SubTreeWalker<'a>>, walker: RefCell<SubTreeWalker<'a>>,
offset: usize, offset: usize,
temp: RefCell<std::collections::HashMap<usize, Option<TtToken>>>,
} }
impl<'a> WalkerOwner<'a> { impl<'a> WalkerOwner<'a> {
fn token_idx<'b>(&self, pos: usize) -> Option<TtToken> { fn token_idx<'b>(&self, pos: usize) -> Option<TtToken> {
self.set_walker_pos(pos); self.set_walker_pos(pos);
let walker = self.walker.borrow(); let walker = self.walker.borrow();
let r = walker.current().cloned(); walker.current().cloned()
if walker.subtree.token_trees.len() == 1 {
if let tt::TokenTree::Leaf(_) = &walker.subtree.token_trees[0] {
let mut temp = self.temp.borrow_mut();
if r.is_none() {
if let Some(Some(p)) = temp.get(&pos) {
unreachable!(
"nWWWWWWWWWWWW~~~~~~~~~~~~~~,\n{:#?}\n{:#?}\n{:#?}",
pos, p, self
);
}
}
// eprintln!("===>{:#?}\n{:#?}\n{:#?}", pos, r, self);
temp.insert(pos, r.clone());
}
}
r
} }
fn start_from_nth(&mut self, pos: usize) { fn start_from_nth(&mut self, pos: usize) {
@ -275,21 +254,16 @@ impl<'a> WalkerOwner<'a> {
fn set_walker_pos(&self, mut pos: usize) { fn set_walker_pos(&self, mut pos: usize) {
pos += self.offset; pos += self.offset;
let mut walker = self.walker.borrow_mut(); let mut walker = self.walker.borrow_mut();
while pos > walker.pos { while pos > walker.pos && walker.idx != WalkIndex::Eof {
walker.forward(); walker.forward();
} }
while pos < walker.pos { while pos < walker.pos {
walker.backward(); walker.backward();
} }
assert!(pos == walker.pos);
} }
fn new(subtree: &'a tt::Subtree) -> Self { fn new(subtree: &'a tt::Subtree) -> Self {
WalkerOwner { WalkerOwner { walker: RefCell::new(SubTreeWalker::new(subtree)), offset: 0 }
walker: RefCell::new(SubTreeWalker::new(subtree)),
offset: 0,
temp: RefCell::new(Default::default()),
}
} }
fn collect_token_tree(&mut self, n: usize) -> Vec<&tt::TokenTree> { fn collect_token_tree(&mut self, n: usize) -> Vec<&tt::TokenTree> {
@ -501,7 +475,7 @@ fn convert_ident(ident: &tt::Ident) -> TtToken {
} }
fn convert_punct(p: &tt::Punct, parent: &tt::Subtree, next: usize) -> TtToken { fn convert_punct(p: &tt::Punct, parent: &tt::Subtree, next: usize) -> TtToken {
let iter = parent.token_trees[next..].iter(); let iter = parent.token_trees[next + 1..].iter();
let mut peek = TokenPeek::new(iter); let mut peek = TokenPeek::new(iter);
if let Some((kind, is_joint_to_next, text, size)) = convert_multi_char_punct(p, &mut peek) { if let Some((kind, is_joint_to_next, text, size)) = convert_multi_char_punct(p, &mut peek) {