diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2011-03-23 13:40:46 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2011-03-23 13:40:46 +0100 |
| commit | 0aa88530ad3c58a6bdab886cabd9b2a4278486e8 (patch) | |
| tree | 4ed5978852d806b49f013bb7bfb60ea843d5adc1 /filter | |
| parent | 26d92bb8921ac4e022cdc88bde8fc7bc617f8766 (diff) | |
Convert && and || to shortcut boolean operators.
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/filter.c | 24 | ||||
| -rw-r--r-- | filter/test.conf | 2 |
2 files changed, 16 insertions, 10 deletions
diff --git a/filter/filter.c b/filter/filter.c index 8426a214..b8044293 100644 --- a/filter/filter.c +++ b/filter/filter.c @@ -523,16 +523,21 @@ interpret(struct f_inst *what) break; case '&': - TWOARGS_C; - res.type = v1.type; - if (res.type != T_BOOL) runtime( "Can't do boolean operation on non-booleans" ); - res.val.i = v1.val.i && v2.val.i; - break; case '|': - TWOARGS_C; - res.type = v1.type; - if (res.type != T_BOOL) runtime( "Can't do boolean operation on non-booleans" ); - res.val.i = v1.val.i || v2.val.i; + ARG(v1, a1.p); + if (v1.type != T_BOOL) + runtime( "Can't do boolean operation on non-booleans" ); + if (v1.val.i == (what->code == '|')) { + res.type = T_BOOL; + res.val.i = v1.val.i; + break; + } + + ARG(v2, a2.p); + if (v2.type != T_BOOL) + runtime( "Can't do boolean operation on non-booleans" ); + res.type = T_BOOL; + res.val.i = v2.val.i; break; case P('m','p'): @@ -577,6 +582,7 @@ interpret(struct f_inst *what) res.val.i = val_in_range(v1, v2); if (res.val.i == CMP_ERROR) runtime( "~ applied on unknown type pair" ); + res.val.i = !!res.val.i; break; case P('d','e'): ONEARG; diff --git a/filter/test.conf b/filter/test.conf index 6d7a7082..fd025ca5 100644 --- a/filter/test.conf +++ b/filter/test.conf @@ -180,7 +180,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, ",", ! false && ! false && true, ",", 1 < 2 && 1 != 3, ",", true && true && ! false; + print " must be true: ", true && true, ",", true || false, ",", ! false && ! false && true, ",", 1 < 2 && 1 != 3, ",", true && true && ! false, ",", true || 1+"a", ",", !(false && 1+"a"); 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; |