scanner: munch full comment lines
Pablo Neira Ayuso
maintainerPATCH v2 1/1 scanner: munch full comment lines
Munch lines full comment lines, regular expression matches lines that start by space or tab, then # follows, finally anything including one single line break.
Call reset_pos() to ensure error reporting location is not puzzled.
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v2: call reset_pos(), otherwise location is misleading in error reporting.
src/scanner.l | 4 ++++ tests/shell/testcases/comments/comments_0 | 20 +++++++++++++++++++ .../testcases/comments/dumps/comments_0.nft | 6 ++++++ 3 files changed, 30 insertions(+) create mode 100755 tests/shell/testcases/comments/comments_0 create mode 100644 tests/shell/testcases/comments/dumps/comments_0.nft
src/scanner.l +4 -0
@@ -124,6 +124,7 @@ string ({letter}|[_.])({letter}|{digit}|[/\-_\.])* quotedstring \"[^"]*\" asteriskstring ({string}\*|{string}\\\*|\\\*|{string}\\\*{string}) comment #.*$ +comment_line ^[ \t]*#.*\n slash \/ timestring ([0-9]+d)?([0-9]+h)?([0-9]+m)?([0-9]+s)?([0-9]+ms)?
@@ -858,6 +859,9 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) {tab}+ {space}+ {comment} +{comment_line} { + reset_pos(yyget_extra(yyscanner), yylloc); + } <<EOF>> { update_pos(yyget_extra(yyscanner), yylloc, 1);
tests/shell/testcases/comments/comments_0 new file +20 -0
@@ -0,0 +1,20 @@ +#!/bin/bash + +RULESET="table ip x { # comment + # comment 1 + # comment 2 + set y { # comment here + type ipv4_addr # comment + elements = { + # 1.1.1.1 + 2.2.2.2, # comment + # more comments + 3.3.3.3, # comment + } + # comment + } +} +" + +$NFT -f - <<< "$RULESET" +
tests/shell/testcases/comments/dumps/comments_0.nft new file +6 -0
@@ -0,0 +1,6 @@ +table ip x { + set y { + type ipv4_addr + elements = { 2.2.2.2, 3.3.3.3 } + } +}
Signature · 1 line
2.30.2