diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2010-01-28 16:00:16 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2010-01-28 16:00:16 +0100 |
| commit | 1a7a4e59a22f903a0be791f229e86ab881593851 (patch) | |
| tree | 5142a24df2fba39fe8e532152fa018992577a0a7 | |
| parent | 41677025ee67fcccd34493f9b205037dd68811c9 (diff) | |
| parent | 1960d20350c5191b089f0a233d99969a0ff23ef6 (diff) | |
Merge commit 'origin/master' into new
| -rw-r--r-- | conf/confbase.Y | 3 | ||||
| -rw-r--r-- | filter/test.conf | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/conf/confbase.Y b/conf/confbase.Y index a2df85dc..91bfb1d5 100644 --- a/conf/confbase.Y +++ b/conf/confbase.Y @@ -60,7 +60,8 @@ CF_DECLS %type <t> text_or_none %nonassoc PREFIX_DUMMY -%nonassoc '=' '<' '>' '~' '.' GEQ LEQ NEQ AND OR PO PC +%left AND OR +%nonassoc '=' '<' '>' '~' '.' GEQ LEQ NEQ PO PC %left '+' '-' %left '*' '/' '%' %left '!' diff --git a/filter/test.conf b/filter/test.conf index 7114fd28..2e828633 100644 --- 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, ",", ! false && ! false && true, ",", 1 < 2 && 1 != 3; # 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; |