decl.c (init_decl_processing): Change definition of __wchar_t to wchar_t.

2000-11-07  Eric Christopher  <echristo@redhat.com>

        * decl.c (init_decl_processing): Change definition of
        __wchar_t to wchar_t.  Remove artificial declaration of
        wchar_t.
        * lex.c: Change instances of __wchar_t to wchar_t.

From-SVN: r37348

gcc/cp/ChangeLog

+2000-11-07  Eric Christopher  <echristo@redhat.com>
+
+        * decl.c (init_decl_processing): Change definition of
+        __wchar_t to wchar_t.  Remove artificial declaration of
+        wchar_t.
+        * lex.c: Change instances of __wchar_t to wchar_t.
+
 2000-11-09  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* lex.c (do_identifier): Don't lookup_name for operators.
@@ -115,7 +122,7 @@
 	* error.c (dump_function_decl): Print no space between
 	`ptr-operator' the `type-specifier' of the return type.
 	(dump_type_prefix): Make sure we put space at the appropriate
-	place. 
+	place.
 
 2000-10-23  Jason Merrill  <jason@redhat.com>
 
@@ -134,7 +141,7 @@
 
 	* optimize.c (copy_body_r): Don't treat CALL_EXPRs specially.
 
-	* typeck.c (c_sizeof): Return an expression of `size_t' type, 
+	* typeck.c (c_sizeof): Return an expression of `size_t' type,
 	not one with TYPE_IS_SIZETYPE set.
 	(dubious_conversion_warnings): Remove special-case code.
 
@@ -147,7 +154,7 @@
 	* tree.c (walk_tree): Handle VECTOR_TYPE.
 
 	* decl.c (init_decl_processing): Call MD_INIT_BUILTINS.
-	
+
 2000-10-21  Jason Merrill  <jason@redhat.com>
 
 	* parse.y (operator): Set got_object from got_scope.
@@ -195,7 +202,7 @@ Fri Oct 20 13:54:59 2000  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 	(splay_tree_compare_integer_csts): New function.
 	(layout_class_type): Use a splay_tree, rather than a varray, to
 	represent the offsets of empty bases.
-	
+
 	* cp-tree.h (DECL_ANTICIPATED): Don't require a FUNCTION_DECL.
 	* decl.c (select_decl): Don't return declarations that are
 	DECL_ANTICIPATED.
@@ -227,7 +234,7 @@ Fri Oct 20 13:54:59 2000  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 	* except.c (init_exception_processing): Use std_identifier.
 	* init.c (build_member_call): Use fake_std_node.
 	* rtti.c (init_rtti_processing): Use std_identifier.
-	 
+
 2000-10-17  Mark Mitchell  <mark@codesourcery.com>
 
 	* cp-tree.h (back_end_hook): Remove declaration.
@@ -295,7 +302,7 @@ Tue Oct 17 20:19:06 2000  Brad Lucier <lucier@math.purdue.edu>
 	(init_repo): Initialize it.
 	* search.c (current_obstack): Remove.
 	* typeck2.c (add_exception_specifier): Don't call build_decl_list.
-	
+
 2000-10-09  Richard Henderson  <rth@cygnus.com>
 
 	* Make-lang.in (CXX_EXTRA_HEADERS): Remove.
@@ -331,7 +338,7 @@ Tue Oct 17 20:19:06 2000  Brad Lucier <lucier@math.purdue.edu>
 
 	* pt.c (lookup_template_class): Set current access for enum.
 	(tsubst_enum): Set file & line for enum decl.
-	
+
 	* spew.c (yylex): Remove unused variable.
 
 2000-10-05  Richard Henderson  <rth@cygnus.com>
@@ -354,7 +361,7 @@ Tue Oct 17 20:19:06 2000  Brad Lucier <lucier@math.purdue.edu>
 2000-10-05  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* pt.c (tsubst_expr, DECL_STMT case): Don't process if
-	tsubsting fails.	
+	tsubsting fails.
 
 2000-10-05  Nathan Sidwell  <nathan@codesourcery.com>
 
@@ -366,7 +373,7 @@ Tue Oct 17 20:19:06 2000  Brad Lucier <lucier@math.purdue.edu>
 
 	* decl.c (lang_mark_false_label_stack): Remove.
 	* lex.c (cp_mang_lang_type): Use ggc_alloc_cleared.
