|
2 | 2 |
|
3 | 3 | use proc_macro::{Delimiter, Group, Ident, Spacing, Span, TokenTree};
|
4 | 4 |
|
5 |
| -fn concat(tokens: &[TokenTree], group_span: Span) -> TokenTree { |
| 5 | +fn process_tokens_into_segments(tokens: &[TokenTree]) -> (Vec<(String, Span)>, Option<Span>) { |
6 | 6 | let mut tokens = tokens.iter();
|
7 | 7 | let mut segments = Vec::new();
|
8 | 8 | let mut span = None;
|
@@ -46,10 +46,29 @@ fn concat(tokens: &[TokenTree], group_span: Span) -> TokenTree {
|
46 | 46 | };
|
47 | 47 | segments.push((value, sp));
|
48 | 48 | }
|
| 49 | + Some(TokenTree::Group(group)) if group.delimiter() == Delimiter::None => { |
| 50 | + let group_tokens: Vec<_> = group.stream().into_iter().collect(); |
| 51 | + let (group_segments, group_span) = process_tokens_into_segments(&group_tokens); |
| 52 | + segments.extend(group_segments); |
| 53 | + |
| 54 | + assert!( |
| 55 | + !(span.is_some() && group_span.is_some()), |
| 56 | + "span modifier should only appear at most once" |
| 57 | + ); |
| 58 | + |
| 59 | + if group_span.is_some() { |
| 60 | + span = group_span; |
| 61 | + } |
| 62 | + } |
49 | 63 | _ => panic!("unexpected token in paste segments"),
|
50 | 64 | };
|
51 | 65 | }
|
52 | 66 |
|
| 67 | + (segments, span) |
| 68 | +} |
| 69 | + |
| 70 | +fn concat(tokens: &[TokenTree], group_span: Span) -> TokenTree { |
| 71 | + let (segments, span) = process_tokens_into_segments(tokens); |
53 | 72 | let pasted: String = segments.into_iter().map(|x| x.0).collect();
|
54 | 73 | TokenTree::Ident(Ident::new(&pasted, span.unwrap_or(group_span)))
|
55 | 74 | }
|
|
0 commit comments