talexander/duster
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Update parser to preserve the dot and support paths beginning with a dot.

Browse Source
This commit is contained in:
Tom Alexander 2020-05-23 23:12:51 -04:00
parent 6e8c7621f1
commit 95dc15f103
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/parser/parser.rs
View File

@ -263,7 +263,14 @@ fn key(i: &str) -> IResult<&str, &str> {
fn path(i: &str) -> IResult<&str, Path> { fn path(i: &str) -> IResult<&str, Path> {
alt(( alt((
map(separated_list1(tag("."), key), |body| Path { keys: body }), map(separated_list1(tag("."), key), |body| Path { keys: body }),
value(Path { keys: Vec::new() }, tag(".")), map(
tuple((tag("."), separated_list1(tag("."), key))),
|(dot, mut body)| {
body.insert(0, dot);
Path { keys: body }
},
),
map(tag("."), |dot| Path { keys: vec![dot] }),
))(i) ))(i)
} }
@ -1210,7 +1217,7 @@ mod tests {
contents: Some(Body { contents: Some(Body {
elements: vec![TemplateElement::TETag(DustTag::DTReference( elements: vec![TemplateElement::TETag(DustTag::DTReference(
Reference { Reference {
path: Path { keys: vec![] }, path: Path { keys: vec!["."] },
filters: vec![] filters: vec![]
} }
))] ))]
@ -1238,7 +1245,7 @@ mod tests {
IgnoredWhitespace::StartOfLine("\n") IgnoredWhitespace::StartOfLine("\n")
), ),
TemplateElement::TETag(DustTag::DTReference(Reference { TemplateElement::TETag(DustTag::DTReference(Reference {
path: Path { keys: vec![] }, path: Path { keys: vec!["."] },
filters: vec![] filters: vec![]
})), })),
TemplateElement::TEIgnoredWhitespace( TemplateElement::TEIgnoredWhitespace(