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

Accept parentheses in conditional expressions in metadata #35

Merged
merged 1 commit into from
Oct 27, 2023
Merged

Accept parentheses in conditional expressions in metadata #35

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 139 additions & 14 deletions src/metadata/properties/conditional/expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use insta::assert_debug_snapshot;
use chumsky::{
pratt::{infix, left, prefix},
primitive::{any, choice, just},
recursive::recursive,
text::{ascii::ident, inline_whitespace, newline},
Parser,
};
Expand Down Expand Up @@ -72,19 +73,25 @@ impl<V> Expr<V> {
var_parser: Pt,
) -> impl Clone + Parser<'a, &'a str, Expr<V>, ParseError<'a>>
where
Pt: Clone + Parser<'a, &'a str, V, ParseError<'a>>,
V: 'a,
Pt: Clone + Parser<'a, &'a str, V, ParseError<'a>> + 'a,
{
let op = |symbol| just(symbol).padded_by(inline_whitespace());

var_parser.map(Expr::Value).pratt((
prefix(3, op("not"), |c| Expr::Not(Box::new(c))),
infix(left(2), op("=="), |c1, c2| {
Expr::Eq(Box::new(c1), Box::new(c2))
}),
infix(left(1), op("and"), |c1, c2| {
Expr::And(Box::new(c1), Box::new(c2))
}),
))
recursive(move |expr| {
var_parser
.map(Expr::Value)
.or(expr.delimited_by(just('('), just(')')))
.pratt((
prefix(3, op("not"), |c| Expr::Not(Box::new(c))),
infix(left(2), op("=="), |c1, c2| {
Expr::Eq(Box::new(c1), Box::new(c2))
}),
infix(left(1), op("and"), |c1, c2| {
Expr::And(Box::new(c1), Box::new(c2))
}),
))
})
}
}

Expand Down Expand Up @@ -124,14 +131,132 @@ fn snapshots() {
"###
);

assert_debug_snapshot!(
condition().parse(r#"(debug)"#),
@r###"
ParseResult {
output: Some(
Value(
Variable(
"debug",
),
),
),
errs: [],
}
"###
);

assert_debug_snapshot!(
condition().parse(r#"(((((((debug)))))))"#),
@r###"
ParseResult {
output: Some(
Value(
Variable(
"debug",
),
),
),
errs: [],
}
"###
);

assert_debug_snapshot!(
condition().parse(r#"((((os == "linux") and debug)))"#),
@r###"
ParseResult {
output: Some(
And(
Eq(
Value(
Variable(
"os",
),
),
Value(
Literal(
String(
"linux",
),
),
),
),
Value(
Variable(
"debug",
),
),
),
),
errs: [],
}
"###
);

assert_debug_snapshot!(
condition().parse(r#"((os == "linux") and debug)"#),
@r###"
ParseResult {
output: Some(
And(
Eq(
Value(
Variable(
"os",
),
),
Value(
Literal(
String(
"linux",
),
),
),
),
Value(
Variable(
"debug",
),
),
),
),
errs: [],
}
"###
);

assert_debug_snapshot!(
condition().parse(r#"(os == "win") and not debug"#),
@r###"
ParseResult {
output: None,
errs: [
found ''('' at 0..1 expected something else,
],
output: Some(
And(
Eq(
Value(
Variable(
"os",
),
),
Value(
Literal(
String(
"win",
),
),
),
),
Not(
Value(
Variable(
"debug",
),
),
),
),
),
errs: [],
}
"###
);
Expand Down
Loading