Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make token processing independent of how libproc_macro renders None groups #48

Merged
merged 1 commit into from May 7, 2022
Merged

Make token processing independent of how libproc_macro renders None groups #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 16 additions & 15 deletions src/lib.rs
View file
Open in desktop
Expand Up @@ -322,31 +322,32 @@ fn try_expand(input: TokenStream, mode: Macro) -> Result<TokenStream> {
}

fn lit_indoc(token: TokenTree, mode: Macro) -> Result<Literal> {
let repr = token.to_string();
let mut repr = repr.trim();
let span = token.span();
let mut single_token = Some(token);

// https://github.com/rust-lang/rust/pull/96682
let invisible_delimiter_prefix = "/*«*/";
let invisible_delimiter_suffix = "/*»*/";
if repr.starts_with(invisible_delimiter_prefix) && repr.ends_with(invisible_delimiter_suffix) {
repr = repr
[invisible_delimiter_prefix.len()..repr.len() - invisible_delimiter_suffix.len()]
.trim();
while let Some(TokenTree::Group(group)) = single_token {
single_token = if group.delimiter() == Delimiter::None {
let mut token_iter = group.stream().into_iter();
token_iter.next().xor(token_iter.next())
} else {
None
};
}

let single_token =
single_token.ok_or_else(|| Error::new(span, "argument must be a single string literal"))?;

let repr = single_token.to_string();
let is_string = repr.starts_with('"') || repr.starts_with('r');
let is_byte_string = repr.starts_with("b\"") || repr.starts_with("br");

if !is_string && !is_byte_string {
return Err(Error::new(
token.span(),
"argument must be a single string literal",
));
return Err(Error::new(span, "argument must be a single string literal"));
}

if is_byte_string && mode != Macro::Indoc {
return Err(Error::new(
token.span(),
span,
"byte strings are not supported in formatting macros",
));
}
Expand All @@ -367,7 +368,7 @@ fn lit_indoc(token: TokenTree, mode: Macro) -> Result<Literal> {
.unwrap()
{
TokenTree::Literal(mut lit) => {
lit.set_span(token.span());
lit.set_span(span);
Ok(lit)
}
_ => unreachable!(),
Expand Down