From 8d052bc70c4265754427c106f325eb4150b048c9 Mon Sep 17 00:00:00 2001
From: Jeffrey A Law <law@cygnus.com>
Date: Tue, 31 Mar 1998 13:25:46 +0000
Subject: [PATCH] call.c: Include system.h.

        * call.c: Include system.h.  Remove includes, declarations and
        defines provided by system.h.
        * class.c, cvt.c, decl.c, decl2.c, errfn.c error.c: Likewise.
        * except.c, expr.c friend.c, g++spec.c, init.c, input.c: Likewise.
        * lex.c, parse.y, pt.c, ptree.c repo.c rtti.c, search.c: Likewise.
        * semantics.c, sig.c, spew.c, tree.c, typeck.c: Likewise.
        * typeck2.c, xref.c: Likewise.
        * Makefile.in: Dependencies updated as appropriate.
        * Make-lang.in: Likewise.
system.h cutover from the cp subdir

From-SVN: r18917
---
 gcc/cp/ChangeLog    |   12 +
 gcc/cp/Make-lang.in |    3 +-
 gcc/cp/Makefile.in  |   64 +-
 gcc/cp/call.c       |    6 +-
 gcc/cp/class.c      |    2 +-
 gcc/cp/cvt.c        |    6 +-
 gcc/cp/decl.c       |   10 +-
 gcc/cp/decl2.c      |   10 +-
 gcc/cp/errfn.c      |    3 +-
 gcc/cp/error.c      |    7 +-
 gcc/cp/except.c     |    2 +-
 gcc/cp/expr.c       |    2 +-
 gcc/cp/friend.c     |    6 +-
 gcc/cp/g++spec.c    |   11 +-
 gcc/cp/init.c       |    2 +-
 gcc/cp/input.c      |    2 +-
 gcc/cp/lex.c        |   24 +-
 gcc/cp/parse.c      | 1563 +++++++++++++++++++++----------------------
 gcc/cp/parse.y      |    3 +-
 gcc/cp/pt.c         |    6 +-
 gcc/cp/ptree.c      |    2 +-
 gcc/cp/repo.c       |   23 +-
 gcc/cp/rtti.c       |    2 +-
 gcc/cp/search.c     |    2 +-
 gcc/cp/semantics.c  |    2 +-
 gcc/cp/sig.c        |    2 +-
 gcc/cp/spew.c       |    2 +-
 gcc/cp/tree.c       |   10 +-
 gcc/cp/typeck.c     |    6 +-
 gcc/cp/typeck2.c    |    2 +-
 gcc/cp/xref.c       |   20 +-
 31 files changed, 861 insertions(+), 956 deletions(-)

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 7fdc60b264d..06f1bb034ca 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,15 @@
+Tue Mar 31 13:43:57 1998  Jeffrey A Law  (law@cygnus.com)
+
+	* call.c: Include system.h.  Remove includes, declarations and
+	defines provided by system.h.
+	* class.c, cvt.c, decl.c, decl2.c, errfn.c error.c: Likewise.
+	* except.c, expr.c friend.c, g++spec.c, init.c, input.c: Likewise.
+	* lex.c, parse.y, pt.c, ptree.c repo.c rtti.c, search.c: Likewise.
+	* semantics.c, sig.c, spew.c, tree.c, typeck.c: Likewise.
+	* typeck2.c, xref.c: Likewise.
+	* Makefile.in: Dependencies updated as appropriate.
+	* Make-lang.in: Likewise.
+
 Mon Mar 30 12:15:00 1998  Mark Mitchell  <mmitchell@usa.net>
 
  	* pt.c (fn_type_unification): Allow incomplete unification without 
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index 215bc950a52..bf2b3526ec7 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -86,7 +86,8 @@ g++spec.o: $(srcdir)/cp/g++spec.c
 # It'd be nice if we could find an easier way to do this---rather than have
 # to track changes to the toplevel gcc Makefile as well.
 # We depend on g++.c last, to make it obvious where it came from.
-g++.o: $(CONFIG_H) multilib.h config.status $(lang_specs_files) g++.c
+g++.o: $(CONFIG_H) multilib.h config.status $(lang_specs_files) g++.c \
+       system.h
 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
 	$(DRIVER_DEFINES) \
 	-DLANG_SPECIFIC_DRIVER \
diff --git a/gcc/cp/Makefile.in b/gcc/cp/Makefile.in
index 77e81960e2c..fd279cabcde 100644
--- a/gcc/cp/Makefile.in
+++ b/gcc/cp/Makefile.in
@@ -198,7 +198,7 @@ PARSE_H = $(srcdir)/parse.h
 PARSE_C = $(srcdir)/parse.c
 
 parse.o : $(PARSE_C) $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h lex.h \
-	$(srcdir)/../except.h $(srcdir)/../output.h
+	$(srcdir)/../except.h $(srcdir)/../output.h $(srcdir)/../system.h
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(BIG_SWITCHFLAG) \
   `echo $(PARSE_C) | sed 's,^\./,,'`
 
@@ -227,39 +227,53 @@ $(srcdir)/hash.h:
 		$(srcdir)/gxx.gperf >$(srcdir)/hash.h
 
 spew.o : spew.c $(CONFIG_H) $(CXX_TREE_H) \
-  $(PARSE_H) $(srcdir)/../flags.h lex.h
+  $(PARSE_H) $(srcdir)/../flags.h lex.h $(srcdir)/../system.h
 lex.o : lex.c $(CONFIG_H) $(CXX_TREE_H) \
-  $(PARSE_H) input.c $(srcdir)/../flags.h hash.h lex.h $(srcdir)/../c-pragma.h
+  $(PARSE_H) input.c $(srcdir)/../flags.h hash.h lex.h \
+  $(srcdir)/../c-pragma.h $(srcdir)/../system.h
 decl.o : decl.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h \
   lex.h decl.h $(srcdir)/../stack.h $(srcdir)/../output.h  \
-  $(srcdir)/../except.h
+  $(srcdir)/../except.h $(srcdir)/../system.h
 decl2.o : decl2.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h \
   lex.h decl.h $(srcdir)/../expr.h ../insn-codes.h $(srcdir)/../except.h \
-  $(srcdir)/../output.h $(srcdir)/../except.h
-typeck2.o : typeck2.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h
+  $(srcdir)/../output.h $(srcdir)/../except.h $(srcdir)/../system.h
+typeck2.o : typeck2.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h \
+  $(srcdir)/../system.h
 typeck.o : typeck.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h $(RTL_H) \
-  $(srcdir)/../expr.h ../insn-codes.h
-class.o : class.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h
-call.o : call.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h
-friend.o : friend.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h $(RTL_H)
+  $(srcdir)/../expr.h ../insn-codes.h $(srcdir)/../system.h
+class.o : class.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h \
+  $(srcdir)/../system.h
+call.o : call.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h \
+  $(srcdir)/../system.h
+friend.o : friend.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h $(RTL_H) \
+  $(srcdir)/../system.h
 init.o : init.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h $(RTL_H) \
-  $(srcdir)/../expr.h ../insn-codes.h
+  $(srcdir)/../expr.h ../insn-codes.h $(srcdir)/../system.h
 method.o : method.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../system.h
-cvt.o : cvt.c $(CONFIG_H) $(CXX_TREE_H)
-search.o : search.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../stack.h $(srcdir)/../flags.h
-tree.o : tree.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h
-ptree.o : ptree.c $(CONFIG_H) $(CXX_TREE_H)
-rtti.o : rtti.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h
-except.o : except.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h $(RTL_H) $(srcdir)/../except.h
+cvt.o : cvt.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../system.h
+search.o : search.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../stack.h \
+  $(srcdir)/../flags.h $(srcdir)/../system.h
+tree.o : tree.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h \
+  $(srcdir)/../system.h
+ptree.o : ptree.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../system.h
+rtti.o : rtti.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h \
+  $(srcdir)/../system.h
+except.o : except.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h $(RTL_H) \
+  $(srcdir)/../except.h $(srcdir)/../system.h
 expr.o : expr.c $(CONFIG_H) $(CXX_TREE_H) $(RTL_H) $(srcdir)/../flags.h \
-  $(srcdir)/../expr.h ../insn-codes.h
-xref.o : xref.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../input.h
-pt.o : pt.c $(CONFIG_H) $(CXX_TREE_H) decl.h $(PARSE_H) lex.h
-error.o : error.c $(CONFIG_H) $(CXX_TREE_H)
-errfn.o : errfn.c $(CONFIG_H) $(CXX_TREE_H)
-sig.o : sig.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h
-repo.o : repo.c $(CONFIG_H) $(CXX_TREE_H)
-semantics.o: semantics.c $(CONFIG_H) $(CXX_TREE_H) lex.h $(srcdir)/../except.h
+  $(srcdir)/../expr.h ../insn-codes.h $(srcdir)/../system.h
+xref.o : xref.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../input.h \
+  $(srcdir)/../system.h
+pt.o : pt.c $(CONFIG_H) $(CXX_TREE_H) decl.h $(PARSE_H) lex.h \
+  $(srcdir)/../system.h
+error.o : error.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../system.h
+errfn.o : errfn.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../system.h
+sig.o : sig.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h \
+  $(srcdir)/../system.h
+repo.o : repo.c $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../system.h
+semantics.o: semantics.c $(CONFIG_H) $(CXX_TREE_H) lex.h \
+  $(srcdir)/../except.h $(srcdir)/../system.h
+  
 
 #
 # These exist for maintenance purposes.
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index d066a582ad8..2959fc26611 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -25,15 +25,11 @@ Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
 #include "tree.h"
-#include <stdio.h>
+#include "system.h"
 #include "cp-tree.h"
 #include "output.h"
 #include "flags.h"
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
 #include "obstack.h"
 #define obstack_chunk_alloc xmalloc
 #define obstack_chunk_free free
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 1fc4f2dc503..d7251240d72 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -24,7 +24,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
 #include "tree.h"
-#include <stdio.h>
+#include "system.h"
 #include "cp-tree.h"
 #include "flags.h"
 #include "rtl.h"
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c
index 7cd5f2eee59..e4f802dadba 100644
--- a/gcc/cp/cvt.c
+++ b/gcc/cp/cvt.c
@@ -26,16 +26,12 @@ Boston, MA 02111-1307, USA.  */
    but what kind of conversions it does will depend on the language.  */
 
 #include "config.h"
-#include <stdio.h>
+#include "system.h"
 #include "tree.h"
 #include "flags.h"
 #include "cp-tree.h"
 #include "convert.h"
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
 extern tree static_aggregates;
 
 static tree cp_convert_to_pointer PROTO((tree, tree));
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index b3f065b24ec..bb916e5c308 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -28,6 +28,7 @@ Boston, MA 02111-1307, USA.  */
    line numbers.  For example, the CONST_DECLs for enum values.  */
 
 #include "config.h"
+#include "system.h"
 #include <stdio.h>
 #include "tree.h"
 #include "rtl.h"
@@ -35,21 +36,12 @@ Boston, MA 02111-1307, USA.  */
 #include "cp-tree.h"
 #include "decl.h"
 #include "lex.h"
-#include <sys/types.h>
 #include <signal.h>
 #include "obstack.h"
 #include "defaults.h"
 #include "output.h"
 #include "except.h"
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#ifdef NEED_DECLARATION_FREE
-extern void free	PROTO((void *));
-#endif
-
 #define obstack_chunk_alloc xmalloc
 #define obstack_chunk_free free
 
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index e65d85547d6..7e3994b641b 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -28,7 +28,7 @@ Boston, MA 02111-1307, USA.  */
    line numbers.  For example, the CONST_DECLs for enum values.  */
 
 #include "config.h"
-#include <stdio.h>
+#include "system.h"
 #include "tree.h"
 #include "rtl.h"
 #include "flags.h"
@@ -40,14 +40,6 @@ Boston, MA 02111-1307, USA.  */
 #include "expr.h"
 #include "defaults.h"
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
 static tree get_sentry PROTO((tree));
 static void mark_vtable_entries PROTO((tree));
 static void import_export_template PROTO((tree));
diff --git a/gcc/cp/errfn.c b/gcc/cp/errfn.c
index 63de7b8fea2..30cbfe56aa4 100644
--- a/gcc/cp/errfn.c
+++ b/gcc/cp/errfn.c
@@ -21,8 +21,7 @@ Boston, MA 02111-1307, USA.  */
    
 #include "config.h"
 #include "tree.h"
-#include <stdio.h>
-#include <ctype.h>
+#include "system.h"
 
 /* cp_printer is the type of a function which converts an argument into
    a string for digestion by printf.  The cp_printer function should deal
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index e5dc73f0d5d..7e9b06cad8b 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -20,15 +20,10 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
-#include <stdio.h>
-#include <sys/types.h>
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
+#include "system.h"
 #include "tree.h"
 #include "cp-tree.h"
 #include "obstack.h"
-#include <ctype.h>
 
 typedef char* cp_printer ();
 
diff --git a/gcc/cp/except.c b/gcc/cp/except.c
index 7eb3c51d0b0..230769c949b 100644
--- a/gcc/cp/except.c
+++ b/gcc/cp/except.c
@@ -23,7 +23,7 @@ Boston, MA 02111-1307, USA.  */
 
 
 #include "config.h"
-#include <stdio.h>
+#include "system.h"
 #include "tree.h"
 #include "rtl.h"
 #include "cp-tree.h"
diff --git a/gcc/cp/expr.c b/gcc/cp/expr.c
index 43be1a829a0..c8617dace0f 100644
--- a/gcc/cp/expr.c
+++ b/gcc/cp/expr.c
@@ -21,7 +21,7 @@ Boston, MA 02111-1307, USA.  */
 
 
 #include "config.h"
-#include <stdio.h>
+#include "system.h"
 #include "rtl.h"
 #include "tree.h"
 #include "flags.h"
diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c
index 304936a82ac..b1f1285b3da 100644
--- a/gcc/cp/friend.c
+++ b/gcc/cp/friend.c
@@ -19,17 +19,13 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
-#include <stdio.h>
+#include "system.h"
 #include "tree.h"
 #include "rtl.h"
 #include "cp-tree.h"
 #include "flags.h"
 #include "output.h"
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
 static void add_friend PROTO((tree, tree));
 static void add_friends PROTO((tree, tree, tree));
 
diff --git a/gcc/cp/g++spec.c b/gcc/cp/g++spec.c
index 66b27565766..105e03c885f 100644
--- a/gcc/cp/g++spec.c
+++ b/gcc/cp/g++spec.c
@@ -20,19 +20,10 @@ Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
 
-#include <sys/types.h>
-#include <stdio.h>
+#include "system.h"
 
 #include "gansidecl.h"
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
 /* This bit is set if we saw a `-xfoo' language specification.  */
 #define LANGSPEC	(1<<1)
 /* This bit is set if they did `-lm' or `-lmath'.  */
diff --git a/gcc/cp/init.c b/gcc/cp/init.c
index d3feefdaca3..9a9c2a5f28d 100644
--- a/gcc/cp/init.c
+++ b/gcc/cp/init.c
@@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA.  */
 /* High-level class interface.  */
 
 #include "config.h"
-#include <stdio.h>
+#include "system.h"
 #include "tree.h"
 #include "rtl.h"
 #include "cp-tree.h"
diff --git a/gcc/cp/input.c b/gcc/cp/input.c
index cb9dfa8b71f..5e4fd5fca55 100644
--- a/gcc/cp/input.c
+++ b/gcc/cp/input.c
@@ -29,7 +29,7 @@ Boston, MA 02111-1307, USA.  */
    lex.c for very minor efficiency gains (primarily in function
    inlining).  */
 
-#include <stdio.h>
+#include "system.h"
 
 extern FILE *finput;
 
diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c
index 3a5e21eadbc..04021aea50a 100644
--- a/gcc/cp/lex.c
+++ b/gcc/cp/lex.c
@@ -26,9 +26,7 @@ Boston, MA 02111-1307, USA.  */
 #define YYDEBUG 1
 
 #include "config.h"
-#include <sys/types.h>
-#include <stdio.h>
-#include <errno.h>
+#include "system.h"
 #include <setjmp.h>
 #include "input.h"
 #include "tree.h"
@@ -59,26 +57,6 @@ Boston, MA 02111-1307, USA.  */
 extern double atof ();
 #endif
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
-#ifdef NEED_DECLARATION_INDEX
-extern char *index ();
-#endif
-
-#ifdef NEED_DECLARATION_RINDEX
-extern char *rindex ();
-#endif
-
-#ifndef errno
-extern int errno;		/* needed for VAX.  */
-#endif
-
 #define obstack_chunk_alloc xmalloc
 #define obstack_chunk_free free
 
diff --git a/gcc/cp/parse.c b/gcc/cp/parse.c
index 53590ab6a0a..4247a9e6a80 100644
--- a/gcc/cp/parse.c
+++ b/gcc/cp/parse.c
@@ -100,8 +100,7 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <errno.h>
+#include "system.h"
 
 #include "tree.h"
 #include "input.h"
@@ -158,9 +157,9 @@ empty_parms ()
 }
 
 
-#line 96 "parse.y"
+#line 95 "parse.y"
 typedef union {long itype; tree ttype; char *strtype; enum tree_code code; flagged_type_tree ftype; } YYSTYPE;
-#line 285 "parse.y"
+#line 284 "parse.y"
 
 /* List of types and structure classes of the current declaration.  */
 static tree current_declspecs = NULL_TREE;
