mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-23 19:03:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix cpp_peek_token behaviour (PR bootstrap/50778)

Browse Source 
libcpp/

	* include/internal.h (_cpp_remaining_tokens_num_in_context): Take the
	context to act upon.
	* lex.c (_cpp_remaining_tokens_num_in_context): Likewise.  Update
	comment.
	(cpp_token_from_context_at): Likewise.
	(cpp_peek_token): Use the context to peek tokens from.

From-SVN: r180328
This commit is contained in:
Dodji Seketeli 2011-10-22 17:49:18 +00:00 committed by Dodji Seketeli
parent 94bf1a5fb7
commit ad2305adb4
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libcpp/ChangeLog
View File

@ -1,3 +1,13 @@
2011-10-22 Dodji Seketeli <dodji@redhat.com>
PR bootstrap/50778
* include/internal.h (_cpp_remaining_tokens_num_in_context): Take the
context to act upon.
* lex.c (_cpp_remaining_tokens_num_in_context): Likewise. Update
comment.
(cpp_token_from_context_at): Likewise.
(cpp_peek_token): Use the context to peek tokens from.
2011-10-20 Dodji Seketeli <dodji@redhat.com>
PR bootstrap/50801

2
libcpp/internal.h
View File

@ -652,7 +652,7 @@ extern cpp_token *_cpp_lex_direct (cpp_reader *);
extern int _cpp_equiv_tokens (const cpp_token *, const cpp_token *);
extern void _cpp_init_tokenrun (tokenrun *, unsigned int);
extern cpp_hashnode *_cpp_lex_identifier (cpp_reader *, const char *);
extern int _cpp_remaining_tokens_num_in_context (cpp_reader *);
extern int _cpp_remaining_tokens_num_in_context (cpp_context *);
/* In init.c. */
extern void _cpp_maybe_push_include_file (cpp_reader *);

16
libcpp/lex.c
View File

@ -1703,12 +1703,11 @@ next_tokenrun (tokenrun *run)
return run->next;
}
/* Return the number of not yet processed token in the the current
/* Return the number of not yet processed token in a given
context. */
int
_cpp_remaining_tokens_num_in_context (cpp_reader *pfile)
_cpp_remaining_tokens_num_in_context (cpp_context *context)
{
cpp_context *context = pfile->context;
if (context->tokens_kind == TOKENS_KIND_DIRECT)
return (LAST (context).token - FIRST (context).token);
else if (context->tokens_kind == TOKENS_KIND_INDIRECT
@ -1718,12 +1717,11 @@ _cpp_remaining_tokens_num_in_context (cpp_reader *pfile)
abort ();
}
/* Returns the token present at index INDEX in the current context.
If INDEX is zero, the next token to be processed is returned. */
/* Returns the token present at index INDEX in a given context. If
INDEX is zero, the next token to be processed is returned. */
static const cpp_token*
_cpp_token_from_context_at (cpp_reader *pfile, int index)
_cpp_token_from_context_at (cpp_context *context, int index)
{
cpp_context *context = pfile->context;
if (context->tokens_kind == TOKENS_KIND_DIRECT)
return &(FIRST (context).token[index]);
else if (context->tokens_kind == TOKENS_KIND_INDIRECT
@ -1744,10 +1742,10 @@ cpp_peek_token (cpp_reader *pfile, int index)
/* First, scan through any pending cpp_context objects. */
while (context->prev)
{
ptrdiff_t sz = _cpp_remaining_tokens_num_in_context (pfile);
ptrdiff_t sz = _cpp_remaining_tokens_num_in_context (context);
if (index < (int) sz)
return _cpp_token_from_context_at (pfile, index);
return _cpp_token_from_context_at (context, index);
index -= (int) sz;
context = context->prev;
}