diff options
| author | Per Bothner <per@bothner.com> | 2004-01-19 21:30:18 -0800 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2004-01-19 21:30:18 -0800 |
| commit | 50f59cd71061055cc039bbe44b5c955747719ebb (patch) | |
| tree | 15fcd6b635123af68ed69ca87bf633fa01f46d8e /gcc/cppmacro.c | |
| parent | 9132fbb788b24bc4b03be723a42b16dd9f65e03f (diff) | |
| download | gcc-50f59cd71061055cc039bbe44b5c955747719ebb.zip gcc-50f59cd71061055cc039bbe44b5c955747719ebb.tar.gz gcc-50f59cd71061055cc039bbe44b5c955747719ebb.tar.bz2 | |
Move cpp_reader's line_maps field to a shared global.
* cpphash.h (cpp_reader): Rename line_maps field to line_table
and change the type to a pointer rather than a struct.
* cppinit.c (cpp_push_main_field): Adjust accordingly.
* cpplib.c (do_include_common, _cpp_do_file_change, cpp_get_callbacks):
Likewise.
* cppfiles.c (validate_pch): Likewise.
* cppmacro.c (_cpp_warn_if_unused_macro, _cpp_builtin_macro_text):
Likewise.
* cpperror.c (print_location): Likewise.
* cpplib.h (cpp_create_reader): New line_maps pointer parameter.
* cppinit.c (cpp_create_reader): Handle new parameter.
(cpp_destroy): Don't free line_maps - that's no longer our job.
* input.h (line_table): New variable.
* toplev.c (line_table): Declare variable.
(general_init): Initialize line_table.
* c-opts.c (c_common_init_options): Pass line_table to
cpp_create_reader.
* fix-header.c (read_scan_file): New local variable line_table.
Initialize, and pass it to cpp_create_reader.
* Makefile.in (LIBS, LIBDEPS): Add libcpp.a.
(C_AND_OBJC_OBJS, fix-header): Remove redundant libcpp.a.
From-SVN: r76198
Diffstat (limited to 'gcc/cppmacro.c')
| -rw-r--r-- | gcc/cppmacro.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c index efae0f0..158d926 100644 --- a/gcc/cppmacro.c +++ b/gcc/cppmacro.c @@ -80,7 +80,7 @@ _cpp_warn_if_unused_macro (cpp_reader *pfile, cpp_hashnode *node, cpp_macro *macro = node->value.macro; if (!macro->used - && MAIN_FILE_P (linemap_lookup (&pfile->line_maps, macro->line))) + && MAIN_FILE_P (linemap_lookup (pfile->line_table, macro->line))) cpp_error_with_line (pfile, CPP_DL_WARNING, macro->line, 0, "macro \"%s\" is not used", NODE_NAME (node)); } @@ -136,7 +136,7 @@ _cpp_builtin_macro_text (cpp_reader *pfile, cpp_hashnode *node) if (node->value.builtin == BT_BASE_FILE) while (! MAIN_FILE_P (map)) - map = INCLUDED_FROM (&pfile->line_maps, map); + map = INCLUDED_FROM (pfile->line_table, map); name = map->to_file; len = strlen (name); @@ -153,7 +153,7 @@ _cpp_builtin_macro_text (cpp_reader *pfile, cpp_hashnode *node) /* The line map depth counts the primary source as level 1, but historically __INCLUDE_DEPTH__ has called the primary source level 0. */ - number = pfile->line_maps.depth - 1; + number = pfile->line_table->depth - 1; break; case BT_SPECLINE: |