It make more sense if this rule can not be empty, so it can be used both as mandatory as optional. The higher rule should choice use it in a way or another.
Signed-off-by: Carlos Falgueras García <[email protected]> --- src/parser_bison.y | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/parser_bison.y b/src/parser_bison.y index ef10dee..6f51a49 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -440,7 +440,7 @@ static void location_update(struct location *loc, struct location *rhs, int n) %destructor { close_scope(state); table_free($$); } table_block_alloc %type <chain> chain_block_alloc chain_block %destructor { close_scope(state); chain_free($$); } chain_block_alloc -%type <rule> rule +%type <rule> rule rule_alloc %destructor { rule_free($$); } rule %type <val> set_flag_list set_flag @@ -1273,11 +1273,7 @@ ruleid_spec : chain_spec handle_spec position_spec } ; -comment_spec : /* empty */ - { - $$ = NULL; - } - | COMMENT string +comment_spec : COMMENT string { $$ = $2; } @@ -1295,12 +1291,21 @@ ruleset_spec : /* empty */ } ; -rule : stmt_list comment_spec +rule : rule_alloc + { + $$->comment = NULL; + } + | rule_alloc comment_spec + { + $$->comment = $2; + } + ; + +rule_alloc : stmt_list { struct stmt *i; $$ = rule_alloc(&@$, NULL); - $$->comment = $2; list_for_each_entry(i, $1, list) $$->num_stmts++; list_splice_tail($1, &$$->stmts); @@ -2029,9 +2034,9 @@ set_elem_option : TIMEOUT time_spec { $<expr>0->timeout = $2 * 1000; } - | COMMENT string + | comment_spec { - $<expr>0->comment = $2; + $<expr>0->comment = $1; } ; -- 2.8.2 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
