From a93f37459e2ad9856e1f3060e9df75cbd2c01417 Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Tue, 11 Aug 2015 20:08:07 +0100 Subject: [PATCH] Logical Expressions with >2 Primary Expressions .. ie. expr && expr was supported but not expr && expr && expr --- src/DataFilter.y | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/DataFilter.y b/src/DataFilter.y index 697724000..4212a01d0 100644 --- a/src/DataFilter.y +++ b/src/DataFilter.y @@ -88,6 +88,11 @@ lexpr : expr lop expr { $$ = new Leaf(); $$->lvalue.l = $1; $$->op = $2; $$->rvalue.l = $3; } + | lexpr lop lexpr { $$ = new Leaf(); + $$->type = Leaf::Logical; + $$->lvalue.l = $1; + $$->op = $2; + $$->rvalue.l = $3; } | '(' expr ')' { $$ = new Leaf(); $$->type = Leaf::Logical; $$->lvalue.l = $2;