diff options
| author | Pavel Machek <pavel@ucw.cz> | 2000-04-12 16:05:37 +0200 |
|---|---|---|
| committer | Pavel Machek <pavel@ucw.cz> | 2000-04-12 16:05:37 +0200 |
| commit | a2d157463accf02e2db9fd3dd174b7e46dae8938 (patch) | |
| tree | 938bb60d3b54613720ba324fcb974b17579151c1 | |
| parent | ac7a2145ccd5cfc54788b0218cc253e3b1721b76 (diff) | |
| download | bird-a2d157463accf02e2db9fd3dd174b7e46dae8938.tar bird-a2d157463accf02e2db9fd3dd174b7e46dae8938.zip | |
One less shift/reduce conflict.
| -rw-r--r-- | filter/config.Y | 7 | ||||
| -rw-r--r-- | filter/filter.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/filter/config.Y b/filter/config.Y index 04c0af5..ebb2e4b 100644 --- a/filter/config.Y +++ b/filter/config.Y @@ -412,12 +412,13 @@ term: | rtadot dynamic_attr '.' ADD '(' term ')' { } | rtadot dynamic_attr '.' DELETE '(' term ')' { } | rtadot dynamic_attr '.' CONTAINS '(' term ')' { } - | rtadot dynamic_attr '.' RESET { } + | rtadot dynamic_attr '.' RESET{ } */ /* Paths */ - | rtadot dynamic_attr '.' APPEND '(' term ')' { } - | rtadot dynamic_attr '.' LEN { $$->code = P('P','l'); } + | term '.' APPEND '(' term ')' { } + | term '.' RESET { } +/* | term '.' LEN { $$->code = P('P','l'); } */ /* function_call is inlined here */ | SYM '(' var_list ')' { diff --git a/filter/filter.h b/filter/filter.h index cac124a..d634c86 100644 --- a/filter/filter.h +++ b/filter/filter.h @@ -64,7 +64,7 @@ struct filter { void filters_postconfig(void); struct f_inst *f_new_inst(void); -struct f_inst *f_new_dynamic_attr(int type, int f_type, int code); /* Type as core knows it, type as filters know it, and code */ +struct f_inst *f_new_dynamic_attr(int type, int f_type, int code); /* Type as core knows it, type as filters know it, and code of dynamic attribute */ struct f_tree *f_new_tree(void); struct f_tree *build_tree(struct f_tree *); |