};
use tt::buffer::{Cursor, TokenBuffer};
-use crate::ExpandError;
use crate::{subtree_source::SubtreeTokenSource, tt_iter::TtIter};
-
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub enum TokenTextRange {
- Token(TextRange),
- Delimiter(TextRange),
-}
-
-impl TokenTextRange {
- pub fn by_kind(self, kind: SyntaxKind) -> Option<TextRange> {
- match self {
- TokenTextRange::Token(it) => Some(it),
- TokenTextRange::Delimiter(it) => match kind {
- T!['{'] | T!['('] | T!['['] => Some(TextRange::at(it.start(), 1.into())),
- T!['}'] | T![')'] | T![']'] => {
- Some(TextRange::at(it.end() - TextSize::of('}'), 1.into()))
- }
- _ => None,
- },
- }
- }
-}
-
-/// Maps `tt::TokenId` to the relative range of the original token.
-#[derive(Debug, PartialEq, Eq, Clone, Default)]
-pub struct TokenMap {
- /// Maps `tt::TokenId` to the *relative* source range.
- entries: Vec<(tt::TokenId, TokenTextRange)>,
-}
+use crate::{ExpandError, TokenMap};
/// Convert the syntax tree (what user has written) to a `TokenTree` (what macro
/// will consume).
pub fn syntax_node_to_token_tree(node: &SyntaxNode) -> (tt::Subtree, TokenMap) {
let global_offset = node.text_range().start();
let mut c = Convertor::new(node, global_offset);
- let subtree = c.go();
- c.id_alloc.map.entries.shrink_to_fit();
+ let subtree = convert_tokens(&mut c);
+ c.id_alloc.map.shrink_to_fit();
(subtree, c.id_alloc.map)
}
},
};
- let subtree = conv.go();
+ let subtree = convert_tokens(&mut conv);
Some((subtree, conv.id_alloc.map))
}
res
}
-impl TokenMap {
- pub fn token_by_range(&self, relative_range: TextRange) -> Option<tt::TokenId> {
- let &(token_id, _) = self.entries.iter().find(|(_, range)| match range {
- TokenTextRange::Token(it) => *it == relative_range,
- TokenTextRange::Delimiter(it) => {
- let open = TextRange::at(it.start(), 1.into());
- let close = TextRange::at(it.end() - TextSize::of('}'), 1.into());
- open == relative_range || close == relative_range
- }
- })?;
- Some(token_id)
+fn convert_tokens<C: TokenConvertor>(conv: &mut C) -> tt::Subtree {
+ let mut subtree = tt::Subtree { delimiter: None, ..Default::default() };
+ while conv.peek().is_some() {
+ collect_leaf(conv, &mut subtree.token_trees);
}
-
- pub fn range_by_token(&self, token_id: tt::TokenId) -> Option<TokenTextRange> {
- let &(_, range) = self.entries.iter().find(|(tid, _)| *tid == token_id)?;
- Some(range)
+ if subtree.token_trees.len() == 1 {
+ if let tt::TokenTree::Subtree(first) = &subtree.token_trees[0] {
+ return first.clone();
+ }
}
+ return subtree;
- fn insert(&mut self, token_id: tt::TokenId, relative_range: TextRange) {
- self.entries.push((token_id, TokenTextRange::Token(relative_range)));
- }
+ fn collect_leaf<C: TokenConvertor>(conv: &mut C, result: &mut Vec<tt::TokenTree>) {
+ let (token, range) = match conv.bump() {
+ None => return,
+ Some(it) => it,
+ };
- fn insert_delim(
- &mut self,
- token_id: tt::TokenId,
- open_relative_range: TextRange,
- close_relative_range: TextRange,
- ) -> usize {
- let res = self.entries.len();
- let cover = open_relative_range.cover(close_relative_range);
+ let k: SyntaxKind = token.kind();
+ if k == COMMENT {
+ if let Some(tokens) = conv.convert_doc_comment(&token) {
+ result.extend(tokens);
+ }
+ return;
+ }
- self.entries.push((token_id, TokenTextRange::Delimiter(cover)));
- res
- }
+ result.push(if k.is_punct() && k != UNDERSCORE {
+ assert_eq!(range.len(), TextSize::of('.'));
+ let delim = match k {
+ T!['('] => Some((tt::DelimiterKind::Parenthesis, T![')'])),
+ T!['{'] => Some((tt::DelimiterKind::Brace, T!['}'])),
+ T!['['] => Some((tt::DelimiterKind::Bracket, T![']'])),
+ _ => None,
+ };
- fn update_close_delim(&mut self, idx: usize, close_relative_range: TextRange) {
- let (_, token_text_range) = &mut self.entries[idx];
- if let TokenTextRange::Delimiter(dim) = token_text_range {
- let cover = dim.cover(close_relative_range);
- *token_text_range = TokenTextRange::Delimiter(cover);
- }
- }
+ if let Some((kind, closed)) = delim {
+ let mut subtree = tt::Subtree::default();
+ let (id, idx) = conv.id_alloc().open_delim(range);
+ subtree.delimiter = Some(tt::Delimiter { id, kind });
- fn remove_delim(&mut self, idx: usize) {
- // FIXME: This could be accidentally quadratic
- self.entries.remove(idx);
+ while conv.peek().map_or(false, |it| it.kind() != closed) {
+ collect_leaf(conv, &mut subtree.token_trees);
+ }
+ let last_range = match conv.bump() {
+ None => {
+ // For error resilience, we insert an char punct for the opening delim here
+ conv.id_alloc().close_delim(idx, None);
+ let leaf: tt::Leaf = tt::Punct {
+ id: conv.id_alloc().alloc(range),
+ char: token.to_char().unwrap(),
+ spacing: tt::Spacing::Alone,
+ }
+ .into();
+ result.push(leaf.into());
+ result.extend(subtree.token_trees);
+ return;
+ }
+ Some(it) => it.1,
+ };
+ conv.id_alloc().close_delim(idx, Some(last_range));
+ subtree.into()
+ } else {
+ let spacing = match conv.peek() {
+ Some(next)
+ if next.kind().is_trivia()
+ || next.kind() == T!['[']
+ || next.kind() == T!['{']
+ || next.kind() == T!['('] =>
+ {
+ tt::Spacing::Alone
+ }
+ Some(next) if next.kind().is_punct() && next.kind() != UNDERSCORE => {
+ tt::Spacing::Joint
+ }
+ _ => tt::Spacing::Alone,
+ };
+ let char = match token.to_char() {
+ Some(c) => c,
+ None => {
+ panic!("Token from lexer must be single char: token = {:#?}", token);
+ }
+ };
+ tt::Leaf::from(tt::Punct { char, spacing, id: conv.id_alloc().alloc(range) }).into()
+ }
+ } else {
+ macro_rules! make_leaf {
+ ($i:ident) => {
+ tt::$i { id: conv.id_alloc().alloc(range), text: token.to_text() }.into()
+ };
+ }
+ let leaf: tt::Leaf = match k {
+ T![true] | T![false] => make_leaf!(Ident),
+ IDENT => make_leaf!(Ident),
+ UNDERSCORE => make_leaf!(Ident),
+ k if k.is_keyword() => make_leaf!(Ident),
+ k if k.is_literal() => make_leaf!(Literal),
+ LIFETIME_IDENT => {
+ let char_unit = TextSize::of('\'');
+ let r = TextRange::at(range.start(), char_unit);
+ let apostrophe = tt::Leaf::from(tt::Punct {
+ char: '\'',
+ spacing: tt::Spacing::Joint,
+ id: conv.id_alloc().alloc(r),
+ });
+ result.push(apostrophe.into());
+
+ let r = TextRange::at(range.start() + char_unit, range.len() - char_unit);
+ let ident = tt::Leaf::from(tt::Ident {
+ text: SmolStr::new(&token.to_text()[1..]),
+ id: conv.id_alloc().alloc(r),
+ });
+ result.push(ident.into());
+ return;
+ }
+ _ => return,
+ };
+
+ leaf.into()
+ });
}
}
trait TokenConvertor {
type Token: SrcToken;
- fn go(&mut self) -> tt::Subtree {
- let mut subtree = tt::Subtree::default();
- subtree.delimiter = None;
- while self.peek().is_some() {
- self.collect_leaf(&mut subtree.token_trees);
- }
- if subtree.token_trees.len() == 1 {
- if let tt::TokenTree::Subtree(first) = &subtree.token_trees[0] {
- return first.clone();
- }
- }
- subtree
- }
-
- fn collect_leaf(&mut self, result: &mut Vec<tt::TokenTree>) {
- let (token, range) = match self.bump() {
- None => return,
- Some(it) => it,
- };
-
- let k: SyntaxKind = token.kind();
- if k == COMMENT {
- if let Some(tokens) = self.convert_doc_comment(&token) {
- result.extend(tokens);
- }
- return;
- }
-
- result.push(if k.is_punct() && k != UNDERSCORE {
- assert_eq!(range.len(), TextSize::of('.'));
- let delim = match k {
- T!['('] => Some((tt::DelimiterKind::Parenthesis, T![')'])),
- T!['{'] => Some((tt::DelimiterKind::Brace, T!['}'])),
- T!['['] => Some((tt::DelimiterKind::Bracket, T![']'])),
- _ => None,
- };
-
- if let Some((kind, closed)) = delim {
- let mut subtree = tt::Subtree::default();
- let (id, idx) = self.id_alloc().open_delim(range);
- subtree.delimiter = Some(tt::Delimiter { id, kind });
-
- while self.peek().map(|it| it.kind() != closed).unwrap_or(false) {
- self.collect_leaf(&mut subtree.token_trees);
- }
- let last_range = match self.bump() {
- None => {
- // For error resilience, we insert an char punct for the opening delim here
- self.id_alloc().close_delim(idx, None);
- let leaf: tt::Leaf = tt::Punct {
- id: self.id_alloc().alloc(range),
- char: token.to_char().unwrap(),
- spacing: tt::Spacing::Alone,
- }
- .into();
- result.push(leaf.into());
- result.extend(subtree.token_trees);
- return;
- }
- Some(it) => it.1,
- };
- self.id_alloc().close_delim(idx, Some(last_range));
- subtree.into()
- } else {
- let spacing = match self.peek() {
- Some(next)
- if next.kind().is_trivia()
- || next.kind() == T!['[']
- || next.kind() == T!['{']
- || next.kind() == T!['('] =>
- {
- tt::Spacing::Alone
- }
- Some(next) if next.kind().is_punct() && next.kind() != UNDERSCORE => {
- tt::Spacing::Joint
- }
- _ => tt::Spacing::Alone,
- };
- let char = match token.to_char() {
- Some(c) => c,
- None => {
- panic!("Token from lexer must be single char: token = {:#?}", token);
- }
- };
- tt::Leaf::from(tt::Punct { char, spacing, id: self.id_alloc().alloc(range) }).into()
- }
- } else {
- macro_rules! make_leaf {
- ($i:ident) => {
- tt::$i { id: self.id_alloc().alloc(range), text: token.to_text() }.into()
- };
- }
- let leaf: tt::Leaf = match k {
- T![true] | T![false] => make_leaf!(Ident),
- IDENT => make_leaf!(Ident),
- UNDERSCORE => make_leaf!(Ident),
- k if k.is_keyword() => make_leaf!(Ident),
- k if k.is_literal() => make_leaf!(Literal),
- LIFETIME_IDENT => {
- let char_unit = TextSize::of('\'');
- let r = TextRange::at(range.start(), char_unit);
- let apostrophe = tt::Leaf::from(tt::Punct {
- char: '\'',
- spacing: tt::Spacing::Joint,
- id: self.id_alloc().alloc(r),
- });
- result.push(apostrophe.into());
-
- let r = TextRange::at(range.start() + char_unit, range.len() - char_unit);
- let ident = tt::Leaf::from(tt::Ident {
- text: SmolStr::new(&token.to_text()[1..]),
- id: self.id_alloc().alloc(r),
- });
- result.push(ident.into());
- return;
- }
- _ => return,
- };
-
- leaf.into()
- });
- }
-
fn convert_doc_comment(&self, token: &Self::Token) -> Option<Vec<tt::TokenTree>>;
fn bump(&mut self) -> Option<(Self::Token, TextRange)>;
fn peek(&self) -> Option<Self::Token> {
if let Some((punct, mut offset)) = self.punct_offset.clone() {
- offset = offset + TextSize::of('.');
+ offset += TextSize::of('.');
if usize::from(offset) < punct.text().len() {
return Some(SynToken::Punch(punct, offset));
}
}
fn finish(mut self) -> (Parse<SyntaxNode>, TokenMap) {
- self.token_map.entries.shrink_to_fit();
+ self.token_map.shrink_to_fit();
(self.inner.finish(), self.token_map)
}
}
}
}
};
- self.buf += &text;
+ self.buf += text;
self.text_pos += TextSize::of(text);
}
projects / rust.git / blobdiff