scanner: match full comment line in case of tie
Pablo Neira Ayuso
maintainerPATCH 1/1 scanner: match full comment line in case of tie
add element ip filter public_services {
# comment 1
tcp . 80 : jump log_accept,
# comment 2
tcp . 443 : jump log_accept,
}still fails with the error message:
# nft -f filter_sets.ip
In file included from filter_sets.ip:63:1-42:
filter_sets.ip:4:12-12: Error: syntax error,
unexpected newline, expecting comma or '}'
# comment 2
^flex honors the first rule found in case of tie, place comment_line before comment rule.
Fixes 931737a17198 ("scanner: munch full comment lines")
Reported-by Jozsef Kadlecsik <[email protected]>
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/scanner.l | 2 +- tests/shell/testcases/comments/comments_0 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
src/scanner.l +1 -1
@@ -858,10 +858,10 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) {tab}+ {space}+ -{comment} {comment_line} { reset_pos(yyget_extra(yyscanner), yylloc); } +{comment} <<EOF>> { update_pos(yyget_extra(yyscanner), yylloc, 1);
tests/shell/testcases/comments/comments_0 +1 -0
@@ -10,6 +10,7 @@ RULESET="table inet x { # comment 2.2.2.2, # comment # more comments 3.3.3.3, # comment +# comment } # comment }
Signature · 1 line
2.30.2