diff options
| author | Pavel Machek <pavel@ucw.cz> | 2000-04-17 10:16:47 +0000 |
|---|---|---|
| committer | Pavel Machek <pavel@ucw.cz> | 2000-04-17 10:16:47 +0000 |
| commit | afc54517db6946e9cfb62bbdc855954316152c62 (patch) | |
| tree | f3c52757df7f273f77a6493617860f7d0a160d15 | |
| parent | f421cfdd80cfce7d1ec4759c603e47071eb028f8 (diff) | |
Prepend and creation of empty path should work, but it has strange
syntax for now.
| -rw-r--r-- | filter/config.Y | 4 | ||||
| -rw-r--r-- | filter/filter.c | 19 |
2 files changed, 22 insertions, 1 deletions
diff --git a/filter/config.Y b/filter/config.Y index ebb2e4b1..a4c1392b 100644 --- a/filter/config.Y +++ b/filter/config.Y @@ -73,6 +73,7 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN, DEFINED, ADD, DELETE, CONTAINS, RESET, APPEND, MATCH, + EMPTY, FILTER, WHERE) %nonassoc THEN @@ -418,6 +419,9 @@ term: /* Paths */ | term '.' APPEND '(' term ')' { } | term '.' RESET { } + + | EMPTY { $$ = f_new_inst(); $$->code = 'E'; $$->aux = T_PATH; } + /* | term '.' LEN { $$->code = P('P','l'); } */ /* function_call is inlined here */ diff --git a/filter/filter.c b/filter/filter.c index cfb502fc..82fb3041 100644 --- a/filter/filter.c +++ b/filter/filter.c @@ -453,6 +453,22 @@ interpret(struct f_inst *what) res.val.px.ip = ipa_and(mask, v1.val.px.ip); } break; + + case 'E': /* Create empty attribute */ + res.type = what->aux; + res.val.ad = adata_empty(f_pool); + break; + case P('A','p'): /* Path prepend */ + TWOARGS; + if (v1.type != T_PATH) + runtime("Can't prepend to non-path"); + if (v2.type != T_INT) + runtime("Can't prepend non-integer"); + + res.type = T_PATH; + res.val.ad = as_path_prepend(f_pool, v1.val.ad, v2.val.i); + break; + default: bug( "Unknown instruction %d (%c)", what->code, what->code & 0xff); } @@ -519,7 +535,7 @@ i_same(struct f_inst *f1, struct f_inst *f2) break; case 'p': ONEARG; break; case '?': TWOARGS; break; - case '0': break; + case '0': case 'E': break; case P('p',','): ONEARG; A2_SAME; break; case 'a': A2_SAME; break; case P('e','a'): A2_SAME; break; @@ -535,6 +551,7 @@ i_same(struct f_inst *f1, struct f_inst *f2) break; case P('S','W'): ONEARG; if (!same_tree(f1->a2.p, f2->a2.p)) return 0; break; case P('i','M'): TWOARGS; break; + case P('A','p'): TWOARGS; break; default: bug( "Unknown instruction %d in same (%c)", f1->code, f1->code & 0xff); } |