diff options
| author | Ondrej Filip <feela@majklik.network.cz> | 2010-01-27 22:26:45 +0100 |
|---|---|---|
| committer | Ondrej Filip <feela@majklik.network.cz> | 2010-01-27 22:26:45 +0100 |
| commit | 7515dafc006f8b71bc15aa7ed9749c7d4fb00153 (patch) | |
| tree | 99078786868a52b79d43e3ab65918681c9357789 | |
| parent | 6cb8f742f1adf99881334b8ae21c398d98571aa1 (diff) | |
Allow multiple || and && statements.
| -rw-r--r-- | conf/confbase.Y | 4 | ||||
| -rw-r--r-- | filter/test.conf | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/conf/confbase.Y b/conf/confbase.Y index a2df85dc..6d2607e4 100644 --- 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 7114fd28..657209a1 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, ",", 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; |