-	
+
 2000-09-30  Joseph S. Myers  <jsm28@cam.ac.uk>
 
 	* gxxint.texi: Use @email for formatting email addresses.

gcc/cp/lex.c

@@ -170,7 +170,7 @@ make_pointer_declarator (cv_qualifiers, target)
 
    We return an ADDR_EXPR whose "contents" are TARGET
    and whose type is the modifier list.  */
-   
+
 tree
 make_reference_declarator (cv_qualifiers, target)
      tree cv_qualifiers, target;
@@ -199,7 +199,7 @@ tree
 make_call_declarator (target, parms, cv_qualifiers, exception_specification)
      tree target, parms, cv_qualifiers, exception_specification;
 {
-  target = build_parse_node (CALL_EXPR, target, 
+  target = build_parse_node (CALL_EXPR, target,
 			     tree_cons (parms, cv_qualifiers, NULL_TREE),
 			     /* The third operand is really RTL.  We
 				shouldn't put anything there.  */
@@ -323,7 +323,7 @@ init_cpp_parse ()
 operator_name_info_t operator_name_info[(int) LAST_CPLUS_TREE_CODE];
 /* Similar, but for assignment operators.  */
 operator_name_info_t assignment_operator_name_info[(int) LAST_CPLUS_TREE_CODE];
-  
+
 /* Initialize data structures that keep track of operator names.  */
 
 #define DEF_OPERATOR(NAME, C, NM, OM, AR, AP) \
@@ -337,7 +337,7 @@ init_operators ()
   tree identifier;
   char buffer[256];
   struct operator_name_info_t *oni;
-  
+
 #define DEF_OPERATOR(NAME, CODE, NEW_MANGLING, OLD_MANGLING, ARITY, ASSN_P) \
   sprintf (buffer, ISALPHA (NAME[0]) ? "operator %s" : "operator%s", NAME); \
   identifier = get_identifier (buffer);					    \
@@ -353,7 +353,7 @@ init_operators ()
 #include "operators.def"
 #undef DEF_OPERATOR
 
-  operator_name_info[(int) ERROR_MARK].identifier 
+  operator_name_info[(int) ERROR_MARK].identifier
     = get_identifier ("<invalid operator>");
 
   /* Handle some special cases.  These operators are not defined in
@@ -361,8 +361,8 @@ init_operators ()
      for error-reporting.  (Eventually, we should ensure that this
      does not happen.  Error messages involving these operators will
      be confusing to users.)  */
-  
-  operator_name_info [(int) INIT_EXPR].name 
+
+  operator_name_info [(int) INIT_EXPR].name
     = operator_name_info [(int) MODIFY_EXPR].name;
   operator_name_info [(int) EXACT_DIV_EXPR].name = "(ceiling /)";
   operator_name_info [(int) CEIL_DIV_EXPR].name = "(ceiling /)";
@@ -380,19 +380,19 @@ init_operators ()
   operator_name_info [(int) RANGE_EXPR].name = "...";
   operator_name_info [(int) CONVERT_EXPR].name = "+";
 
-  assignment_operator_name_info [(int) EXACT_DIV_EXPR].name 
+  assignment_operator_name_info [(int) EXACT_DIV_EXPR].name
     = "(exact /=)";
-  assignment_operator_name_info [(int) CEIL_DIV_EXPR].name 
+  assignment_operator_name_info [(int) CEIL_DIV_EXPR].name
     = "(ceiling /=)";
-  assignment_operator_name_info [(int) FLOOR_DIV_EXPR].name 
+  assignment_operator_name_info [(int) FLOOR_DIV_EXPR].name
     = "(floor /=)";
-  assignment_operator_name_info [(int) ROUND_DIV_EXPR].name 
+  assignment_operator_name_info [(int) ROUND_DIV_EXPR].name
     = "(round /=)";
-  assignment_operator_name_info [(int) CEIL_MOD_EXPR].name 
+  assignment_operator_name_info [(int) CEIL_MOD_EXPR].name
     = "(ceiling %=)";
-  assignment_operator_name_info [(int) FLOOR_MOD_EXPR].name 
+  assignment_operator_name_info [(int) FLOOR_MOD_EXPR].name
     = "(floor %=)";
-  assignment_operator_name_info [(int) ROUND_MOD_EXPR].name 
+  assignment_operator_name_info [(int) ROUND_MOD_EXPR].name
     = "(round %=)";
 }
 
@@ -443,7 +443,6 @@ static const struct resword reswords[] =
   { "__typeof__",	RID_TYPEOF,	0 },
   { "__volatile",	RID_VOLATILE,	0 },
   { "__volatile__",	RID_VOLATILE,	0 },
-  { "__wchar_t",	RID_WCHAR,	0 },
   { "asm",		RID_ASM,	D_ASM },
   { "and",		RID_AND,	D_OPNAME },
   { "and_eq",		RID_AND_EQ,	D_OPNAME },
@@ -515,6 +514,7 @@ static const struct resword reswords[] =
   { "virtual",		RID_VIRTUAL,	0 },
   { "void",		RID_VOID,	0 },
   { "volatile",		RID_VOLATILE,	0 },
+  { "wchar_t",          RID_WCHAR,	0 },
   { "while",		RID_WHILE,	0 },
   { "xor",		RID_XOR,	D_OPNAME },
   { "xor_eq",		RID_XOR_EQ,	D_OPNAME },
@@ -560,7 +560,7 @@ const short rid_to_yy[RID_MAX] =
   /* RID_BYCOPY */	0,
   /* RID_BYREF */	0,
   /* RID_ONEWAY */	0,
-  
+
   /* C */
   /* RID_INT */		TYPESPEC,
   /* RID_CHAR */	TYPESPEC,
@@ -708,7 +708,7 @@ init_parse (filename)
   set_identifier_size (sizeof (struct lang_identifier));
   decl_printable_name = lang_printable_name;
 
-  internal_filename = ggc_alloc_string (INTERNAL_FILENAME, 
+  internal_filename = ggc_alloc_string (INTERNAL_FILENAME,
 					sizeof (INTERNAL_FILENAME));
   input_filename = internal_filename;
 
@@ -896,7 +896,7 @@ print_parse_statistics ()
   int i;
   int maxlen = REDUCE_LENGTH;
   unsigned *sorted;
-  
+
   if (reduce_count[-1] == 0)
     return;
 
@@ -981,7 +981,7 @@ extract_interface_info ()
   if (flag_alt_external_templates)
     {
       tree til = tinst_for_decl ();
-  
+
       if (til)
 	finfo = get_fileinfo (TINST_FILE (til));
     }
@@ -1117,7 +1117,7 @@ parse_strconst_pragma (name, opt)
   error ("invalid #pragma %s", name);
   return (tree)-1;
 }
-      
+
 static void
 handle_pragma_vtable (dfile)
      cpp_reader *dfile ATTRIBUTE_UNUSED;
@@ -1392,15 +1392,15 @@ do_identifier (token, parsing, args)
      like local variables, rather than creating TEMPLATE_DECLs for the
      local variables and then finding matching instantiations.  */
   if (current_template_parms
-      && (is_overloaded_fn (id) 
-	  || (TREE_CODE (id) == VAR_DECL 
+      && (is_overloaded_fn (id)
+	  || (TREE_CODE (id) == VAR_DECL
 	      && CP_DECL_CONTEXT (id)
 	      && TREE_CODE (CP_DECL_CONTEXT (id)) == FUNCTION_DECL)
 	  || TREE_CODE (id) == PARM_DECL
 	  || TREE_CODE (id) == RESULT_DECL
 	  || TREE_CODE (id) == USING_DECL))
     id = build_min_nt (LOOKUP_EXPR, token);
-      
+
   return id;
 }
 
@@ -1418,7 +1418,7 @@ do_scoped_id (token, parsing)
 	id = NULL_TREE;
       else
 	id = BINDING_VALUE (id);
-    } 
+    }
   else
     id = IDENTIFIER_GLOBAL_VALUE (token);
   if (parsing && yychar == YYEMPTY)
@@ -1616,7 +1616,7 @@ cp_make_lang_type (code)
     {
       struct lang_type *pi;
 
-      pi = ((struct lang_type *) 
+      pi = ((struct lang_type *)
 	    ggc_alloc_cleared (sizeof (struct lang_type)));
 
       TYPE_LANG_SPECIFIC (t) = pi;
@@ -1669,9 +1669,9 @@ compiler_error VPARAMS ((const char *msg, ...))
 #endif
   char buf[1024];
   va_list ap;
-  
+
   VA_START (ap, msg);
-  
+
 #ifndef ANSI_PROTOTYPES
   msg = va_arg (ap, const char *);
 #endif