@@ -629,91 +628,91 @@ static const short yyrhs[] = {    -1,
 
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-   333,   335,   349,   352,   353,   357,   359,   362,   367,   371,
-   377,   379,   382,   385,   389,   392,   394,   396,   399,   401,
-   404,   407,   409,   411,   413,   415,   417,   419,   425,   429,
-   432,   434,   438,   440,   441,   443,   447,   450,   456,   459,
-   461,   466,   469,   473,   476,   479,   482,   486,   491,   501,
-   503,   505,   507,   509,   522,   531,   541,   543,   545,   549,
-   551,   552,   559,   560,   561,   564,   567,   571,   573,   574,
-   577,   579,   582,   585,   587,   591,   594,   596,   600,   602,
-   604,   608,   610,   612,   616,   618,   620,   626,   630,   633,
-   636,   639,   644,   647,   649,   651,   657,   667,   669,   672,
-   675,   677,   680,   684,   693,   696,   698,   702,   715,   735,
-   738,   740,   741,   744,   751,   757,   759,   761,   763,   765,
-   768,   773,   775,   776,   777,   778,   781,   783,   784,   787,
-   789,   790,   793,   798,   798,   802,   802,   805,   805,   808,
-   808,   812,   812,   817,   817,   820,   820,   823,   825,   828,
-   835,   842,   848,   851,   860,   862,   870,   873,   876,   879,
-   883,   886,   889,   892,   894,   896,   898,   902,   905,   908,
-   913,   917,   922,   926,   929,   931,   935,   955,   962,   965,
-   967,   968,   969,   972,   976,   977,   981,   985,   988,   990,
-   994,   997,  1000,  1004,  1007,  1009,  1011,  1013,  1020,  1024,
-  1026,  1028,  1030,  1036,  1039,  1042,  1045,  1048,  1052,  1055,
-  1058,  1062,  1064,  1068,  1072,  1074,  1078,  1081,  1088,  1091,
-  1093,  1101,  1114,  1120,  1127,  1129,  1131,  1144,  1147,  1149,
-  1151,  1153,  1155,  1157,  1159,  1161,  1163,  1165,  1167,  1169,
-  1171,  1173,  1175,  1177,  1179,  1181,  1183,  1185,  1187,  1191,
-  1193,  1195,  1212,  1215,  1216,  1217,  1218,  1219,  1222,  1225,
-  1228,  1232,  1235,  1237,  1242,  1244,  1245,  1248,  1250,  1252,
-  1254,  1258,  1261,  1265,  1267,  1268,  1269,  1273,  1281,  1282,
-  1283,  1291,  1293,  1296,  1298,  1308,  1310,  1312,  1314,  1316,
-  1318,  1321,  1323,  1367,  1368,  1372,  1376,  1380,  1384,  1386,
-  1390,  1392,  1400,  1402,  1404,  1406,  1410,  1412,  1414,  1416,
-  1421,  1423,  1425,  1427,  1430,  1432,  1434,  1478,  1481,  1485,
-  1488,  1492,  1495,  1500,  1502,  1506,  1519,  1522,  1529,  1536,
-  1541,  1543,  1548,  1550,  1557,  1559,  1563,  1567,  1573,  1577,
-  1580,  1583,  1586,  1596,  1598,  1601,  1605,  1608,  1611,  1614,
-  1617,  1623,  1629,  1631,  1636,  1638,  1647,  1650,  1652,  1655,
-  1661,  1663,  1673,  1677,  1680,  1683,  1688,  1691,  1699,  1701,
-  1703,  1705,  1708,  1711,  1726,  1745,  1748,  1750,  1753,  1755,
-  1758,  1760,  1763,  1765,  1768,  1771,  1775,  1781,  1782,  1794,
-  1801,  1804,  1810,  1814,  1819,  1825,  1826,  1834,  1837,  1841,
-  1844,  1848,  1853,  1856,  1860,  1863,  1865,  1867,  1869,  1876,
-  1878,  1879,  1880,  1884,  1887,  1891,  1894,  1900,  1902,  1905,
-  1908,  1911,  1917,  1920,  1923,  1925,  1927,  1931,  1937,  1945,
-  1947,  1951,  1953,  1958,  1961,  1964,  1966,  1968,  1972,  1976,
-  1981,  1985,  1988,  1993,  1997,  2000,  2003,  2007,  2042,  2048,
-  2057,  2077,  2079,  2082,  2084,  2089,  2091,  2093,  2095,  2097,
-  2101,  2106,  2111,  2117,  2122,  2127,  2129,  2133,  2138,  2141,
-  2148,  2176,  2182,  2184,  2187,  2190,  2192,  2196,  2198,  2202,
-  2228,  2257,  2260,  2261,  2282,  2305,  2307,  2311,  2322,  2336,
-  2425,  2432,  2435,  2443,  2454,  2463,  2467,  2482,  2485,  2490,
-  2492,  2494,  2496,  2498,  2500,  2503,  2505,  2513,  2519,  2521,
-  2524,  2527,  2529,  2540,  2545,  2548,  2553,  2556,  2557,  2568,
-  2571,  2572,  2583,  2585,  2588,  2590,  2593,  2600,  2608,  2615,
-  2621,  2627,  2635,  2639,  2644,  2648,  2651,  2660,  2662,  2666,
-  2669,  2674,  2678,  2683,  2693,  2696,  2700,  2704,  2712,  2717,
-  2723,  2726,  2728,  2730,  2736,  2739,  2741,  2743,  2745,  2749,
-  2752,  2770,  2780,  2782,  2783,  2787,  2792,  2795,  2797,  2799,
-  2801,  2805,  2811,  2814,  2816,  2818,  2820,  2824,  2827,  2830,
-  2832,  2834,  2836,  2840,  2843,  2846,  2848,  2850,  2852,  2859,
-  2870,  2874,  2879,  2883,  2888,  2890,  2894,  2897,  2899,  2903,
-  2905,  2906,  2909,  2911,  2913,  2919,  2934,  2940,  2946,  2960,
-  2962,  2966,  2980,  2982,  2984,  2988,  2994,  3007,  3009,  3013,
-  3024,  3030,  3032,  3033,  3034,  3042,  3047,  3056,  3057,  3061,
-  3064,  3070,  3076,  3079,  3081,  3083,  3085,  3089,  3093,  3097,
-  3100,  3105,  3108,  3110,  3112,  3114,  3116,  3118,  3120,  3122,
-  3126,  3130,  3134,  3138,  3139,  3141,  3143,  3145,  3147,  3149,
-  3151,  3153,  3155,  3163,  3165,  3166,  3167,  3170,  3176,  3178,
-  3183,  3185,  3188,  3202,  3205,  3208,  3212,  3215,  3222,  3224,
-  3227,  3229,  3231,  3234,  3237,  3240,  3243,  3245,  3248,  3252,
-  3254,  3260,  3262,  3263,  3265,  3270,  3272,  3274,  3276,  3278,
-  3281,  3282,  3284,  3287,  3288,  3291,  3291,  3294,  3294,  3297,
-  3297,  3299,  3301,  3303,  3305,  3311,  3317,  3320,  3323,  3329,
-  3331,  3333,  3337,  3339,  3342,  3349,  3352,  3360,  3364,  3366,
-  3369,  3371,  3374,  3378,  3380,  3383,  3385,  3388,  3405,  3411,
-  3419,  3421,  3423,  3427,  3430,  3431,  3439,  3443,  3447,  3450,
-  3451,  3457,  3460,  3463,  3465,  3469,  3474,  3477,  3487,  3492,
-  3493,  3501,  3507,  3512,  3516,  3521,  3525,  3529,  3533,  3538,
-  3549,  3563,  3567,  3570,  3572,  3576,  3580,  3583,  3586,  3588,
-  3592,  3594,  3601,  3608,  3611,  3614,  3618,  3622,  3628,  3632,
-  3637,  3639,  3642,  3647,  3653,  3664,  3667,  3669,  3673,  3678,
-  3680,  3687,  3690,  3692,  3694,  3700,  3705,  3708,  3710,  3712,
-  3714,  3716,  3718,  3720,  3722,  3724,  3726,  3728,  3730,  3732,
-  3734,  3736,  3738,  3740,  3742,  3744,  3746,  3748,  3750,  3752,
-  3754,  3756,  3758,  3760,  3762,  3764,  3766,  3768,  3770,  3773,
-  3775
+   332,   334,   348,   351,   352,   356,   358,   361,   366,   370,
+   376,   378,   381,   384,   388,   391,   393,   395,   398,   400,
+   403,   406,   408,   410,   412,   414,   416,   418,   424,   428,
+   431,   433,   437,   439,   440,   442,   446,   449,   455,   458,
+   460,   465,   468,   472,   475,   478,   481,   485,   490,   500,
+   502,   504,   506,   508,   521,   530,   540,   542,   544,   548,
+   550,   551,   558,   559,   560,   563,   566,   570,   572,   573,
+   576,   578,   581,   584,   586,   590,   593,   595,   599,   601,
+   603,   607,   609,   611,   615,   617,   619,   625,   629,   632,
+   635,   638,   643,   646,   648,   650,   656,   666,   668,   671,
+   674,   676,   679,   683,   692,   695,   697,   701,   714,   734,
+   737,   739,   740,   743,   750,   756,   758,   760,   762,   764,
+   767,   772,   774,   775,   776,   777,   780,   782,   783,   786,
+   788,   789,   792,   797,   797,   801,   801,   804,   804,   807,
+   807,   811,   811,   816,   816,   819,   819,   822,   824,   827,
+   834,   841,   847,   850,   859,   861,   869,   872,   875,   878,
+   882,   885,   888,   891,   893,   895,   897,   901,   904,   907,
+   912,   916,   921,   925,   928,   930,   934,   954,   961,   964,
+   966,   967,   968,   971,   975,   976,   980,   984,   987,   989,
+   993,   996,   999,  1003,  1006,  1008,  1010,  1012,  1019,  1023,
+  1025,  1027,  1029,  1035,  1038,  1041,  1044,  1047,  1051,  1054,
+  1057,  1061,  1063,  1067,  1071,  1073,  1077,  1080,  1087,  1090,
+  1092,  1100,  1113,  1119,  1126,  1128,  1130,  1143,  1146,  1148,
+  1150,  1152,  1154,  1156,  1158,  1160,  1162,  1164,  1166,  1168,
+  1170,  1172,  1174,  1176,  1178,  1180,  1182,  1184,  1186,  1190,
+  1192,  1194,  1211,  1214,  1215,  1216,  1217,  1218,  1221,  1224,
+  1227,  1231,  1234,  1236,  1241,  1243,  1244,  1247,  1249,  1251,
+  1253,  1257,  1260,  1264,  1266,  1267,  1268,  1272,  1280,  1281,
+  1282,  1290,  1292,  1295,  1297,  1307,  1309,  1311,  1313,  1315,
+  1317,  1320,  1322,  1366,  1367,  1371,  1375,  1379,  1383,  1385,
+  1389,  1391,  1399,  1401,  1403,  1405,  1409,  1411,  1413,  1415,
+  1420,  1422,  1424,  1426,  1429,  1431,  1433,  1477,  1480,  1484,
+  1487,  1491,  1494,  1499,  1501,  1505,  1518,  1521,  1528,  1535,
+  1540,  1542,  1547,  1549,  1556,  1558,  1562,  1566,  1572,  1576,
+  1579,  1582,  1585,  1595,  1597,  1600,  1604,  1607,  1610,  1613,
+  1616,  1622,  1628,  1630,  1635,  1637,  1646,  1649,  1651,  1654,
+  1660,  1662,  1672,  1676,  1679,  1682,  1687,  1690,  1698,  1700,
+  1702,  1704,  1707,  1710,  1725,  1744,  1747,  1749,  1752,  1754,
+  1757,  1759,  1762,  1764,  1767,  1770,  1774,  1780,  1781,  1793,
+  1800,  1803,  1809,  1813,  1818,  1824,  1825,  1833,  1836,  1840,
+  1843,  1847,  1852,  1855,  1859,  1862,  1864,  1866,  1868,  1875,
+  1877,  1878,  1879,  1883,  1886,  1890,  1893,  1899,  1901,  1904,
+  1907,  1910,  1916,  1919,  1922,  1924,  1926,  1930,  1936,  1944,
+  1946,  1950,  1952,  1957,  1960,  1963,  1965,  1967,  1971,  1975,
+  1980,  1984,  1987,  1992,  1996,  1999,  2002,  2006,  2041,  2047,
+  2056,  2076,  2078,  2081,  2083,  2088,  2090,  2092,  2094,  2096,
+  2100,  2105,  2110,  2116,  2121,  2126,  2128,  2132,  2137,  2140,
+  2147,  2175,  2181,  2183,  2186,  2189,  2191,  2195,  2197,  2201,
+  2227,  2256,  2259,  2260,  2281,  2304,  2306,  2310,  2321,  2335,
+  2424,  2431,  2434,  2442,  2453,  2462,  2466,  2481,  2484,  2489,
+  2491,  2493,  2495,  2497,  2499,  2502,  2504,  2512,  2518,  2520,
+  2523,  2526,  2528,  2539,  2544,  2547,  2552,  2555,  2556,  2567,
+  2570,  2571,  2582,  2584,  2587,  2589,  2592,  2599,  2607,  2614,
+  2620,  2626,  2634,  2638,  2643,  2647,  2650,  2659,  2661,  2665,
+  2668,  2673,  2677,  2682,  2692,  2695,  2699,  2703,  2711,  2716,
+  2722,  2725,  2727,  2729,  2735,  2738,  2740,  2742,  2744,  2748,
+  2751,  2769,  2779,  2781,  2782,  2786,  2791,  2794,  2796,  2798,
+  2800,  2804,  2810,  2813,  2815,  2817,  2819,  2823,  2826,  2829,
+  2831,  2833,  2835,  2839,  2842,  2845,  2847,  2849,  2851,  2858,
+  2869,  2873,  2878,  2882,  2887,  2889,  2893,  2896,  2898,  2902,
+  2904,  2905,  2908,  2910,  2912,  2918,  2933,  2939,  2945,  2959,
+  2961,  2965,  2979,  2981,  2983,  2987,  2993,  3006,  3008,  3012,
+  3023,  3029,  3031,  3032,  3033,  3041,  3046,  3055,  3056,  3060,
+  3063,  3069,  3075,  3078,  3080,  3082,  3084,  3088,  3092,  3096,
+  3099,  3104,  3107,  3109,  3111,  3113,  3115,  3117,  3119,  3121,
+  3125,  3129,  3133,  3137,  3138,  3140,  3142,  3144,  3146,  3148,
+  3150,  3152,  3154,  3162,  3164,  3165,  3166,  3169,  3175,  3177,
+  3182,  3184,  3187,  3201,  3204,  3207,  3211,  3214,  3221,  3223,
+  3226,  3228,  3230,  3233,  3236,  3239,  3242,  3244,  3247,  3251,
+  3253,  3259,  3261,  3262,  3264,  3269,  3271,  3273,  3275,  3277,
+  3280,  3281,  3283,  3286,  3287,  3290,  3290,  3293,  3293,  3296,
+  3296,  3298,  3300,  3302,  3304,  3310,  3316,  3319,  3322,  3328,
+  3330,  3332,  3336,  3338,  3341,  3348,  3351,  3359,  3363,  3365,
+  3368,  3370,  3373,  3377,  3379,  3382,  3384,  3387,  3404,  3410,
+  3418,  3420,  3422,  3426,  3429,  3430,  3438,  3442,  3446,  3449,
+  3450,  3456,  3459,  3462,  3464,  3468,  3473,  3476,  3486,  3491,
+  3492,  3500,  3506,  3511,  3515,  3520,  3524,  3528,  3532,  3537,
+  3548,  3562,  3566,  3569,  3571,  3575,  3579,  3582,  3585,  3587,
+  3591,  3593,  3600,  3607,  3610,  3613,  3617,  3621,  3627,  3631,
+  3636,  3638,  3641,  3646,  3652,  3663,  3666,  3668,  3672,  3677,
+  3679,  3686,  3689,  3691,  3693,  3699,  3704,  3707,  3709,  3711,
+  3713,  3715,  3717,  3719,  3721,  3723,  3725,  3727,  3729,  3731,
+  3733,  3735,  3737,  3739,  3741,  3743,  3745,  3747,  3749,  3751,
+  3753,  3755,  3757,  3759,  3761,  3763,  3765,  3767,  3769,  3772,
+  3774
 };
 #endif
 
@@ -3496,7 +3495,7 @@ static const short yycheck[] = {     4,
     80,    81,    82,    83,    84,    85
 };
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/lib/bison.simple"
+#line 3 "/usr/cygnus/progressive-97r2/share/bison.simple"
 
 /* Skeleton output parser for bison,
    Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -3689,7 +3688,7 @@ __yy_memcpy (char *to, char *from, int count)
 #endif
 #endif
 
-#line 196 "/usr/lib/bison.simple"
+#line 196 "/usr/cygnus/progressive-97r2/share/bison.simple"
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
@@ -3994,7 +3993,7 @@ yyreduce:
   switch (yyn) {
 
 case 2:
-#line 336 "parse.y"
+#line 335 "parse.y"
 {
 		  /* In case there were missing closebraces,
 		     get us back to the global binding level.  */
@@ -4004,98 +4003,98 @@ case 2:
 		;
     break;}
 case 3:
-#line 350 "parse.y"
+#line 349 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 4:
-#line 352 "parse.y"
+#line 351 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 5:
-#line 354 "parse.y"
+#line 353 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 8:
-#line 363 "parse.y"
+#line 362 "parse.y"
 { have_extern_spec = 1;
 		  used_extern_spec = 0;
 		  yyval.ttype = NULL_TREE; ;
     break;}
 case 9:
-#line 368 "parse.y"
+#line 367 "parse.y"
 { have_extern_spec = 0; ;
     break;}
 case 10:
-#line 373 "parse.y"
+#line 372 "parse.y"
 { yyval.itype = pedantic;
 		  pedantic = 0; ;
     break;}
 case 13:
-#line 383 "parse.y"
+#line 382 "parse.y"
 { if (pending_lang_change) do_pending_lang_change(); ;
     break;}
 case 14:
-#line 385 "parse.y"
+#line 384 "parse.y"
 { if (! toplevel_bindings_p () && ! pseudo_global_level_p())
 		  pop_everything (); ;
     break;}
 case 15:
-#line 391 "parse.y"
+#line 390 "parse.y"
 { if (pending_inlines) do_pending_inlines (); ;
     break;}
 case 16:
-#line 393 "parse.y"
+#line 392 "parse.y"
 { if (pending_inlines) do_pending_inlines (); ;
     break;}
 case 17:
-#line 395 "parse.y"
+#line 394 "parse.y"
 { if (pending_inlines) do_pending_inlines (); ;
     break;}
 case 18:
-#line 397 "parse.y"
+#line 396 "parse.y"
 { if (TREE_CHAIN (yyvsp[-2].ttype)) yyvsp[-2].ttype = combine_strings (yyvsp[-2].ttype);
 		  assemble_asm (yyvsp[-2].ttype); ;
     break;}
 case 19:
-#line 400 "parse.y"
+#line 399 "parse.y"
 { pop_lang_context (); ;
     break;}
 case 20:
-#line 402 "parse.y"
+#line 401 "parse.y"
 { if (pending_inlines) do_pending_inlines ();
 		  pop_lang_context (); ;
     break;}
 case 21:
-#line 405 "parse.y"
+#line 404 "parse.y"
 { if (pending_inlines) do_pending_inlines ();
 		  pop_lang_context (); ;
     break;}
 case 22:
-#line 408 "parse.y"
+#line 407 "parse.y"
 { push_namespace (yyvsp[-1].ttype); ;
     break;}
 case 23:
-#line 410 "parse.y"
+#line 409 "parse.y"
 { pop_namespace (); ;
     break;}
 case 24:
-#line 412 "parse.y"
+#line 411 "parse.y"
 { push_namespace (NULL_TREE); ;
     break;}
 case 25:
-#line 414 "parse.y"
+#line 413 "parse.y"
 { pop_namespace (); ;
     break;}
 case 26:
