Escape stringified expression

Payload of `Literal` token must be escaped.
Also print printable non-ASCII characters.
This commit is contained in:
Shotaro Yamada
2018-03-14 18:11:42 +09:00
parent cb5be1bb4c
commit 4a254c0050
3 changed files with 77 additions and 5 deletions

View File

@@ -15,7 +15,7 @@ use syntax::ext::build::AstBuilder;
use syntax::parse::token;
use syntax::print::pprust;
use syntax::tokenstream::{TokenStream, TokenTree};
use syntax_pos::Span;
use syntax_pos::{Span, DUMMY_SP};
pub fn expand_assert<'cx>(
cx: &'cx mut ExtCtxt,
@@ -41,10 +41,18 @@ pub fn expand_assert<'cx>(
tts: if let Some(ts) = custom_msg_args {
ts.into()
} else {
let panic_str = format!("assertion failed: {}", pprust::expr_to_string(&cond_expr));
TokenStream::from(token::Literal(
token::Lit::Str_(Name::intern(&panic_str)),
None,
// `expr_to_string` escapes the string literals with `.escape_default()`
// which escapes all non-ASCII characters with `\u`.
let escaped_expr = escape_format_string(&unescape_printable_unicode(
&pprust::expr_to_string(&cond_expr),
));
TokenStream::from(TokenTree::Token(
DUMMY_SP,
token::Literal(
token::Lit::Str_(Name::intern(&format!("assertion failed: {}", escaped_expr))),
None,
),
)).into()
},
};
@@ -62,3 +70,53 @@ pub fn expand_assert<'cx>(
);
MacEager::expr(if_expr)
}
/// Escapes a string for use as a formatting string.
fn escape_format_string(s: &str) -> String {
let mut res = String::with_capacity(s.len());
for c in s.chars() {
res.extend(c.escape_debug());
match c {
'{' | '}' => res.push(c),
_ => {}
}
}
res
}
#[test]
fn test_escape_format_string() {
assert!(escape_format_string(r"foo{}\") == r"foo{{}}\\");
}
/// Unescapes the escaped unicodes (`\u{...}`) that are printable.
fn unescape_printable_unicode(mut s: &str) -> String {
use std::{char, u32};
let mut res = String::with_capacity(s.len());
loop {
if let Some(start) = s.find(r"\u{") {
res.push_str(&s[0..start]);
s = &s[start..];
s.find('}')
.and_then(|end| {
let v = u32::from_str_radix(&s[3..end], 16).ok()?;
let c = char::from_u32(v)?;
// Escape unprintable characters.
res.extend(c.escape_debug());
s = &s[end + 1..];
Some(())
})
.expect("lexer should have rejected invalid escape sequences");
} else {
res.push_str(s);
return res;
}
}
}
#[test]
fn test_unescape_printable_unicode() {
assert!(unescape_printable_unicode(r"\u{2603}\n\u{0}") == r"☃\n\u{0}");
}