itsscb/askama
1
0
Fork 0
mirror of https://github.com/askama-rs/askama.git synced 2025-10-02 07:20:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Parse boolean literals in assignment targets

Browse Source 
268d825 introduced a regression that made matching against boolean
literals impossible. E.g. "true" was interpreted as the variable
"r#true". This PR fixes the problem.

The bug was reported by @Restioson in issue #531.
This commit is contained in:
René Kijewski 2021-08-25 02:00:41 +02:00 committed by Dirkjan Ochtman
parent 81429636eb
commit 35cf03cf79
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
askama_shared/src/generator.rs
View File

@ -1484,6 +1484,12 @@ impl<'a, S: std::hash::BuildHasher> Generator<'a, S> {
}
self.visit_char_lit(buf, s);
}
Target::BoolLit(s) => {
if first_level {
buf.write("&");
}
buf.write(s);
}
}
}

24
askama_shared/src/parser.rs
View File

@ -109,6 +109,7 @@ pub enum Target<'a> {
NumLit(&'a str),
StrLit(&'a str),
CharLit(&'a str),
BoolLit(&'a str),
Path(Vec<&'a str>),
}
@ -241,12 +242,20 @@ fn non_ascii(chr: u8) -> bool {
(0x80..=0xFD).contains(&chr)
}
fn expr_bool_lit(i: &[u8]) -> IResult<&[u8], Expr<'_>> {
fn bool_lit(i: &[u8]) -> IResult<&[u8], &str> {
map(alt((tag("false"), tag("true"))), |s| {
Expr::BoolLit(str::from_utf8(s).unwrap())
str::from_utf8(s).unwrap()
})(i)
}
fn expr_bool_lit(i: &[u8]) -> IResult<&[u8], Expr<'_>> {
map(bool_lit, Expr::BoolLit)(i)
}
fn variant_bool_lit(i: &[u8]) -> IResult<&[u8], Target<'_>> {
map(bool_lit, Target::BoolLit)(i)
}
fn num_lit(i: &[u8]) -> IResult<&[u8], &str> {
map(recognize(pair(digit1, opt(pair(tag("."), digit1)))), |s| {
str::from_utf8(s).unwrap()
@ -362,12 +371,21 @@ fn named_target(i: &[u8]) -> IResult<&[u8], (&str, Target<'_>)> {
Ok((i, (src, target.unwrap_or(Target::Name(src)))))
}
fn variant_lit(i: &[u8]) -> IResult<&[u8], Target<'_>> {
alt((
variant_str_lit,
variant_char_lit,
variant_num_lit,
variant_bool_lit,
))(i)
}
fn target(i: &[u8]) -> IResult<&[u8], Target<'_>> {
let mut opt_opening_paren = map(opt(ws(tag("("))), |o| o.is_some());
let mut opt_closing_paren = map(opt(ws(tag(")"))), |o| o.is_some());
let mut opt_opening_brace = map(opt(ws(tag("{"))), |o| o.is_some());
let (i, lit) = opt(alt((variant_str_lit, variant_char_lit, variant_num_lit)))(i)?;
let (i, lit) = opt(variant_lit)(i)?;
if let Some(lit) = lit {
return Ok((i, lit));
}