mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-02-23 04:19:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

directives.c (do_pragma): Save current buffer position before lexing the pragma keywords...

Browse Source 
* 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
This commit is contained in:
Zack Weinberg 2004-09-18 00:53:50 +00:00 committed by Zack Weinberg
parent bf3b7cd307
commit 8f8e9aa5c1
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcpp/ChangeLog
View File

@ -1,3 +1,9 @@
2004-09-17 Zack Weinberg <zack@codesourcery.com>
* 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 <per@bothner.com>
* include/line-map.h (line_map_start): Add parameter names so

9
libcpp/directives.c
View File

@ -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;