Allow multiple || and && statements.

diff --git a/conf/confbase.Y b/conf/confbase.Y
index a2df85dcf0f172e618356501b1cd02133f722757..6d2607e4804a4cbada3e290eb6495c32cd053206 100644 (file)
--- a/conf/confbase.Y
+++ b/conf/confbase.Y
@@ -60,8 +60,8 @@ CF_DECLS
 %type <t> text_or_none
 
 %nonassoc PREFIX_DUMMY
-%nonassoc '=' '<' '>' '~' '.' GEQ LEQ NEQ AND OR PO PC
-%left '+' '-'
+%nonassoc '=' '<' '>' '~' '.' GEQ LEQ NEQ PO PC
+%left '+' '-' AND OR
 %left '*' '/' '%'
 %left '!'
 

diff --git a/filter/test.conf b/filter/test.conf
index 7114fd28eaec76ad89f1522839528df1c81d5c64..657209a12a1c3ed2e3498f36d760722484fb3a3e 100644 (file)
--- a/filter/test.conf
+++ b/filter/test.conf
@@ -149,7 +149,7 @@ string s;
        is = [ 2, 3, 4, 7..11 ];
        print "  must be true: ", 1.2.0.0/16 ~ [ 1.0.0.0/8{ 15 , 17 } ];
        print "  data types; must be true: ", 1.2.3.4 = 1.2.3.4, ",", 1 ~ [1,2,3], ",", 5 ~ [1..20], ",", 10 ~ is, ",", 2 ~ [ 1, 2, 3 ], ",", 5 ~ [ 4 .. 7 ], ",", 1.2.3.4 ~ [ 1.2.3.3..1.2.3.5 ], ",", 1.2.3.4 ~ 1.0.0.0/8, ",", 1.0.0.0/8 ~ 1.0.0.0/8, ",", 1.0.0.0/8 ~ [ 1.0.0.0/8+ ];
-       print "  must be true: ", true && true, ",", true || false;
+       print "  must be true: ", true && true, ",", true || false, ",", true || false || false;
 
 #      print "  must be true: ", defined(1), ",", defined(1.2.3.4), ",", 1 != 2, ",", 1 <= 2;
        print "  data types: must be false: ", 1 ~ [ 2, 3, 4 ], ",", 5 ~ is, ",", 1.2.3.4 ~ [ 1.2.3.3, 1.2.3.5 ], ",", (1,2) > (2,2), ",", (1,1) > (1,1), ",", 1.0.0.0/9 ~ [ 1.0.0.0/8- ], ",", 1.2.0.0/17 ~ [ 1.0.0.0/8{ 15 , 16 } ], ",", true && false;