Garmelon/tada
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Forbid underscores in unicode escapes

Browse source
This commit is contained in:
Joscha 2022-11-20 18:17:19 +01:00
parent dfaa878820
commit 43d5b6d5ae
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/parser/lit.rs
View file

@ -87,12 +87,18 @@ fn string_lit_elem() -> impl Parser<char, StringLitElem, Error = Error> {
.collect::<String>() .collect::<String>()
.map(StringLitElem::Plain); .map(StringLitElem::Plain);
let unicode_char = num_lit_str_radix(16).try_map(|(n, _), span| { // The maximum unicode codepoint is 10ffff, which has 6 digits.
let msg = "not a valid unicode code point"; let unicode_char = filter(|c: &char| c.is_ascii_hexdigit())
let n: u32 = n.try_into().map_err(|_| Simple::custom(span, msg))?; .repeated()
let c: char = n.try_into().map_err(|_| Simple::custom(span, msg))?; .at_least(1)
Ok(c) .at_most(6)
}); .collect::<String>()
.try_map(|str, span| {
let msg = "not a valid unicode code point";
let n = u32::from_str_radix(&str, 16).unwrap();
let c: char = n.try_into().map_err(|_| Simple::custom(span, msg))?;
Ok(c)
});
let unicode = just("\\u{") let unicode = just("\\u{")
.ignore_then(unicode_char) .ignore_then(unicode_char)
.then_ignore(just('}')) .then_ignore(just('}'))