From 1be6968d9d51f43fdb00535708a6fed0be6bfbca Mon Sep 17 00:00:00 2001 From: Bruce Beare Date: Sun, 26 Dec 2010 09:55:10 -0800 Subject: init: Fix parser line numbering Change-Id: I1ac481a2cef749b26c73bc9e6a212e6ace7a0ae2 --- init/parser.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'init/parser.c') diff --git a/init/parser.c b/init/parser.c index 2f36ac76..3c2ec00b 100644 --- a/init/parser.c +++ b/init/parser.c @@ -83,7 +83,6 @@ int next_token(struct parse_state *state) state->ptr = x; return T_EOF; case '\n': - state->line++; x++; state->ptr = x; return T_NEWLINE; @@ -94,9 +93,13 @@ int next_token(struct parse_state *state) continue; case '#': while (*x && (*x != '\n')) x++; - state->line++; - state->ptr = x; - return T_NEWLINE; + if (*x == '\n') { + state->ptr = x+1; + return T_NEWLINE; + } else { + state->ptr = x; + return T_EOF; + } default: goto text; } -- cgit v1.2.3