* c-lex.h (parse_in): Change parse_in to a cpp_reader *.

	* c-decl.c (c_decode_option): Update to match.
	* c-lex.c (init_c_lex, yyparse): Update to match.
	* c-lang.c (lang_init_options): Use cpp_create_reader.
	* cppinit.c (cpp_init): Rename initialize.
	(cpp_reader_init): Rename cpp_create_reader.  Create the
	reader.  Initialize cpplib if appropriate.
	* cpplib.h (cpp_create_reader) New prototype.
	(cpp_init, cpp_reader_init): Delete prototypes.
	* cppmain.c (general_init, setup_callbacks): New functions.
	(main): Use them.
	* fix-header.c (scan_in): Change type to cpp_reader *.
	(read_scan_file): Update for new cpplib interface and scan_in type.

	* cp/decl.c (parse_in): Change to cpp_reader *.
	(lang_decode_option): Update.
	* cp/lex.c (lang_init_options): Use new cpplib interface.
	(init_cp_pragma, finish_parse, handle_pragma_implementation): Update.
	* cp/spew.c (read_token): Update.
	* objc/objc-act.c (lang_init_options): Update new cpplib interface.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37826 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 11 insertions, 13 deletions

diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index 79919f9c033..0565704e32f 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -79,7 +79,6 @@ static void init_operators PARAMS ((void));
 #endif
 
 #include "cpplib.h"
-extern cpp_reader  parse_in;
 
 /* Pending language change.
    Positive is push count, negative is pop count.  */
@@ -246,8 +245,7 @@ static const char *cplus_tree_code_name[] = {
 void
 lang_init_options ()
 {
-  cpp_init ();
-  cpp_reader_init (&parse_in, CLK_GNUCXX);
+  parse_in = cpp_create_reader (CLK_GNUCXX);
 
   /* Default exceptions on.  */
   flag_exceptions = 1;
@@ -661,16 +659,16 @@ init_reswords ()
 static void
 init_cp_pragma ()
 {
-  cpp_register_pragma (&parse_in, 0, "vtable", handle_pragma_vtable);
-  cpp_register_pragma (&parse_in, 0, "unit", handle_pragma_unit);
+  cpp_register_pragma (parse_in, 0, "vtable", handle_pragma_vtable);
+  cpp_register_pragma (parse_in, 0, "unit", handle_pragma_unit);
 
-  cpp_register_pragma (&parse_in, 0, "interface", handle_pragma_interface);
-  cpp_register_pragma (&parse_in, 0, "implementation",
+  cpp_register_pragma (parse_in, 0, "interface", handle_pragma_interface);
+  cpp_register_pragma (parse_in, 0, "implementation",
 		       handle_pragma_implementation);
 
-  cpp_register_pragma_space (&parse_in, "GCC");
-  cpp_register_pragma (&parse_in, "GCC", "interface", handle_pragma_interface);
-  cpp_register_pragma (&parse_in, "GCC", "implementation",
+  cpp_register_pragma_space (parse_in, "GCC");
+  cpp_register_pragma (parse_in, "GCC", "interface", handle_pragma_interface);
+  cpp_register_pragma (parse_in, "GCC", "implementation",
 		       handle_pragma_implementation);
 }
 
@@ -742,8 +740,8 @@ init_parse (filename)
 void
 finish_parse ()
 {
-  cpp_finish (&parse_in);
-  errorcount += parse_in.errors;
+  cpp_finish (parse_in);
+  errorcount += parse_in->errors;
 }
 
 inline void
@@ -1150,7 +1148,7 @@ handle_pragma_implementation (dfile)
   else
     {
       main_filename = TREE_STRING_POINTER (fname);
-      if (cpp_included (&parse_in, main_filename))
+      if (cpp_included (parse_in, main_filename))
 	warning ("#pragma implementation for %s appears after file is included",
 		 main_filename);
     }