One less shift/reduce conflict.

This commit is contained in:
Pavel Machek 2000-04-12 14:05:37 +00:00
parent ac7a2145cc
commit a2d157463a
2 changed files with 5 additions and 4 deletions

View file

@ -412,12 +412,13 @@ term:
| rtadot dynamic_attr '.' ADD '(' term ')' { } | rtadot dynamic_attr '.' ADD '(' term ')' { }
| rtadot dynamic_attr '.' DELETE '(' term ')' { } | rtadot dynamic_attr '.' DELETE '(' term ')' { }
| rtadot dynamic_attr '.' CONTAINS '(' term ')' { } | rtadot dynamic_attr '.' CONTAINS '(' term ')' { }
| rtadot dynamic_attr '.' RESET { } | rtadot dynamic_attr '.' RESET{ }
*/ */
/* Paths */ /* Paths */
| rtadot dynamic_attr '.' APPEND '(' term ')' { } | term '.' APPEND '(' term ')' { }
| rtadot dynamic_attr '.' LEN { $$->code = P('P','l'); } | term '.' RESET { }
/* | term '.' LEN { $$->code = P('P','l'); } */
/* function_call is inlined here */ /* function_call is inlined here */
| SYM '(' var_list ')' { | SYM '(' var_list ')' {

View file

@ -64,7 +64,7 @@ struct filter {
void filters_postconfig(void); void filters_postconfig(void);
struct f_inst *f_new_inst(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 *f_new_tree(void);
struct f_tree *build_tree(struct f_tree *); struct f_tree *build_tree(struct f_tree *);