diff options
| author | Per Bothner <pbothner@apple.com> | 2003-08-09 22:14:07 +0000 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2003-08-09 15:14:07 -0700 |
| commit | 4169c321d07546a66be69a0d4c448862c971d640 (patch) | |
| tree | 128dea28dd9ac999f2887671bb6668d7a150269c /gcc/cppinit.c | |
| parent | 3d93cdfa884d3308eabaafa46e7bfda27c2234b8 (diff) | |
| download | gcc-4169c321d07546a66be69a0d4c448862c971d640.zip gcc-4169c321d07546a66be69a0d4c448862c971d640.tar.gz gcc-4169c321d07546a66be69a0d4c448862c971d640.tar.bz2 | |
cppinit.c (cpp_read_main_file): Split out source-independent initialization to separate function ...
* cppinit.c (cpp_read_main_file): Split out source-independent
initialization to separate function ...
(cpp_post_options): New function.
* cppfiles.c (cpp_stack_file): Rename public name to ...
(_cpp_stack_file): New internal function name.
* cpplib.h: Update accordingly.
* cppinit.c: (cpp_create_reader): Initialize cpp_readers line here.
(cpp_read_main_file): Don't initialize line here.
* c-opts.c (c_common_post_options): Call cpp_post_options.
(c_common_parse_file): Call cpp_read_main_file, not cpp_stack_file.
* fix-header.c (read_scan_file): Call cpp_post_options.
From-SVN: r70279
Diffstat (limited to 'gcc/cppinit.c')
| -rw-r--r-- | gcc/cppinit.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/gcc/cppinit.c b/gcc/cppinit.c index 4ef7e24..07abea8 100644 --- a/gcc/cppinit.c +++ b/gcc/cppinit.c @@ -170,6 +170,7 @@ cpp_create_reader (enum c_lang lang, hash_table *table) /* Initialize the line map. Start at logical line 1, so we can use a line number of zero for special states. */ linemap_init (&pfile->line_maps); + pfile->line = 1; /* Initialize lexer state. */ pfile->state.save_comments = ! CPP_OPTION (pfile, discard_comments); @@ -434,11 +435,9 @@ cpp_add_dependency_target (cpp_reader *pfile, const char *target, int quote) } /* This is called after options have been parsed, and partially - processed. Setup for processing input from the file named FNAME, - or stdin if it is the empty string. Return the original filename - on success (e.g. foo.i->foo.c), or NULL on failure. */ -const char * -cpp_read_main_file (cpp_reader *pfile, const char *fname) + processed. */ +void +cpp_post_options (cpp_reader *pfile) { sanity_checks (pfile); @@ -447,7 +446,14 @@ cpp_read_main_file (cpp_reader *pfile, const char *fname) /* Mark named operators before handling command line macros. */ if (CPP_OPTION (pfile, cplusplus) && CPP_OPTION (pfile, operator_names)) mark_named_operators (pfile); +} +/* Setup for processing input from the file named FNAME, + or stdin if it is the empty string. Return the original filename + on success (e.g. foo.i->foo.c), or NULL on failure. */ +const char * +cpp_read_main_file (cpp_reader *pfile, const char *fname) +{ if (CPP_OPTION (pfile, deps.style) != DEPS_NONE) { if (!pfile->deps) @@ -457,8 +463,7 @@ cpp_read_main_file (cpp_reader *pfile, const char *fname) deps_add_default_target (pfile->deps, fname); } - pfile->line = 1; - if (!cpp_stack_file (pfile, fname)) + if (! _cpp_stack_file (pfile, fname)) return NULL; /* Set this here so the client can change the option if it wishes, |