-#line 416 "parse.y"
+#line 415 "parse.y"
 { do_namespace_alias (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 27:
-#line 418 "parse.y"
+#line 417 "parse.y"
 { do_toplevel_using_decl (yyvsp[-1].ttype); ;
     break;}
 case 28:
-#line 420 "parse.y"
+#line 419 "parse.y"
 {
 		  if (TREE_CODE (yyvsp[-1].ttype) == IDENTIFIER_NODE)
 		    yyvsp[-1].ttype = lastiddecl;
@@ -4103,102 +4102,102 @@ case 28:
 		;
     break;}
 case 29:
-#line 426 "parse.y"
+#line 425 "parse.y"
 { pedantic = yyvsp[-1].itype; ;
     break;}
 case 30:
-#line 431 "parse.y"
+#line 430 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 31:
-#line 433 "parse.y"
+#line 432 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 32:
-#line 435 "parse.y"
+#line 434 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 35:
-#line 442 "parse.y"
+#line 441 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 36:
-#line 444 "parse.y"
+#line 443 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 37:
-#line 449 "parse.y"
+#line 448 "parse.y"
 { push_lang_context (yyvsp[0].ttype); ;
     break;}
 case 38:
-#line 451 "parse.y"
+#line 450 "parse.y"
 { if (current_lang_name != yyvsp[0].ttype)
 		    cp_error ("use of linkage spec `%D' is different from previous spec `%D'", yyvsp[0].ttype, current_lang_name);
 		  pop_lang_context (); push_lang_context (yyvsp[0].ttype); ;
     break;}
 case 39:
-#line 458 "parse.y"
+#line 457 "parse.y"
 { begin_template_parm_list (); ;
     break;}
 case 40:
-#line 460 "parse.y"
+#line 459 "parse.y"
 { yyval.ttype = end_template_parm_list (yyvsp[-1].ttype); ;
     break;}
 case 41:
-#line 462 "parse.y"
+#line 461 "parse.y"
 { begin_specialization(); 
 		  yyval.ttype = NULL_TREE; ;
     break;}
 case 42:
-#line 468 "parse.y"
+#line 467 "parse.y"
 { yyval.ttype = process_template_parm (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 43:
-#line 470 "parse.y"
+#line 469 "parse.y"
 { yyval.ttype = process_template_parm (yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 44:
-#line 475 "parse.y"
+#line 474 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 45:
-#line 477 "parse.y"
+#line 476 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 46:
-#line 481 "parse.y"
+#line 480 "parse.y"
 { yyval.ttype = finish_template_type_parm (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 47:
-#line 483 "parse.y"
+#line 482 "parse.y"
 { yyval.ttype = finish_template_type_parm (class_type_node, yyvsp[0].ttype); ;
     break;}
 case 48:
-#line 488 "parse.y"
+#line 487 "parse.y"
 { yyval.ttype = finish_template_template_parm (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 49:
-#line 500 "parse.y"
+#line 499 "parse.y"
 { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 50:
-#line 502 "parse.y"
+#line 501 "parse.y"
 { yyval.ttype = build_tree_list (groktypename (yyvsp[0].ftype.t), yyvsp[-2].ttype); ;
     break;}
 case 51:
-#line 504 "parse.y"
+#line 503 "parse.y"
 { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ftype.t); ;
     break;}
 case 52:
-#line 506 "parse.y"
+#line 505 "parse.y"
 { yyval.ttype = build_tree_list (yyvsp[0].ttype, yyvsp[-2].ftype.t); ;
     break;}
 case 53:
-#line 508 "parse.y"
+#line 507 "parse.y"
 { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 54:
-#line 510 "parse.y"
+#line 509 "parse.y"
 {
 		  if (TREE_CODE (yyvsp[0].ttype) != TEMPLATE_DECL
 		      && TREE_CODE (yyvsp[0].ttype) != TEMPLATE_TEMPLATE_PARM
@@ -4211,7 +4210,7 @@ case 54:
 		;
     break;}
 case 55:
-#line 525 "parse.y"
+#line 524 "parse.y"
 { 
                   if (yyvsp[-1].ttype) 
                     end_template_decl (); 
@@ -4220,7 +4219,7 @@ case 55:
 		;
     break;}
 case 56:
-#line 533 "parse.y"
+#line 532 "parse.y"
 { 
                   if (yyvsp[-1].ttype) 
                     end_template_decl ();
@@ -4229,21 +4228,21 @@ case 56:
                 ;
     break;}
 case 58:
-#line 544 "parse.y"
+#line 543 "parse.y"
 {;
     break;}
 case 59:
-#line 546 "parse.y"
+#line 545 "parse.y"
 {
 		  note_list_got_semicolon (yyvsp[-2].ftype.t);
 		;
     break;}
 case 60:
-#line 550 "parse.y"
+#line 549 "parse.y"
 { pedwarn ("empty declaration"); ;
     break;}
 case 62:
-#line 553 "parse.y"
+#line 552 "parse.y"
 {
 		  tree t, attrs;
 		  split_specs_attrs (yyvsp[-1].ftype.t, &t, &attrs);
@@ -4252,124 +4251,124 @@ case 62:
 		;
     break;}
 case 66:
-#line 566 "parse.y"
+#line 565 "parse.y"
 { yyval.itype = 0; ;
     break;}
 case 67:
-#line 568 "parse.y"
+#line 567 "parse.y"
 { yyval.itype = 1; ;
     break;}
 case 73:
-#line 584 "parse.y"
+#line 583 "parse.y"
 { finish_function (lineno, (int)yyvsp[-1].itype, 0); ;
     break;}
 case 74:
-#line 586 "parse.y"
+#line 585 "parse.y"
 { ;
     break;}
 case 75:
-#line 588 "parse.y"
+#line 587 "parse.y"
 { ;
     break;}
 case 76:
-#line 593 "parse.y"
+#line 592 "parse.y"
 { yyval.ttype = begin_constructor_declarator (yyvsp[-2].ttype, yyvsp[-1].ttype); ;
     break;}
 case 77:
-#line 595 "parse.y"
+#line 594 "parse.y"
 { yyval.ttype = make_call_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 78:
-#line 597 "parse.y"
+#line 596 "parse.y"
 { yyval.ttype = begin_constructor_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype); 
 		  yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype);
 		;
     break;}
 case 79:
-#line 601 "parse.y"
+#line 600 "parse.y"
 { yyval.ttype = begin_constructor_declarator (yyvsp[-2].ttype, yyvsp[-1].ttype); ;
     break;}
 case 80:
-#line 603 "parse.y"
+#line 602 "parse.y"
 { yyval.ttype = make_call_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 81:
-#line 605 "parse.y"
+#line 604 "parse.y"
 { yyval.ttype = begin_constructor_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype);
 		  yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype);
 		;
     break;}
 case 82:
-#line 609 "parse.y"
+#line 608 "parse.y"
 { yyval.ttype = begin_constructor_declarator (yyvsp[-2].ttype, yyvsp[-1].ttype); ;
     break;}
 case 83:
-#line 611 "parse.y"
+#line 610 "parse.y"
 { yyval.ttype = make_call_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 84:
-#line 613 "parse.y"
+#line 612 "parse.y"
 { yyval.ttype = begin_constructor_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype);
 		  yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype);
 		;
     break;}
 case 85:
-#line 617 "parse.y"
+#line 616 "parse.y"
 { yyval.ttype = begin_constructor_declarator (yyvsp[-2].ttype, yyvsp[-1].ttype); ;
     break;}
 case 86:
-#line 619 "parse.y"
+#line 618 "parse.y"
 { yyval.ttype = make_call_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 87:
-#line 621 "parse.y"
+#line 620 "parse.y"
 { yyval.ttype = begin_constructor_declarator (yyvsp[-4].ttype, yyvsp[-3].ttype); 
 		  yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype);
 		;
     break;}
 case 88:
-#line 628 "parse.y"
+#line 627 "parse.y"
 { if (!begin_function_definition (yyvsp[-1].ftype.t, yyvsp[0].ttype))
 		    YYERROR1; ;
     break;}
 case 89:
-#line 631 "parse.y"
+#line 630 "parse.y"
 { if (!begin_function_definition (yyvsp[-1].ttype, yyvsp[0].ttype))
 		    YYERROR1; ;
     break;}
 case 90:
-#line 634 "parse.y"
+#line 633 "parse.y"
 { if (!begin_function_definition (NULL_TREE, yyvsp[0].ttype))
 		    YYERROR1; ;
     break;}
 case 91:
-#line 637 "parse.y"
+#line 636 "parse.y"
 { if (!begin_function_definition (yyvsp[-1].ttype, yyvsp[0].ttype))
 		    YYERROR1; ;
     break;}
 case 92:
-#line 640 "parse.y"
+#line 639 "parse.y"
 { if (!begin_function_definition (NULL_TREE, yyvsp[0].ttype))
 		    YYERROR1; ;
     break;}
 case 93:
-#line 646 "parse.y"
+#line 645 "parse.y"
 { yyval.ttype = make_call_declarator (yyvsp[-5].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 94:
-#line 648 "parse.y"
+#line 647 "parse.y"
 { yyval.ttype = make_call_declarator (yyvsp[-3].ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 95:
-#line 650 "parse.y"
+#line 649 "parse.y"
 { yyval.ttype = make_call_declarator (yyvsp[-5].ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 96:
-#line 652 "parse.y"
+#line 651 "parse.y"
 { yyval.ttype = make_call_declarator (yyvsp[-3].ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 97:
-#line 659 "parse.y"
+#line 658 "parse.y"
 { tree specs = strip_attrs (yyvsp[-1].ttype);
 		  yyval.ttype = start_method (specs, yyvsp[0].ttype);
 		 rest_of_mdef:
@@ -4380,34 +4379,34 @@ case 97:
 		  reinit_parse_for_method (yychar, yyval.ttype); ;
     break;}
 case 98:
-#line 668 "parse.y"
+#line 667 "parse.y"
 { yyval.ttype = start_method (NULL_TREE, yyvsp[0].ttype); goto rest_of_mdef; ;
     break;}
 case 99:
-#line 670 "parse.y"
+#line 669 "parse.y"
 { tree specs = strip_attrs (yyvsp[-1].ftype.t);
 		  yyval.ttype = start_method (specs, yyvsp[0].ttype); goto rest_of_mdef; ;
     break;}
 case 100:
-#line 673 "parse.y"
+#line 672 "parse.y"
 { tree specs = strip_attrs (yyvsp[-1].ttype);
 		  yyval.ttype = start_method (specs, yyvsp[0].ttype); goto rest_of_mdef; ;
     break;}
 case 101:
-#line 676 "parse.y"
+#line 675 "parse.y"
 { yyval.ttype = start_method (NULL_TREE, yyval.ttype); goto rest_of_mdef; ;
     break;}
 case 102:
-#line 678 "parse.y"
+#line 677 "parse.y"
 { tree specs = strip_attrs (yyvsp[-1].ttype);
 		  yyval.ttype = start_method (specs, yyvsp[0].ttype); goto rest_of_mdef; ;
     break;}
 case 103:
-#line 681 "parse.y"
+#line 680 "parse.y"
 { yyval.ttype = start_method (NULL_TREE, yyval.ttype); goto rest_of_mdef; ;
     break;}
 case 104:
-#line 686 "parse.y"
+#line 685 "parse.y"
 {
 		  if (! current_function_parms_stored)
 		    store_parm_decls ();
@@ -4415,19 +4414,19 @@ case 104:
 		;
     break;}
 case 105:
-#line 695 "parse.y"
+#line 694 "parse.y"
 { store_return_init (yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 106:
-#line 697 "parse.y"
+#line 696 "parse.y"
 { store_return_init (yyval.ttype, yyvsp[-1].ttype); ;
     break;}
 case 107:
-#line 699 "parse.y"
+#line 698 "parse.y"
 { store_return_init (yyval.ttype, NULL_TREE); ;
     break;}
 case 108:
-#line 704 "parse.y"
+#line 703 "parse.y"
 {
 		  if (yyvsp[0].itype == 0)
 		    error ("no base initializers given following ':'");
@@ -4439,7 +4438,7 @@ case 108:
 		;
     break;}
 case 109:
-#line 717 "parse.y"
+#line 716 "parse.y"
 {
 		  if (! current_function_parms_stored)
 		    store_parm_decls ();
@@ -4458,15 +4457,15 @@ case 109:
 		;
     break;}
 case 110:
-#line 737 "parse.y"
+#line 736 "parse.y"
 { yyval.itype = 0; ;
     break;}
 case 111:
-#line 739 "parse.y"
+#line 738 "parse.y"
 { yyval.itype = 1; ;
     break;}
 case 114:
-#line 746 "parse.y"
+#line 745 "parse.y"
 {
 		  if (current_class_name)
 		    pedwarn ("anachronistic old style base class initializer");
@@ -4474,7 +4473,7 @@ case 114:
 		;
     break;}
 case 115:
-#line 752 "parse.y"
+#line 751 "parse.y"
 {
 		  if (current_class_name)
 		    pedwarn ("anachronistic old style base class initializer");
@@ -4482,77 +4481,77 @@ case 115:
 		;
     break;}
 case 116:
-#line 758 "parse.y"
+#line 757 "parse.y"
 { expand_member_init (current_class_ref, yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 117:
-#line 760 "parse.y"
+#line 759 "parse.y"
 { expand_member_init (current_class_ref, yyvsp[-1].ttype, void_type_node); ;
     break;}
 case 118:
-#line 762 "parse.y"
+#line 761 "parse.y"
 { expand_member_init (current_class_ref, yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 119:
-#line 764 "parse.y"
+#line 763 "parse.y"
 { expand_member_init (current_class_ref, yyvsp[-1].ttype, void_type_node); ;
     break;}
 case 120:
-#line 766 "parse.y"
+#line 765 "parse.y"
 { expand_member_init (current_class_ref, TYPE_MAIN_DECL (yyvsp[-3].ttype),
 				      yyvsp[-1].ttype); ;
     break;}
 case 121:
-#line 769 "parse.y"
+#line 768 "parse.y"
 { expand_member_init (current_class_ref, TYPE_MAIN_DECL (yyvsp[-1].ttype),
 				      void_type_node); ;
     break;}
 case 133:
-#line 795 "parse.y"
+#line 794 "parse.y"
 { do_type_instantiation (yyvsp[-1].ftype.t, NULL_TREE);
 		  yyungetc (';', 1); ;
     break;}
 case 135:
-#line 799 "parse.y"
+#line 798 "parse.y"
 { tree specs = strip_attrs (yyvsp[-1].ftype.t);
 		  do_decl_instantiation (specs, yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 137:
-#line 803 "parse.y"
+#line 802 "parse.y"
 { do_decl_instantiation (NULL_TREE, yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 139:
-#line 806 "parse.y"
+#line 805 "parse.y"
 { do_decl_instantiation (NULL_TREE, yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 141:
-#line 809 "parse.y"
+#line 808 "parse.y"
 { do_type_instantiation (yyvsp[-1].ftype.t, yyvsp[-4].ttype);
 		  yyungetc (';', 1); ;
     break;}
 case 143:
-#line 814 "parse.y"
+#line 813 "parse.y"
 { tree specs = strip_attrs (yyvsp[-1].ftype.t);
 		  do_decl_instantiation (specs, yyvsp[0].ttype, yyvsp[-4].ttype); ;
     break;}
 case 145:
-#line 818 "parse.y"
+#line 817 "parse.y"
 { do_decl_instantiation (NULL_TREE, yyvsp[0].ttype, yyvsp[-3].ttype); ;
     break;}
 case 147:
-#line 821 "parse.y"
+#line 820 "parse.y"
 { do_decl_instantiation (NULL_TREE, yyvsp[0].ttype, yyvsp[-3].ttype); ;
     break;}
 case 149:
-#line 826 "parse.y"
+#line 825 "parse.y"
 { begin_explicit_instantiation(); ;
     break;}
 case 150:
-#line 829 "parse.y"
+#line 828 "parse.y"
 { end_explicit_instantiation(); ;
     break;}
 case 151:
-#line 837 "parse.y"
+#line 836 "parse.y"
 {
 		  yyval.ttype = lookup_template_class (yyvsp[-3].ttype, yyvsp[-1].ttype, NULL_TREE, NULL_TREE);
 		  if (yyval.ttype != error_mark_node)
@@ -4560,7 +4559,7 @@ case 151:
 		;
     break;}
 case 152:
-#line 843 "parse.y"
+#line 842 "parse.y"
 {
 		  yyval.ttype = lookup_template_class (yyvsp[-3].ttype, yyvsp[-1].ttype, NULL_TREE, NULL_TREE);
 		  if (yyval.ttype != error_mark_node)
@@ -4568,7 +4567,7 @@ case 152:
 		;
     break;}
 case 154:
-#line 853 "parse.y"
+#line 852 "parse.y"
 {
 		  yyval.ttype = lookup_template_class (yyvsp[-3].ttype, yyvsp[-1].ttype, NULL_TREE, NULL_TREE);
 		  if (yyval.ttype != error_mark_node)
@@ -4576,7 +4575,7 @@ case 154:
 		;
     break;}
 case 156:
-#line 863 "parse.y"
+#line 862 "parse.y"
 {
 		  /* Handle `Class<Class<Type>>' without space in the `>>' */
 		  pedwarn ("`>>' should be `> >' in template class name");
@@ -4584,79 +4583,79 @@ case 156:
 		;
     break;}
 case 157:
-#line 872 "parse.y"
+#line 871 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 159:
-#line 878 "parse.y"
+#line 877 "parse.y"
 { yyval.ttype = build_tree_list (NULL_TREE, yyval.ttype); ;
     break;}
 case 160:
-#line 880 "parse.y"
+#line 879 "parse.y"
 { yyval.ttype = chainon (yyval.ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ;
     break;}
 case 161:
-#line 885 "parse.y"
+#line 884 "parse.y"
 { yyval.ttype = groktypename (yyvsp[0].ftype.t); ;
     break;}
 case 163:
-#line 891 "parse.y"
+#line 890 "parse.y"
 { yyval.code = NEGATE_EXPR; ;
     break;}
 case 164:
-#line 893 "parse.y"
+#line 892 "parse.y"
 { yyval.code = CONVERT_EXPR; ;
     break;}
 case 165:
-#line 895 "parse.y"
+#line 894 "parse.y"
 { yyval.code = PREINCREMENT_EXPR; ;
     break;}
 case 166:
-#line 897 "parse.y"
+#line 896 "parse.y"
 { yyval.code = PREDECREMENT_EXPR; ;
     break;}
 case 167:
-#line 899 "parse.y"
+#line 898 "parse.y"
 { yyval.code = TRUTH_NOT_EXPR; ;
     break;}
 case 168:
-#line 904 "parse.y"
+#line 903 "parse.y"
 { yyval.ttype = build_x_compound_expr (yyval.ttype); ;
     break;}
 case 170:
-#line 910 "parse.y"
+#line 909 "parse.y"
 { error ("ANSI C++ forbids an empty condition for `%s'",
 			 cond_stmt_keyword);
 		  yyval.ttype = integer_zero_node; ;
     break;}
 case 171:
-#line 914 "parse.y"
+#line 913 "parse.y"
 { yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 172:
-#line 919 "parse.y"
+#line 918 "parse.y"
 { error ("ANSI C++ forbids an empty condition for `%s'",
 			 cond_stmt_keyword);
 		  yyval.ttype = integer_zero_node; ;
     break;}
 case 173:
-#line 923 "parse.y"
+#line 922 "parse.y"
 { yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 174:
-#line 928 "parse.y"
+#line 927 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 175:
-#line 930 "parse.y"
+#line 929 "parse.y"
 { yyval.ttype = condition_conversion (yyval.ttype); ;
     break;}
 case 176:
-#line 932 "parse.y"
+#line 931 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 177:
-#line 937 "parse.y"
+#line 936 "parse.y"
 { {
 		  tree d;
 		  for (d = getdecls (); d; d = TREE_CHAIN (d))
@@ -4676,7 +4675,7 @@ case 177:
 		;
     break;}
 case 178:
-#line 955 "parse.y"
+#line 954 "parse.y"
 { 
 		  cp_finish_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-3].ttype, 1, LOOKUP_ONLYCONVERTING);
 		  resume_momentary (yyvsp[-2].itype);
@@ -4686,58 +4685,58 @@ case 178:
 		;
     break;}
 case 184:
-#line 974 "parse.y"
+#line 973 "parse.y"
 { yyval.ttype = begin_compound_stmt (1); ;
     break;}
 case 185:
-#line 976 "parse.y"
+#line 975 "parse.y"
 { finish_compound_stmt (1, yyvsp[-1].ttype); ;
     break;}
 case 187:
-#line 983 "parse.y"
+#line 982 "parse.y"
 { yyval.ttype = expr_tree_cons (NULL_TREE, yyval.ttype, 
 		                  build_expr_list (NULL_TREE, yyvsp[0].ttype)); ;
     break;}
 case 188:
-#line 986 "parse.y"
+#line 985 "parse.y"
 { yyval.ttype = expr_tree_cons (NULL_TREE, yyval.ttype, 
 		                  build_expr_list (NULL_TREE, error_mark_node)); ;
     break;}
 case 189:
-#line 989 "parse.y"
+#line 988 "parse.y"
 { chainon (yyval.ttype, build_expr_list (NULL_TREE, yyvsp[0].ttype)); ;
     break;}
 case 190:
-#line 991 "parse.y"
+#line 990 "parse.y"
 { chainon (yyval.ttype, build_expr_list (NULL_TREE, error_mark_node)); ;
     break;}
 case 191:
-#line 996 "parse.y"
+#line 995 "parse.y"
 { yyval.ttype = build_expr_list (NULL_TREE, yyval.ttype); ;
     break;}
 case 193:
-#line 1002 "parse.y"
+#line 1001 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 194:
-#line 1005 "parse.y"
+#line 1004 "parse.y"
 { yyval.ttype = yyvsp[0].ttype;
 		  pedantic = yyvsp[-1].itype; ;
     break;}
 case 195:
-#line 1008 "parse.y"
+#line 1007 "parse.y"
 { yyval.ttype = build_x_indirect_ref (yyvsp[0].ttype, "unary *"); ;
     break;}
 case 196:
-#line 1010 "parse.y"
+#line 1009 "parse.y"
 { yyval.ttype = build_x_unary_op (ADDR_EXPR, yyvsp[0].ttype); ;
     break;}
 case 197:
-#line 1012 "parse.y"
+#line 1011 "parse.y"
 { yyval.ttype = build_x_unary_op (BIT_NOT_EXPR, yyvsp[0].ttype); ;
     break;}
 case 198:
-#line 1014 "parse.y"
+#line 1013 "parse.y"
 { yyval.ttype = build_x_unary_op (yyvsp[-1].code, yyvsp[0].ttype);
 		  if (yyvsp[-1].code == NEGATE_EXPR && TREE_CODE (yyvsp[0].ttype) == INTEGER_CST)
 		    TREE_NEGATED_INT (yyval.ttype) = 1;
@@ -4745,121 +4744,121 @@ case 198:
 		;
     break;}
 case 199:
-#line 1021 "parse.y"
+#line 1020 "parse.y"
 { if (pedantic)
 		    pedwarn ("ANSI C++ forbids `&&'");
   		  yyval.ttype = finish_label_address_expr (yyvsp[0].ttype); ;
     break;}
 case 200:
-#line 1025 "parse.y"
+#line 1024 "parse.y"
 { yyval.ttype = expr_sizeof (yyvsp[0].ttype); ;
     break;}
 case 201:
-#line 1027 "parse.y"
+#line 1026 "parse.y"
 { yyval.ttype = c_sizeof (groktypename (yyvsp[-1].ftype.t)); ;
     break;}
 case 202:
-#line 1029 "parse.y"
+#line 1028 "parse.y"
 { yyval.ttype = grok_alignof (yyvsp[0].ttype); ;
     break;}
 case 203:
-#line 1031 "parse.y"
+#line 1030 "parse.y"
 { yyval.ttype = c_alignof (groktypename (yyvsp[-1].ftype.t)); 
 		  check_for_new_type ("alignof", yyvsp[-1].ftype); ;
     break;}
 case 204:
-#line 1037 "parse.y"
+#line 1036 "parse.y"
 { yyval.ttype = build_new (NULL_TREE, yyvsp[0].ftype.t, NULL_TREE, yyvsp[-1].itype); 
 		  check_for_new_type ("new", yyvsp[0].ftype); ;
     break;}
 case 205:
-#line 1040 "parse.y"
+#line 1039 "parse.y"
 { yyval.ttype = build_new (NULL_TREE, yyvsp[-1].ftype.t, yyvsp[0].ttype, yyvsp[-2].itype); 
 		  check_for_new_type ("new", yyvsp[-1].ftype); ;
     break;}
 case 206:
-#line 1043 "parse.y"
+#line 1042 "parse.y"
 { yyval.ttype = build_new (yyvsp[-1].ttype, yyvsp[0].ftype.t, NULL_TREE, yyvsp[-2].itype); 
 		  check_for_new_type ("new", yyvsp[0].ftype); ;
     break;}
 case 207:
-#line 1046 "parse.y"
+#line 1045 "parse.y"
 { yyval.ttype = build_new (yyvsp[-2].ttype, yyvsp[-1].ftype.t, yyvsp[0].ttype, yyvsp[-3].itype); 
 		  check_for_new_type ("new", yyvsp[-1].ftype); ;
     break;}
 case 208:
-#line 1049 "parse.y"
+#line 1048 "parse.y"
 { yyval.ttype = build_new (NULL_TREE, groktypename(yyvsp[-1].ftype.t),
 				  NULL_TREE, yyvsp[-3].itype); 
 		  check_for_new_type ("new", yyvsp[-1].ftype); ;
     break;}
 case 209:
-#line 1053 "parse.y"
+#line 1052 "parse.y"
 { yyval.ttype = build_new (NULL_TREE, groktypename(yyvsp[-2].ftype.t), yyvsp[0].ttype, yyvsp[-4].itype); 
 		  check_for_new_type ("new", yyvsp[-2].ftype); ;
     break;}
 case 210:
-#line 1056 "parse.y"
+#line 1055 "parse.y"
 { yyval.ttype = build_new (yyvsp[-3].ttype, groktypename(yyvsp[-1].ftype.t), NULL_TREE, yyvsp[-4].itype); 
 		  check_for_new_type ("new", yyvsp[-1].ftype); ;
     break;}
 case 211:
-#line 1059 "parse.y"
+#line 1058 "parse.y"
 { yyval.ttype = build_new (yyvsp[-4].ttype, groktypename(yyvsp[-2].ftype.t), yyvsp[0].ttype, yyvsp[-5].itype); 
 		  check_for_new_type ("new", yyvsp[-2].ftype); ;
     break;}
 case 212:
-#line 1063 "parse.y"
+#line 1062 "parse.y"
 { yyval.ttype = delete_sanity (yyvsp[0].ttype, NULL_TREE, 0, yyvsp[-1].itype); ;
     break;}
 case 213:
-#line 1065 "parse.y"
+#line 1064 "parse.y"
 { yyval.ttype = delete_sanity (yyvsp[0].ttype, NULL_TREE, 1, yyvsp[-3].itype);
 		  if (yychar == YYEMPTY)
 		    yychar = YYLEX; ;
     break;}
 case 214:
-#line 1069 "parse.y"
+#line 1068 "parse.y"
 { yyval.ttype = delete_sanity (yyvsp[0].ttype, yyvsp[-2].ttype, 2, yyvsp[-4].itype);
 		  if (yychar == YYEMPTY)
 		    yychar = YYLEX; ;
     break;}
 case 215:
-#line 1073 "parse.y"
+#line 1072 "parse.y"
 { yyval.ttype = build_x_unary_op (REALPART_EXPR, yyvsp[0].ttype); ;
     break;}
 case 216:
-#line 1075 "parse.y"
+#line 1074 "parse.y"
 { yyval.ttype = build_x_unary_op (IMAGPART_EXPR, yyvsp[0].ttype); ;
     break;}
 case 217:
-#line 1080 "parse.y"
+#line 1079 "parse.y"
 { yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 218:
-#line 1082 "parse.y"
+#line 1081 "parse.y"
 {
 		  yyval.ttype = yyvsp[-1].ttype; 
 		  pedwarn ("old style placement syntax, use () instead");
 		;
     break;}
 case 219:
-#line 1090 "parse.y"
+#line 1089 "parse.y"
 { yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 220:
-#line 1092 "parse.y"
+#line 1091 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 221:
-#line 1094 "parse.y"
+#line 1093 "parse.y"
 {
 		  cp_error ("`%T' is not a valid expression", yyvsp[-1].ftype.t);
 		  yyval.ttype = error_mark_node;
 		;
     break;}
 case 222:
-#line 1102 "parse.y"
+#line 1101 "parse.y"
 {
 		  if (pedantic)
 		    pedwarn ("ANSI C++ forbids initialization of new expression with `='");
@@ -4871,25 +4870,25 @@ case 222:
 		;
     break;}
 case 223:
-#line 1116 "parse.y"
+#line 1115 "parse.y"
 { yyvsp[-1].ftype.t = tree_cons (NULL_TREE, yyvsp[-1].ftype.t, void_list_node);
 		  TREE_PARMLIST (yyvsp[-1].ftype.t) = 1;
 		  yyval.ttype = make_call_declarator (NULL_TREE, yyvsp[-1].ftype.t, NULL_TREE, NULL_TREE);
 		  check_for_new_type ("cast", yyvsp[-1].ftype); ;
     break;}
 case 224:
-#line 1121 "parse.y"
+#line 1120 "parse.y"
 { yyvsp[-1].ftype.t = tree_cons (NULL_TREE, yyvsp[-1].ftype.t, void_list_node);
 		  TREE_PARMLIST (yyvsp[-1].ftype.t) = 1;
 		  yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-1].ftype.t, NULL_TREE, NULL_TREE);
 		  check_for_new_type ("cast", yyvsp[-1].ftype); ;
     break;}
 case 226:
-#line 1130 "parse.y"
+#line 1129 "parse.y"
 { yyval.ttype = reparse_absdcl_as_casts (yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 227:
-#line 1132 "parse.y"
+#line 1131 "parse.y"
 { 
 		  tree init = build_nt (CONSTRUCTOR, NULL_TREE,
 					nreverse (yyvsp[-2].ttype)); 
@@ -4902,157 +4901,157 @@ case 227:
 		;
     break;}
 case 229:
-#line 1148 "parse.y"
+#line 1147 "parse.y"
 { yyval.ttype = build_x_binary_op (MEMBER_REF, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 230:
-#line 1150 "parse.y"
+#line 1149 "parse.y"
 { yyval.ttype = build_m_component_ref (yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 231:
-#line 1152 "parse.y"
+#line 1151 "parse.y"
 { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 232:
-#line 1154 "parse.y"
+#line 1153 "parse.y"
 { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 233:
-#line 1156 "parse.y"
+#line 1155 "parse.y"
 { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 234:
-#line 1158 "parse.y"
+#line 1157 "parse.y"
 { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 235:
-#line 1160 "parse.y"
+#line 1159 "parse.y"
 { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 236:
-#line 1162 "parse.y"
+#line 1161 "parse.y"
 { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 237:
-#line 1164 "parse.y"
+#line 1163 "parse.y"
 { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 238:
-#line 1166 "parse.y"
+#line 1165 "parse.y"
 { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 239:
-#line 1168 "parse.y"
+#line 1167 "parse.y"
 { yyval.ttype = build_x_binary_op (LT_EXPR, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 240:
-#line 1170 "parse.y"
+#line 1169 "parse.y"
 { yyval.ttype = build_x_binary_op (GT_EXPR, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 241:
-#line 1172 "parse.y"
+#line 1171 "parse.y"
 { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 242:
-#line 1174 "parse.y"
+#line 1173 "parse.y"
 { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 243:
-#line 1176 "parse.y"
+#line 1175 "parse.y"
 { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 244:
-#line 1178 "parse.y"
+#line 1177 "parse.y"
 { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 245:
-#line 1180 "parse.y"
+#line 1179 "parse.y"
 { yyval.ttype = build_x_binary_op (yyvsp[-1].code, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 246:
-#line 1182 "parse.y"
+#line 1181 "parse.y"
 { yyval.ttype = build_x_binary_op (TRUTH_ANDIF_EXPR, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 247:
-#line 1184 "parse.y"
+#line 1183 "parse.y"
 { yyval.ttype = build_x_binary_op (TRUTH_ORIF_EXPR, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 248:
-#line 1186 "parse.y"
+#line 1185 "parse.y"
 { yyval.ttype = build_x_conditional_expr (yyval.ttype, yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 249:
-#line 1188 "parse.y"
+#line 1187 "parse.y"
 { yyval.ttype = build_x_modify_expr (yyval.ttype, NOP_EXPR, yyvsp[0].ttype);
 		  if (yyval.ttype != error_mark_node)
                     C_SET_EXP_ORIGINAL_CODE (yyval.ttype, MODIFY_EXPR); ;
     break;}
 case 250:
-#line 1192 "parse.y"
+#line 1191 "parse.y"
 { yyval.ttype = build_x_modify_expr (yyval.ttype, yyvsp[-1].code, yyvsp[0].ttype); ;
     break;}
 case 251:
-#line 1194 "parse.y"
+#line 1193 "parse.y"
 { yyval.ttype = build_throw (NULL_TREE); ;
     break;}
 case 252:
-#line 1196 "parse.y"
+#line 1195 "parse.y"
 { yyval.ttype = build_throw (yyvsp[0].ttype); ;
     break;}
 case 253:
-#line 1214 "parse.y"
+#line 1213 "parse.y"
 { yyval.ttype = build_parse_node (BIT_NOT_EXPR, yyvsp[0].ttype); ;
     break;}
 case 259:
-#line 1223 "parse.y"
+#line 1222 "parse.y"
 { yyval.ttype = do_identifier (yyvsp[-1].ttype, 1); ;
     break;}
 case 260:
-#line 1227 "parse.y"
+#line 1226 "parse.y"
 { yyval.ttype = lookup_template_function (yyvsp[-2].ttype, yyvsp[-1].ttype); ;
     break;}
 case 261:
-#line 1229 "parse.y"
+#line 1228 "parse.y"
 { yyval.ttype = lookup_template_function (yyvsp[-2].ttype, yyvsp[-1].ttype); ;
     break;}
 case 262:
-#line 1234 "parse.y"
+#line 1233 "parse.y"
 { yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 263:
-#line 1236 "parse.y"
+#line 1235 "parse.y"
 { yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 264:
-#line 1239 "parse.y"
+#line 1238 "parse.y"
 { yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 269:
-#line 1251 "parse.y"
+#line 1250 "parse.y"
 { yyval.ttype = build_parse_node (INDIRECT_REF, yyvsp[0].ttype); ;
     break;}
 case 270:
-#line 1253 "parse.y"
+#line 1252 "parse.y"
 { yyval.ttype = build_parse_node (ADDR_EXPR, yyvsp[0].ttype); ;
     break;}
 case 271:
-#line 1255 "parse.y"
+#line 1254 "parse.y"
 { yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 272:
-#line 1260 "parse.y"
+#line 1259 "parse.y"
 { yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 273:
-#line 1262 "parse.y"
+#line 1261 "parse.y"
 { yyval.ttype = lookup_template_function (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 277:
-#line 1270 "parse.y"
+#line 1269 "parse.y"
 { yyval.ttype = finish_decl_parsing (yyvsp[-1].ttype); ;
     break;}
 case 278:
-#line 1275 "parse.y"
+#line 1274 "parse.y"
 {
 		  if (TREE_CODE (yyval.ttype) == BIT_NOT_EXPR)
 		    yyval.ttype = build_x_unary_op (BIT_NOT_EXPR, TREE_OPERAND (yyval.ttype, 0));
@@ -5061,7 +5060,7 @@ case 278:
 		;
     break;}
 case 281:
-#line 1284 "parse.y"
+#line 1283 "parse.y"
 {
 		  if (processing_template_decl)
 		    push_obstacks (&permanent_obstack, &permanent_obstack);
@@ -5071,20 +5070,20 @@ case 281:
 		;
     break;}
 case 282:
-#line 1292 "parse.y"
+#line 1291 "parse.y"
 { yyval.ttype = finish_parenthesized_expr (yyvsp[-1].ttype); ;
     break;}
 case 283:
-#line 1294 "parse.y"
+#line 1293 "parse.y"
 { yyvsp[-1].ttype = reparse_decl_as_expr (NULL_TREE, yyvsp[-1].ttype);
 		  yyval.ttype = finish_parenthesized_expr (yyvsp[-1].ttype); ;
     break;}
 case 284:
-#line 1297 "parse.y"
+#line 1296 "parse.y"
 { yyval.ttype = error_mark_node; ;
     break;}
 case 285:
-#line 1299 "parse.y"
+#line 1298 "parse.y"
 { if (current_function_decl == 0)
 		    {
 		      error ("braced-group within expression allowed only inside a function");
@@ -5096,35 +5095,35 @@ case 285:
 		;
     break;}
 case 286:
-#line 1309 "parse.y"
+#line 1308 "parse.y"
 { yyval.ttype = finish_stmt_expr (yyvsp[-2].ttype, yyvsp[-1].ttype); ;
     break;}
 case 287:
-#line 1311 "parse.y"
+#line 1310 "parse.y"
 { yyval.ttype = finish_call_expr (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 288:
-#line 1313 "parse.y"
+#line 1312 "parse.y"
 { yyval.ttype = finish_call_expr (yyvsp[-1].ttype, NULL_TREE); ;
     break;}
 case 289:
-#line 1315 "parse.y"
+#line 1314 "parse.y"
 { yyval.ttype = grok_array_decl (yyval.ttype, yyvsp[-1].ttype); ;
     break;}
 case 290:
-#line 1317 "parse.y"
+#line 1316 "parse.y"
 { yyval.ttype = finish_increment_expr (yyvsp[-1].ttype, POSTINCREMENT_EXPR); ;
     break;}
 case 291:
-#line 1319 "parse.y"
+#line 1318 "parse.y"
 { yyval.ttype = finish_increment_expr (yyvsp[-1].ttype, POSTDECREMENT_EXPR); ;
     break;}
 case 292:
-#line 1322 "parse.y"
+#line 1321 "parse.y"
 { yyval.ttype = finish_this_expr (); ;
     break;}
 case 293:
-#line 1324 "parse.y"
+#line 1323 "parse.y"
 {
 		  tree type = NULL_TREE;
 		  tree id = yyval.ttype;
@@ -5170,45 +5169,45 @@ case 293:
 		;
     break;}
 case 295:
-#line 1369 "parse.y"
+#line 1368 "parse.y"
 { tree type = groktypename (yyvsp[-4].ftype.t);
 		  check_for_new_type ("dynamic_cast", yyvsp[-4].ftype);
 		  yyval.ttype = build_dynamic_cast (type, yyvsp[-1].ttype); ;
     break;}
 case 296:
-#line 1373 "parse.y"
+#line 1372 "parse.y"
 { tree type = groktypename (yyvsp[-4].ftype.t);
 		  check_for_new_type ("static_cast", yyvsp[-4].ftype);
 		  yyval.ttype = build_static_cast (type, yyvsp[-1].ttype); ;
     break;}
 case 297:
-#line 1377 "parse.y"
+#line 1376 "parse.y"
 { tree type = groktypename (yyvsp[-4].ftype.t);
 		  check_for_new_type ("reinterpret_cast", yyvsp[-4].ftype);
 		  yyval.ttype = build_reinterpret_cast (type, yyvsp[-1].ttype); ;
     break;}
 case 298:
-#line 1381 "parse.y"
+#line 1380 "parse.y"
 { tree type = groktypename (yyvsp[-4].ftype.t);
 		  check_for_new_type ("const_cast", yyvsp[-4].ftype);
 		  yyval.ttype = build_const_cast (type, yyvsp[-1].ttype); ;
     break;}
 case 299:
-#line 1385 "parse.y"
+#line 1384 "parse.y"
 { yyval.ttype = build_x_typeid (yyvsp[-1].ttype); ;
     break;}
 case 300:
-#line 1387 "parse.y"
+#line 1386 "parse.y"
 { tree type = groktypename (yyvsp[-1].ftype.t);
 		  check_for_new_type ("typeid", yyvsp[-1].ftype);
 		  yyval.ttype = get_typeid (TYPE_MAIN_VARIANT (type)); ;
     break;}
 case 301:
-#line 1391 "parse.y"
+#line 1390 "parse.y"
 { yyval.ttype = do_scoped_id (yyvsp[0].ttype, 1); ;
     break;}
 case 302:
-#line 1393 "parse.y"
+#line 1392 "parse.y"
 {
 		  got_scope = NULL_TREE;
 		  if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE)
@@ -5218,102 +5217,102 @@ case 302:
 		;
     break;}
 case 303:
-#line 1401 "parse.y"
+#line 1400 "parse.y"
 { yyval.ttype = build_offset_ref (OP0 (yyval.ttype), OP1 (yyval.ttype)); ;
     break;}
 case 304:
-#line 1403 "parse.y"
+#line 1402 "parse.y"
 { yyval.ttype = finish_globally_qualified_member_call_expr (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 305:
-#line 1405 "parse.y"
+#line 1404 "parse.y"
 { yyval.ttype = finish_globally_qualified_member_call_expr (yyvsp[-1].ttype, NULL_TREE); ;
     break;}
 case 306:
-#line 1407 "parse.y"
+#line 1406 "parse.y"
 { 
 		  yyval.ttype = build_x_component_ref (yyval.ttype, yyvsp[0].ttype, NULL_TREE, 1); 
 		;
     break;}
 case 307:
-#line 1411 "parse.y"
+#line 1410 "parse.y"
 { yyval.ttype = finish_object_call_expr (yyvsp[-3].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ;
     break;}
 case 308:
-#line 1413 "parse.y"
+#line 1412 "parse.y"
 { yyval.ttype = finish_object_call_expr (yyvsp[-1].ttype, yyvsp[-2].ttype, NULL_TREE); ;
     break;}
 case 309:
-#line 1415 "parse.y"
+#line 1414 "parse.y"
 { yyval.ttype = build_x_component_ref (yyval.ttype, yyvsp[0].ttype, NULL_TREE, 1); ;
     break;}
 case 310:
-#line 1417 "parse.y"
+#line 1416 "parse.y"
 { if (processing_template_decl)
 		    yyval.ttype = build_min_nt (COMPONENT_REF, yyvsp[-1].ttype, copy_to_permanent (yyvsp[0].ttype));
 		  else
 		    yyval.ttype = build_object_ref (yyval.ttype, OP0 (yyvsp[0].ttype), OP1 (yyvsp[0].ttype)); ;
     break;}
 case 311:
-#line 1422 "parse.y"
+#line 1421 "parse.y"
 { yyval.ttype = finish_object_call_expr (yyvsp[-3].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ;
     break;}
 case 312:
-#line 1424 "parse.y"
+#line 1423 "parse.y"
 { yyval.ttype = finish_object_call_expr (yyvsp[-1].ttype, yyvsp[-2].ttype, NULL_TREE); ;
     break;}
 case 313:
-#line 1426 "parse.y"
+#line 1425 "parse.y"
 { yyval.ttype = finish_qualified_object_call_expr (yyvsp[-3].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ;
     break;}
 case 314:
-#line 1428 "parse.y"
+#line 1427 "parse.y"
 { yyval.ttype = finish_qualified_object_call_expr (yyvsp[-1].ttype, yyvsp[-2].ttype, NULL_TREE); ;
     break;}
 case 315:
-#line 1431 "parse.y"
+#line 1430 "parse.y"
 { yyval.ttype = finish_pseudo_destructor_call_expr (yyvsp[-3].ttype, NULL_TREE, yyvsp[-1].ttype); ;
     break;}
 case 316:
-#line 1433 "parse.y"
+#line 1432 "parse.y"
 { yyval.ttype = finish_pseudo_destructor_call_expr (yyvsp[-5].ttype, yyvsp[-4].ttype, yyvsp[-1].ttype); ;
     break;}
 case 317:
-#line 1435 "parse.y"
+#line 1434 "parse.y"
 {
 		  yyval.ttype = error_mark_node;
 		;
     break;}
 case 318:
-#line 1480 "parse.y"
+#line 1479 "parse.y"
 { yyval.itype = 0; ;
     break;}
 case 319:
-#line 1482 "parse.y"
+#line 1481 "parse.y"
 { got_scope = NULL_TREE; yyval.itype = 1; ;
     break;}
 case 320:
-#line 1487 "parse.y"
+#line 1486 "parse.y"
 { yyval.itype = 0; ;
     break;}
 case 321:
-#line 1489 "parse.y"
+#line 1488 "parse.y"
 { got_scope = NULL_TREE; yyval.itype = 1; ;
     break;}
 case 322:
-#line 1494 "parse.y"
+#line 1493 "parse.y"
 { yyval.ttype = boolean_true_node; ;
     break;}
 case 323:
-#line 1496 "parse.y"
+#line 1495 "parse.y"
 { yyval.ttype = boolean_false_node; ;
     break;}
 case 325:
-#line 1503 "parse.y"
+#line 1502 "parse.y"
 { yyval.ttype = chainon (yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 326:
-#line 1508 "parse.y"
+#line 1507 "parse.y"
 {
 		  if (! current_function_parms_stored)
 		    store_parm_decls ();
@@ -5325,18 +5324,18 @@ case 326:
 		;
     break;}
 case 327:
-#line 1521 "parse.y"
+#line 1520 "parse.y"
 { got_object = TREE_TYPE (yyval.ttype); ;
     break;}
 case 328:
-#line 1523 "parse.y"
+#line 1522 "parse.y"
 {
 		  yyval.ttype = build_x_arrow (yyval.ttype); 
 		  got_object = TREE_TYPE (yyval.ttype);
 		;
     break;}
 case 329:
-#line 1531 "parse.y"
+#line 1530 "parse.y"
 {
 		  resume_momentary (yyvsp[-1].itype);
 		  if (yyvsp[-2].ftype.t && IS_AGGR_TYPE_CODE (TREE_CODE (yyvsp[-2].ftype.t)))
@@ -5344,138 +5343,138 @@ case 329:
 		;
     break;}
 case 330:
-#line 1537 "parse.y"
+#line 1536 "parse.y"
 {
 		  resume_momentary (yyvsp[-1].itype);
 		  note_list_got_semicolon (yyvsp[-2].ftype.t);
 		;
     break;}
 case 331:
-#line 1542 "parse.y"
+#line 1541 "parse.y"
 { resume_momentary (yyvsp[-1].itype); ;
     break;}
 case 332:
-#line 1544 "parse.y"
+#line 1543 "parse.y"
 {
 		  shadow_tag (yyvsp[-1].ftype.t);
 		  note_list_got_semicolon (yyvsp[-1].ftype.t);
 		;
     break;}
 case 333:
-#line 1549 "parse.y"
+#line 1548 "parse.y"
 { warning ("empty declaration"); ;
     break;}
 case 334:
-#line 1551 "parse.y"
+#line 1550 "parse.y"
 { pedantic = yyvsp[-1].itype; ;
     break;}
 case 337:
-#line 1565 "parse.y"
+#line 1564 "parse.y"
 { yyval.ttype = make_call_declarator (NULL_TREE, empty_parms (),
 					     NULL_TREE, NULL_TREE); ;
     break;}
 case 338:
-#line 1568 "parse.y"
+#line 1567 "parse.y"
 { yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), NULL_TREE,
 					     NULL_TREE); ;
     break;}
 case 339:
-#line 1575 "parse.y"
+#line 1574 "parse.y"
 { yyval.ftype.t = build_decl_list (yyvsp[-1].ftype.t, yyvsp[0].ttype); 
 		  yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ;
     break;}
 case 340:
-#line 1578 "parse.y"
+#line 1577 "parse.y"
 { yyval.ftype.t = build_decl_list (yyvsp[-1].ftype.t, yyvsp[0].ttype); 
 		  yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ;
     break;}
 case 341:
-#line 1581 "parse.y"
+#line 1580 "parse.y"
 { yyval.ftype.t = build_decl_list (get_decl_list (yyvsp[-1].ftype.t), yyvsp[0].ttype); 
 		  yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ;
     break;}
 case 342:
-#line 1584 "parse.y"
+#line 1583 "parse.y"
 { yyval.ftype.t = build_decl_list (yyvsp[0].ftype.t, NULL_TREE);
 		  yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag;  ;
     break;}
 case 343:
-#line 1587 "parse.y"
+#line 1586 "parse.y"
 { yyval.ftype.t = build_decl_list (yyvsp[0].ftype.t, NULL_TREE); 
 		  yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ;
     break;}
 case 346:
-#line 1603 "parse.y"
+#line 1602 "parse.y"
 { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[0].ftype.t, yyvsp[-1].ttype); 
 		  yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ;
     break;}
 case 347:
-#line 1606 "parse.y"
+#line 1605 "parse.y"
 { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-1].ftype.t, yyvsp[0].ttype); 
 		  yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ;
     break;}
 case 348:
-#line 1609 "parse.y"
+#line 1608 "parse.y"
 { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-2].ftype.t, chainon (yyvsp[-1].ttype, yyvsp[0].ttype)); 
 		  yyval.ftype.new_type_flag = yyvsp[-2].ftype.new_type_flag; ;
     break;}
 case 349:
-#line 1612 "parse.y"
+#line 1611 "parse.y"
 { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-1].ftype.t, chainon (yyvsp[0].ttype, yyvsp[-2].ttype)); 
 		  yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ;
     break;}
 case 350:
-#line 1615 "parse.y"
+#line 1614 "parse.y"
 { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-1].ftype.t, chainon (yyvsp[0].ttype, yyvsp[-2].ttype)); 
 		  yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ;
     break;}
 case 351:
-#line 1618 "parse.y"
+#line 1617 "parse.y"
 { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-2].ftype.t,
 					 chainon (yyvsp[-1].ttype, chainon (yyvsp[0].ttype, yyvsp[-3].ttype))); 
 		  yyval.ftype.new_type_flag = yyvsp[-2].ftype.new_type_flag; ;
     break;}
 case 352:
-#line 1625 "parse.y"
+#line 1624 "parse.y"
 { if (extra_warnings)
 		    warning ("`%s' is not at beginning of declaration",
 			     IDENTIFIER_POINTER (yyval.ttype));
 		  yyval.ttype = build_decl_list (NULL_TREE, yyval.ttype); ;
     break;}
 case 353:
-#line 1630 "parse.y"
+#line 1629 "parse.y"
 { yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ftype.t, yyval.ttype); ;
     break;}
 case 354:
-#line 1632 "parse.y"
+#line 1631 "parse.y"
 { if (extra_warnings)
 		    warning ("`%s' is not at beginning of declaration",
 			     IDENTIFIER_POINTER (yyvsp[0].ttype));
 		  yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ;
     break;}
 case 355:
-#line 1637 "parse.y"
+#line 1636 "parse.y"
 { yyval.ttype = decl_tree_cons (yyvsp[0].ttype, NULL_TREE, yyvsp[-1].ttype); ;
     break;}
 case 356:
-#line 1639 "parse.y"
+#line 1638 "parse.y"
 { yyval.ttype = decl_tree_cons (yyvsp[0].ttype, NULL_TREE, NULL_TREE); ;
     break;}
 case 357:
-#line 1649 "parse.y"
+#line 1648 "parse.y"
 { yyval.ttype = yyvsp[0].ftype.t; TREE_STATIC (yyval.ttype) = 1; ;
     break;}
 case 358:
-#line 1651 "parse.y"
+#line 1650 "parse.y"
 { yyval.ttype = IDENTIFIER_AS_LIST (yyval.ttype); ;
     break;}
 case 359:
-#line 1653 "parse.y"
+#line 1652 "parse.y"
 { yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype);
 		  TREE_STATIC (yyval.ttype) = 1; ;
     break;}
 case 360:
-#line 1656 "parse.y"
+#line 1655 "parse.y"
 { if (extra_warnings && TREE_STATIC (yyval.ttype))
 		    warning ("`%s' is not at beginning of declaration",
 			     IDENTIFIER_POINTER (yyvsp[0].ttype));
@@ -5483,61 +5482,61 @@ case 360:
 		  TREE_STATIC (yyval.ttype) = TREE_STATIC (yyvsp[-1].ttype); ;
     break;}
 case 361:
-#line 1662 "parse.y"
+#line 1661 "parse.y"
 { yyval.ttype = decl_tree_cons (yyvsp[0].ttype, NULL_TREE, yyvsp[-1].ttype); ;
     break;}
 case 362:
-#line 1664 "parse.y"
+#line 1663 "parse.y"
 { yyval.ttype = decl_tree_cons (yyvsp[0].ttype, NULL_TREE, NULL_TREE); ;
     break;}
 case 363:
-#line 1675 "parse.y"
+#line 1674 "parse.y"
 { yyval.ftype.t = get_decl_list (yyvsp[0].ftype.t); 
 		  yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ;
     break;}
 case 364:
-#line 1678 "parse.y"
+#line 1677 "parse.y"
 { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[0].ftype.t, yyvsp[-1].ftype.t); 
 		  yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ;
     break;}
 case 365:
-#line 1681 "parse.y"
+#line 1680 "parse.y"
 { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-1].ftype.t, yyvsp[0].ttype); 
 		  yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ;
     break;}
 case 366:
-#line 1684 "parse.y"
+#line 1683 "parse.y"
 { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[-1].ftype.t, chainon (yyvsp[0].ttype, yyvsp[-2].ftype.t)); 
 		  yyval.ftype.new_type_flag = yyvsp[-2].ftype.new_type_flag; ;
     break;}
 case 367:
-#line 1690 "parse.y"
+#line 1689 "parse.y"
 { yyval.ttype = build_decl_list (NULL_TREE, yyvsp[0].ftype.t); ;
     break;}
 case 368:
-#line 1692 "parse.y"
+#line 1691 "parse.y"
 { yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ftype.t, yyvsp[-1].ttype); ;
     break;}
 case 370:
-#line 1702 "parse.y"
+#line 1701 "parse.y"
 { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ;
     break;}
 case 371:
-#line 1704 "parse.y"
+#line 1703 "parse.y"
 { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ;
     break;}
 case 372:
-#line 1706 "parse.y"
+#line 1705 "parse.y"
 { yyval.ftype.t = TREE_TYPE (yyvsp[-1].ttype);
 		  yyval.ftype.new_type_flag = 0; ;
     break;}
 case 373:
-#line 1709 "parse.y"
+#line 1708 "parse.y"
 { yyval.ftype.t = groktypename (yyvsp[-1].ftype.t);
 		  yyval.ftype.new_type_flag = 0; ;
     break;}
 case 374:
-#line 1712 "parse.y"
+#line 1711 "parse.y"
 { tree type = TREE_TYPE (yyvsp[-1].ttype);
 
                   yyval.ftype.new_type_flag = 0;
@@ -5554,7 +5553,7 @@ case 374:
 		;
     break;}
 case 375:
-#line 1727 "parse.y"
+#line 1726 "parse.y"
 { tree type = groktypename (yyvsp[-1].ftype.t);
 
                   yyval.ftype.new_type_flag = 0;
@@ -5571,188 +5570,188 @@ case 375:
 		;
     break;}
 case 376:
-#line 1747 "parse.y"
+#line 1746 "parse.y"
 { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ;
     break;}
 case 377:
-#line 1749 "parse.y"
+#line 1748 "parse.y"
 { yyval.ftype.t = yyvsp[0].ttype; yyval.ftype.new_type_flag = 0; ;
     break;}
 case 385:
-#line 1770 "parse.y"
+#line 1769 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 386:
-#line 1772 "parse.y"
+#line 1771 "parse.y"
 { if (TREE_CHAIN (yyvsp[-1].ttype)) yyvsp[-1].ttype = combine_strings (yyvsp[-1].ttype); yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 387:
-#line 1777 "parse.y"
+#line 1776 "parse.y"
 { yyval.ttype = start_decl (yyvsp[-3].ttype, current_declspecs, 1);
 		  cplus_decl_attributes (yyval.ttype, yyvsp[-1].ttype, prefix_attributes); ;
     break;}
 case 388:
-#line 1781 "parse.y"
+#line 1780 "parse.y"
 { cp_finish_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-4].ttype, 1, LOOKUP_ONLYCONVERTING); ;
     break;}
 case 389:
-#line 1783 "parse.y"
+#line 1782 "parse.y"
 { yyval.ttype = start_decl (yyvsp[-2].ttype, current_declspecs, 0);
 		  cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes);
 		  cp_finish_decl (yyval.ttype, NULL_TREE, yyvsp[-1].ttype, 1, 0); ;
     break;}
 case 390:
-#line 1796 "parse.y"
+#line 1795 "parse.y"
 { yyvsp[0].itype = parse_decl (yyvsp[-3].ttype, yyvsp[-4].ttype, 
 					   yyvsp[-1].ttype, 1, &yyval.ttype); ;
     break;}
 case 391:
-#line 1801 "parse.y"
+#line 1800 "parse.y"
 { cp_finish_decl (yyvsp[-1].ttype, yyvsp[0].ttype, yyvsp[-4].ttype, 1,
 				  LOOKUP_ONLYCONVERTING);
 		  yyval.itype = yyvsp[-2].itype; ;
     break;}
 case 392:
-#line 1805 "parse.y"
+#line 1804 "parse.y"
 { tree d;
 		  yyval.itype = parse_decl (yyvsp[-2].ttype, yyvsp[-3].ttype, yyvsp[0].ttype, 0, &d);
 		  cp_finish_decl (d, NULL_TREE, yyvsp[-1].ttype, 1, 0); ;
     break;}
 case 393:
-#line 1812 "parse.y"
+#line 1811 "parse.y"
 { yyval.itype = yyvsp[0].itype; ;
     break;}
 case 394:
-#line 1816 "parse.y"
+#line 1815 "parse.y"
 { yyval.itype = yyvsp[0].itype; ;
     break;}
 case 395:
-#line 1821 "parse.y"
+#line 1820 "parse.y"
 { /* Set things up as initdcl0_innards expects.  */
 	      yyval.ttype = yyvsp[-1].ttype; 
               yyvsp[-1].ttype = NULL_TREE; ;
     break;}
 case 396:
-#line 1825 "parse.y"
+#line 1824 "parse.y"
 {;
     break;}
 case 397:
-#line 1827 "parse.y"
+#line 1826 "parse.y"
 { tree d;
 		  parse_decl(yyvsp[-2].ttype, NULL_TREE, yyvsp[0].ttype, 0, &d);
 		  cp_finish_decl (d, NULL_TREE, yyvsp[-1].ttype, 1, 0); ;
     break;}
 case 398:
-#line 1836 "parse.y"
+#line 1835 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 399:
-#line 1838 "parse.y"
+#line 1837 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 400:
-#line 1843 "parse.y"
+#line 1842 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 401:
-#line 1845 "parse.y"
+#line 1844 "parse.y"
 { yyval.ttype = chainon (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 402:
-#line 1850 "parse.y"
+#line 1849 "parse.y"
 { yyval.ttype = yyvsp[-2].ttype; ;
     break;}
 case 403:
-#line 1855 "parse.y"
+#line 1854 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 404:
-#line 1857 "parse.y"
+#line 1856 "parse.y"
 { yyval.ttype = chainon (yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 405:
-#line 1862 "parse.y"
+#line 1861 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 406:
-#line 1864 "parse.y"
+#line 1863 "parse.y"
 { yyval.ttype = build_tree_list (yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 407:
-#line 1866 "parse.y"
+#line 1865 "parse.y"
 { yyval.ttype = build_tree_list (yyvsp[-3].ttype, build_tree_list (NULL_TREE, yyvsp[-1].ttype)); ;
     break;}
 case 408:
-#line 1868 "parse.y"
+#line 1867 "parse.y"
 { yyval.ttype = build_tree_list (yyvsp[-5].ttype, tree_cons (NULL_TREE, yyvsp[-3].ttype, yyvsp[-1].ttype)); ;
     break;}
 case 409:
-#line 1870 "parse.y"
+#line 1869 "parse.y"
 { yyval.ttype = build_tree_list (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 414:
-#line 1886 "parse.y"
+#line 1885 "parse.y"
 { yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 415:
-#line 1888 "parse.y"
+#line 1887 "parse.y"
 { yyval.ttype = chainon (yyvsp[-2].ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ;
     break;}
 case 416:
-#line 1893 "parse.y"
+#line 1892 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 417:
-#line 1895 "parse.y"
+#line 1894 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 419:
-#line 1903 "parse.y"
+#line 1902 "parse.y"
 { yyval.ttype = build_nt (CONSTRUCTOR, NULL_TREE, NULL_TREE);
 		  TREE_HAS_CONSTRUCTOR (yyval.ttype) = 1; ;
     break;}
 case 420:
-#line 1906 "parse.y"
+#line 1905 "parse.y"
 { yyval.ttype = build_nt (CONSTRUCTOR, NULL_TREE, nreverse (yyvsp[-1].ttype));
 		  TREE_HAS_CONSTRUCTOR (yyval.ttype) = 1; ;
     break;}
 case 421:
-#line 1909 "parse.y"
+#line 1908 "parse.y"
 { yyval.ttype = build_nt (CONSTRUCTOR, NULL_TREE, nreverse (yyvsp[-2].ttype));
 		  TREE_HAS_CONSTRUCTOR (yyval.ttype) = 1; ;
     break;}
 case 422:
-#line 1912 "parse.y"
+#line 1911 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 423:
-#line 1919 "parse.y"
+#line 1918 "parse.y"
 { yyval.ttype = build_tree_list (NULL_TREE, yyval.ttype); ;
     break;}
 case 424:
-#line 1921 "parse.y"
+#line 1920 "parse.y"
 { yyval.ttype = expr_tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ;
     break;}
 case 425:
-#line 1924 "parse.y"
+#line 1923 "parse.y"
 { yyval.ttype = build_expr_list (yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 426:
-#line 1926 "parse.y"
+#line 1925 "parse.y"
 { yyval.ttype = build_expr_list (yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 427:
-#line 1928 "parse.y"
+#line 1927 "parse.y"
 { yyval.ttype = expr_tree_cons (yyvsp[-2].ttype, yyvsp[0].ttype, yyval.ttype); ;
     break;}
 case 428:
-#line 1933 "parse.y"
+#line 1932 "parse.y"
 { start_function (NULL_TREE, TREE_VALUE (yyvsp[0].ttype),
 				  NULL_TREE, 1);
 		  reinit_parse_for_function (); ;
     break;}
 case 429:
-#line 1939 "parse.y"
+#line 1938 "parse.y"
 {
 		  int nested = (hack_decl_function_context
 				(current_function_decl) != NULL_TREE);
@@ -5761,82 +5760,82 @@ case 429:
 		;
     break;}
 case 430:
-#line 1946 "parse.y"
+#line 1945 "parse.y"
 { process_next_inline (yyvsp[-2].ttype); ;
     break;}
 case 431:
-#line 1948 "parse.y"
+#line 1947 "parse.y"
 { process_next_inline (yyvsp[-2].ttype); ;
     break;}
 case 434:
-#line 1960 "parse.y"
+#line 1959 "parse.y"
 { replace_defarg (yyvsp[-2].ttype, yyvsp[-1].ttype); ;
     break;}
 case 435:
-#line 1962 "parse.y"
+#line 1961 "parse.y"
 { replace_defarg (yyvsp[-2].ttype, error_mark_node); ;
     break;}
 case 437:
-#line 1967 "parse.y"
+#line 1966 "parse.y"
 { do_pending_defargs (); ;
     break;}
 case 438:
-#line 1969 "parse.y"
+#line 1968 "parse.y"
 { do_pending_defargs (); ;
     break;}
 case 439:
-#line 1974 "parse.y"
+#line 1973 "parse.y"
 { yyvsp[0].itype = suspend_momentary ();
 		  yyval.ttype = start_enum (yyvsp[-1].ttype); ;
     break;}
 case 440:
-#line 1977 "parse.y"
+#line 1976 "parse.y"
 { yyval.ftype.t = finish_enum (yyvsp[-3].ttype, yyvsp[-2].ttype);
 		  yyval.ftype.new_type_flag = 1;
 		  resume_momentary ((int) yyvsp[-4].itype);
 		  check_for_missing_semicolon (yyvsp[-3].ttype); ;
     break;}
 case 441:
-#line 1982 "parse.y"
+#line 1981 "parse.y"
 { yyval.ftype.t = finish_enum (start_enum (yyvsp[-2].ttype), NULL_TREE);
 		  yyval.ftype.new_type_flag = 1;
 		  check_for_missing_semicolon (yyval.ftype.t); ;
     break;}
 case 442:
-#line 1986 "parse.y"
+#line 1985 "parse.y"
 { yyvsp[0].itype = suspend_momentary ();
 		  yyval.ttype = start_enum (make_anon_name ()); ;
     break;}
 case 443:
-#line 1989 "parse.y"
+#line 1988 "parse.y"
 { yyval.ftype.t = finish_enum (yyvsp[-3].ttype, yyvsp[-2].ttype);
 		  resume_momentary ((int) yyvsp[-5].itype);
 		  check_for_missing_semicolon (yyvsp[-3].ttype);
 		  yyval.ftype.new_type_flag = 1; ;
     break;}
 case 444:
-#line 1994 "parse.y"
+#line 1993 "parse.y"
 { yyval.ftype.t = finish_enum (start_enum (make_anon_name()), NULL_TREE);
 		  yyval.ftype.new_type_flag = 1;
 		  check_for_missing_semicolon (yyval.ftype.t); ;
     break;}
 case 445:
-#line 1998 "parse.y"
+#line 1997 "parse.y"
 { yyval.ftype.t = xref_tag (enum_type_node, yyvsp[0].ttype, NULL_TREE, 1); 
 		  yyval.ftype.new_type_flag = 0; ;
     break;}
 case 446:
-#line 2001 "parse.y"
+#line 2000 "parse.y"
 { yyval.ftype.t = xref_tag (enum_type_node, yyvsp[0].ttype, NULL_TREE, 1); 
 		  yyval.ftype.new_type_flag = 0; ;
     break;}
 case 447:
-#line 2004 "parse.y"
+#line 2003 "parse.y"
 { yyval.ftype.t = yyvsp[0].ttype;
 		  yyval.ftype.new_type_flag = 0; ;
     break;}
 case 448:
-#line 2009 "parse.y"
+#line 2008 "parse.y"
 {
 		  int semi;
 
@@ -5871,7 +5870,7 @@ case 448:
 		;
     break;}
 case 449:
-#line 2042 "parse.y"
+#line 2041 "parse.y"
 {
 		  if (pending_inlines 
 		      && current_scope () == current_function_decl)
@@ -5879,7 +5878,7 @@ case 449:
 		;
     break;}
 case 450:
-#line 2048 "parse.y"
+#line 2047 "parse.y"
 { 
 		  yyval.ftype.t = yyvsp[-3].ttype;
 		  yyval.ftype.new_type_flag = 1; 
@@ -5891,7 +5890,7 @@ case 450:
 		;
     break;}
 case 451:
-#line 2058 "parse.y"
+#line 2057 "parse.y"
 {
 		  yyval.ftype.new_type_flag = 0;
 		  if (TYPE_BINFO (yyvsp[0].ttype) == NULL_TREE)
@@ -5911,73 +5910,73 @@ case 451:
 		;
     break;}
 case 455:
-#line 2085 "parse.y"
+#line 2084 "parse.y"
 { if (pedantic && !in_system_header)
 		    pedwarn ("comma at end of enumerator list"); ;
     break;}
 case 457:
-#line 2092 "parse.y"
+#line 2091 "parse.y"
 { error ("storage class specifier `%s' not allowed after struct or class", IDENTIFIER_POINTER (yyvsp[0].ttype)); ;
     break;}
 case 458:
-#line 2094 "parse.y"
+#line 2093 "parse.y"
 { error ("type specifier `%s' not allowed after struct or class", IDENTIFIER_POINTER (yyvsp[0].ttype)); ;
     break;}
 case 459:
-#line 2096 "parse.y"
+#line 2095 "parse.y"
 { error ("type qualifier `%s' not allowed after struct or class", IDENTIFIER_POINTER (yyvsp[0].ttype)); ;
     break;}
 case 460:
-#line 2098 "parse.y"
+#line 2097 "parse.y"
 { error ("no body nor ';' separates two class, struct or union declarations"); ;
     break;}
 case 461:
-#line 2103 "parse.y"
+#line 2102 "parse.y"
 { current_aggr = yyval.ttype; yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 462:
-#line 2108 "parse.y"
+#line 2107 "parse.y"
 { current_aggr = yyval.ttype; yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 463:
-#line 2113 "parse.y"
+#line 2112 "parse.y"
 {
 		  current_aggr = yyvsp[-2].ttype;
 		  yyval.ttype = handle_class_head (yyvsp[-2].ttype, yyvsp[-1].ttype, yyvsp[0].ttype);
 		;
     break;}
 case 464:
-#line 2118 "parse.y"
+#line 2117 "parse.y"
 {
 		  current_aggr = yyvsp[-3].ttype;
 		  yyval.ttype = handle_class_head (yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype);
 		;
     break;}
 case 465:
-#line 2123 "parse.y"
+#line 2122 "parse.y"
 {
 		  current_aggr = yyvsp[-2].ttype;
 		  yyval.ttype = handle_class_head (yyvsp[-2].ttype, NULL_TREE, yyvsp[0].ttype);
 		;
     break;}
 case 466:
-#line 2128 "parse.y"
+#line 2127 "parse.y"
 { current_aggr = yyval.ttype; yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 467:
-#line 2130 "parse.y"
+#line 2129 "parse.y"
 { current_aggr = yyval.ttype; yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 468:
-#line 2135 "parse.y"
+#line 2134 "parse.y"
 { yyval.ttype = xref_tag (current_aggr, yyvsp[0].ttype, NULL_TREE, 0); ;
     break;}
 case 469:
-#line 2140 "parse.y"
+#line 2139 "parse.y"
 { yyval.ttype = xref_tag (current_aggr, yyvsp[0].ttype, NULL_TREE, 1); ;
     break;}
 case 470:
-#line 2143 "parse.y"
+#line 2142 "parse.y"
 { 
 		  yyval.ttype = yyvsp[-1].ttype;
 		  if (yyvsp[0].ttype)
@@ -5985,7 +5984,7 @@ case 470:
 		;
     break;}
 case 471:
-#line 2149 "parse.y"
+#line 2148 "parse.y"
 { 
 		  yyval.ttype = TREE_TYPE (yyvsp[-1].ttype);
 		  if (TREE_INT_CST_LOW (current_aggr) == union_type 
@@ -6013,28 +6012,28 @@ case 471:
 		;
     break;}
 case 472:
-#line 2178 "parse.y"
+#line 2177 "parse.y"
 { yyval.ttype = xref_tag (yyval.ttype, make_anon_name (), NULL_TREE, 0);
 		  yyungetc ('{', 1); ;
     break;}
 case 475:
-#line 2189 "parse.y"
+#line 2188 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 476:
-#line 2191 "parse.y"
+#line 2190 "parse.y"
 { yyungetc(':', 1); yyval.ttype = NULL_TREE; ;
     break;}
 case 477:
-#line 2193 "parse.y"
+#line 2192 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 479:
-#line 2199 "parse.y"
+#line 2198 "parse.y"
 { yyval.ttype = chainon (yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 480:
-#line 2204 "parse.y"
+#line 2203 "parse.y"
 {
 		  tree type = TREE_TYPE (yyvsp[0].ttype);
 		  if (! is_aggr_type (type, 1))
@@ -6061,7 +6060,7 @@ case 480:
 		;
     break;}
 case 481:
-#line 2229 "parse.y"
+#line 2228 "parse.y"
 {
 		  tree type = TREE_TYPE (yyvsp[0].ttype);
 		  if (current_aggr == signature_type_node)
@@ -6090,11 +6089,11 @@ case 481:
 		;
     break;}
 case 482:
-#line 2259 "parse.y"
+#line 2258 "parse.y"
 { yyval.ttype = TYPE_MAIN_DECL (yyvsp[0].ttype); ;
     break;}
 case 484:
-#line 2262 "parse.y"
+#line 2261 "parse.y"
 {
 		  if (current_aggr == signature_type_node)
 		    {
@@ -6117,7 +6116,7 @@ case 484:
 		;
     break;}
 case 485:
-#line 2283 "parse.y"
+#line 2282 "parse.y"
 {
 		  if (current_aggr == signature_type_node)
 		    {
@@ -6140,13 +6139,13 @@ case 485:
 		;
     break;}
 case 487:
-#line 2308 "parse.y"
+#line 2307 "parse.y"
 { if (yyvsp[-1].ttype != ridpointers[(int)RID_VIRTUAL])
 		    cp_error ("`%D' access", yyvsp[-1].ttype);
 		  yyval.ttype = access_default_virtual_node; ;
     break;}
 case 488:
-#line 2312 "parse.y"
+#line 2311 "parse.y"
 {
 		  if (yyvsp[-2].ttype != access_default_virtual_node)
 		    error ("multiple access specifiers");
@@ -6159,7 +6158,7 @@ case 488:
 		;
     break;}
 case 489:
-#line 2323 "parse.y"
+#line 2322 "parse.y"
 { if (yyvsp[-1].ttype != ridpointers[(int)RID_VIRTUAL])
 		    cp_error ("`%D' access", yyvsp[-1].ttype);
 		  else if (yyval.ttype == access_public_node)
@@ -6173,7 +6172,7 @@ case 489:
 		;
     break;}
 case 490:
-#line 2338 "parse.y"
+#line 2337 "parse.y"
 { tree t = yyvsp[-1].ttype;
 		  push_obstacks_nochange ();
 		  end_temporary_allocation ();
@@ -6261,17 +6260,17 @@ case 490:
 		;
     break;}
 case 491:
-#line 2427 "parse.y"
+#line 2426 "parse.y"
 {
 		    yyval.ttype = build_self_reference ();
 		;
     break;}
 case 492:
-#line 2434 "parse.y"
+#line 2433 "parse.y"
 { if (yyval.ttype) yyval.ttype = build_tree_list (access_public_node, yyval.ttype); ;
     break;}
 case 493:
-#line 2436 "parse.y"
+#line 2435 "parse.y"
 {
 		  if (current_aggr == signature_type_node)
 		    yyval.ttype = build_tree_list (access_public_node, yyvsp[0].ttype);
@@ -6281,7 +6280,7 @@ case 493:
 		;
     break;}
 case 494:
-#line 2444 "parse.y"
+#line 2443 "parse.y"
 {
 		  tree visspec = yyvsp[-2].ttype;
 
@@ -6294,19 +6293,19 @@ case 494:
 		;
     break;}
 case 495:
-#line 2455 "parse.y"
+#line 2454 "parse.y"
 {
 		  if (current_aggr == signature_type_node)
 		    error ("access specifier not allowed in signature");
 		;
     break;}
 case 496:
-#line 2465 "parse.y"
+#line 2464 "parse.y"
 { if (yyval.ttype == void_type_node) yyval.ttype = NULL_TREE; 
 		;
     break;}
 case 497:
-#line 2468 "parse.y"
+#line 2467 "parse.y"
 { /* In pushdecl, we created a reverse list of names
 		     in this binding level.  Make sure that the chain
 		     of what we're trying to add isn't the item itself
@@ -6321,45 +6320,45 @@ case 497:
 		;
     break;}
 case 498:
-#line 2484 "parse.y"
+#line 2483 "parse.y"
 { ;
     break;}
 case 499:
-#line 2486 "parse.y"
+#line 2485 "parse.y"
 { error ("missing ';' before right brace");
 		  yyungetc ('}', 0); ;
     break;}
 case 500:
-#line 2491 "parse.y"
+#line 2490 "parse.y"
 { yyval.ttype = finish_method (yyval.ttype); ;
     break;}
 case 501:
-#line 2493 "parse.y"
+#line 2492 "parse.y"
 { yyval.ttype = finish_method (yyval.ttype); ;
     break;}
 case 502:
-#line 2495 "parse.y"
+#line 2494 "parse.y"
 { yyval.ttype = finish_method (yyval.ttype); ;
     break;}
 case 503:
-#line 2497 "parse.y"
+#line 2496 "parse.y"
 { yyval.ttype = finish_method (yyval.ttype); ;
     break;}
 case 504:
-#line 2499 "parse.y"
+#line 2498 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 505:
-#line 2501 "parse.y"
+#line 2500 "parse.y"
 { yyval.ttype = yyvsp[0].ttype;
 		  pedantic = yyvsp[-1].itype; ;
     break;}
 case 506:
-#line 2504 "parse.y"
+#line 2503 "parse.y"
 { yyval.ttype = finish_member_template_decl (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 507:
-#line 2506 "parse.y"
+#line 2505 "parse.y"
 {
 		  shadow_tag (yyvsp[-1].ftype.t);
 		  note_list_got_semicolon (yyvsp[-1].ftype.t);
@@ -6367,53 +6366,53 @@ case 507:
 		;
     break;}
 case 508:
-#line 2518 "parse.y"
+#line 2517 "parse.y"
 { yyval.ttype = grok_x_components (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 509:
-#line 2520 "parse.y"
+#line 2519 "parse.y"
 { yyval.ttype = grok_x_components (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 510:
-#line 2522 "parse.y"
+#line 2521 "parse.y"
 { yyval.ttype = grokfield (yyval.ttype, NULL_TREE, yyvsp[0].ttype, yyvsp[-2].ttype,
 				  build_tree_list (yyvsp[-1].ttype, NULL_TREE)); ;
     break;}
 case 511:
-#line 2525 "parse.y"
+#line 2524 "parse.y"
 { yyval.ttype = grokfield (yyval.ttype, NULL_TREE, yyvsp[0].ttype, yyvsp[-2].ttype,
 				  build_tree_list (yyvsp[-1].ttype, NULL_TREE)); ;
     break;}
 case 512:
-#line 2528 "parse.y"
+#line 2527 "parse.y"
 { yyval.ttype = grokbitfield (NULL_TREE, NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 513:
-#line 2530 "parse.y"
+#line 2529 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 514:
-#line 2541 "parse.y"
+#line 2540 "parse.y"
 { tree specs, attrs;
 		  split_specs_attrs (yyvsp[-4].ttype, &specs, &attrs);
 		  yyval.ttype = grokfield (yyvsp[-3].ttype, specs, yyvsp[0].ttype, yyvsp[-2].ttype,
 				  build_tree_list (yyvsp[-1].ttype, attrs)); ;
     break;}
 case 515:
-#line 2546 "parse.y"
+#line 2545 "parse.y"
 { yyval.ttype = grokfield (yyval.ttype, NULL_TREE, yyvsp[0].ttype, yyvsp[-2].ttype,
 				  build_tree_list (yyvsp[-1].ttype, NULL_TREE)); ;
     break;}
 case 516:
-#line 2549 "parse.y"
+#line 2548 "parse.y"
 { yyval.ttype = do_class_using_decl (yyvsp[0].ttype); ;
     break;}
 case 517:
-#line 2555 "parse.y"
+#line 2554 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 519:
-#line 2558 "parse.y"
+#line 2557 "parse.y"
 {
 		  /* In this context, void_type_node encodes
 		     friends.  They have been recorded elsewhere.  */
@@ -6424,11 +6423,11 @@ case 519:
 		;
     break;}
 case 520:
-#line 2570 "parse.y"
+#line 2569 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 522:
-#line 2573 "parse.y"
+#line 2572 "parse.y"
 {
 		  /* In this context, void_type_node encodes
 		     friends.  They have been recorded elsewhere.  */
@@ -6439,7 +6438,7 @@ case 522:
 		;
     break;}
 case 527:
-#line 2595 "parse.y"
+#line 2594 "parse.y"
 { split_specs_attrs (yyvsp[-4].ttype, &current_declspecs,
 				     &prefix_attributes);
 		  yyvsp[-4].ttype = current_declspecs;
@@ -6447,7 +6446,7 @@ case 527:
 				  build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ;
     break;}
 case 528:
-#line 2601 "parse.y"
+#line 2600 "parse.y"
 { split_specs_attrs (yyvsp[-4].ttype, &current_declspecs,
 				     &prefix_attributes);
 		  yyvsp[-4].ttype = current_declspecs;
@@ -6455,7 +6454,7 @@ case 528:
 		  cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ;
     break;}
 case 529:
-#line 2610 "parse.y"
+#line 2609 "parse.y"
 { split_specs_attrs (yyvsp[-4].ttype, &current_declspecs,
 				     &prefix_attributes);
 		  yyvsp[-4].ttype = current_declspecs;
@@ -6463,7 +6462,7 @@ case 529:
 				  build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ;
     break;}
 case 530:
-#line 2616 "parse.y"
+#line 2615 "parse.y"
 { split_specs_attrs (yyvsp[-4].ttype, &current_declspecs,
 				     &prefix_attributes);
 		  yyvsp[-4].ttype = current_declspecs;
@@ -6471,7 +6470,7 @@ case 530:
 				  build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ;
     break;}
 case 531:
-#line 2622 "parse.y"
+#line 2621 "parse.y"
 { split_specs_attrs (yyvsp[-4].ttype, &current_declspecs,
 				     &prefix_attributes);
 		  yyvsp[-4].ttype = current_declspecs;
@@ -6479,7 +6478,7 @@ case 531:
 		  cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ;
     break;}
 case 532:
-#line 2628 "parse.y"
+#line 2627 "parse.y"
 { split_specs_attrs (yyvsp[-3].ttype, &current_declspecs,
 				     &prefix_attributes);
 		  yyvsp[-3].ttype = current_declspecs;
@@ -6487,54 +6486,54 @@ case 532:
 		  cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ;
     break;}
 case 533:
-#line 2637 "parse.y"
+#line 2636 "parse.y"
 { yyval.ttype = grokfield (yyval.ttype, current_declspecs, yyvsp[0].ttype, yyvsp[-2].ttype,
 				  build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ;
     break;}
 case 534:
-#line 2640 "parse.y"
+#line 2639 "parse.y"
 { yyval.ttype = grokbitfield (yyval.ttype, current_declspecs, yyvsp[-1].ttype);
 		  cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ;
     break;}
 case 535:
-#line 2646 "parse.y"
+#line 2645 "parse.y"
 { yyval.ttype = grokfield (yyval.ttype, current_declspecs, yyvsp[0].ttype, yyvsp[-2].ttype,
 				  build_tree_list (yyvsp[-1].ttype, prefix_attributes)); ;
     break;}
 case 536:
-#line 2649 "parse.y"
+#line 2648 "parse.y"
 { yyval.ttype = grokbitfield (yyval.ttype, current_declspecs, yyvsp[-1].ttype);
 		  cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ;
     break;}
 case 537:
-#line 2652 "parse.y"
+#line 2651 "parse.y"
 { yyval.ttype = grokbitfield (NULL_TREE, current_declspecs, yyvsp[-1].ttype);
 		  cplus_decl_attributes (yyval.ttype, yyvsp[0].ttype, prefix_attributes); ;
     break;}
 case 539:
-#line 2663 "parse.y"
+#line 2662 "parse.y"
 { TREE_CHAIN (yyvsp[0].ttype) = yyval.ttype; yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 540:
-#line 2668 "parse.y"
+#line 2667 "parse.y"
 { yyval.ttype = build_enumerator (yyval.ttype, NULL_TREE); ;
     break;}
 case 541:
-#line 2670 "parse.y"
+#line 2669 "parse.y"
 { yyval.ttype = build_enumerator (yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 542:
-#line 2676 "parse.y"
+#line 2675 "parse.y"
 { yyval.ftype.t = build_decl_list (yyvsp[-1].ftype.t, yyvsp[0].ttype); 
 		  yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ;
     break;}
 case 543:
-#line 2679 "parse.y"
+#line 2678 "parse.y"
 { yyval.ftype.t = build_decl_list (yyvsp[0].ftype.t, NULL_TREE); 
 		  yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ;
     break;}
 case 544:
-#line 2684 "parse.y"
+#line 2683 "parse.y"
 {
 		  if (pedantic)
 		    pedwarn ("ANSI C++ forbids array dimensions with parenthesized type in new");
@@ -6544,71 +6543,71 @@ case 544:
 		;
     break;}
 case 545:
-#line 2695 "parse.y"
+#line 2694 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 546:
-#line 2697 "parse.y"
+#line 2696 "parse.y"
 { yyval.ttype = decl_tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ;
     break;}
 case 547:
-#line 2702 "parse.y"
+#line 2701 "parse.y"
 { yyval.ftype.t = IDENTIFIER_AS_LIST (yyvsp[0].ttype); 
 		  yyval.ftype.new_type_flag = 0; ;
     break;}
 case 548:
-#line 2705 "parse.y"
+#line 2704 "parse.y"
 { yyval.ftype.t = decl_tree_cons (NULL_TREE, yyvsp[0].ttype, yyvsp[-1].ftype.t); 
 		  yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ;
     break;}
 case 549:
-#line 2714 "parse.y"
+#line 2713 "parse.y"
 { yyval.itype = suspend_momentary (); ;
     break;}
 case 550:
-#line 2719 "parse.y"
+#line 2718 "parse.y"
 { resume_momentary ((int) yyvsp[-1].itype); yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 551:
-#line 2725 "parse.y"
+#line 2724 "parse.y"
 { resume_momentary ((int) yyvsp[-3].itype); yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 552:
-#line 2727 "parse.y"
+#line 2726 "parse.y"
 { resume_momentary ((int) yyvsp[-3].itype); yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 553:
-#line 2729 "parse.y"
+#line 2728 "parse.y"
 { resume_momentary ((int) yyvsp[-1].itype); yyval.ttype = empty_parms (); ;
     break;}
 case 554:
-#line 2731 "parse.y"
+#line 2730 "parse.y"
 { resume_momentary ((int) yyvsp[-3].itype); yyval.ttype = NULL_TREE; ;
     break;}
 case 555:
-#line 2738 "parse.y"
+#line 2737 "parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 556:
-#line 2740 "parse.y"
+#line 2739 "parse.y"
 { yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 557:
-#line 2742 "parse.y"
+#line 2741 "parse.y"
 { yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 558:
-#line 2744 "parse.y"
+#line 2743 "parse.y"
 { yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 559:
-#line 2746 "parse.y"
+#line 2745 "parse.y"
 { tree arg = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype);
 		  yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-2].ttype, arg);
 		;
     break;}
 case 561:
-#line 2754 "parse.y"
+#line 2753 "parse.y"
 {
 		  if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE)
 		    {
@@ -6627,7 +6626,7 @@ case 561:
 		;
     break;}
 case 562:
-#line 2771 "parse.y"
+#line 2770 "parse.y"
 {
 		  if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE)
 		    yyval.ttype = IDENTIFIER_GLOBAL_VALUE (yyvsp[0].ttype);
@@ -6637,97 +6636,97 @@ case 562:
 		;
     break;}
 case 565:
-#line 2784 "parse.y"
+#line 2783 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 566:
-#line 2789 "parse.y"
+#line 2788 "parse.y"
 { yyval.ttype = get_type_decl (yyvsp[0].ttype); ;
     break;}
 case 567:
-#line 2794 "parse.y"
+#line 2793 "parse.y"
 { yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-2].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 568:
-#line 2796 "parse.y"
+#line 2795 "parse.y"
 { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ;
     break;}
 case 569:
-#line 2798 "parse.y"
+#line 2797 "parse.y"
 { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, NULL_TREE); ;
     break;}
 case 570:
-#line 2800 "parse.y"
+#line 2799 "parse.y"
 { yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 571:
-#line 2802 "parse.y"
+#line 2801 "parse.y"
 { push_nested_class (yyvsp[-1].ttype, 3);
 		  yyval.ttype = build_parse_node (SCOPE_REF, yyval.ttype, yyvsp[0].ttype);
 		  TREE_COMPLEXITY (yyval.ttype) = current_class_depth; ;
     break;}
 case 573:
-#line 2813 "parse.y"
+#line 2812 "parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 574:
-#line 2815 "parse.y"
+#line 2814 "parse.y"
 { yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 575:
-#line 2817 "parse.y"
+#line 2816 "parse.y"
 { yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 576:
-#line 2819 "parse.y"
+#line 2818 "parse.y"
 { yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 577:
-#line 2821 "parse.y"
+#line 2820 "parse.y"
 { tree arg = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype);
 		  yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-2].ttype, arg);
 		;
     break;}
 case 579:
-#line 2829 "parse.y"
+#line 2828 "parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 580:
-#line 2831 "parse.y"
+#line 2830 "parse.y"
 { yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 581:
-#line 2833 "parse.y"
+#line 2832 "parse.y"
 { yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 582:
-#line 2835 "parse.y"
+#line 2834 "parse.y"
 { yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 583:
-#line 2837 "parse.y"
+#line 2836 "parse.y"
 { tree arg = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype);
 		  yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-2].ttype, arg);
 		;
     break;}
 case 585:
-#line 2845 "parse.y"
+#line 2844 "parse.y"
 { yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-2].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 586:
-#line 2847 "parse.y"
+#line 2846 "parse.y"
 { yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 587:
-#line 2849 "parse.y"
+#line 2848 "parse.y"
 { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ;
     break;}
 case 588:
-#line 2851 "parse.y"
+#line 2850 "parse.y"
 { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, NULL_TREE); ;
     break;}
 case 589:
-#line 2853 "parse.y"
+#line 2852 "parse.y"
 { if (OP0 (yyval.ttype) != current_class_type)
 		    {
 		      push_nested_class (OP0 (yyval.ttype), 3);
@@ -6736,7 +6735,7 @@ case 589:
 		;
     break;}
 case 590:
-#line 2860 "parse.y"
+#line 2859 "parse.y"
 { got_scope = NULL_TREE;
 		  yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype);
 		  if (yyvsp[-1].ttype != current_class_type)
@@ -6747,51 +6746,51 @@ case 590:
 		;
     break;}
 case 591:
-#line 2872 "parse.y"
+#line 2871 "parse.y"
 { got_scope = NULL_TREE;
 		  yyval.ttype = build_parse_node (SCOPE_REF, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 592:
-#line 2875 "parse.y"
+#line 2874 "parse.y"
 { got_scope = NULL_TREE;
  		  yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 593:
-#line 2881 "parse.y"
+#line 2880 "parse.y"
 { got_scope = NULL_TREE;
 		  yyval.ttype = build_parse_node (SCOPE_REF, yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 594:
-#line 2884 "parse.y"
+#line 2883 "parse.y"
 { got_scope = NULL_TREE;
 		  yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 596:
-#line 2891 "parse.y"
+#line 2890 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 597:
-#line 2896 "parse.y"
+#line 2895 "parse.y"
 { yyval.ttype = build_functional_cast (yyvsp[-3].ftype.t, yyvsp[-1].ttype); ;
     break;}
 case 598:
-#line 2898 "parse.y"
+#line 2897 "parse.y"
 { yyval.ttype = reparse_decl_as_expr (yyvsp[-3].ftype.t, yyvsp[-1].ttype); ;
     break;}
 case 599:
-#line 2900 "parse.y"
+#line 2899 "parse.y"
 { yyval.ttype = reparse_absdcl_as_expr (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 604:
-#line 2912 "parse.y"
+#line 2911 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 605:
-#line 2914 "parse.y"
+#line 2913 "parse.y"
 { got_scope = yyval.ttype = make_typename_type (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 606:
-#line 2921 "parse.y"
+#line 2920 "parse.y"
 {
 		  if (TREE_CODE (yyvsp[-1].ttype) == IDENTIFIER_NODE)
 		    {
@@ -6807,7 +6806,7 @@ case 606:
 		;
     break;}
 case 607:
-#line 2935 "parse.y"
+#line 2934 "parse.y"
 {
 		  if (TREE_CODE (yyvsp[-1].ttype) == IDENTIFIER_NODE)
 		    yyval.ttype = lastiddecl;
@@ -6815,7 +6814,7 @@ case 607:
 		;
     break;}
 case 608:
-#line 2941 "parse.y"
+#line 2940 "parse.y"
 {
 		  if (TREE_CODE (yyval.ttype) == IDENTIFIER_NODE)
 		    yyval.ttype = lastiddecl;
@@ -6823,15 +6822,15 @@ case 608:
 		;
     break;}
 case 609:
-#line 2947 "parse.y"
+#line 2946 "parse.y"
 { got_scope = yyval.ttype = complete_type (TREE_TYPE (yyvsp[-1].ttype)); ;
     break;}
 case 611:
-#line 2963 "parse.y"
+#line 2962 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 612:
-#line 2968 "parse.y"
+#line 2967 "parse.y"
 {
 		  if (TREE_CODE_CLASS (TREE_CODE (yyvsp[-1].ttype)) == 't')
 		    yyval.ttype = make_typename_type (yyvsp[-1].ttype, yyvsp[0].ttype);
@@ -6846,26 +6845,26 @@ case 612:
 		;
     break;}
 case 613:
-#line 2981 "parse.y"
+#line 2980 "parse.y"
 { yyval.ttype = TREE_TYPE (yyvsp[0].ttype); ;
     break;}
 case 614:
-#line 2983 "parse.y"
+#line 2982 "parse.y"
 { yyval.ttype = make_typename_type (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 615:
-#line 2985 "parse.y"
+#line 2984 "parse.y"
 { yyval.ttype = make_typename_type (yyvsp[-2].ttype, yyvsp[0].ttype); ;
     break;}
 case 616:
-#line 2990 "parse.y"
+#line 2989 "parse.y"
 {
 		  if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE)
 		    cp_error ("`%T' is not a class or namespace", yyvsp[0].ttype);
 		;
     break;}
 case 617:
-#line 2995 "parse.y"
+#line 2994 "parse.y"
 {
 		  if (TREE_CODE_CLASS (TREE_CODE (yyvsp[-1].ttype)) == 't')
 		    yyval.ttype = make_typename_type (yyvsp[-1].ttype, yyvsp[0].ttype);
@@ -6880,15 +6879,15 @@ case 617:
 		;
     break;}
 case 618:
-#line 3008 "parse.y"
+#line 3007 "parse.y"
 { got_scope = yyval.ttype = make_typename_type (yyvsp[-2].ttype, yyvsp[-1].ttype); ;
     break;}
 case 619:
-#line 3010 "parse.y"
+#line 3009 "parse.y"
 { got_scope = yyval.ttype = make_typename_type (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 620:
-#line 3015 "parse.y"
+#line 3014 "parse.y"
 {
 		  if (TREE_CODE (yyvsp[-1].ttype) != IDENTIFIER_NODE)
 		    yyvsp[-1].ttype = lastiddecl;
@@ -6900,7 +6899,7 @@ case 620:
 		;
     break;}
 case 621:
-#line 3025 "parse.y"
+#line 3024 "parse.y"
 {
 		  if (TREE_CODE (yyvsp[-1].ttype) != IDENTIFIER_NODE)
 		    yyval.ttype = lastiddecl;
@@ -6908,11 +6907,11 @@ case 621:
 		;
     break;}
 case 622:
-#line 3031 "parse.y"
+#line 3030 "parse.y"
 { got_scope = yyval.ttype = complete_type (TREE_TYPE (yyval.ttype)); ;
     break;}
 case 625:
-#line 3035 "parse.y"
+#line 3034 "parse.y"
 {
 		  if (TREE_CODE (yyval.ttype) == IDENTIFIER_NODE)
 		    yyval.ttype = lastiddecl;
@@ -6920,11 +6919,11 @@ case 625:
 		;
     break;}
 case 626:
-#line 3044 "parse.y"
+#line 3043 "parse.y"
 { yyval.ttype = build_min_nt (TEMPLATE_ID_EXPR, yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 627:
-#line 3049 "parse.y"
+#line 3048 "parse.y"
 {
 		  if (TREE_CODE (yyvsp[0].ttype) == IDENTIFIER_NODE)
 		    yyval.ttype = IDENTIFIER_GLOBAL_VALUE (yyvsp[0].ttype);
@@ -6934,148 +6933,148 @@ case 627:
 		;
     break;}
 case 629:
-#line 3058 "parse.y"
+#line 3057 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 630:
-#line 3063 "parse.y"
+#line 3062 "parse.y"
 { got_scope = NULL_TREE; ;
     break;}
 case 631:
-#line 3065 "parse.y"
+#line 3064 "parse.y"
 { yyval.ttype = yyvsp[-1].ttype; got_scope = NULL_TREE; ;
     break;}
 case 632:
-#line 3072 "parse.y"
+#line 3071 "parse.y"
 { got_scope = void_type_node; ;
     break;}
 case 633:
-#line 3078 "parse.y"
+#line 3077 "parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 634:
-#line 3080 "parse.y"
+#line 3079 "parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 635:
-#line 3082 "parse.y"
+#line 3081 "parse.y"
 { yyval.ttype = make_reference_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 636:
-#line 3084 "parse.y"
+#line 3083 "parse.y"
 { yyval.ttype = make_reference_declarator (yyvsp[0].ttype, NULL_TREE); ;
     break;}
 case 637:
-#line 3086 "parse.y"
+#line 3085 "parse.y"
 { tree arg = make_pointer_declarator (yyvsp[0].ttype, NULL_TREE);
 		  yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, arg);
 		;
     break;}
 case 638:
-#line 3090 "parse.y"
+#line 3089 "parse.y"
 { tree arg = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype);
 		  yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-2].ttype, arg);
 		;
     break;}
 case 640:
-#line 3099 "parse.y"
+#line 3098 "parse.y"
 { yyval.ttype = build_parse_node (ARRAY_REF, NULL_TREE, yyvsp[-1].ttype); ;
     break;}
 case 641:
-#line 3101 "parse.y"
+#line 3100 "parse.y"
 { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ;
     break;}
 case 642:
-#line 3107 "parse.y"
+#line 3106 "parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 643:
-#line 3109 "parse.y"
+#line 3108 "parse.y"
 { yyval.ttype = make_pointer_declarator (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 644:
-#line 3111 "parse.y"
+#line 3110 "parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[0].ftype.t, NULL_TREE); ;
     break;}
 case 645:
-#line 3113 "parse.y"
+#line 3112 "parse.y"
 { yyval.ttype = make_pointer_declarator (NULL_TREE, NULL_TREE); ;
     break;}
 case 646:
-#line 3115 "parse.y"
+#line 3114 "parse.y"
 { yyval.ttype = make_reference_declarator (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 647:
-#line 3117 "parse.y"
+#line 3116 "parse.y"
 { yyval.ttype = make_reference_declarator (NULL_TREE, yyvsp[0].ttype); ;
     break;}
 case 648:
-#line 3119 "parse.y"
+#line 3118 "parse.y"
 { yyval.ttype = make_reference_declarator (yyvsp[0].ftype.t, NULL_TREE); ;
     break;}
 case 649:
-#line 3121 "parse.y"
+#line 3120 "parse.y"
 { yyval.ttype = make_reference_declarator (NULL_TREE, NULL_TREE); ;
     break;}
 case 650:
-#line 3123 "parse.y"
+#line 3122 "parse.y"
 { tree arg = make_pointer_declarator (yyvsp[0].ttype, NULL_TREE);
 		  yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-1].ttype, arg);
 		;
     break;}
 case 651:
-#line 3127 "parse.y"
+#line 3126 "parse.y"
 { tree arg = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype);
 		  yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-2].ttype, arg);
 		;
     break;}
 case 653:
-#line 3136 "parse.y"
+#line 3135 "parse.y"
 { yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 655:
-#line 3140 "parse.y"
+#line 3139 "parse.y"
 { yyval.ttype = make_call_declarator (yyval.ttype, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 656:
-#line 3142 "parse.y"
+#line 3141 "parse.y"
 { yyval.ttype = make_call_declarator (yyval.ttype, empty_parms (), yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 657:
-#line 3144 "parse.y"
+#line 3143 "parse.y"
 { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, yyvsp[-1].ttype); ;
     break;}
 case 658:
-#line 3146 "parse.y"
+#line 3145 "parse.y"
 { yyval.ttype = build_parse_node (ARRAY_REF, yyval.ttype, NULL_TREE); ;
     break;}
 case 659:
-#line 3148 "parse.y"
+#line 3147 "parse.y"
 { yyval.ttype = make_call_declarator (NULL_TREE, yyvsp[-3].ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 660:
-#line 3150 "parse.y"
+#line 3149 "parse.y"
 { set_quals_and_spec (yyval.ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 661:
-#line 3152 "parse.y"
+#line 3151 "parse.y"
 { set_quals_and_spec (yyval.ttype, yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 662:
-#line 3154 "parse.y"
+#line 3153 "parse.y"
 { yyval.ttype = build_parse_node (ARRAY_REF, NULL_TREE, yyvsp[-1].ttype); ;
     break;}
 case 663:
-#line 3156 "parse.y"
+#line 3155 "parse.y"
 { yyval.ttype = build_parse_node (ARRAY_REF, NULL_TREE, NULL_TREE); ;
     break;}
 case 670:
-#line 3179 "parse.y"
+#line 3178 "parse.y"
 { if (pedantic)
 		    pedwarn ("ANSI C++ forbids label declarations"); ;
     break;}
 case 673:
-#line 3190 "parse.y"
+#line 3189 "parse.y"
 { tree link;
 		  for (link = yyvsp[-1].ttype; link; link = TREE_CHAIN (link))
 		    {
@@ -7086,181 +7085,181 @@ case 673:
 		;
     break;}
 case 674:
-#line 3204 "parse.y"
+#line 3203 "parse.y"
 {;
     break;}
 case 676:
-#line 3210 "parse.y"
+#line 3209 "parse.y"
 { yyval.ttype = begin_compound_stmt (0); ;
     break;}
 case 677:
-#line 3212 "parse.y"
+#line 3211 "parse.y"
 { yyval.ttype = finish_compound_stmt (0, yyvsp[-1].ttype); ;
     break;}
 case 678:
-#line 3217 "parse.y"
+#line 3216 "parse.y"
 {
 		  yyval.ttype = begin_if_stmt ();
 		  cond_stmt_keyword = "if";
 		;
     break;}
 case 679:
-#line 3222 "parse.y"
+#line 3221 "parse.y"
 { finish_if_stmt_cond (yyvsp[0].ttype, yyvsp[-1].ttype); ;
     break;}
 case 680:
-#line 3224 "parse.y"
+#line 3223 "parse.y"
 { yyval.ttype = finish_then_clause (yyvsp[-3].ttype); ;
     break;}
 case 682:
-#line 3229 "parse.y"
+#line 3228 "parse.y"
 { yyval.ttype = begin_compound_stmt (0); ;
     break;}
 case 683:
-#line 3231 "parse.y"
+#line 3230 "parse.y"
 { yyval.ttype = finish_compound_stmt (0, yyvsp[-1].ttype); ;
     break;}
 case 684:
-#line 3236 "parse.y"
+#line 3235 "parse.y"
 {;
     break;}
 case 686:
-#line 3242 "parse.y"
+#line 3241 "parse.y"
 { finish_stmt (); ;
     break;}
 case 687:
-#line 3244 "parse.y"
+#line 3243 "parse.y"
 { finish_expr_stmt (yyvsp[-1].ttype); ;
     break;}
 case 688:
-#line 3246 "parse.y"
+#line 3245 "parse.y"
 { begin_else_clause (); ;
     break;}
 case 689:
-#line 3248 "parse.y"
+#line 3247 "parse.y"
 { 
 		  finish_else_clause (yyvsp[-3].ttype); 
 		  finish_if_stmt ();
 		;
     break;}
 case 690:
-#line 3253 "parse.y"
+#line 3252 "parse.y"
 { finish_if_stmt (); ;
     break;}
 case 691:
-#line 3255 "parse.y"
+#line 3254 "parse.y"
 {
 		  yyval.ttype = begin_while_stmt ();
 		  cond_stmt_keyword = "while";
 		;
     break;}
 case 692:
-#line 3260 "parse.y"
+#line 3259 "parse.y"
 { finish_while_stmt_cond (yyvsp[0].ttype, yyvsp[-1].ttype); ;
     break;}
 case 693:
-#line 3262 "parse.y"
+#line 3261 "parse.y"
 { finish_while_stmt (yyvsp[-3].ttype); ;
     break;}
 case 694:
-#line 3264 "parse.y"
+#line 3263 "parse.y"
 { yyval.ttype = begin_do_stmt (); ;
     break;}
 case 695:
-#line 3266 "parse.y"
+#line 3265 "parse.y"
 {
 		  finish_do_body (yyvsp[-2].ttype);
 		  cond_stmt_keyword = "do";
 		;
     break;}
 case 696:
-#line 3271 "parse.y"
+#line 3270 "parse.y"
 { finish_do_stmt (yyvsp[-1].ttype, yyvsp[-5].ttype); ;
     break;}
 case 697:
-#line 3273 "parse.y"
+#line 3272 "parse.y"
 { yyval.ttype = begin_for_stmt (); ;
     break;}
 case 698:
-#line 3275 "parse.y"
+#line 3274 "parse.y"
 { finish_for_init_stmt (yyvsp[-2].ttype); ;
     break;}
 case 699:
-#line 3277 "parse.y"
+#line 3276 "parse.y"
 { finish_for_cond (yyvsp[-1].ttype, yyvsp[-5].ttype); ;
     break;}
 case 700:
-#line 3279 "parse.y"
+#line 3278 "parse.y"
 { finish_for_expr (yyvsp[-1].ttype, yyvsp[-8].ttype); ;
     break;}
 case 701:
-#line 3281 "parse.y"
+#line 3280 "parse.y"
 { finish_for_stmt (yyvsp[-3].ttype, yyvsp[-10].ttype); ;
     break;}
 case 702:
-#line 3283 "parse.y"
+#line 3282 "parse.y"
 { begin_switch_stmt (); ;
     break;}
 case 703:
-#line 3285 "parse.y"
+#line 3284 "parse.y"
 { yyval.ttype = finish_switch_cond (yyvsp[-1].ttype); ;
     break;}
 case 704:
-#line 3287 "parse.y"
+#line 3286 "parse.y"
 { finish_switch_stmt (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 705:
-#line 3289 "parse.y"
+#line 3288 "parse.y"
 { finish_case_label (yyvsp[-1].ttype, NULL_TREE); ;
     break;}
 case 707:
-#line 3292 "parse.y"
+#line 3291 "parse.y"
 { finish_case_label (yyvsp[-3].ttype, yyvsp[-1].ttype); ;
     break;}
 case 709:
-#line 3295 "parse.y"
+#line 3294 "parse.y"
 { finish_case_label (NULL_TREE, NULL_TREE); ;
     break;}
 case 711:
-#line 3298 "parse.y"
+#line 3297 "parse.y"
 { finish_break_stmt (); ;
     break;}
 case 712:
-#line 3300 "parse.y"
+#line 3299 "parse.y"
 { finish_continue_stmt (); ;
     break;}
 case 713:
-#line 3302 "parse.y"
+#line 3301 "parse.y"
 { finish_return_stmt (NULL_TREE); ;
     break;}
 case 714:
-#line 3304 "parse.y"
+#line 3303 "parse.y"
 { finish_return_stmt (yyvsp[-1].ttype); ;
     break;}
 case 715:
-#line 3306 "parse.y"
+#line 3305 "parse.y"
 { 
 		  finish_asm_stmt (yyvsp[-4].ttype, yyvsp[-2].ttype, NULL_TREE, NULL_TREE,
 				   NULL_TREE); 
 		;
     break;}
 case 716:
-#line 3312 "parse.y"
+#line 3311 "parse.y"
 { 
 		  finish_asm_stmt (yyvsp[-6].ttype, yyvsp[-4].ttype, yyvsp[-2].ttype, NULL_TREE,
 				   NULL_TREE); 
 		;
     break;}
 case 717:
-#line 3318 "parse.y"
+#line 3317 "parse.y"
 { finish_asm_stmt (yyvsp[-8].ttype, yyvsp[-6].ttype, yyvsp[-4].ttype, yyvsp[-2].ttype, NULL_TREE); ;
     break;}
 case 718:
-#line 3322 "parse.y"
+#line 3321 "parse.y"
 { finish_asm_stmt (yyvsp[-10].ttype, yyvsp[-8].ttype, yyvsp[-6].ttype, yyvsp[-4].ttype, yyvsp[-2].ttype); ;
     break;}
 case 719:
-#line 3324 "parse.y"
+#line 3323 "parse.y"
 { 
 		  if (pedantic)
 		    pedwarn ("ANSI C++ forbids computed gotos");
@@ -7268,25 +7267,25 @@ case 719:
 		;
     break;}
 case 720:
-#line 3330 "parse.y"
+#line 3329 "parse.y"
 { finish_goto_stmt (yyvsp[-1].ttype); ;
     break;}
 case 721:
-#line 3332 "parse.y"
+#line 3331 "parse.y"
 { finish_stmt (); ;
     break;}
 case 722:
-#line 3334 "parse.y"
+#line 3333 "parse.y"
 { error ("label must be followed by statement");
 		  yyungetc ('}', 0);
 		  finish_stmt (); ;
     break;}
 case 723:
-#line 3338 "parse.y"
+#line 3337 "parse.y"
 { finish_stmt (); ;
     break;}
 case 725:
-#line 3344 "parse.y"
+#line 3343 "parse.y"
 {
 		  if (! current_function_parms_stored)
 		    store_parm_decls ();
@@ -7294,11 +7293,11 @@ case 725:
 		;
     break;}
 case 726:
-#line 3350 "parse.y"
+#line 3349 "parse.y"
 { expand_start_all_catch (); ;
     break;}
 case 727:
-#line 3352 "parse.y"
+#line 3351 "parse.y"
 {
 		  int nested = (hack_decl_function_context
 				(current_function_decl) != NULL_TREE);
@@ -7307,41 +7306,41 @@ case 727:
 		;
     break;}
 case 728:
-#line 3362 "parse.y"
+#line 3361 "parse.y"
 { yyval.ttype = begin_try_block (); ;
     break;}
 case 729:
-#line 3364 "parse.y"
+#line 3363 "parse.y"
 { finish_try_block (yyvsp[-1].ttype); ;
     break;}
 case 730:
-#line 3366 "parse.y"
+#line 3365 "parse.y"
 { finish_handler_sequence (yyvsp[-3].ttype); ;
     break;}
 case 733:
-#line 3376 "parse.y"
+#line 3375 "parse.y"
 { yyval.ttype = begin_handler(); ;
     break;}
 case 734:
-#line 3378 "parse.y"
+#line 3377 "parse.y"
 { finish_handler_parms (yyvsp[-1].ttype); ;
     break;}
 case 735:
-#line 3380 "parse.y"
+#line 3379 "parse.y"
 { finish_handler (yyvsp[-3].ttype); ;
     break;}
 case 738:
-#line 3390 "parse.y"
+#line 3389 "parse.y"
 { expand_start_catch_block (NULL_TREE, NULL_TREE); ;
     break;}
 case 739:
-#line 3406 "parse.y"
+#line 3405 "parse.y"
 { check_for_new_type ("inside exception declarations", yyvsp[-1].ftype);
 		  expand_start_catch_block (TREE_PURPOSE (yyvsp[-1].ftype.t),
 					    TREE_VALUE (yyvsp[-1].ftype.t)); ;
     break;}
 case 740:
-#line 3413 "parse.y"
+#line 3412 "parse.y"
 { tree label;
 		do_label:
 		  label = define_label (input_filename, lineno, yyvsp[-1].ttype);
@@ -7350,129 +7349,129 @@ case 740:
 		;
     break;}
 case 741:
-#line 3420 "parse.y"
+#line 3419 "parse.y"
 { goto do_label; ;
     break;}
 case 742:
-#line 3422 "parse.y"
+#line 3421 "parse.y"
 { goto do_label; ;
     break;}
 case 743:
-#line 3424 "parse.y"
+#line 3423 "parse.y"
 { goto do_label; ;
     break;}
 case 744:
-#line 3429 "parse.y"
+#line 3428 "parse.y"
 { if (yyvsp[-1].ttype) cplus_expand_expr_stmt (yyvsp[-1].ttype); ;
     break;}
 case 746:
-#line 3432 "parse.y"
+#line 3431 "parse.y"
 { if (pedantic)
 		    pedwarn ("ANSI C++ forbids compound statements inside for initializations");
 		;
     break;}
 case 747:
-#line 3441 "parse.y"
+#line 3440 "parse.y"
 { emit_line_note (input_filename, lineno);
 		  yyval.ttype = NULL_TREE; ;
     break;}
 case 748:
-#line 3444 "parse.y"
+#line 3443 "parse.y"
 { emit_line_note (input_filename, lineno); ;
     break;}
 case 749:
-#line 3449 "parse.y"
+#line 3448 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 751:
-#line 3452 "parse.y"
+#line 3451 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 752:
-#line 3459 "parse.y"
+#line 3458 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 755:
-#line 3466 "parse.y"
+#line 3465 "parse.y"
 { yyval.ttype = chainon (yyval.ttype, yyvsp[0].ttype); ;
     break;}
 case 756:
-#line 3471 "parse.y"
+#line 3470 "parse.y"
 { yyval.ttype = build_tree_list (yyval.ttype, yyvsp[-1].ttype); ;
     break;}
 case 757:
-#line 3476 "parse.y"
+#line 3475 "parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyval.ttype, NULL_TREE); ;
     break;}
 case 758:
-#line 3478 "parse.y"
+#line 3477 "parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ttype, yyval.ttype); ;
     break;}
 case 759:
-#line 3489 "parse.y"
+#line 3488 "parse.y"
 {
 		  yyval.ttype = empty_parms();
 		;
     break;}
 case 761:
-#line 3494 "parse.y"
+#line 3493 "parse.y"
 { yyval.ttype = tree_cons (NULL_TREE, yyvsp[0].ftype.t, void_list_node);
 		  TREE_PARMLIST (yyval.ttype) = 1; 
 		  check_for_new_type ("inside parameter list", yyvsp[0].ftype); ;
     break;}
 case 762:
-#line 3503 "parse.y"
+#line 3502 "parse.y"
 {
 		  yyval.ttype = chainon (yyval.ttype, void_list_node);
 		  TREE_PARMLIST (yyval.ttype) = 1;
 		;
     break;}
 case 763:
-#line 3508 "parse.y"
+#line 3507 "parse.y"
 {
 		  TREE_PARMLIST (yyval.ttype) = 1;
 		;
     break;}
 case 764:
-#line 3513 "parse.y"
+#line 3512 "parse.y"
 {
 		  TREE_PARMLIST (yyval.ttype) = 1;
 		;
     break;}
 case 765:
-#line 3517 "parse.y"
+#line 3516 "parse.y"
 {
 		  yyval.ttype = build_tree_list (NULL_TREE, yyvsp[-1].ftype.t); 
 		  TREE_PARMLIST (yyval.ttype) = 1;
 		;
     break;}
 case 766:
-#line 3522 "parse.y"
+#line 3521 "parse.y"
 {
 		  yyval.ttype = NULL_TREE;
 		;
     break;}
 case 767:
-#line 3526 "parse.y"
+#line 3525 "parse.y"
 {
 		  TREE_PARMLIST (yyval.ttype) = 1;
 		;
     break;}
 case 768:
-#line 3530 "parse.y"
+#line 3529 "parse.y"
 {
 		  TREE_PARMLIST (yyval.ttype) = 1;
 		;
     break;}
 case 769:
-#line 3534 "parse.y"
+#line 3533 "parse.y"
 {
 		  yyval.ttype = build_tree_list (NULL_TREE, yyvsp[-1].ftype.t);
 		  TREE_PARMLIST (yyval.ttype) = 1;
 		;
     break;}
 case 770:
-#line 3539 "parse.y"
+#line 3538 "parse.y"
 {
 		  /* This helps us recover from really nasty
 		     parse errors, for example, a missing right
@@ -7485,7 +7484,7 @@ case 770:
 		;
     break;}
 case 771:
-#line 3550 "parse.y"
+#line 3549 "parse.y"
 {
 		  /* This helps us recover from really nasty
 		     parse errors, for example, a missing right
@@ -7498,98 +7497,98 @@ case 771:
 		;
     break;}
 case 772:
-#line 3565 "parse.y"
+#line 3564 "parse.y"
 { maybe_snarf_defarg (); ;
     break;}
 case 773:
-#line 3567 "parse.y"
+#line 3566 "parse.y"
 { yyval.ttype = yyvsp[0].ttype; ;
     break;}
 case 776:
-#line 3578 "parse.y"
+#line 3577 "parse.y"
 { check_for_new_type ("in a parameter list", yyvsp[0].ftype);
 		  yyval.ttype = build_tree_list (NULL_TREE, yyvsp[0].ftype.t); ;
     break;}
 case 777:
-#line 3581 "parse.y"
+#line 3580 "parse.y"
 { check_for_new_type ("in a parameter list", yyvsp[-1].ftype);
 		  yyval.ttype = build_tree_list (yyvsp[0].ttype, yyvsp[-1].ftype.t); ;
     break;}
 case 778:
-#line 3584 "parse.y"
+#line 3583 "parse.y"
 { check_for_new_type ("in a parameter list", yyvsp[0].ftype);
 		  yyval.ttype = chainon (yyval.ttype, yyvsp[0].ftype.t); ;
     break;}
 case 779:
-#line 3587 "parse.y"
+#line 3586 "parse.y"
 { yyval.ttype = chainon (yyval.ttype, build_tree_list (NULL_TREE, yyvsp[0].ttype)); ;
     break;}
 case 780:
-#line 3589 "parse.y"
+#line 3588 "parse.y"
 { yyval.ttype = chainon (yyval.ttype, build_tree_list (yyvsp[0].ttype, yyvsp[-2].ttype)); ;
     break;}
 case 782:
-#line 3595 "parse.y"
+#line 3594 "parse.y"
 { check_for_new_type ("in a parameter list", yyvsp[-1].ftype);
 		  yyval.ttype = build_tree_list (NULL_TREE, yyvsp[-1].ftype.t); ;
     break;}
 case 783:
-#line 3605 "parse.y"
+#line 3604 "parse.y"
 { tree specs = strip_attrs (yyvsp[-1].ftype.t);
 		  yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag;
 		  yyval.ftype.t = build_tree_list (specs, yyvsp[0].ttype); ;
     break;}
 case 784:
-#line 3609 "parse.y"
+#line 3608 "parse.y"
 { yyval.ftype.t = build_tree_list (yyvsp[-1].ftype.t, yyvsp[0].ttype); 
 		  yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ;
     break;}
 case 785:
-#line 3612 "parse.y"
+#line 3611 "parse.y"
 { yyval.ftype.t = build_tree_list (get_decl_list (yyvsp[-1].ftype.t), yyvsp[0].ttype); 
 		  yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ;
     break;}
 case 786:
-#line 3615 "parse.y"
+#line 3614 "parse.y"
 { tree specs = strip_attrs (yyvsp[-1].ftype.t);
 		  yyval.ftype.t = build_tree_list (specs, yyvsp[0].ttype);
 		  yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag; ;
     break;}
 case 787:
-#line 3619 "parse.y"
+#line 3618 "parse.y"
 { tree specs = strip_attrs (yyvsp[0].ftype.t);
 		  yyval.ftype.t = build_tree_list (specs, NULL_TREE); 
 		  yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag; ;
     break;}
 case 788:
-#line 3623 "parse.y"
+#line 3622 "parse.y"
 { tree specs = strip_attrs (yyvsp[-1].ttype);
 		  yyval.ftype.t = build_tree_list (specs, yyvsp[0].ttype); 
 		  yyval.ftype.new_type_flag = 0; ;
     break;}
 case 789:
-#line 3630 "parse.y"
+#line 3629 "parse.y"
 { yyval.ftype.t = build_tree_list (NULL_TREE, yyvsp[0].ftype.t);
 		  yyval.ftype.new_type_flag = yyvsp[0].ftype.new_type_flag;  ;
     break;}
 case 790:
-#line 3633 "parse.y"
+#line 3632 "parse.y"
 { yyval.ftype.t = build_tree_list (yyvsp[0].ttype, yyvsp[-1].ftype.t);
 		  yyval.ftype.new_type_flag = yyvsp[-1].ftype.new_type_flag;  ;
     break;}
 case 793:
-#line 3644 "parse.y"
+#line 3643 "parse.y"
 { see_typename (); ;
     break;}
 case 794:
-#line 3649 "parse.y"
+#line 3648 "parse.y"
 {
 		  error ("type specifier omitted for parameter");
 		  yyval.ttype = build_tree_list (integer_type_node, NULL_TREE);
 		;
     break;}
 case 795:
-#line 3654 "parse.y"
+#line 3653 "parse.y"
 {
 		  error ("type specifier omitted for parameter");
 		  if (TREE_CODE (yyval.ttype) == SCOPE_REF
@@ -7600,193 +7599,193 @@ case 795:
 		;
     break;}
 case 796:
-#line 3666 "parse.y"
+#line 3665 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 797:
-#line 3668 "parse.y"
+#line 3667 "parse.y"
 { yyval.ttype = yyvsp[-1].ttype; ;
     break;}
 case 798:
-#line 3670 "parse.y"
+#line 3669 "parse.y"
 { yyval.ttype = build_decl_list (NULL_TREE, NULL_TREE); ;
     break;}
 case 799:
-#line 3675 "parse.y"
+#line 3674 "parse.y"
 { yyval.ttype = build_decl_list (NULL_TREE, groktypename(yyvsp[0].ftype.t)); ;
     break;}
 case 801:
-#line 3681 "parse.y"
+#line 3680 "parse.y"
 {
 		  TREE_CHAIN (yyvsp[0].ttype) = yyval.ttype;
 		  yyval.ttype = yyvsp[0].ttype;
 		;
     break;}
 case 802:
-#line 3689 "parse.y"
+#line 3688 "parse.y"
 { yyval.ttype = NULL_TREE; ;
     break;}
 case 803:
-#line 3691 "parse.y"
+#line 3690 "parse.y"
 { yyval.ttype = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 804:
-#line 3693 "parse.y"
+#line 3692 "parse.y"
 { yyval.ttype = make_reference_declarator (yyvsp[-1].ttype, yyvsp[0].ttype); ;
     break;}
 case 805:
-#line 3695 "parse.y"
+#line 3694 "parse.y"
 { tree arg = make_pointer_declarator (yyvsp[-1].ttype, yyvsp[0].ttype);
 		  yyval.ttype = build_parse_node (SCOPE_REF, yyvsp[-2].ttype, arg);
 		;
     break;}
 case 806:
-#line 3702 "parse.y"
+#line 3701 "parse.y"
 { got_scope = NULL_TREE; ;
     break;}
 case 807:
-#line 3707 "parse.y"
+#line 3706 "parse.y"
 { yyval.ttype = ansi_opname[MULT_EXPR]; ;
     break;}
 case 808:
-#line 3709 "parse.y"
+#line 3708 "parse.y"
 { yyval.ttype = ansi_opname[TRUNC_DIV_EXPR]; ;
     break;}
 case 809:
-#line 3711 "parse.y"
+#line 3710 "parse.y"
 { yyval.ttype = ansi_opname[TRUNC_MOD_EXPR]; ;
     break;}
 case 810:
-#line 3713 "parse.y"
+#line 3712 "parse.y"
 { yyval.ttype = ansi_opname[PLUS_EXPR]; ;
     break;}
 case 811:
-#line 3715 "parse.y"
+#line 3714 "parse.y"
 { yyval.ttype = ansi_opname[MINUS_EXPR]; ;
     break;}
 case 812:
-#line 3717 "parse.y"
+#line 3716 "parse.y"
 { yyval.ttype = ansi_opname[BIT_AND_EXPR]; ;
     break;}
 case 813:
-#line 3719 "parse.y"
+#line 3718 "parse.y"
 { yyval.ttype = ansi_opname[BIT_IOR_EXPR]; ;
     break;}
 case 814:
-#line 3721 "parse.y"
+#line 3720 "parse.y"
 { yyval.ttype = ansi_opname[BIT_XOR_EXPR]; ;
     break;}
 case 815:
-#line 3723 "parse.y"
+#line 3722 "parse.y"
 { yyval.ttype = ansi_opname[BIT_NOT_EXPR]; ;
     break;}
 case 816:
-#line 3725 "parse.y"
+#line 3724 "parse.y"
 { yyval.ttype = ansi_opname[COMPOUND_EXPR]; ;
     break;}
 case 817:
-#line 3727 "parse.y"
+#line 3726 "parse.y"
 { yyval.ttype = ansi_opname[yyvsp[0].code]; ;
     break;}
 case 818:
-#line 3729 "parse.y"
+#line 3728 "parse.y"
 { yyval.ttype = ansi_opname[LT_EXPR]; ;
     break;}
 case 819:
-#line 3731 "parse.y"
+#line 3730 "parse.y"
 { yyval.ttype = ansi_opname[GT_EXPR]; ;
     break;}
 case 820:
-#line 3733 "parse.y"
+#line 3732 "parse.y"
 { yyval.ttype = ansi_opname[yyvsp[0].code]; ;
     break;}
 case 821:
-#line 3735 "parse.y"
+#line 3734 "parse.y"
 { yyval.ttype = ansi_assopname[yyvsp[0].code]; ;
     break;}
 case 822:
-#line 3737 "parse.y"
+#line 3736 "parse.y"
 { yyval.ttype = ansi_opname [MODIFY_EXPR]; ;
     break;}
 case 823:
-#line 3739 "parse.y"
+#line 3738 "parse.y"
 { yyval.ttype = ansi_opname[yyvsp[0].code]; ;
     break;}
 case 824:
-#line 3741 "parse.y"
+#line 3740 "parse.y"
 { yyval.ttype = ansi_opname[yyvsp[0].code]; ;
     break;}
 case 825:
-#line 3743 "parse.y"
+#line 3742 "parse.y"
 { yyval.ttype = ansi_opname[POSTINCREMENT_EXPR]; ;
     break;}
 case 826:
-#line 3745 "parse.y"
+#line 3744 "parse.y"
 { yyval.ttype = ansi_opname[PREDECREMENT_EXPR]; ;
     break;}
 case 827:
-#line 3747 "parse.y"
+#line 3746 "parse.y"
 { yyval.ttype = ansi_opname[TRUTH_ANDIF_EXPR]; ;
     break;}
 case 828:
-#line 3749 "parse.y"
+#line 3748 "parse.y"
 { yyval.ttype = ansi_opname[TRUTH_ORIF_EXPR]; ;
     break;}
 case 829:
-#line 3751 "parse.y"
+#line 3750 "parse.y"
 { yyval.ttype = ansi_opname[TRUTH_NOT_EXPR]; ;
     break;}
 case 830:
-#line 3753 "parse.y"
+#line 3752 "parse.y"
 { yyval.ttype = ansi_opname[COND_EXPR]; ;
     break;}
 case 831:
-#line 3755 "parse.y"
+#line 3754 "parse.y"
 { yyval.ttype = ansi_opname[yyvsp[0].code]; ;
     break;}
 case 832:
-#line 3757 "parse.y"
+#line 3756 "parse.y"
 { yyval.ttype = ansi_opname[COMPONENT_REF]; ;
     break;}
 case 833:
-#line 3759 "parse.y"
+#line 3758 "parse.y"
 { yyval.ttype = ansi_opname[MEMBER_REF]; ;
     break;}
 case 834:
-#line 3761 "parse.y"
+#line 3760 "parse.y"
 { yyval.ttype = ansi_opname[CALL_EXPR]; ;
     break;}
 case 835:
-#line 3763 "parse.y"
+#line 3762 "parse.y"
 { yyval.ttype = ansi_opname[ARRAY_REF]; ;
     break;}
 case 836:
-#line 3765 "parse.y"
+#line 3764 "parse.y"
 { yyval.ttype = ansi_opname[NEW_EXPR]; ;
     break;}
 case 837:
-#line 3767 "parse.y"
+#line 3766 "parse.y"
 { yyval.ttype = ansi_opname[DELETE_EXPR]; ;
     break;}
 case 838:
-#line 3769 "parse.y"
+#line 3768 "parse.y"
 { yyval.ttype = ansi_opname[VEC_NEW_EXPR]; ;
     break;}
 case 839:
-#line 3771 "parse.y"
+#line 3770 "parse.y"
 { yyval.ttype = ansi_opname[VEC_DELETE_EXPR]; ;
     break;}
 case 840:
-#line 3774 "parse.y"
+#line 3773 "parse.y"
 { yyval.ttype = grokoptypename (yyvsp[-1].ftype.t, yyvsp[0].ttype); ;
     break;}
 case 841:
-#line 3776 "parse.y"
+#line 3775 "parse.y"
 { yyval.ttype = ansi_opname[ERROR_MARK]; ;
     break;}
 }
    /* the action file gets copied in in place of this dollarsign */
-#line 498 "/usr/lib/bison.simple"
+#line 498 "/usr/cygnus/progressive-97r2/share/bison.simple"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -7982,7 +7981,7 @@ yyerrhandle:
   yystate = yyn;
   goto yynewstate;
 }
-#line 3779 "parse.y"
+#line 3778 "parse.y"
 
 
 #ifdef SPEW_DEBUG
diff --git a/gcc/cp/parse.y b/gcc/cp/parse.y
index 007a411772a..8729cc6444c 100644
--- a/gcc/cp/parse.y
+++ b/gcc/cp/parse.y
@@ -32,8 +32,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
 
-#include <stdio.h>
-#include <errno.h>
+#include "system.h"
 
 #include "tree.h"
 #include "input.h"
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 779d06c8aa4..640d8e7ef04 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -26,7 +26,7 @@ Boston, MA 02111-1307, USA.  */
      file that contains only the method templates and "just win".  */
 
 #include "config.h"
-#include <stdio.h>
+#include "system.h"
 #include "obstack.h"
 
 #include "tree.h"
@@ -39,10 +39,6 @@ Boston, MA 02111-1307, USA.  */
 #include "defaults.h"
 #include "except.h"
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
 /* The type of functions taking a tree, and some additional data, and
    returning an int.  */
 typedef int (*tree_fn_t) PROTO((tree, void*));
diff --git a/gcc/cp/ptree.c b/gcc/cp/ptree.c
index fa749973e3c..6b7e6a41317 100644
--- a/gcc/cp/ptree.c
+++ b/gcc/cp/ptree.c
@@ -22,7 +22,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
 #include "tree.h"
-#include <stdio.h>
+#include "system.h"
 #include "cp-tree.h"
 
 void
diff --git a/gcc/cp/repo.c b/gcc/cp/repo.c
index 27a1f4dda31..ed682331515 100644
--- a/gcc/cp/repo.c
+++ b/gcc/cp/repo.c
@@ -26,28 +26,15 @@ Boston, MA 02111-1307, USA.  */
    explicit code.  */
 
 #include "config.h"
-#include <stdio.h>
+#include "system.h"
 #include "tree.h"
 #include "cp-tree.h"
 #include "input.h"
 #include "obstack.h"
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#else
-extern char * getenv ();
-#endif
-
-#ifdef NEED_DECLARATION_RINDEX
-extern char *rindex ();
-#endif
 extern char *getpwd PROTO((void));
 
 static tree repo_get_id PROTO((tree));
-static char *save_string PROTO((char *, int));
 static char *extract_string PROTO((char **));
 static char *get_base_filename PROTO((char *));
 static void open_repo_file PROTO((char *));
@@ -210,14 +197,6 @@ repo_template_instantiated (t, extern_p)
     }
 }
 
-static char *
-save_string (s, len)
-     char *s;
-     int len;
-{
-  return obstack_copy0 (&temporary_obstack, s, len);
-}
-
 /* Parse a reasonable subset of shell quoting syntax.  */
 
 static char *
diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c
index e866e3c023a..8b9b3151039 100644
--- a/gcc/cp/rtti.c
+++ b/gcc/cp/rtti.c
@@ -21,7 +21,7 @@ Boston, MA 02111-1307, USA.  */
 
 
 #include "config.h"
-#include <stdio.h>
+#include "system.h"
 #include "tree.h"
 #include "cp-tree.h"
 #include "flags.h"
diff --git a/gcc/cp/search.c b/gcc/cp/search.c
index 2d16fc45a8b..ed55e3c47ff 100644
--- a/gcc/cp/search.c
+++ b/gcc/cp/search.c
@@ -24,7 +24,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
 #include "tree.h"
-#include <stdio.h>
+#include "system.h"
 #include "cp-tree.h"
 #include "obstack.h"
 #include "flags.h"
diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
index 3538aa10341..d43e6117761 100644
--- a/gcc/cp/semantics.c
+++ b/gcc/cp/semantics.c
@@ -25,7 +25,7 @@
    02111-1307, USA.  */
 
 #include "config.h"
-#include <stdio.h>
+#include "system.h"
 #include "tree.h"
 #include "cp-tree.h"
 #include "except.h"
diff --git a/gcc/cp/sig.c b/gcc/cp/sig.c
index 72eb314aeb2..c83c20a8be9 100644
--- a/gcc/cp/sig.c
+++ b/gcc/cp/sig.c
@@ -21,7 +21,7 @@ Boston, MA 02111-1307, USA.  */
 
 
 #include "config.h"
-#include <stdio.h>
+#include "system.h"
 #include "obstack.h"
 #include "tree.h"
 #include "cp-tree.h"
diff --git a/gcc/cp/spew.c b/gcc/cp/spew.c
index 2112e23cf27..08446792901 100644
--- a/gcc/cp/spew.c
+++ b/gcc/cp/spew.c
@@ -24,7 +24,7 @@ Boston, MA 02111-1307, USA.  */
    when compiling parse.c and spew.c.  */
 
 #include "config.h"
-#include <stdio.h>
+#include "system.h"
 #include "input.h"
 #include "tree.h"
 #include "lex.h"
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 52a148ade87..edd3d036272 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -20,7 +20,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
-#include <stdio.h>
+#include "system.h"
 #include "obstack.h"
 #include "tree.h"
 #include "cp-tree.h"
@@ -32,14 +32,6 @@ Boston, MA 02111-1307, USA.  */
 #include <varargs.h>
 #endif
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#ifdef NEED_DECLARATION_FREE
-extern void free	PROTO((void *));
-#endif
-
 extern void compiler_error ();
 
 static tree get_identifier_list PROTO((tree));
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index dfcda9ad21c..c39bbb956ac 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -30,7 +30,7 @@ Boston, MA 02111-1307, USA.  */
    like a strange sort of assignment).  */
 
 #include "config.h"
-#include <stdio.h>
+#include "system.h"
 #include "tree.h"
 #include "rtl.h"
 #include "cp-tree.h"
@@ -38,10 +38,6 @@ Boston, MA 02111-1307, USA.  */
 #include "output.h"
 #include "expr.h"
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
 extern void compiler_error ();
 
 static tree convert_for_assignment PROTO((tree, tree, char*, tree,
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index 5b17ae2d76f..3bfe54e6390 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -31,7 +31,7 @@ Boston, MA 02111-1307, USA.  */
    like a strange sort of assignment).  */
 
 #include "config.h"
-#include <stdio.h>
+#include "system.h"
 #include "tree.h"
 #include "cp-tree.h"
 #include "flags.h"
diff --git a/gcc/cp/xref.c b/gcc/cp/xref.c
index c3c35de7f4a..04330899da0 100644
--- a/gcc/cp/xref.c
+++ b/gcc/cp/xref.c
@@ -22,30 +22,12 @@ Boston, MA 02111-1307, USA.  */
 
 #include "config.h"
 #include "tree.h"
-#include <stdio.h>
+#include "system.h"
 #include "cp-tree.h"
 #include "input.h"
 
-#include <ctype.h>
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 extern char *getpwd PROTO((void));
 
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
-#ifdef NEED_DECLARATION_RINDEX
-extern char *rindex ();
-#endif
-
 /* The character(s) used to join a directory specification (obtained with
    getwd or equivalent) with a non-absolute file name.  */