From: Patrick McHardy <kaber@trash.net>
To: pablo@netfilter.org
Cc: netfilter-devel@vger.kernel.org
Subject: [PATCH 2/8] scanner: don't update location's line_offset for newlines
Date: Tue, 4 Feb 2014 08:35:14 +0000 [thread overview]
Message-ID: <1391502920-19186-3-git-send-email-kaber@trash.net> (raw)
In-Reply-To: <1391502920-19186-1-git-send-email-kaber@trash.net>
When reset_pos() is invoked, YY_USER_ACTION() has already advanced the
line offset to the next line. This causes errors for unexpected newlines
to incorrectly show the following line when reading from files.
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
src/scanner.l | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/scanner.l b/src/scanner.l
index 47ab1e2..11965cd 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -88,7 +88,6 @@ static void reset_pos(struct parser_state *state, struct location *loc)
state->indesc->line_offset = state->indesc->token_offset;
state->indesc->lineno += 1;
state->indesc->column = 1;
- loc->line_offset = state->indesc->line_offset;
}
#define YY_USER_ACTION { \
--
1.8.5.3
next prev parent reply other threads:[~2014-02-04 8:35 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-04 8:35 [PATCH 0/8] nftables: fix and improve error reporting Patrick McHardy
2014-02-04 8:35 ` [PATCH 1/8] evaluate: determine implicit relational op before RHS constant checks Patrick McHardy
2014-02-04 8:35 ` Patrick McHardy [this message]
2014-02-04 8:35 ` [PATCH 3/8] scanner: update last_line in struct location Patrick McHardy
2014-02-04 8:35 ` [PATCH 4/8] erec: skip includes with INDESC_INTERNAL Patrick McHardy
2014-02-04 8:35 ` [PATCH 5/8] parser: close scope when encountering an error in a table or chain block Patrick McHardy
2014-02-04 8:35 ` [PATCH 6/8] parser: recover from errors in any block Patrick McHardy
2014-02-04 8:35 ` [PATCH 7/8] parser: evaluate commands immediately after parsing Patrick McHardy
2014-02-04 8:35 ` [PATCH 8/8] tests: add two tests for error reporting Patrick McHardy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1391502920-19186-3-git-send-email-kaber@trash.net \
--to=kaber@trash.net \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).