nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

assign ids when converting tt

Browse Source
This commit is contained in:
Aleksey Kladov 2019-02-11 21:12:06 +03:00
parent 58897dd8dd
commit 0d34a256de
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/ra_mbe/src/lib.rs
View File

@ -144,8 +144,8 @@ impl_froms!(TokenTree: Leaf, Subtree);
let macro_invocation = let macro_invocation =
source_file.syntax().descendants().find_map(ast::MacroCall::cast).unwrap(); source_file.syntax().descendants().find_map(ast::MacroCall::cast).unwrap();
let definition_tt = ast_to_token_tree(macro_definition.token_tree().unwrap()).unwrap(); let (definition_tt, _) = ast_to_token_tree(macro_definition.token_tree().unwrap()).unwrap();
let invocation_tt = ast_to_token_tree(macro_invocation.token_tree().unwrap()).unwrap(); let (invocation_tt, _) = ast_to_token_tree(macro_invocation.token_tree().unwrap()).unwrap();
let rules = crate::MacroRules::parse(&definition_tt).unwrap(); let rules = crate::MacroRules::parse(&definition_tt).unwrap();
let expansion = rules.expand(&invocation_tt).unwrap(); let expansion = rules.expand(&invocation_tt).unwrap();
assert_eq!( assert_eq!(
@ -160,7 +160,7 @@ impl_froms!(TokenTree: Leaf, Subtree);
let macro_definition = let macro_definition =
source_file.syntax().descendants().find_map(ast::MacroCall::cast).unwrap(); source_file.syntax().descendants().find_map(ast::MacroCall::cast).unwrap();
let definition_tt = ast_to_token_tree(macro_definition.token_tree().unwrap()).unwrap(); let (definition_tt, _) = ast_to_token_tree(macro_definition.token_tree().unwrap()).unwrap();
crate::MacroRules::parse(&definition_tt).unwrap() crate::MacroRules::parse(&definition_tt).unwrap()
} }
@ -169,7 +169,7 @@ impl_froms!(TokenTree: Leaf, Subtree);
let macro_invocation = let macro_invocation =
source_file.syntax().descendants().find_map(ast::MacroCall::cast).unwrap(); source_file.syntax().descendants().find_map(ast::MacroCall::cast).unwrap();
let invocation_tt = ast_to_token_tree(macro_invocation.token_tree().unwrap()).unwrap(); let (invocation_tt, _) = ast_to_token_tree(macro_invocation.token_tree().unwrap()).unwrap();
let expaned = rules.expand(&invocation_tt).unwrap(); let expaned = rules.expand(&invocation_tt).unwrap();
assert_eq!(expaned.to_string(), expansion); assert_eq!(expaned.to_string(), expansion);

38
crates/ra_mbe/src/syntax_bridge.rs
View File

@ -1,10 +1,34 @@
use ra_syntax::{ast, AstNode, SyntaxNode, SyntaxKind::*}; use ra_syntax::{
AstNode, SyntaxNode, TextRange,
ast, SyntaxKind::*, TextUnit
};
pub fn ast_to_token_tree(ast: &ast::TokenTree) -> Option<tt::Subtree> { #[derive(Default)]
convert_tt(ast.syntax()) pub struct TokenMap {
/// Maps `tt::TokenId` to the *relative* source range.
toknes: Vec<TextRange>,
} }
fn convert_tt(tt: &SyntaxNode) -> Option<tt::Subtree> { pub fn ast_to_token_tree(ast: &ast::TokenTree) -> Option<(tt::Subtree, TokenMap)> {
let mut token_map = TokenMap::default();
let node = ast.syntax();
let tt = convert_tt(&mut token_map, node.range().start(), node)?;
Some((tt, token_map))
}
impl TokenMap {
fn alloc(&mut self, relative_range: TextRange) -> tt::TokenId {
let id = self.toknes.len();
self.toknes.push(relative_range);
tt::TokenId(id as u32)
}
}
fn convert_tt(
token_map: &mut TokenMap,
global_offset: TextUnit,
tt: &SyntaxNode,
) -> Option<tt::Subtree> {
let first_child = tt.first_child()?; let first_child = tt.first_child()?;
let last_child = tt.last_child()?; let last_child = tt.last_child()?;
let delimiter = match (first_child.kind(), last_child.kind()) { let delimiter = match (first_child.kind(), last_child.kind()) {
@ -34,10 +58,12 @@ fn convert_tt(tt: &SyntaxNode) -> Option<tt::Subtree> {
} }
} else { } else {
let child: tt::TokenTree = if child.kind() == TOKEN_TREE { let child: tt::TokenTree = if child.kind() == TOKEN_TREE {
convert_tt(child)?.into() convert_tt(token_map, global_offset, child)?.into()
} else if child.kind().is_keyword() || child.kind() == IDENT { } else if child.kind().is_keyword() || child.kind() == IDENT {
let relative_range = child.range() - global_offset;
let id = token_map.alloc(relative_range);
let text = child.leaf_text().unwrap().clone(); let text = child.leaf_text().unwrap().clone();
tt::Leaf::from(tt::Ident { text, id: tt::TokenId::unspecified() }).into() tt::Leaf::from(tt::Ident { text, id }).into()
} else if child.kind().is_literal() { } else if child.kind().is_literal() {
tt::Leaf::from(tt::Literal { text: child.leaf_text().unwrap().clone() }).into() tt::Leaf::from(tt::Literal { text: child.leaf_text().unwrap().clone() }).into()
} else { } else {