procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cpphash.h, cpplib.c: Correct erroneous previous checkin.

Browse source 
* cpphash.h, cpplib.c: Correct erroneous previous checkin.

Co-Authored-By: Franz Sirl <Franz.Sirl-kernel@lauterbach.com>

From-SVN: r44790
This commit is contained in:
Neil Booth 2001-08-11 08:02:54 +00:00 • committed by Neil Booth
parent 47d89cf3e6
commit f80f7e8cd8
3 changed files with 42 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
gcc/ChangeLog
View file

@ -1,3 +1,42 @@
2001-08-11 Neil Booth <neil@daikokuya.demon.co.uk>
Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
* c-lex.c (map): Make const.
(cb_file_change): Update for callback passing a line map.
Don't assume we have a previous map. Remove sanity check
about popping too many files.
* cpperror.c (print_location): Make map const.
* cppfiles.c (stack_include_file): Update; line maps now hold sysp.
(cpp_make_system_header): Similarly.
(search_from): Similarly.
(_cpp_execute_include): Don't remember where we came from.
* cpphash.h (struct cpp_buffer): Remove return_to_line, sysp.
(struct cpp_reader): Make map const.
(CPP_IN_SYSTEM_HEADER, _cpp_do_file_change): Update.
* cpplib.c (do_line): Update; line maps now hold sysp.
(cpp_push_buffer): Similarly.
(_cpp_do_file_change): Similarly; callback with map instead.
(cpp_get_line_maps): Constify return value.
(_cpp_pop_buffer): Update.
* cpplib.h (struct cpp_file_change): Remove.
(struct cpp_callbacks): Update.
(cpp_get_line_maps): Constify return value.
* cppmacro.c (_cpp_create_definition): Update.
* cppmain.c (struct printer): Constify map.
(maybe_print_line): Similarly.
(print_line): Similarly. Deduce flags 1 and 2 here.
(cb_file_change): Update.
* line-map.c (free_line_maps): Warn regardless.
(add_line_map): Return pointer to const. When passed NULL to_file
with LC_LEAVE, use the obvious values for the return point so the
caller doesn't have to figure them out.
(lookup_line): Return pointer to const.
(print_containing_files): Take pointer to const.
* line-map.h (struct line_map): New members reason, sysp.
(add_line_map): Return pointer to const.
(lookup_line): Similarly.
(print_containing_files): Take pointer to const.
2001-08-10 Roman Zippel <zippel@linux-m68k.org>
Richard Henderson <rth@redhat.com>

2
gcc/cpphash.h
View file

@ -66,7 +66,7 @@ struct cpp_chunk
typedef struct cpp_pool cpp_pool;
struct cpp_pool
{
struct cpp_chunk *cur, *locked, *first;
struct cpp_chunk *cur, *locked;
unsigned char *pos; /* Current position. */
unsigned int align;
unsigned int locks;

6
gcc/cpplib.c
View file

@ -901,8 +901,7 @@ cpp_register_pragma (pfile, space, name, handler)
}
found:
new = (struct pragma_entry *)
_cpp_pool_alloc (&pfile->macro_pool, sizeof (struct pragma_entry));
new = xnew (struct pragma_entry);
new->name = name;
new->len = strlen (name);
new->isnspace = 0;
@ -930,8 +929,7 @@ cpp_register_pragma_space (pfile, space)
p = p->next;
}
new = (struct pragma_entry *)
_cpp_pool_alloc (&pfile->macro_pool, sizeof (struct pragma_entry));
new = xnew (struct pragma_entry);
new->name = space;
new->len = len;
new->isnspace = 1;