Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 19 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,25 @@ mod tests {
Ok(())
}

#[test]
fn pipe_operator() -> Result<()> {
let jslt: Jslt = r#"
.menu.popup.menuitem | {
"Open" : .[0].onclick,
"Close" : .[1].onclick
} | {
"result" : .
}
"#
.parse()?;

let output = jslt.transform_value(&BASIC_INPUT)?;

assert_eq!(&output, BASIC_OUTPUT.deref());

Ok(())
}

#[test]
fn object_for() -> Result<()> {
let jslt: Jslt = r#"
Expand Down
3 changes: 2 additions & 1 deletion src/parser/jslt.pest
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Expr = _{ OperatorExpr | ValueExpr }
ValueExpr = _{ VariableDef | FunctionDef | IfStatement | Value }
OperatorExpr = { ValueExpr ~ (Operator ~ ValueExpr)+ }

Operator = _{ Add | Sub | Div | Mul | Gte | Gt | Lte | Lt | And | Or | Equal | NotEqual }
Operator = _{ Add | Sub | Div | Mul | Gte | Gt | Lte | Lt | And | Or | Equal | NotEqual | Pipe }

Add = { "+" }
Sub = { "-" }
Expand All @@ -20,6 +20,7 @@ Equal = { "==" }
NotEqual = { "!=" }
And = { "and" }
Or = { "or" }
Pipe = { "|" }
If = _{ "if" }
For = _{ "for" }
Def = _{ "def " }
Expand Down
10 changes: 10 additions & 0 deletions src/transform/expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ pub enum OperatorTransformer {
Lte,
Equal,
NotEqual,
Pipe,
}

impl fmt::Display for OperatorTransformer {
Expand All @@ -109,6 +110,7 @@ impl fmt::Display for OperatorTransformer {
OperatorTransformer::Lte => f.write_str("<="),
OperatorTransformer::Equal => f.write_str("=="),
OperatorTransformer::NotEqual => f.write_str("!="),
OperatorTransformer::Pipe => f.write_str("|"),
}
}
}
Expand Down Expand Up @@ -169,6 +171,8 @@ macro_rules! impl_operator_parse {

impl OperatorExprTransformer {
pub fn from_inner_vec(mut pairs: Vec<Pair<Rule>>) -> Result<Self> {
impl_operator_parse!(pairs, Pipe);

impl_operator_parse!(pairs, And);
impl_operator_parse!(pairs, Or);
impl_operator_parse!(pairs, Gt);
Expand Down Expand Up @@ -202,6 +206,11 @@ impl Transform for OperatorExprTransformer {
let left = self
.lhs
.transform_value(Context::Borrowed(&context), input)?;

if matches!(self.operator, OperatorTransformer::Pipe) {
return self.rhs.transform_value(context, &left);
}

let right = self.rhs.transform_value(context, input)?;

match self.operator {
Expand Down Expand Up @@ -396,6 +405,7 @@ impl Transform for OperatorExprTransformer {
},
OperatorTransformer::Equal => Ok(Value::Bool(left == right)),
OperatorTransformer::NotEqual => Ok(Value::Bool(left != right)),
OperatorTransformer::Pipe => unreachable!(),
}
}
}
Expand Down