From 8f8e9aa5c1b48a6a6a40839fec7ce986cfb6b303 Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Sat, 18 Sep 2004 00:53:50 +0000 Subject: [PATCH] directives.c (do_pragma): Save current buffer position before lexing the pragma keywords... * directives.c (do_pragma): Save current buffer position before lexing the pragma keywords; don't call _cpp_backup_tokens in the defer_pragmas case. From-SVN: r87687 --- libcpp/ChangeLog | 6 ++++++ libcpp/directives.c | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index b9aac7bad09..5727f1ba165 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,9 @@ +2004-09-17 Zack Weinberg + + * directives.c (do_pragma): Save current buffer position + before lexing the pragma keywords; don't call + _cpp_backup_tokens in the defer_pragmas case. + 2004-09-15 Per Bothner * include/line-map.h (line_map_start): Add parameter names so diff --git a/libcpp/directives.c b/libcpp/directives.c index b2b6b32e6c1..49f95ca3389 100644 --- a/libcpp/directives.c +++ b/libcpp/directives.c @@ -1145,6 +1145,11 @@ do_pragma (cpp_reader *pfile) const cpp_token *token, *pragma_token = pfile->cur_token; unsigned int count = 1; + /* Save the current position so that defer_pragmas mode can + copy the entire current line to a string. It will not work + to use _cpp_backup_tokens as that does not reverse buffer->cur. */ + const uchar *line_start = CPP_BUFFER (pfile)->cur; + pfile->state.prevent_expansion++; token = cpp_get_token (pfile); @@ -1174,13 +1179,11 @@ do_pragma (cpp_reader *pfile) else if (CPP_OPTION (pfile, defer_pragmas)) { /* Squirrel away the pragma text. Pragmas are newline-terminated. */ - const uchar *line_start, *line_end; + const uchar *line_end; uchar *s; cpp_string body; cpp_token *ptok; - _cpp_backup_tokens (pfile, count); - line_start = CPP_BUFFER (pfile)->cur; line_end = ustrchr (line_start, '\n'); body.len = (line_end - line_start) + 1; -- 2.30.2