diff -Nrc3pad gcc-3.2/boehm-gc/ChangeLog gcc-3.2.1/boehm-gc/ChangeLog *** gcc-3.2/boehm-gc/ChangeLog Wed Aug 14 08:58:59 2002 --- gcc-3.2.1/boehm-gc/ChangeLog Tue Nov 19 17:47:53 2002 *************** *** 1,3 **** --- 1,23 ---- + 2002-11-19 Release Manager + + * GCC 3.2.1 Released. + + 2002-11-19 Release Manager + + * GCC 3.2.1 Released. + + 2002-11-18 Release Manager + + * GCC 3.2.1 Released. + + 2002-10-07 Kaveh R. Ghazi + + * Makefile.am (all-multi): Fix multilib parallel build. + + 2002-08-23 Adam Megacz + + * win32_threads.cc: Removed extraneous ABORT() + 2002-08-14 Release Manager * GCC 3.2 Released. diff -Nrc3pad gcc-3.2/boehm-gc/Makefile.am gcc-3.2.1/boehm-gc/Makefile.am *** gcc-3.2/boehm-gc/Makefile.am Tue Apr 23 03:20:04 2002 --- gcc-3.2.1/boehm-gc/Makefile.am Mon Oct 7 04:37:02 2002 *************** distclean-am: distclean-multi *** 144,150 **** maintainer-clean-am: maintainer-clean-multi all-multi: ! $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: --- 144,150 ---- maintainer-clean-am: maintainer-clean-multi all-multi: ! : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: diff -Nrc3pad gcc-3.2/boehm-gc/Makefile.in gcc-3.2.1/boehm-gc/Makefile.in *** gcc-3.2/boehm-gc/Makefile.in Wed Aug 14 09:31:10 2002 --- gcc-3.2.1/boehm-gc/Makefile.in Tue Nov 19 18:11:44 2002 *************** distclean-am: distclean-multi *** 616,622 **** maintainer-clean-am: maintainer-clean-multi all-multi: ! $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: --- 616,622 ---- maintainer-clean-am: maintainer-clean-multi all-multi: ! : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: diff -Nrc3pad gcc-3.2/boehm-gc/win32_threads.c gcc-3.2.1/boehm-gc/win32_threads.c *** gcc-3.2/boehm-gc/win32_threads.c Sat Jun 29 17:29:51 2002 --- gcc-3.2.1/boehm-gc/win32_threads.c Tue Sep 24 00:59:04 2002 *************** void GC_push_all_stacks() *** 134,142 **** (LPCONTEXT)&thread_table[i].context)) ABORT("GetThreadContext failed"); # ifdef I386 - if (thread_table[i].context.Esp >= (DWORD)thread_table[i].stack - || thread_table[i].context.Esp < (DWORD)bottom) - ABORT("Thread stack pointer out of range"); GC_push_one ((word) thread_table[i].context.Edi); GC_push_one ((word) thread_table[i].context.Esi); GC_push_one ((word) thread_table[i].context.Ebp); --- 134,139 ---- diff -Nrc3pad gcc-3.2/fastjar/ChangeLog gcc-3.2.1/fastjar/ChangeLog *** gcc-3.2/fastjar/ChangeLog Wed Aug 14 08:59:07 2002 --- gcc-3.2.1/fastjar/ChangeLog Tue Nov 19 17:48:07 2002 *************** *** 1,3 **** --- 1,27 ---- + 2002-11-19 Release Manager + + * GCC 3.2.1 Released. + + 2002-11-19 Release Manager + + * GCC 3.2.1 Released. + + 2002-11-18 Release Manager + + * GCC 3.2.1 Released. + + 2002-11-11 Tom Tromey + + * dostime.c (dos2unixtime): Mask for seconds is 0x1f. Correctly + compute month. + (unix2dostime): Handle years before 1980. Correctly compute month + and day of month. + + 2002-11-07 Tom Tromey + + * dostime.c: Rewrote from scratch. + * dostime.h (dostime): Removed. + 2002-08-14 Release Manager * GCC 3.2 Released. diff -Nrc3pad gcc-3.2/fastjar/dostime.c gcc-3.2.1/fastjar/dostime.c *** gcc-3.2/fastjar/dostime.c Thu Dec 14 18:45:35 2000 --- gcc-3.2.1/fastjar/dostime.c Mon Nov 11 22:22:31 2002 *************** *** 1,157 **** ! /* ! dostime.c - routines for converting UNIX time to MS-DOS time. ! ! Borrowed from Info-zip's unzip ! Copyright (C) 1999 Bryan Burns This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. ! This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. ! You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ! /* $Id: dostime.c,v 1.2 2000/12/14 18:45:35 ghazi Exp $ ! ! $Log: dostime.c,v $ ! Revision 1.2 2000/12/14 18:45:35 ghazi ! Warning fixes: ! ! * compress.c: Include stdlib.h and compress.h. ! (rcsid): Delete. ! (report_str_error): Make static. ! (ez_inflate_str): Delete unused variable. Add parens in if-stmt. ! (hrd_inflate_str): Likewise. ! ! * compress.h (init_compression, end_compression, init_inflation, ! end_inflation): Prototype void arguments. ! ! * dostime.c (rcsid): Delete. ! ! * jargrep.c: Include ctype.h, stdlib.h, zlib.h and compress.h. ! Make functions static. Cast ctype function argument to `unsigned ! char'. Add parens in if-stmts. Constify. ! (Usage): Change into a macro. ! (jargrep): Remove unused parameter. ! ! * jartool.c: Constify. Add parens in if-stmts. Align ! signed/unsigned char pointers in functions calls using casts. ! (rcsid): Delete. ! (list_jar): Fix printf format specifier. ! (usage): Chop long string into bits. Reformat. ! ! * pushback.c (rcsid): Delete. ! ! Revision 1.1 2000/12/09 03:08:23 apbianco ! 2000-12-08 Alexandre Petit-Bianco ! ! * fastjar: Imported. ! ! Revision 1.1.1.1 1999/12/06 03:09:12 toast ! initial checkin.. ! ! ! ! Revision 1.6 1999/05/10 08:32:26 burnsbr ! added dos2unixtime ! ! Revision 1.5 1999/04/27 10:03:50 burnsbr ! configure support ! ! Revision 1.4 1999/04/26 21:55:19 burnsbr ! switched from sys/time.h to time.h for better portability ! ! Revision 1.3 1999/04/20 08:54:30 burnsbr ! added GPL comment ! ! Revision 1.2 1999/04/20 05:10:53 burnsbr ! added RCS tags ! ! ! */ ! #include "config.h" - #ifdef TM_IN_SYS_TIME - #include - #else #include - #endif #include "dostime.h" /* ! Copyright (C) 1990-1997 Mark Adler, Richard B. Wales, Jean-loup Gailly, ! Kai Uwe Rommel, Onno van der Linden and Igor Mandrichenko. ! Permission is granted to any individual or institution to use, copy, or ! redistribute this software so long as all of the original files are included, ! that it is not sold for profit, and that this copyright notice is retained. ! ! */ ! ! ! time_t dos2unixtime(dostime) ! unsigned long dostime; /* DOS time to convert */ ! /* Return the Unix time_t value (GMT/UTC time) for the DOS format (local) ! * time dostime, where dostime is a four byte value (date in most ! * significant word, time in least significant word), see dostime() ! * function. ! */ { ! struct tm *t; /* argument for mktime() */ ! time_t clock = time(NULL); ! t = localtime(&clock); ! t->tm_isdst = -1; /* let mktime() determine if DST is in effect */ ! /* Convert DOS time to UNIX time_t format */ ! t->tm_sec = (((int)dostime) << 1) & 0x3e; ! t->tm_min = (((int)dostime) >> 5) & 0x3f; ! t->tm_hour = (((int)dostime) >> 11) & 0x1f; ! t->tm_mday = (int)(dostime >> 16) & 0x1f; ! t->tm_mon = ((int)(dostime >> 21) & 0x0f) - 1; ! t->tm_year = ((int)(dostime >> 25) & 0x7f) + 80; ! return mktime(t); ! } ! unsigned long dostime(y, n, d, h, m, s) ! int y; /* year */ ! int n; /* month */ ! int d; /* day */ ! int h; /* hour */ ! int m; /* minute */ ! int s; /* second */ ! /* Convert the date y/n/d and time h:m:s to a four byte DOS date and ! time (date in high two bytes, time in low two bytes allowing magnitude ! comparison). */ ! { ! return y < 1980 ? dostime(1980, 1, 1, 0, 0, 0) : ! (((unsigned long)y - 1980) << 25) | ((unsigned long)n << 21) | ! ((unsigned long)d << 16) | ((unsigned long)h << 11) | ! ((unsigned long)m << 5) | ((unsigned long)s >> 1); ! } ! unsigned long unix2dostime(t) ! time_t *t; /* unix time to convert */ ! /* Return the Unix time t in DOS format, rounded up to the next two ! second boundary. */ { ! time_t t_even; ! struct tm *s; /* result of localtime() */ ! t_even = (*t + 1) & (~1); /* Round up to even seconds. */ ! s = localtime(&t_even); /* Use local time since MSDOS does. */ ! return dostime(s->tm_year + 1900, s->tm_mon + 1, s->tm_mday, ! s->tm_hour, s->tm_min, s->tm_sec); } - --- 1,79 ---- ! /* dostime.c - convert dos time to/from time_t. ! Copyright (C) 2002 Free Software Foundation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. ! This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. ! You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ ! #include #include #include "dostime.h" /* + * The specification to which this was written. From Joe Buck. + * The DOS format appears to have only 2 second resolution. It is an + * unsigned long, and ORs together + * + * (year-1980)<<25 + * month<<21 (month is tm_mon + 1, 1=Jan through 12=Dec) + * day<<16 (day is tm_mday, 1-31) + * hour<<11 (hour is tm_hour, 0-23) + * min<<5 (min is tm_min, 0-59) + * sec>>1 (sec is tm_sec, 0-59, that's right, we throw away the LSB) + * + * DOS uses local time, so the localtime() call is used to turn the time_t + * into a struct tm. + */ ! time_t ! dos2unixtime (unsigned long dostime) { ! struct tm ltime; ! time_t now = time (NULL); ! /* Call localtime to initialize timezone in TIME. */ ! ltime = *localtime (&now); ! ltime.tm_year = (dostime >> 25) + 80; ! ltime.tm_mon = ((dostime >> 21) & 0x0f) - 1; ! ltime.tm_mday = (dostime >> 16) & 0x1f; ! ltime.tm_hour = (dostime >> 11) & 0x0f; ! ltime.tm_min = (dostime >> 5) & 0x3f; ! ltime.tm_sec = (dostime & 0x1f) << 1; ! ltime.tm_wday = -1; ! ltime.tm_yday = -1; ! ltime.tm_isdst = -1; + return mktime (<ime); + } ! unsigned long ! unix2dostime (time_t *time) { ! struct tm *ltime = localtime (time); ! int year = ltime->tm_year - 80; ! if (year < 0) ! year = 0; ! return (year << 25 ! | (ltime->tm_mon + 1) << 21 ! | ltime->tm_mday << 16 ! | ltime->tm_hour << 11 ! | ltime->tm_min << 5 ! | ltime->tm_sec >> 1); } diff -Nrc3pad gcc-3.2/fastjar/dostime.h gcc-3.2.1/fastjar/dostime.h *** gcc-3.2/fastjar/dostime.h Sat Dec 9 03:08:23 2000 --- gcc-3.2.1/fastjar/dostime.h Thu Nov 7 14:09:37 2002 *************** *** 1,6 **** /* dostime.h - function prototypes ! Copyright (C) 1999 Bryan Burns This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License --- 1,6 ---- /* dostime.h - function prototypes ! Copyright (C) 1999, 2002 Bryan Burns This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License *************** *** 18,22 **** */ time_t dos2unixtime(unsigned long dostime); - unsigned long dostime(int, int, int, int, int, int); unsigned long unix2dostime(time_t*); --- 18,21 ---- diff -Nrc3pad gcc-3.2/gcc/java/ChangeLog gcc-3.2.1/gcc/java/ChangeLog *** gcc-3.2/gcc/java/ChangeLog Wed Aug 14 09:00:24 2002 --- gcc-3.2.1/gcc/java/ChangeLog Tue Nov 19 17:49:12 2002 *************** *** 1,3 **** --- 1,38 ---- + 2002-11-19 Release Manager + + * GCC 3.2.1 Released. + + 2002-11-19 Release Manager + + * GCC 3.2.1 Released. + + 2002-11-18 Release Manager + + * GCC 3.2.1 Released. + + 2002-10-21 Matthias Klose + + * Backport, without whitespace change: + + 2002-06-10 Akim Demaille + * parse.y (interface_type_list, class_member_declaration) + (unary_expression_not_plus_minus): Remove duplicate %type. + Whitespace changes. + + 2002-06-13 Akim Demaille + * parse.y (class_declaration, interface_declaration): Make sure + all their rules have an action, in order to avoid meaningless `$$ + = $1' and their type clashes. + + * parse.y (catch_clause): Terminate with `;'. + + 2002-10-06 Roger Sayle + + PR optimization/6627 + * java/lang.c (java_init): If storing the vbit in function + pointers, ensure that force_align_functions_log is atleast + one to aid compatability with g++ vtables. + 2002-08-14 Release Manager * GCC 3.2 Released. *************** Tue Apr 23 14:31:23 2002 Anthony Green *** 104,110 **** * jcf-parse.c (get_constant): CONSTANT_Integer: Use an unsigned HOST_WIDE_INT for num. Use JPOOL_UINT to get it. CONSTANT_Double: Use JPOOL_UINT to get both halves of a double. ! 2002-04-18 Bryce McKinlay * class.c (make_class_data): Set DECL_ALIGN on static class data, --- 139,145 ---- * jcf-parse.c (get_constant): CONSTANT_Integer: Use an unsigned HOST_WIDE_INT for num. Use JPOOL_UINT to get it. CONSTANT_Double: Use JPOOL_UINT to get both halves of a double. ! 2002-04-18 Bryce McKinlay * class.c (make_class_data): Set DECL_ALIGN on static class data, *************** Tue Apr 23 14:31:23 2002 Anthony Green *** 112,118 **** * expr.c (java_expand_expr): Set DECL_ALIGN on static array objects. * decl.c (java_init_decl_processing): Don't set TYPE_ALIGN for class_type_node. ! 2002-04-16 Mark Wielaard * jcf-write.c (generate_bytecode_insns): Only write const_0 if not --- 147,153 ---- * expr.c (java_expand_expr): Set DECL_ALIGN on static array objects. * decl.c (java_init_decl_processing): Don't set TYPE_ALIGN for class_type_node. ! 2002-04-16 Mark Wielaard * jcf-write.c (generate_bytecode_insns): Only write const_0 if not diff -Nrc3pad gcc-3.2/gcc/java/gcj.1 gcc-3.2.1/gcc/java/gcj.1 *** gcc-3.2/gcc/java/gcj.1 Wed Aug 14 09:36:43 2002 --- gcc-3.2.1/gcc/java/gcj.1 Tue Nov 19 18:17:21 2002 *************** *** 1,5 **** .\" Automatically generated by Pod::Man version 1.15 ! .\" Wed Aug 14 09:36:42 2002 .\" .\" Standard preamble: .\" ====================================================================== --- 1,5 ---- .\" Automatically generated by Pod::Man version 1.15 ! .\" Tue Nov 19 18:17:21 2002 .\" .\" Standard preamble: .\" ====================================================================== *************** *** 138,144 **** .\" ====================================================================== .\" .IX Title "GCJ 1" ! .TH GCJ 1 "gcc-3.2" "2002-08-14" "GNU" .UC .SH "NAME" gcj \- Ahead-of-time compiler for the Java language --- 138,144 ---- .\" ====================================================================== .\" .IX Title "GCJ 1" ! .TH GCJ 1 "gcc-3.2.1" "2002-11-19" "GNU" .UC .SH "NAME" gcj \- Ahead-of-time compiler for the Java language diff -Nrc3pad gcc-3.2/gcc/java/gcjh.1 gcc-3.2.1/gcc/java/gcjh.1 *** gcc-3.2/gcc/java/gcjh.1 Wed Aug 14 09:36:43 2002 --- gcc-3.2.1/gcc/java/gcjh.1 Tue Nov 19 18:17:21 2002 *************** *** 1,5 **** .\" Automatically generated by Pod::Man version 1.15 ! .\" Wed Aug 14 09:36:43 2002 .\" .\" Standard preamble: .\" ====================================================================== --- 1,5 ---- .\" Automatically generated by Pod::Man version 1.15 ! .\" Tue Nov 19 18:17:21 2002 .\" .\" Standard preamble: .\" ====================================================================== *************** *** 138,144 **** .\" ====================================================================== .\" .IX Title "GCJH 1" ! .TH GCJH 1 "gcc-3.2" "2002-08-14" "GNU" .UC .SH "NAME" gcjh \- generate header files from Java class files --- 138,144 ---- .\" ====================================================================== .\" .IX Title "GCJH 1" ! .TH GCJH 1 "gcc-3.2.1" "2002-11-19" "GNU" .UC .SH "NAME" gcjh \- generate header files from Java class files diff -Nrc3pad gcc-3.2/gcc/java/gij.1 gcc-3.2.1/gcc/java/gij.1 *** gcc-3.2/gcc/java/gij.1 Wed Aug 14 09:36:44 2002 --- gcc-3.2.1/gcc/java/gij.1 Tue Nov 19 18:17:22 2002 *************** *** 1,5 **** .\" Automatically generated by Pod::Man version 1.15 ! .\" Wed Aug 14 09:36:43 2002 .\" .\" Standard preamble: .\" ====================================================================== --- 1,5 ---- .\" Automatically generated by Pod::Man version 1.15 ! .\" Tue Nov 19 18:17:22 2002 .\" .\" Standard preamble: .\" ====================================================================== *************** *** 138,144 **** .\" ====================================================================== .\" .IX Title "GIJ 1" ! .TH GIJ 1 "gcc-3.2" "2002-08-14" "GNU" .UC .SH "NAME" gij \- \s-1GNU\s0 interpreter for Java bytecode --- 138,144 ---- .\" ====================================================================== .\" .IX Title "GIJ 1" ! .TH GIJ 1 "gcc-3.2.1" "2002-11-19" "GNU" .UC .SH "NAME" gij \- \s-1GNU\s0 interpreter for Java bytecode diff -Nrc3pad gcc-3.2/gcc/java/jcf-dump.1 gcc-3.2.1/gcc/java/jcf-dump.1 *** gcc-3.2/gcc/java/jcf-dump.1 Wed Aug 14 09:36:43 2002 --- gcc-3.2.1/gcc/java/jcf-dump.1 Tue Nov 19 18:17:22 2002 *************** *** 1,5 **** .\" Automatically generated by Pod::Man version 1.15 ! .\" Wed Aug 14 09:36:43 2002 .\" .\" Standard preamble: .\" ====================================================================== --- 1,5 ---- .\" Automatically generated by Pod::Man version 1.15 ! .\" Tue Nov 19 18:17:22 2002 .\" .\" Standard preamble: .\" ====================================================================== *************** *** 138,144 **** .\" ====================================================================== .\" .IX Title "JCF-DUMP 1" ! .TH JCF-DUMP 1 "gcc-3.2" "2002-08-14" "GNU" .UC .SH "NAME" jcf-dump \- print information about Java class files --- 138,144 ---- .\" ====================================================================== .\" .IX Title "JCF-DUMP 1" ! .TH JCF-DUMP 1 "gcc-3.2.1" "2002-11-19" "GNU" .UC .SH "NAME" jcf-dump \- print information about Java class files diff -Nrc3pad gcc-3.2/gcc/java/jv-convert.1 gcc-3.2.1/gcc/java/jv-convert.1 *** gcc-3.2/gcc/java/jv-convert.1 Wed Aug 14 09:36:44 2002 --- gcc-3.2.1/gcc/java/jv-convert.1 Tue Nov 19 18:17:22 2002 *************** *** 1,5 **** .\" Automatically generated by Pod::Man version 1.15 ! .\" Wed Aug 14 09:36:44 2002 .\" .\" Standard preamble: .\" ====================================================================== --- 1,5 ---- .\" Automatically generated by Pod::Man version 1.15 ! .\" Tue Nov 19 18:17:22 2002 .\" .\" Standard preamble: .\" ====================================================================== *************** *** 138,144 **** .\" ====================================================================== .\" .IX Title "JV-CONVERT 1" ! .TH JV-CONVERT 1 "gcc-3.2" "2002-08-14" "GNU" .UC .SH "NAME" jv-convert \- Convert file from one encoding to another --- 138,144 ---- .\" ====================================================================== .\" .IX Title "JV-CONVERT 1" ! .TH JV-CONVERT 1 "gcc-3.2.1" "2002-11-19" "GNU" .UC .SH "NAME" jv-convert \- Convert file from one encoding to another diff -Nrc3pad gcc-3.2/gcc/java/jv-scan.1 gcc-3.2.1/gcc/java/jv-scan.1 *** gcc-3.2/gcc/java/jv-scan.1 Wed Aug 14 09:36:43 2002 --- gcc-3.2.1/gcc/java/jv-scan.1 Tue Nov 19 18:17:21 2002 *************** *** 1,5 **** .\" Automatically generated by Pod::Man version 1.15 ! .\" Wed Aug 14 09:36:43 2002 .\" .\" Standard preamble: .\" ====================================================================== --- 1,5 ---- .\" Automatically generated by Pod::Man version 1.15 ! .\" Tue Nov 19 18:17:21 2002 .\" .\" Standard preamble: .\" ====================================================================== *************** *** 138,144 **** .\" ====================================================================== .\" .IX Title "JV-SCAN 1" ! .TH JV-SCAN 1 "gcc-3.2" "2002-08-14" "GNU" .UC .SH "NAME" jv-scan \- print information about Java source file --- 138,144 ---- .\" ====================================================================== .\" .IX Title "JV-SCAN 1" ! .TH JV-SCAN 1 "gcc-3.2.1" "2002-11-19" "GNU" .UC .SH "NAME" jv-scan \- print information about Java source file diff -Nrc3pad gcc-3.2/gcc/java/lang.c gcc-3.2.1/gcc/java/lang.c *** gcc-3.2/gcc/java/lang.c Tue Jun 11 06:20:12 2002 --- gcc-3.2.1/gcc/java/lang.c Sun Oct 6 23:02:12 2002 *************** java_init (filename) *** 458,463 **** --- 458,470 ---- flag_minimal_debug = 0; #endif + /* Force minimum function alignment if g++ uses the least significant + bit of function pointers to store the virtual bit. This is required + to keep vtables compatible. */ + if (TARGET_PTRMEMFUNC_VBIT_LOCATION == ptrmemfunc_vbit_in_pfn + && force_align_functions_log < 1) + force_align_functions_log = 1; + /* Open input file. */ if (filename == 0 || !strcmp (filename, "-")) diff -Nrc3pad gcc-3.2/gcc/java/parse-scan.c gcc-3.2.1/gcc/java/parse-scan.c *** gcc-3.2/gcc/java/parse-scan.c Wed Aug 14 09:51:19 2002 --- gcc-3.2.1/gcc/java/parse-scan.c Tue Nov 19 18:32:06 2002 *************** *** 1,5 **** ! /* A Bison parser, made from /home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y by GNU Bison version 1.28 */ #define YYBISON 1 /* Identify Bison output. */ --- 1,5 ---- ! /* A Bison parser, made from /home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y by GNU Bison version 1.28 */ #define YYBISON 1 /* Identify Bison output. */ *************** *** 113,119 **** #define BOOL_LIT_TK 363 #define NULL_TK 364 ! #line 37 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" #define JC1_LITE --- 113,119 ---- #define BOOL_LIT_TK 363 #define NULL_TK 364 ! #line 37 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" #define JC1_LITE *************** void report PARAMS ((void)); *** 189,201 **** #include "lex.h" #include "parse.h" ! #line 113 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" typedef union { char *node; struct method_declarator *declarator; int value; /* For modifiers */ } YYSTYPE; ! #line 119 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" #include "lex.c" #ifndef YYDEBUG --- 189,201 ---- #include "lex.h" #include "parse.h" ! #line 113 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" typedef union { char *node; struct method_declarator *declarator; int value; /* For modifiers */ } YYSTYPE; ! #line 119 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" #include "lex.c" #ifndef YYDEBUG *************** yyreduce: *** 1939,1990 **** switch (yyn) { case 10: ! #line 211 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { /* use preset global here. FIXME */ yyval.node = xstrdup ("int"); ; break;} case 11: ! #line 216 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { /* use preset global here. FIXME */ yyval.node = xstrdup ("double"); ; break;} case 12: ! #line 221 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { /* use preset global here. FIXME */ yyval.node = xstrdup ("boolean"); ; break;} case 18: ! #line 246 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { while (bracket_count-- > 0) yyval.node = concat ("[", yyvsp[-1].node, NULL); ; break;} case 19: ! #line 251 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { while (bracket_count-- > 0) yyval.node = concat ("[", yyvsp[-1].node, NULL); ; break;} case 23: ! #line 269 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { yyval.node = concat (yyvsp[-2].node, ".", yyvsp[0].node, NULL); ; break;} case 37: ! #line 301 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { package_name = yyvsp[-1].node; ; break;} case 45: ! #line 328 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { if (yyvsp[0].value == PUBLIC_TK) modifier_value++; --- 1939,1990 ---- switch (yyn) { case 10: ! #line 211 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { /* use preset global here. FIXME */ yyval.node = xstrdup ("int"); ; break;} case 11: ! #line 216 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { /* use preset global here. FIXME */ yyval.node = xstrdup ("double"); ; break;} case 12: ! #line 221 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { /* use preset global here. FIXME */ yyval.node = xstrdup ("boolean"); ; break;} case 18: ! #line 246 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { while (bracket_count-- > 0) yyval.node = concat ("[", yyvsp[-1].node, NULL); ; break;} case 19: ! #line 251 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { while (bracket_count-- > 0) yyval.node = concat ("[", yyvsp[-1].node, NULL); ; break;} case 23: ! #line 269 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { yyval.node = concat (yyvsp[-2].node, ".", yyvsp[0].node, NULL); ; break;} case 37: ! #line 301 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { package_name = yyvsp[-1].node; ; break;} case 45: ! #line 328 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { if (yyvsp[0].value == PUBLIC_TK) modifier_value++; *************** case 45: *** 1994,2000 **** ; break;} case 46: ! #line 336 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { if (yyvsp[0].value == PUBLIC_TK) modifier_value++; --- 1994,2000 ---- ; break;} case 46: ! #line 336 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { if (yyvsp[0].value == PUBLIC_TK) modifier_value++; *************** case 46: *** 2004,2068 **** ; break;} case 47: ! #line 348 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { report_class_declaration(yyvsp[-2].node); modifier_value = 0; ; break;} case 49: ! #line 354 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { report_class_declaration(yyvsp[-2].node); ; break;} case 55: ! #line 368 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 56: ! #line 370 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 57: ! #line 375 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { pop_class_context (); ; break;} case 58: ! #line 377 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { pop_class_context (); ; break;} case 70: ! #line 403 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 71: ! #line 405 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { modifier_value = 0; ; break;} case 76: ! #line 421 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { bracket_count = 0; USE_ABSORBER; ; break;} case 77: ! #line 423 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { ++bracket_count; ; break;} case 81: ! #line 438 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 83: ! #line 441 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { modifier_value = 0; ; break;} case 84: ! #line 443 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { report_main_declaration (yyvsp[-1].declarator); modifier_value = 0; ; break;} case 85: ! #line 451 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { struct method_declarator *d; NEW_METHOD_DECLARATOR (d, yyvsp[-2].node, NULL); --- 2004,2068 ---- ; break;} case 47: ! #line 348 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { report_class_declaration(yyvsp[-2].node); modifier_value = 0; ; break;} case 49: ! #line 354 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { report_class_declaration(yyvsp[-2].node); ; break;} case 55: ! #line 368 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 56: ! #line 370 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 57: ! #line 375 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { pop_class_context (); ; break;} case 58: ! #line 377 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { pop_class_context (); ; break;} case 70: ! #line 403 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 71: ! #line 405 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { modifier_value = 0; ; break;} case 76: ! #line 421 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { bracket_count = 0; USE_ABSORBER; ; break;} case 77: ! #line 423 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { ++bracket_count; ; break;} case 81: ! #line 438 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 83: ! #line 441 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { modifier_value = 0; ; break;} case 84: ! #line 443 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { report_main_declaration (yyvsp[-1].declarator); modifier_value = 0; ; break;} case 85: ! #line 451 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { struct method_declarator *d; NEW_METHOD_DECLARATOR (d, yyvsp[-2].node, NULL); *************** case 85: *** 2070,2076 **** ; break;} case 86: ! #line 457 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { struct method_declarator *d; NEW_METHOD_DECLARATOR (d, yyvsp[-3].node, yyvsp[-1].node); --- 2070,2076 ---- ; break;} case 86: ! #line 457 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { struct method_declarator *d; NEW_METHOD_DECLARATOR (d, yyvsp[-3].node, yyvsp[-1].node); *************** case 86: *** 2078,2090 **** ; break;} case 89: ! #line 468 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { yyval.node = concat (yyvsp[-2].node, ",", yyvsp[0].node, NULL); ; break;} case 90: ! #line 475 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; if (bracket_count) --- 2078,2090 ---- ; break;} case 89: ! #line 468 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { yyval.node = concat (yyvsp[-2].node, ",", yyvsp[0].node, NULL); ; break;} case 90: ! #line 475 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; if (bracket_count) *************** case 90: *** 2101,2107 **** ; break;} case 91: ! #line 490 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { if (bracket_count) { --- 2101,2107 ---- ; break;} case 91: ! #line 490 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { if (bracket_count) { *************** case 91: *** 2117,2327 **** ; break;} case 94: ! #line 511 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 95: ! #line 513 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 99: ! #line 528 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 101: ! #line 539 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { modifier_value = 0; ; break;} case 103: ! #line 544 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { modifier_value = 0; ; break;} case 104: ! #line 551 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 105: ! #line 553 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 112: ! #line 570 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 113: ! #line 572 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 116: ! #line 584 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { report_class_declaration (yyvsp[0].node); modifier_value = 0; ; break;} case 118: ! #line 587 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { report_class_declaration (yyvsp[0].node); modifier_value = 0; ; break;} case 120: ! #line 590 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { report_class_declaration (yyvsp[-1].node); modifier_value = 0; ; break;} case 122: ! #line 593 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { report_class_declaration (yyvsp[-1].node); modifier_value = 0; ; break;} case 126: ! #line 604 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { pop_class_context (); ; break;} case 127: ! #line 606 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { pop_class_context (); ; break;} case 150: ! #line 665 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 151: ! #line 667 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { modifier_value = 0; ; break;} case 175: ! #line 707 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 186: ! #line 735 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { ++complexity; ; break;} case 187: ! #line 740 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { ++complexity; ; break;} case 188: ! #line 745 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { ++complexity; ; break;} case 196: ! #line 765 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { ++complexity; ; break;} case 201: ! #line 780 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { ++complexity; ; break;} case 205: ! #line 797 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { ++complexity; ; break;} case 211: ! #line 815 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { ++complexity; ; break;} case 222: ! #line 840 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { ++complexity; ; break;} case 225: ! #line 849 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { ++complexity; ; break;} case 228: ! #line 859 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 234: ! #line 874 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { ++complexity; ; break;} case 235: ! #line 878 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { ++complexity; ; break;} case 246: ! #line 900 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 247: ! #line 905 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 248: ! #line 907 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 249: ! #line 909 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 250: ! #line 911 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 258: ! #line 926 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { report_class_declaration (NULL); ; break;} case 260: ! #line 929 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { report_class_declaration (NULL); ; break;} case 262: ! #line 935 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 276: ! #line 967 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { bracket_count = 1; ; break;} case 277: ! #line 969 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { bracket_count++; ; break;} case 280: ! #line 982 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ++complexity; ; break;} case 281: ! #line 984 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ++complexity; ; break;} case 282: ! #line 985 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { ++complexity; ; break;} case 283: ! #line 986 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { ++complexity; ; break;} case 284: ! #line 987 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { ++complexity; ; break;} case 285: ! #line 988 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { ++complexity; ; break;} case 286: ! #line 993 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 289: ! #line 1000 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 336: ! #line 1096 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { ++complexity; ; break;} case 338: ! #line 1102 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { ++complexity; ; break;} case 340: ! #line 1108 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { ++complexity; ; break;} case 344: ! #line 1122 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} } --- 2117,2327 ---- ; break;} case 94: ! #line 511 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 95: ! #line 513 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 99: ! #line 528 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 101: ! #line 539 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { modifier_value = 0; ; break;} case 103: ! #line 544 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { modifier_value = 0; ; break;} case 104: ! #line 551 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 105: ! #line 553 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 112: ! #line 570 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 113: ! #line 572 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 116: ! #line 584 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { report_class_declaration (yyvsp[0].node); modifier_value = 0; ; break;} case 118: ! #line 587 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { report_class_declaration (yyvsp[0].node); modifier_value = 0; ; break;} case 120: ! #line 590 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { report_class_declaration (yyvsp[-1].node); modifier_value = 0; ; break;} case 122: ! #line 593 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { report_class_declaration (yyvsp[-1].node); modifier_value = 0; ; break;} case 126: ! #line 604 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { pop_class_context (); ; break;} case 127: ! #line 606 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { pop_class_context (); ; break;} case 150: ! #line 665 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 151: ! #line 667 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { modifier_value = 0; ; break;} case 175: ! #line 707 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 186: ! #line 735 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 187: ! #line 740 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 188: ! #line 745 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 196: ! #line 765 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 201: ! #line 780 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 205: ! #line 797 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 211: ! #line 815 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 222: ! #line 840 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 225: ! #line 849 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 228: ! #line 859 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 234: ! #line 874 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 235: ! #line 878 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 246: ! #line 900 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 247: ! #line 905 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 248: ! #line 907 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 249: ! #line 909 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 250: ! #line 911 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 258: ! #line 926 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { report_class_declaration (NULL); ; break;} case 260: ! #line 929 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { report_class_declaration (NULL); ; break;} case 262: ! #line 935 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 276: ! #line 967 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { bracket_count = 1; ; break;} case 277: ! #line 969 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { bracket_count++; ; break;} case 280: ! #line 982 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ++complexity; ; break;} case 281: ! #line 984 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ++complexity; ; break;} case 282: ! #line 985 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 283: ! #line 986 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 284: ! #line 987 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 285: ! #line 988 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 286: ! #line 993 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 289: ! #line 1000 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 336: ! #line 1096 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 338: ! #line 1102 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 340: ! #line 1108 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 344: ! #line 1122 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} } *************** yyerrhandle: *** 2546,2552 **** } return 1; } ! #line 1140 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse-scan.y" /* Create a new parser context */ --- 2546,2552 ---- } return 1; } ! #line 1140 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse-scan.y" /* Create a new parser context */ diff -Nrc3pad gcc-3.2/gcc/java/parse.c gcc-3.2.1/gcc/java/parse.c *** gcc-3.2/gcc/java/parse.c Wed Aug 14 09:49:51 2002 --- gcc-3.2.1/gcc/java/parse.c Tue Nov 19 18:30:39 2002 *************** *** 1,5 **** ! /* A Bison parser, made from /home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y by GNU Bison version 1.28 */ #define YYBISON 1 /* Identify Bison output. */ --- 1,5 ---- ! /* A Bison parser, made from /home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y by GNU Bison version 1.28 */ #define YYBISON 1 /* Identify Bison output. */ *************** *** 120,126 **** #define BOOL_LIT_TK 363 #define NULL_TK 364 ! #line 48 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" #include "config.h" #include "system.h" --- 120,126 ---- #define BOOL_LIT_TK 363 #define NULL_TK 364 ! #line 48 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" #include "config.h" #include "system.h" *************** static tree src_parse_roots[1]; *** 518,524 **** } while (0) ! #line 446 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" typedef union { tree node; int sub_token; --- 518,524 ---- } while (0) ! #line 446 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" typedef union { tree node; int sub_token; *************** typedef union { *** 528,534 **** } operator; int value; } YYSTYPE; ! #line 456 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" #include "lex.c" #ifndef YYDEBUG --- 528,534 ---- } operator; int value; } YYSTYPE; ! #line 456 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" #include "lex.c" #ifndef YYDEBUG *************** static const short yyrhs[] = { -1, *** 826,882 **** #if YYDEBUG != 0 static const short yyrline[] = { 0, ! 606, 632, 636, 638, 639, 640, 641, 642, 646, 648, ! 651, 653, 654, 657, 659, 662, 666, 670, 674, 683, ! 694, 696, 699, 703, 708, 713, 715, 716, 717, 718, ! 719, 720, 721, 724, 729, 735, 737, 740, 746, 748, ! 752, 754, 757, 784, 786, 790, 809, 811, 815, 818, ! 820, 821, 831, 836, 851, 855, 855, 858, 858, 860, ! 862, 867, 871, 873, 875, 877, 881, 883, 885, 892, ! 898, 903, 907, 916, 926, 928, 931, 933, 934, 935, ! 945, 947, 948, 950, 952, 956, 959, 969, 972, 974, ! 978, 981, 988, 994, 1002, 1004, 1006, 1008, 1018, 1022, ! 1024, 1028, 1039, 1040, 1044, 1047, 1049, 1051, 1053, 1058, ! 1060, 1062, 1064, 1071, 1077, 1079, 1088, 1090, 1094, 1099, ! 1104, 1108, 1113, 1118, 1123, 1130, 1140, 1142, 1144, 1148, ! 1151, 1153, 1157, 1159, 1163, 1172, 1188, 1195, 1198, 1201, ! 1205, 1211, 1215, 1224, 1226, 1228, 1232, 1237, 1244, 1252, ! 1254, 1258, 1265, 1275, 1279, 1279, 1282, 1282, 1285, 1285, ! 1288, 1288, 1290, 1294, 1300, 1305, 1307, 1311, 1314, 1318, ! 1320, 1323, 1325, 1326, 1328, 1332, 1336, 1342, 1347, 1350, ! 1352, 1354, 1358, 1364, 1368, 1373, 1382, 1386, 1391, 1405, ! 1407, 1410, 1412, 1414, 1421, 1425, 1428, 1432, 1434, 1435, ! 1436, 1437, 1438, 1442, 1444, 1445, 1446, 1447, 1451, 1453, ! 1454, 1455, 1456, 1457, 1458, 1459, 1460, 1461, 1462, 1465, ! 1483, 1494, 1497, 1501, 1508, 1518, 1523, 1528, 1533, 1535, ! 1540, 1542, 1547, 1549, 1551, 1553, 1555, 1559, 1561, 1562, ! 1563, 1564, 1565, 1566, 1569, 1575, 1577, 1579, 1583, 1588, ! 1593, 1599, 1609, 1615, 1617, 1619, 1626, 1629, 1631, 1633, ! 1637, 1639, 1642, 1646, 1648, 1651, 1658, 1664, 1666, 1668, ! 1672, 1680, 1683, 1685, 1687, 1691, 1696, 1705, 1710, 1717, ! 1724, 1726, 1728, 1732, 1735, 1744, 1751, 1753, 1757, 1770, ! 1772, 1778, 1784, 1788, 1790, 1794, 1797, 1799, 1803, 1806, ! 1808, 1810, 1814, 1817, 1819, 1821, 1825, 1828, 1830, 1832, ! 1836, 1842, 1844, 1848, 1855, 1857, 1859, 1861, 1865, 1877, ! 1880, 1882, 1887, 1891, 1893, 1900, 1908, 1925, 1927, 1932, ! 1936, 1939, 1944, 1946, 1949, 1951, 1953, 1955, 1956, 1957, ! 1958, 1959, 1963, 1968, 1970, 1972, 1974, 1978, 1981, 1983, ! 1985, 1992, 1995, 1997, 2001, 2007, 2008, 2014, 2015, 2017, ! 2019, 2021, 2023, 2025, 2034, 2038, 2068, 2071, 2085, 2088, ! 2092, 2098, 2103, 2107, 2110, 2112, 2114, 2118, 2129, 2138, ! 2140, 2144, 2147, 2151, 2162, 2164, 2172, 2199, 2201, 2205, ! 2210, 2216, 2220, 2223, 2225, 2236, 2247, 2252, 2261, 2263, ! 2267, 2270, 2272, 2277, 2282, 2287, 2294, 2296, 2297, 2298, ! 2301, 2306, 2311, 2313, 2314, 2316, 2317, 2321, 2327, 2329, ! 2333, 2336, 2340, 2343, 2347, 2349, 2351, 2353, 2354, 2356, ! 2360, 2369, 2371, 2373, 2387, 2389, 2394, 2396, 2398, 2402, ! 2404, 2409, 2414, 2419, 2421, 2423, 2427, 2429, 2434, 2439, ! 2441, 2445, 2447, 2452, 2457, 2462, 2464, 2466, 2470, 2472, ! 2477, 2482, 2487, 2492, 2494, 2496, 2498, 2500, 2502, 2506, ! 2508, 2513, 2518, 2520, 2524, 2526, 2531, 2535, 2537, 2542, ! 2546, 2548, 2553, 2557, 2559, 2564, 2568, 2570, 2575, 2579, ! 2581, 2586, 2592, 2594, 2598, 2600, 2603, 2606, 2613, 2615, ! 2616, 2619, 2621, 2624, 2628 }; #endif --- 826,882 ---- #if YYDEBUG != 0 static const short yyrline[] = { 0, ! 605, 631, 635, 637, 638, 639, 640, 641, 645, 647, ! 650, 652, 653, 656, 658, 661, 665, 669, 673, 682, ! 693, 695, 698, 702, 707, 712, 714, 715, 716, 717, ! 718, 719, 720, 723, 728, 734, 736, 739, 745, 747, ! 751, 753, 756, 783, 785, 789, 808, 810, 814, 817, ! 819, 820, 830, 835, 850, 854, 855, 858, 859, 861, ! 863, 868, 872, 874, 876, 878, 882, 884, 886, 893, ! 899, 904, 908, 917, 927, 929, 932, 934, 935, 936, ! 946, 948, 949, 951, 953, 957, 960, 970, 973, 975, ! 979, 982, 989, 995, 1003, 1005, 1007, 1009, 1019, 1023, ! 1025, 1029, 1040, 1041, 1045, 1048, 1050, 1052, 1054, 1059, ! 1061, 1063, 1065, 1072, 1078, 1080, 1089, 1091, 1095, 1100, ! 1105, 1109, 1114, 1119, 1124, 1131, 1141, 1143, 1145, 1149, ! 1152, 1154, 1158, 1160, 1164, 1173, 1189, 1196, 1199, 1202, ! 1206, 1212, 1216, 1225, 1227, 1229, 1233, 1238, 1245, 1253, ! 1255, 1259, 1266, 1276, 1280, 1281, 1284, 1285, 1288, 1289, ! 1292, 1293, 1295, 1299, 1305, 1310, 1312, 1316, 1319, 1323, ! 1325, 1328, 1330, 1331, 1333, 1337, 1341, 1347, 1352, 1355, ! 1357, 1359, 1363, 1369, 1373, 1378, 1387, 1391, 1396, 1410, ! 1412, 1415, 1417, 1419, 1426, 1430, 1433, 1437, 1439, 1440, ! 1441, 1442, 1443, 1447, 1449, 1450, 1451, 1452, 1456, 1458, ! 1459, 1460, 1461, 1462, 1463, 1464, 1465, 1466, 1467, 1470, ! 1488, 1499, 1502, 1506, 1513, 1523, 1528, 1533, 1538, 1540, ! 1545, 1547, 1552, 1554, 1556, 1558, 1560, 1564, 1566, 1567, ! 1568, 1569, 1570, 1571, 1574, 1580, 1582, 1584, 1588, 1593, ! 1598, 1604, 1614, 1620, 1622, 1624, 1631, 1634, 1636, 1638, ! 1642, 1644, 1647, 1651, 1653, 1656, 1663, 1669, 1671, 1673, ! 1677, 1685, 1688, 1690, 1692, 1696, 1701, 1710, 1715, 1722, ! 1729, 1731, 1733, 1737, 1740, 1749, 1756, 1758, 1762, 1775, ! 1777, 1783, 1789, 1793, 1795, 1799, 1802, 1804, 1808, 1811, ! 1813, 1815, 1819, 1822, 1824, 1826, 1830, 1833, 1835, 1837, ! 1841, 1847, 1849, 1853, 1860, 1862, 1864, 1866, 1870, 1882, ! 1885, 1887, 1892, 1896, 1898, 1905, 1914, 1931, 1933, 1938, ! 1942, 1945, 1950, 1952, 1955, 1957, 1959, 1961, 1962, 1963, ! 1964, 1965, 1969, 1974, 1976, 1978, 1980, 1984, 1987, 1989, ! 1991, 1998, 2001, 2003, 2007, 2013, 2014, 2020, 2021, 2023, ! 2025, 2027, 2029, 2031, 2040, 2044, 2074, 2077, 2091, 2094, ! 2098, 2104, 2109, 2113, 2116, 2118, 2120, 2124, 2135, 2144, ! 2146, 2150, 2153, 2157, 2168, 2170, 2178, 2205, 2207, 2211, ! 2216, 2222, 2226, 2229, 2231, 2242, 2253, 2258, 2267, 2269, ! 2273, 2276, 2278, 2283, 2288, 2293, 2300, 2302, 2303, 2304, ! 2307, 2312, 2317, 2319, 2320, 2322, 2323, 2327, 2333, 2335, ! 2339, 2342, 2346, 2349, 2353, 2355, 2357, 2359, 2360, 2362, ! 2366, 2375, 2377, 2379, 2393, 2395, 2400, 2402, 2404, 2408, ! 2410, 2415, 2420, 2425, 2427, 2429, 2433, 2435, 2440, 2445, ! 2447, 2451, 2453, 2458, 2463, 2468, 2470, 2472, 2476, 2478, ! 2483, 2488, 2493, 2498, 2500, 2502, 2504, 2506, 2508, 2512, ! 2514, 2519, 2524, 2526, 2530, 2532, 2537, 2541, 2543, 2548, ! 2552, 2554, 2559, 2563, 2565, 2570, 2574, 2576, 2581, 2585, ! 2587, 2592, 2598, 2600, 2604, 2606, 2609, 2612, 2619, 2621, ! 2622, 2625, 2627, 2630, 2634 }; #endif *************** yyreduce: *** 2897,2903 **** switch (yyn) { case 1: ! #line 607 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { /* Register static variables with the garbage collector. */ --- 2897,2903 ---- switch (yyn) { case 1: ! #line 606 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { /* Register static variables with the garbage collector. */ *************** case 1: *** 2924,2934 **** ; break;} case 2: ! #line 632 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {; break;} case 19: ! #line 676 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { int osb = pop_current_osb (ctxp); tree t = build_java_array_type ((yyvsp[-1].node), -1); --- 2924,2934 ---- ; break;} case 2: ! #line 631 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {; break;} case 19: ! #line 675 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { int osb = pop_current_osb (ctxp); tree t = build_java_array_type ((yyvsp[-1].node), -1); *************** case 19: *** 2938,2944 **** ; break;} case 20: ! #line 684 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { int osb = pop_current_osb (ctxp); tree t = yyvsp[-1].node; --- 2938,2944 ---- ; break;} case 20: ! #line 683 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { int osb = pop_current_osb (ctxp); tree t = yyvsp[-1].node; *************** case 20: *** 2948,2989 **** ; break;} case 24: ! #line 705 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = make_qualified_name (yyvsp[-2].node, yyvsp[0].node, yyvsp[-1].operator.location); ; break;} case 26: ! #line 714 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyval.node = NULL;; break;} case 34: ! #line 726 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = NULL; ; break;} case 35: ! #line 730 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = NULL; ; break;} case 38: ! #line 742 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { ctxp->package = EXPR_WFL_NODE (yyvsp[-1].node); register_package (ctxp->package); ; break;} case 39: ! #line 747 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing name"); RECOVER;; break;} case 40: ! #line 749 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 43: ! #line 759 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { tree name = EXPR_WFL_NODE (yyvsp[-1].node), last_name; int i = IDENTIFIER_LENGTH (name)-1; --- 2948,2989 ---- ; break;} case 24: ! #line 704 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = make_qualified_name (yyvsp[-2].node, yyvsp[0].node, yyvsp[-1].operator.location); ; break;} case 26: ! #line 713 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyval.node = NULL;; break;} case 34: ! #line 725 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = NULL; ; break;} case 35: ! #line 729 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = NULL; ; break;} case 38: ! #line 741 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { ctxp->package = EXPR_WFL_NODE (yyvsp[-1].node); register_package (ctxp->package); ; break;} case 39: ! #line 746 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing name"); RECOVER;; break;} case 40: ! #line 748 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 43: ! #line 758 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { tree name = EXPR_WFL_NODE (yyvsp[-1].node), last_name; int i = IDENTIFIER_LENGTH (name)-1; *************** case 43: *** 3011,3025 **** ; break;} case 44: ! #line 785 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing name"); RECOVER;; break;} case 45: ! #line 787 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 46: ! #line 792 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { tree name = EXPR_WFL_NODE (yyvsp[-3].node); tree it; --- 3011,3025 ---- ; break;} case 44: ! #line 784 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing name"); RECOVER;; break;} case 45: ! #line 786 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 46: ! #line 791 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { tree name = EXPR_WFL_NODE (yyvsp[-3].node); tree it; *************** case 46: *** 3039,3074 **** ; break;} case 47: ! #line 810 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'*' expected"); RECOVER;; break;} case 48: ! #line 812 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 49: ! #line 817 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { end_class_declaration (0); ; break;} case 50: ! #line 819 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { end_class_declaration (0); ; break;} case 52: ! #line 822 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { YYERROR_NOW; yyerror ("Class or interface declaration expected"); ; break;} case 53: ! #line 833 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.value = (1 << yyvsp[0].value); ; break;} case 54: ! #line 837 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { int acc = (1 << yyvsp[0].value); if (yyval.value & acc) --- 3039,3074 ---- ; break;} case 47: ! #line 809 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'*' expected"); RECOVER;; break;} case 48: ! #line 811 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 49: ! #line 816 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { end_class_declaration (0); ; break;} case 50: ! #line 818 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { end_class_declaration (0); ; break;} case 52: ! #line 821 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { YYERROR_NOW; yyerror ("Class or interface declaration expected"); ; break;} case 53: ! #line 832 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.value = (1 << yyvsp[0].value); ; break;} case 54: ! #line 836 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { int acc = (1 << yyvsp[0].value); if (yyval.value & acc) *************** case 54: *** 3082,3164 **** ; break;} case 55: ! #line 853 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { create_class (yyvsp[-4].value, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ; break;} case 57: ! #line 856 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { create_class (0, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ; break;} case 59: ! #line 859 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing class name"); RECOVER;; break;} case 60: ! #line 861 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing class name"); RECOVER;; break;} case 61: ! #line 863 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { if (!ctxp->class_err) yyerror ("'{' expected"); DRECOVER(class1); ; break;} case 62: ! #line 868 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {if (!ctxp->class_err) yyerror ("'{' expected"); RECOVER;; break;} case 63: ! #line 872 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = NULL; ; break;} case 64: ! #line 874 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 65: ! #line 876 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'{' expected"); ctxp->class_err=1;; break;} case 66: ! #line 878 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing super class name"); ctxp->class_err=1;; break;} case 67: ! #line 882 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 68: ! #line 884 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 69: ! #line 886 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { ctxp->class_err=1; yyerror ("Missing interface name"); ; break;} case 70: ! #line 894 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { ctxp->interface_number = 1; yyval.node = build_tree_list (yyvsp[0].node, NULL_TREE); ; break;} case 71: ! #line 899 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { ctxp->interface_number++; yyval.node = chainon (yyvsp[-2].node, build_tree_list (yyvsp[0].node, NULL_TREE)); ; break;} case 72: ! #line 904 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing interface name"); RECOVER;; break;} case 73: ! #line 909 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { /* Store the location of the `}' when doing xrefs */ if (flag_emit_xref) --- 3082,3172 ---- ; break;} case 55: ! #line 852 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { create_class (yyvsp[-4].value, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ; break;} + case 56: + #line 854 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" + {;; + break;} case 57: ! #line 856 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { create_class (0, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ; break;} + case 58: + #line 858 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" + {;; + break;} case 59: ! #line 860 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing class name"); RECOVER;; break;} case 60: ! #line 862 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing class name"); RECOVER;; break;} case 61: ! #line 864 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { if (!ctxp->class_err) yyerror ("'{' expected"); DRECOVER(class1); ; break;} case 62: ! #line 869 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {if (!ctxp->class_err) yyerror ("'{' expected"); RECOVER;; break;} case 63: ! #line 873 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = NULL; ; break;} case 64: ! #line 875 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 65: ! #line 877 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'{' expected"); ctxp->class_err=1;; break;} case 66: ! #line 879 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing super class name"); ctxp->class_err=1;; break;} case 67: ! #line 883 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 68: ! #line 885 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 69: ! #line 887 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { ctxp->class_err=1; yyerror ("Missing interface name"); ; break;} case 70: ! #line 895 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { ctxp->interface_number = 1; yyval.node = build_tree_list (yyvsp[0].node, NULL_TREE); ; break;} case 71: ! #line 900 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { ctxp->interface_number++; yyval.node = chainon (yyvsp[-2].node, build_tree_list (yyvsp[0].node, NULL_TREE)); ; break;} case 72: ! #line 905 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing interface name"); RECOVER;; break;} case 73: ! #line 910 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { /* Store the location of the `}' when doing xrefs */ if (flag_emit_xref) *************** case 73: *** 3168,3174 **** ; break;} case 74: ! #line 917 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { /* Store the location of the `}' when doing xrefs */ if (flag_emit_xref) --- 3176,3182 ---- ; break;} case 74: ! #line 918 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { /* Store the location of the `}' when doing xrefs */ if (flag_emit_xref) *************** case 74: *** 3178,3184 **** ; break;} case 80: ! #line 936 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { if (yyvsp[0].node != empty_stmt_node) { --- 3186,3192 ---- ; break;} case 80: ! #line 937 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { if (yyvsp[0].node != empty_stmt_node) { *************** case 80: *** 3188,3206 **** ; break;} case 83: ! #line 949 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { end_class_declaration (1); ; break;} case 84: ! #line 951 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { end_class_declaration (1); ; break;} case 86: ! #line 958 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { register_fields (0, yyvsp[-2].node, yyvsp[-1].node); ; break;} case 87: ! #line 960 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { check_modifiers ("Illegal modifier `%s' for field declaration", --- 3196,3214 ---- ; break;} case 83: ! #line 950 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { end_class_declaration (1); ; break;} case 84: ! #line 952 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { end_class_declaration (1); ; break;} case 86: ! #line 959 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { register_fields (0, yyvsp[-2].node, yyvsp[-1].node); ; break;} case 87: ! #line 961 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { check_modifiers ("Illegal modifier `%s' for field declaration", *************** case 87: *** 3210,3228 **** ; break;} case 89: ! #line 973 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = chainon (yyvsp[-2].node, yyvsp[0].node); ; break;} case 90: ! #line 975 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 91: ! #line 980 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_tree_list (yyvsp[0].node, NULL_TREE); ; break;} case 92: ! #line 982 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { if (java_error_count) yyvsp[0].node = NULL_TREE; --- 3218,3236 ---- ; break;} case 89: ! #line 974 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = chainon (yyvsp[-2].node, yyvsp[0].node); ; break;} case 90: ! #line 976 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 91: ! #line 981 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_tree_list (yyvsp[0].node, NULL_TREE); ; break;} case 92: ! #line 983 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { if (java_error_count) yyvsp[0].node = NULL_TREE; *************** case 92: *** 3231,3237 **** ; break;} case 93: ! #line 989 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyerror ("Missing variable initializer"); yyval.node = build_tree_list (yyvsp[-2].node, NULL_TREE); --- 3239,3245 ---- ; break;} case 93: ! #line 990 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyerror ("Missing variable initializer"); yyval.node = build_tree_list (yyvsp[-2].node, NULL_TREE); *************** case 93: *** 3239,3245 **** ; break;} case 94: ! #line 995 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyerror ("';' expected"); yyval.node = build_tree_list (yyvsp[-3].node, NULL_TREE); --- 3247,3253 ---- ; break;} case 94: ! #line 996 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyerror ("';' expected"); yyval.node = build_tree_list (yyvsp[-3].node, NULL_TREE); *************** case 94: *** 3247,3261 **** ; break;} case 96: ! #line 1005 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_unresolved_array_type (yyvsp[-2].node); ; break;} case 97: ! #line 1007 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Invalid declaration"); DRECOVER(vdi);; break;} case 98: ! #line 1009 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { tree node = java_lval.node; if (node && (TREE_CODE (node) == INTEGER_CST --- 3255,3269 ---- ; break;} case 96: ! #line 1006 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_unresolved_array_type (yyvsp[-2].node); ; break;} case 97: ! #line 1008 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Invalid declaration"); DRECOVER(vdi);; break;} case 98: ! #line 1010 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { tree node = java_lval.node; if (node && (TREE_CODE (node) == INTEGER_CST *************** case 98: *** 3267,3277 **** ; break;} case 99: ! #line 1019 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Unbalanced ']'"); DRECOVER(vdi);; break;} case 102: ! #line 1030 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { current_function_decl = yyvsp[0].node; if (current_function_decl --- 3275,3285 ---- ; break;} case 99: ! #line 1020 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Unbalanced ']'"); DRECOVER(vdi);; break;} case 102: ! #line 1031 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { current_function_decl = yyvsp[0].node; if (current_function_decl *************** case 102: *** 3282,3349 **** ; break;} case 103: ! #line 1039 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { finish_method_declaration (yyvsp[0].node); ; break;} case 104: ! #line 1041 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {YYNOT_TWICE yyerror ("'{' expected"); RECOVER;; break;} case 105: ! #line 1046 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = method_header (0, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ; break;} case 106: ! #line 1048 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = method_header (0, void_type_node, yyvsp[-1].node, yyvsp[0].node); ; break;} case 107: ! #line 1050 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = method_header (yyvsp[-3].value, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ; break;} case 108: ! #line 1052 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = method_header (yyvsp[-3].value, void_type_node, yyvsp[-1].node, yyvsp[0].node); ; break;} case 109: ! #line 1054 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyerror ("Invalid method declaration, method name required"); RECOVER; ; break;} case 110: ! #line 1059 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {RECOVER;; break;} case 111: ! #line 1061 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Identifier expected"); RECOVER;; break;} case 112: ! #line 1063 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Identifier expected"); RECOVER;; break;} case 113: ! #line 1065 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyerror ("Invalid method declaration, return type required"); RECOVER; ; break;} case 114: ! #line 1073 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { ctxp->formal_parameter_number = 0; yyval.node = method_declarator (yyvsp[-2].node, NULL_TREE); ; break;} case 115: ! #line 1078 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = method_declarator (yyvsp[-3].node, yyvsp[-1].node); ; break;} case 116: ! #line 1080 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { EXPR_WFL_LINECOL (wfl_operator) = yyvsp[-1].operator.location; TREE_PURPOSE (yyvsp[-2].node) = --- 3290,3357 ---- ; break;} case 103: ! #line 1040 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { finish_method_declaration (yyvsp[0].node); ; break;} case 104: ! #line 1042 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {YYNOT_TWICE yyerror ("'{' expected"); RECOVER;; break;} case 105: ! #line 1047 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = method_header (0, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ; break;} case 106: ! #line 1049 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = method_header (0, void_type_node, yyvsp[-1].node, yyvsp[0].node); ; break;} case 107: ! #line 1051 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = method_header (yyvsp[-3].value, yyvsp[-2].node, yyvsp[-1].node, yyvsp[0].node); ; break;} case 108: ! #line 1053 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = method_header (yyvsp[-3].value, void_type_node, yyvsp[-1].node, yyvsp[0].node); ; break;} case 109: ! #line 1055 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyerror ("Invalid method declaration, method name required"); RECOVER; ; break;} case 110: ! #line 1060 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {RECOVER;; break;} case 111: ! #line 1062 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Identifier expected"); RECOVER;; break;} case 112: ! #line 1064 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Identifier expected"); RECOVER;; break;} case 113: ! #line 1066 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyerror ("Invalid method declaration, return type required"); RECOVER; ; break;} case 114: ! #line 1074 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { ctxp->formal_parameter_number = 0; yyval.node = method_declarator (yyvsp[-2].node, NULL_TREE); ; break;} case 115: ! #line 1079 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = method_declarator (yyvsp[-3].node, yyvsp[-1].node); ; break;} case 116: ! #line 1081 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { EXPR_WFL_LINECOL (wfl_operator) = yyvsp[-1].operator.location; TREE_PURPOSE (yyvsp[-2].node) = *************** case 116: *** 3354,3412 **** ; break;} case 117: ! #line 1089 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("')' expected"); DRECOVER(method_declarator);; break;} case 118: ! #line 1091 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("']' expected"); RECOVER;; break;} case 119: ! #line 1096 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { ctxp->formal_parameter_number = 1; ; break;} case 120: ! #line 1100 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { ctxp->formal_parameter_number += 1; yyval.node = chainon (yyvsp[-2].node, yyvsp[0].node); ; break;} case 121: ! #line 1105 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyerror ("Missing formal parameter term"); RECOVER; ; break;} case 122: ! #line 1110 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_tree_list (yyvsp[0].node, yyvsp[-1].node); ; break;} case 123: ! #line 1114 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_tree_list (yyvsp[0].node, yyvsp[-1].node); ARG_FINAL_P (yyval.node) = 1; ; break;} case 124: ! #line 1119 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyerror ("Missing identifier"); RECOVER; yyval.node = NULL_TREE; ; break;} case 125: ! #line 1124 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyerror ("Missing identifier"); RECOVER; yyval.node = NULL_TREE; ; break;} case 126: ! #line 1132 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { check_modifiers ("Illegal modifier `%s'. Only `final' was expected here", yyvsp[0].value, ACC_FINAL); --- 3362,3420 ---- ; break;} case 117: ! #line 1090 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("')' expected"); DRECOVER(method_declarator);; break;} case 118: ! #line 1092 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("']' expected"); RECOVER;; break;} case 119: ! #line 1097 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { ctxp->formal_parameter_number = 1; ; break;} case 120: ! #line 1101 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { ctxp->formal_parameter_number += 1; yyval.node = chainon (yyvsp[-2].node, yyvsp[0].node); ; break;} case 121: ! #line 1106 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyerror ("Missing formal parameter term"); RECOVER; ; break;} case 122: ! #line 1111 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_tree_list (yyvsp[0].node, yyvsp[-1].node); ; break;} case 123: ! #line 1115 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_tree_list (yyvsp[0].node, yyvsp[-1].node); ARG_FINAL_P (yyval.node) = 1; ; break;} case 124: ! #line 1120 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyerror ("Missing identifier"); RECOVER; yyval.node = NULL_TREE; ; break;} case 125: ! #line 1125 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyerror ("Missing identifier"); RECOVER; yyval.node = NULL_TREE; ; break;} case 126: ! #line 1133 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { check_modifiers ("Illegal modifier `%s'. Only `final' was expected here", yyvsp[0].value, ACC_FINAL); *************** case 126: *** 3415,3449 **** ; break;} case 127: ! #line 1141 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 128: ! #line 1143 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 129: ! #line 1145 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing class type term"); RECOVER;; break;} case 130: ! #line 1150 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_tree_list (yyvsp[0].node, yyvsp[0].node); ; break;} case 131: ! #line 1152 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = tree_cons (yyvsp[0].node, yyvsp[0].node, yyvsp[-2].node); ; break;} case 132: ! #line 1154 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing class type term"); RECOVER;; break;} case 134: ! #line 1159 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 135: ! #line 1165 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { TREE_CHAIN (yyvsp[0].node) = CPC_STATIC_INITIALIZER_STMT (ctxp); SET_CPC_STATIC_INITIALIZER_STMT (ctxp, yyvsp[0].node); --- 3423,3457 ---- ; break;} case 127: ! #line 1142 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 128: ! #line 1144 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 129: ! #line 1146 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing class type term"); RECOVER;; break;} case 130: ! #line 1151 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_tree_list (yyvsp[0].node, yyvsp[0].node); ; break;} case 131: ! #line 1153 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = tree_cons (yyvsp[0].node, yyvsp[0].node, yyvsp[-2].node); ; break;} case 132: ! #line 1155 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing class type term"); RECOVER;; break;} case 134: ! #line 1160 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 135: ! #line 1166 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { TREE_CHAIN (yyvsp[0].node) = CPC_STATIC_INITIALIZER_STMT (ctxp); SET_CPC_STATIC_INITIALIZER_STMT (ctxp, yyvsp[0].node); *************** case 135: *** 3451,3457 **** ; break;} case 136: ! #line 1174 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { check_modifiers ("Illegal modifier `%s' for static initializer", yyvsp[0].value, ACC_STATIC); /* Can't have a static initializer in an innerclass */ --- 3459,3465 ---- ; break;} case 136: ! #line 1175 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { check_modifiers ("Illegal modifier `%s' for static initializer", yyvsp[0].value, ACC_STATIC); /* Can't have a static initializer in an innerclass */ *************** case 136: *** 3465,3520 **** ; break;} case 137: ! #line 1190 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { current_function_decl = yyvsp[0].node; source_start_java_method (current_function_decl); ; break;} case 138: ! #line 1195 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { finish_method_declaration (yyvsp[0].node); ; break;} case 139: ! #line 1200 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = method_header (0, NULL_TREE, yyvsp[-1].node, yyvsp[0].node); ; break;} case 140: ! #line 1202 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = method_header (yyvsp[-2].value, NULL_TREE, yyvsp[-1].node, yyvsp[0].node); ; break;} case 141: ! #line 1207 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { ctxp->formal_parameter_number = 0; yyval.node = method_declarator (yyvsp[-2].node, NULL_TREE); ; break;} case 142: ! #line 1212 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = method_declarator (yyvsp[-3].node, yyvsp[-1].node); ; break;} case 143: ! #line 1220 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { BLOCK_EXPR_BODY (yyvsp[0].node) = empty_stmt_node; yyval.node = yyvsp[0].node; ; break;} case 144: ! #line 1225 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 145: ! #line 1227 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 146: ! #line 1229 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 148: ! #line 1239 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_method_invocation (yyvsp[-3].node, NULL_TREE); yyval.node = build_debugable_stmt (EXPR_WFL_LINECOL (yyvsp[-3].node), yyval.node); --- 3473,3528 ---- ; break;} case 137: ! #line 1191 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { current_function_decl = yyvsp[0].node; source_start_java_method (current_function_decl); ; break;} case 138: ! #line 1196 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { finish_method_declaration (yyvsp[0].node); ; break;} case 139: ! #line 1201 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = method_header (0, NULL_TREE, yyvsp[-1].node, yyvsp[0].node); ; break;} case 140: ! #line 1203 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = method_header (yyvsp[-2].value, NULL_TREE, yyvsp[-1].node, yyvsp[0].node); ; break;} case 141: ! #line 1208 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { ctxp->formal_parameter_number = 0; yyval.node = method_declarator (yyvsp[-2].node, NULL_TREE); ; break;} case 142: ! #line 1213 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = method_declarator (yyvsp[-3].node, yyvsp[-1].node); ; break;} case 143: ! #line 1221 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { BLOCK_EXPR_BODY (yyvsp[0].node) = empty_stmt_node; yyval.node = yyvsp[0].node; ; break;} case 144: ! #line 1226 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 145: ! #line 1228 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 146: ! #line 1230 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 148: ! #line 1240 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_method_invocation (yyvsp[-3].node, NULL_TREE); yyval.node = build_debugable_stmt (EXPR_WFL_LINECOL (yyvsp[-3].node), yyval.node); *************** case 148: *** 3522,3528 **** ; break;} case 149: ! #line 1245 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_method_invocation (yyvsp[-4].node, yyvsp[-2].node); yyval.node = build_debugable_stmt (EXPR_WFL_LINECOL (yyvsp[-4].node), yyval.node); --- 3530,3536 ---- ; break;} case 149: ! #line 1246 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_method_invocation (yyvsp[-4].node, yyvsp[-2].node); yyval.node = build_debugable_stmt (EXPR_WFL_LINECOL (yyvsp[-4].node), yyval.node); *************** case 149: *** 3530,3544 **** ; break;} case 150: ! #line 1253 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyval.node = parse_jdk1_1_error ("explicit constructor invocation"); ; break;} case 151: ! #line 1255 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyval.node = parse_jdk1_1_error ("explicit constructor invocation"); ; break;} case 152: ! #line 1260 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { tree wfl = build_wfl_node (this_identifier_node); EXPR_WFL_LINECOL (wfl) = yyvsp[0].operator.location; --- 3538,3552 ---- ; break;} case 150: ! #line 1254 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyval.node = parse_jdk1_1_error ("explicit constructor invocation"); ; break;} case 151: ! #line 1256 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyval.node = parse_jdk1_1_error ("explicit constructor invocation"); ; break;} case 152: ! #line 1261 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { tree wfl = build_wfl_node (this_identifier_node); EXPR_WFL_LINECOL (wfl) = yyvsp[0].operator.location; *************** case 152: *** 3546,3552 **** ; break;} case 153: ! #line 1266 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { tree wfl = build_wfl_node (super_identifier_node); EXPR_WFL_LINECOL (wfl) = yyvsp[0].operator.location; --- 3554,3560 ---- ; break;} case 153: ! #line 1267 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { tree wfl = build_wfl_node (super_identifier_node); EXPR_WFL_LINECOL (wfl) = yyvsp[0].operator.location; *************** case 153: *** 3554,3666 **** ; break;} case 154: ! #line 1277 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { create_interface (0, yyvsp[0].node, NULL_TREE); ; break;} case 156: ! #line 1280 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { create_interface (yyvsp[-2].value, yyvsp[0].node, NULL_TREE); ; break;} case 158: ! #line 1283 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { create_interface (0, yyvsp[-1].node, yyvsp[0].node); ; break;} case 160: ! #line 1286 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { create_interface (yyvsp[-3].value, yyvsp[-1].node, yyvsp[0].node); ; break;} case 162: ! #line 1289 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'{' expected"); RECOVER;; break;} case 163: ! #line 1291 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'{' expected"); RECOVER;; break;} case 164: ! #line 1296 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { ctxp->interface_number = 1; yyval.node = build_tree_list (yyvsp[0].node, NULL_TREE); ; break;} case 165: ! #line 1301 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { ctxp->interface_number++; yyval.node = chainon (yyvsp[-2].node, build_tree_list (yyvsp[0].node, NULL_TREE)); ; break;} case 166: ! #line 1306 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Invalid interface type"); RECOVER;; break;} case 167: ! #line 1308 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 168: ! #line 1313 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 169: ! #line 1315 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 174: ! #line 1327 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { end_class_declaration (1); ; break;} case 175: ! #line 1329 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { end_class_declaration (1); ; break;} case 177: ! #line 1338 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { check_abstract_method_header (yyvsp[-1].node); current_function_decl = NULL_TREE; /* FIXME ? */ ; break;} case 178: ! #line 1343 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 179: ! #line 1349 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_new_array_init (yyvsp[-1].operator.location, NULL_TREE); ; break;} case 180: ! #line 1351 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_new_array_init (yyvsp[-2].operator.location, NULL_TREE); ; break;} case 181: ! #line 1353 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_new_array_init (yyvsp[-2].operator.location, yyvsp[-1].node); ; break;} case 182: ! #line 1355 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_new_array_init (yyvsp[-3].operator.location, yyvsp[-2].node); ; break;} case 183: ! #line 1360 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = tree_cons (maybe_build_array_element_wfl (yyvsp[0].node), yyvsp[0].node, NULL_TREE); ; break;} case 184: ! #line 1365 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = tree_cons (maybe_build_array_element_wfl (yyvsp[0].node), yyvsp[0].node, yyvsp[-2].node); ; break;} case 185: ! #line 1369 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 186: ! #line 1375 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { /* Store the location of the `}' when doing xrefs */ if (current_function_decl && flag_emit_xref) --- 3562,3690 ---- ; break;} case 154: ! #line 1278 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { create_interface (0, yyvsp[0].node, NULL_TREE); ; break;} + case 155: + #line 1280 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" + { ; ; + break;} case 156: ! #line 1282 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { create_interface (yyvsp[-2].value, yyvsp[0].node, NULL_TREE); ; break;} + case 157: + #line 1284 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" + { ; ; + break;} case 158: ! #line 1286 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { create_interface (0, yyvsp[-1].node, yyvsp[0].node); ; break;} + case 159: + #line 1288 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" + { ; ; + break;} case 160: ! #line 1290 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { create_interface (yyvsp[-3].value, yyvsp[-1].node, yyvsp[0].node); ; break;} + case 161: + #line 1292 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" + { ; ; + break;} case 162: ! #line 1294 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'{' expected"); RECOVER;; break;} case 163: ! #line 1296 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'{' expected"); RECOVER;; break;} case 164: ! #line 1301 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { ctxp->interface_number = 1; yyval.node = build_tree_list (yyvsp[0].node, NULL_TREE); ; break;} case 165: ! #line 1306 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { ctxp->interface_number++; yyval.node = chainon (yyvsp[-2].node, build_tree_list (yyvsp[0].node, NULL_TREE)); ; break;} case 166: ! #line 1311 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Invalid interface type"); RECOVER;; break;} case 167: ! #line 1313 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 168: ! #line 1318 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 169: ! #line 1320 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 174: ! #line 1332 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { end_class_declaration (1); ; break;} case 175: ! #line 1334 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { end_class_declaration (1); ; break;} case 177: ! #line 1343 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { check_abstract_method_header (yyvsp[-1].node); current_function_decl = NULL_TREE; /* FIXME ? */ ; break;} case 178: ! #line 1348 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 179: ! #line 1354 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_new_array_init (yyvsp[-1].operator.location, NULL_TREE); ; break;} case 180: ! #line 1356 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_new_array_init (yyvsp[-2].operator.location, NULL_TREE); ; break;} case 181: ! #line 1358 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_new_array_init (yyvsp[-2].operator.location, yyvsp[-1].node); ; break;} case 182: ! #line 1360 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_new_array_init (yyvsp[-3].operator.location, yyvsp[-2].node); ; break;} case 183: ! #line 1365 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = tree_cons (maybe_build_array_element_wfl (yyvsp[0].node), yyvsp[0].node, NULL_TREE); ; break;} case 184: ! #line 1370 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = tree_cons (maybe_build_array_element_wfl (yyvsp[0].node), yyvsp[0].node, yyvsp[-2].node); ; break;} case 185: ! #line 1374 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 186: ! #line 1380 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { /* Store the location of the `}' when doing xrefs */ if (current_function_decl && flag_emit_xref) *************** case 186: *** 3670,3684 **** ; break;} case 187: ! #line 1383 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 188: ! #line 1388 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { enter_block (); ; break;} case 189: ! #line 1393 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { maybe_absorb_scoping_blocks (); /* Store the location of the `}' when doing xrefs */ --- 3694,3708 ---- ; break;} case 187: ! #line 1388 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 188: ! #line 1393 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { enter_block (); ; break;} case 189: ! #line 1398 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { maybe_absorb_scoping_blocks (); /* Store the location of the `}' when doing xrefs */ *************** case 189: *** 3691,3724 **** ; break;} case 193: ! #line 1413 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { java_method_add_stmt (current_function_decl, yyvsp[0].node); ; break;} case 194: ! #line 1415 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { LOCAL_CLASS_P (TREE_TYPE (GET_CPC ())) = 1; end_class_declaration (1); ; break;} case 196: ! #line 1427 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { declare_local_variables (0, yyvsp[-1].node, yyvsp[0].node); ; break;} case 197: ! #line 1429 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { declare_local_variables (yyvsp[-2].value, yyvsp[-1].node, yyvsp[0].node); ; break;} case 203: ! #line 1439 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = exit_block (); ; break;} case 208: ! #line 1448 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = exit_block (); ; break;} case 220: ! #line 1467 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { if (flag_extraneous_semicolon && ! current_static_block --- 3715,3748 ---- ; break;} case 193: ! #line 1418 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { java_method_add_stmt (current_function_decl, yyvsp[0].node); ; break;} case 194: ! #line 1420 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { LOCAL_CLASS_P (TREE_TYPE (GET_CPC ())) = 1; end_class_declaration (1); ; break;} case 196: ! #line 1432 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { declare_local_variables (0, yyvsp[-1].node, yyvsp[0].node); ; break;} case 197: ! #line 1434 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { declare_local_variables (yyvsp[-2].value, yyvsp[-1].node, yyvsp[0].node); ; break;} case 203: ! #line 1444 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = exit_block (); ; break;} case 208: ! #line 1453 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = exit_block (); ; break;} case 220: ! #line 1472 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { if (flag_extraneous_semicolon && ! current_static_block *************** case 220: *** 3735,3741 **** ; break;} case 221: ! #line 1485 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_labeled_block (EXPR_WFL_LINECOL (yyvsp[-1].node), EXPR_WFL_NODE (yyvsp[-1].node)); --- 3759,3765 ---- ; break;} case 221: ! #line 1490 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_labeled_block (EXPR_WFL_LINECOL (yyvsp[-1].node), EXPR_WFL_NODE (yyvsp[-1].node)); *************** case 221: *** 3745,3763 **** ; break;} case 222: ! #line 1496 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = finish_labeled_statement (yyvsp[-1].node, yyvsp[0].node); ; break;} case 223: ! #line 1498 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("':' expected"); RECOVER;; break;} case 224: ! #line 1503 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = finish_labeled_statement (yyvsp[-1].node, yyvsp[0].node); ; break;} case 225: ! #line 1510 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { /* We have a statement. Generate a WFL around it so we can debug it */ --- 3769,3787 ---- ; break;} case 222: ! #line 1501 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = finish_labeled_statement (yyvsp[-1].node, yyvsp[0].node); ; break;} case 223: ! #line 1503 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("':' expected"); RECOVER;; break;} case 224: ! #line 1508 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = finish_labeled_statement (yyvsp[-1].node, yyvsp[0].node); ; break;} case 225: ! #line 1515 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { /* We have a statement. Generate a WFL around it so we can debug it */ *************** case 225: *** 3768,3870 **** ; break;} case 226: ! #line 1519 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { YYNOT_TWICE yyerror ("Invalid expression statement"); DRECOVER (expr_stmt); ; break;} case 227: ! #line 1524 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { YYNOT_TWICE yyerror ("Invalid expression statement"); DRECOVER (expr_stmt); ; break;} case 228: ! #line 1529 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { YYNOT_TWICE yyerror ("Invalid expression statement"); DRECOVER (expr_stmt); ; break;} case 229: ! #line 1534 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 230: ! #line 1536 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { parse_ctor_invocation_error (); RECOVER; ; break;} case 231: ! #line 1541 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 232: ! #line 1543 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { parse_ctor_invocation_error (); RECOVER; ; break;} case 233: ! #line 1548 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 234: ! #line 1550 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 235: ! #line 1552 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 236: ! #line 1554 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 237: ! #line 1556 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 245: ! #line 1571 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_if_else_statement (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[0].node, NULL_TREE); ; break;} case 246: ! #line 1576 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 247: ! #line 1578 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 248: ! #line 1580 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 249: ! #line 1585 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_if_else_statement (yyvsp[-5].operator.location, yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node); ; break;} case 250: ! #line 1590 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_if_else_statement (yyvsp[-5].operator.location, yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node); ; break;} case 251: ! #line 1595 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { enter_block (); ; break;} case 252: ! #line 1599 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { /* Make into "proper list" of COMPOUND_EXPRs. I.e. make the last statement also have its own --- 3792,3894 ---- ; break;} case 226: ! #line 1524 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { YYNOT_TWICE yyerror ("Invalid expression statement"); DRECOVER (expr_stmt); ; break;} case 227: ! #line 1529 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { YYNOT_TWICE yyerror ("Invalid expression statement"); DRECOVER (expr_stmt); ; break;} case 228: ! #line 1534 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { YYNOT_TWICE yyerror ("Invalid expression statement"); DRECOVER (expr_stmt); ; break;} case 229: ! #line 1539 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 230: ! #line 1541 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { parse_ctor_invocation_error (); RECOVER; ; break;} case 231: ! #line 1546 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 232: ! #line 1548 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { parse_ctor_invocation_error (); RECOVER; ; break;} case 233: ! #line 1553 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 234: ! #line 1555 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 235: ! #line 1557 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 236: ! #line 1559 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 237: ! #line 1561 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 245: ! #line 1576 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_if_else_statement (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[0].node, NULL_TREE); ; break;} case 246: ! #line 1581 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 247: ! #line 1583 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 248: ! #line 1585 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 249: ! #line 1590 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_if_else_statement (yyvsp[-5].operator.location, yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node); ; break;} case 250: ! #line 1595 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_if_else_statement (yyvsp[-5].operator.location, yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node); ; break;} case 251: ! #line 1600 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { enter_block (); ; break;} case 252: ! #line 1604 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { /* Make into "proper list" of COMPOUND_EXPRs. I.e. make the last statement also have its own *************** case 252: *** 3875,3916 **** ; break;} case 253: ! #line 1611 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build (SWITCH_EXPR, NULL_TREE, yyvsp[-1].node, NULL_TREE); EXPR_WFL_LINECOL (yyval.node) = yyvsp[-2].operator.location; ; break;} case 254: ! #line 1616 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 255: ! #line 1618 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term or ')'"); DRECOVER(switch_statement);; break;} case 256: ! #line 1620 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'{' expected"); RECOVER;; break;} case 257: ! #line 1628 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 258: ! #line 1630 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 259: ! #line 1632 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 260: ! #line 1634 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 266: ! #line 1653 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { tree lab = build1 (CASE_EXPR, NULL_TREE, yyvsp[-1].node); EXPR_WFL_LINECOL (lab) = yyvsp[-2].operator.location; --- 3899,3940 ---- ; break;} case 253: ! #line 1616 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build (SWITCH_EXPR, NULL_TREE, yyvsp[-1].node, NULL_TREE); EXPR_WFL_LINECOL (yyval.node) = yyvsp[-2].operator.location; ; break;} case 254: ! #line 1621 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 255: ! #line 1623 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term or ')'"); DRECOVER(switch_statement);; break;} case 256: ! #line 1625 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'{' expected"); RECOVER;; break;} case 257: ! #line 1633 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 258: ! #line 1635 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 259: ! #line 1637 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 260: ! #line 1639 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 266: ! #line 1658 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { tree lab = build1 (CASE_EXPR, NULL_TREE, yyvsp[-1].node); EXPR_WFL_LINECOL (lab) = yyvsp[-2].operator.location; *************** case 266: *** 3918,3924 **** ; break;} case 267: ! #line 1659 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { tree lab = build (DEFAULT_EXPR, NULL_TREE, NULL_TREE); EXPR_WFL_LINECOL (lab) = yyvsp[-1].operator.location; --- 3942,3948 ---- ; break;} case 267: ! #line 1664 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { tree lab = build (DEFAULT_EXPR, NULL_TREE, NULL_TREE); EXPR_WFL_LINECOL (lab) = yyvsp[-1].operator.location; *************** case 267: *** 3926,3982 **** ; break;} case 268: ! #line 1665 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing or invalid constant expression"); RECOVER;; break;} case 269: ! #line 1667 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("':' expected"); RECOVER;; break;} case 270: ! #line 1669 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("':' expected"); RECOVER;; break;} case 271: ! #line 1674 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { tree body = build_loop_body (yyvsp[-2].operator.location, yyvsp[-1].node, 0); yyval.node = build_new_loop (body); ; break;} case 272: ! #line 1682 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = finish_loop_body (0, NULL_TREE, yyvsp[0].node, 0); ; break;} case 273: ! #line 1684 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {YYERROR_NOW; yyerror ("'(' expected"); RECOVER;; break;} case 274: ! #line 1686 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term and ')' expected"); RECOVER;; break;} case 275: ! #line 1688 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 276: ! #line 1693 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = finish_loop_body (0, NULL_TREE, yyvsp[0].node, 0); ; break;} case 277: ! #line 1698 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { tree body = build_loop_body (0, NULL_TREE, 1); yyval.node = build_new_loop (body); ; break;} case 278: ! #line 1707 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = finish_loop_body (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[-5].node, 1); ; break;} case 279: ! #line 1712 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { if (TREE_CODE_CLASS (TREE_CODE (yyvsp[-4].node)) == 'c') yyvsp[-4].node = build_wfl_node (yyvsp[-4].node); --- 3950,4006 ---- ; break;} case 268: ! #line 1670 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing or invalid constant expression"); RECOVER;; break;} case 269: ! #line 1672 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("':' expected"); RECOVER;; break;} case 270: ! #line 1674 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("':' expected"); RECOVER;; break;} case 271: ! #line 1679 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { tree body = build_loop_body (yyvsp[-2].operator.location, yyvsp[-1].node, 0); yyval.node = build_new_loop (body); ; break;} case 272: ! #line 1687 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = finish_loop_body (0, NULL_TREE, yyvsp[0].node, 0); ; break;} case 273: ! #line 1689 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {YYERROR_NOW; yyerror ("'(' expected"); RECOVER;; break;} case 274: ! #line 1691 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term and ')' expected"); RECOVER;; break;} case 275: ! #line 1693 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 276: ! #line 1698 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = finish_loop_body (0, NULL_TREE, yyvsp[0].node, 0); ; break;} case 277: ! #line 1703 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { tree body = build_loop_body (0, NULL_TREE, 1); yyval.node = build_new_loop (body); ; break;} case 278: ! #line 1712 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = finish_loop_body (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[-5].node, 1); ; break;} case 279: ! #line 1717 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { if (TREE_CODE_CLASS (TREE_CODE (yyvsp[-4].node)) == 'c') yyvsp[-4].node = build_wfl_node (yyvsp[-4].node); *************** case 279: *** 3984,3990 **** ; break;} case 280: ! #line 1718 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = finish_for_loop (0, NULL_TREE, yyvsp[-2].node, yyvsp[0].node); /* We have not condition, so we get rid of the EXIT_EXPR */ --- 4008,4014 ---- ; break;} case 280: ! #line 1723 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = finish_for_loop (0, NULL_TREE, yyvsp[-2].node, yyvsp[0].node); /* We have not condition, so we get rid of the EXIT_EXPR */ *************** case 280: *** 3993,4015 **** ; break;} case 281: ! #line 1725 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Invalid control expression"); RECOVER;; break;} case 282: ! #line 1727 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Invalid update expression"); RECOVER;; break;} case 283: ! #line 1729 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Invalid update expression"); RECOVER;; break;} case 284: ! #line 1734 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = finish_for_loop (EXPR_WFL_LINECOL (yyvsp[-4].node), yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node);; break;} case 285: ! #line 1736 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = finish_for_loop (0, NULL_TREE, yyvsp[-2].node, yyvsp[0].node); /* We have not condition, so we get rid of the EXIT_EXPR */ --- 4017,4039 ---- ; break;} case 281: ! #line 1730 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Invalid control expression"); RECOVER;; break;} case 282: ! #line 1732 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Invalid update expression"); RECOVER;; break;} case 283: ! #line 1734 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Invalid update expression"); RECOVER;; break;} case 284: ! #line 1739 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = finish_for_loop (EXPR_WFL_LINECOL (yyvsp[-4].node), yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node);; break;} case 285: ! #line 1741 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = finish_for_loop (0, NULL_TREE, yyvsp[-2].node, yyvsp[0].node); /* We have not condition, so we get rid of the EXIT_EXPR */ *************** case 285: *** 4018,4024 **** ; break;} case 286: ! #line 1746 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { /* This scope defined for local variable that may be defined within the scope of the for loop */ --- 4042,4048 ---- ; break;} case 286: ! #line 1751 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { /* This scope defined for local variable that may be defined within the scope of the for loop */ *************** case 286: *** 4026,4040 **** ; break;} case 287: ! #line 1752 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'(' expected"); DRECOVER(for_1);; break;} case 288: ! #line 1754 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Invalid init statement"); RECOVER;; break;} case 289: ! #line 1759 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { /* We now declare the loop body. The loop is declared as a for loop. */ --- 4050,4064 ---- ; break;} case 287: ! #line 1757 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'(' expected"); DRECOVER(for_1);; break;} case 288: ! #line 1759 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Invalid init statement"); RECOVER;; break;} case 289: ! #line 1764 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { /* We now declare the loop body. The loop is declared as a for loop. */ *************** case 289: *** 4047,4057 **** ; break;} case 290: ! #line 1771 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = empty_stmt_node; ; break;} case 291: ! #line 1773 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { /* Init statement recorded within the previously defined block scope */ --- 4071,4081 ---- ; break;} case 290: ! #line 1776 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = empty_stmt_node; ; break;} case 291: ! #line 1778 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { /* Init statement recorded within the previously defined block scope */ *************** case 291: *** 4059,4065 **** ; break;} case 292: ! #line 1779 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { /* Local variable are recorded within the previously defined block scope */ --- 4083,4089 ---- ; break;} case 292: ! #line 1784 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { /* Local variable are recorded within the previously defined block scope */ *************** case 292: *** 4067,4160 **** ; break;} case 293: ! #line 1785 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("';' expected"); DRECOVER(for_init_1);; break;} case 294: ! #line 1789 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyval.node = empty_stmt_node;; break;} case 295: ! #line 1791 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_debugable_stmt (BUILD_LOCATION (), yyvsp[0].node); ; break;} case 296: ! #line 1796 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = add_stmt_to_compound (NULL_TREE, NULL_TREE, yyvsp[0].node); ; break;} case 297: ! #line 1798 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = add_stmt_to_compound (yyvsp[-2].node, NULL_TREE, yyvsp[0].node); ; break;} case 298: ! #line 1800 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 299: ! #line 1805 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_bc_statement (yyvsp[-1].operator.location, 1, NULL_TREE); ; break;} case 300: ! #line 1807 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_bc_statement (yyvsp[-2].operator.location, 1, yyvsp[-1].node); ; break;} case 301: ! #line 1809 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 302: ! #line 1811 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 303: ! #line 1816 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_bc_statement (yyvsp[-1].operator.location, 0, NULL_TREE); ; break;} case 304: ! #line 1818 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_bc_statement (yyvsp[-2].operator.location, 0, yyvsp[-1].node); ; break;} case 305: ! #line 1820 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 306: ! #line 1822 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 307: ! #line 1827 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_return (yyvsp[-1].operator.location, NULL_TREE); ; break;} case 308: ! #line 1829 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_return (yyvsp[-2].operator.location, yyvsp[-1].node); ; break;} case 309: ! #line 1831 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 310: ! #line 1833 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 311: ! #line 1838 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build1 (THROW_EXPR, NULL_TREE, yyvsp[-1].node); EXPR_WFL_LINECOL (yyval.node) = yyvsp[-2].operator.location; ; break;} case 312: ! #line 1843 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 313: ! #line 1845 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 314: ! #line 1850 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build (SYNCHRONIZED_EXPR, NULL_TREE, yyvsp[-2].node, yyvsp[0].node); EXPR_WFL_LINECOL (yyval.node) = --- 4091,4184 ---- ; break;} case 293: ! #line 1790 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("';' expected"); DRECOVER(for_init_1);; break;} case 294: ! #line 1794 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyval.node = empty_stmt_node;; break;} case 295: ! #line 1796 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_debugable_stmt (BUILD_LOCATION (), yyvsp[0].node); ; break;} case 296: ! #line 1801 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = add_stmt_to_compound (NULL_TREE, NULL_TREE, yyvsp[0].node); ; break;} case 297: ! #line 1803 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = add_stmt_to_compound (yyvsp[-2].node, NULL_TREE, yyvsp[0].node); ; break;} case 298: ! #line 1805 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 299: ! #line 1810 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_bc_statement (yyvsp[-1].operator.location, 1, NULL_TREE); ; break;} case 300: ! #line 1812 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_bc_statement (yyvsp[-2].operator.location, 1, yyvsp[-1].node); ; break;} case 301: ! #line 1814 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 302: ! #line 1816 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 303: ! #line 1821 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_bc_statement (yyvsp[-1].operator.location, 0, NULL_TREE); ; break;} case 304: ! #line 1823 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_bc_statement (yyvsp[-2].operator.location, 0, yyvsp[-1].node); ; break;} case 305: ! #line 1825 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 306: ! #line 1827 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 307: ! #line 1832 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_return (yyvsp[-1].operator.location, NULL_TREE); ; break;} case 308: ! #line 1834 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_return (yyvsp[-2].operator.location, yyvsp[-1].node); ; break;} case 309: ! #line 1836 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 310: ! #line 1838 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 311: ! #line 1843 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build1 (THROW_EXPR, NULL_TREE, yyvsp[-1].node); EXPR_WFL_LINECOL (yyval.node) = yyvsp[-2].operator.location; ; break;} case 312: ! #line 1848 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 313: ! #line 1850 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 314: ! #line 1855 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build (SYNCHRONIZED_EXPR, NULL_TREE, yyvsp[-2].node, yyvsp[0].node); EXPR_WFL_LINECOL (yyval.node) = *************** case 314: *** 4162,4184 **** ; break;} case 315: ! #line 1856 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'{' expected"); RECOVER;; break;} case 316: ! #line 1858 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 317: ! #line 1860 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 318: ! #line 1862 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 319: ! #line 1867 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { check_modifiers ( "Illegal modifier `%s'. Only `synchronized' was expected here", --- 4186,4208 ---- ; break;} case 315: ! #line 1861 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'{' expected"); RECOVER;; break;} case 316: ! #line 1863 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 317: ! #line 1865 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 318: ! #line 1867 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 319: ! #line 1872 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { check_modifiers ( "Illegal modifier `%s'. Only `synchronized' was expected here", *************** case 319: *** 4189,4221 **** ; break;} case 320: ! #line 1879 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_try_statement (yyvsp[-2].operator.location, yyvsp[-1].node, yyvsp[0].node); ; break;} case 321: ! #line 1881 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_try_finally_statement (yyvsp[-2].operator.location, yyvsp[-1].node, yyvsp[0].node); ; break;} case 322: ! #line 1883 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_try_finally_statement (yyvsp[-3].operator.location, build_try_statement (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[-1].node), yyvsp[0].node); ; break;} case 323: ! #line 1888 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'{' expected"); DRECOVER (try_statement);; break;} case 325: ! #line 1894 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { TREE_CHAIN (yyvsp[0].node) = yyvsp[-1].node; yyval.node = yyvsp[0].node; ; break;} case 326: ! #line 1902 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { java_method_add_stmt (current_function_decl, yyvsp[0].node); exit_block (); --- 4213,4245 ---- ; break;} case 320: ! #line 1884 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_try_statement (yyvsp[-2].operator.location, yyvsp[-1].node, yyvsp[0].node); ; break;} case 321: ! #line 1886 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_try_finally_statement (yyvsp[-2].operator.location, yyvsp[-1].node, yyvsp[0].node); ; break;} case 322: ! #line 1888 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_try_finally_statement (yyvsp[-3].operator.location, build_try_statement (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[-1].node), yyvsp[0].node); ; break;} case 323: ! #line 1893 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'{' expected"); DRECOVER (try_statement);; break;} case 325: ! #line 1899 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { TREE_CHAIN (yyvsp[0].node) = yyvsp[-1].node; yyval.node = yyvsp[0].node; ; break;} case 326: ! #line 1907 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { java_method_add_stmt (current_function_decl, yyvsp[0].node); exit_block (); *************** case 326: *** 4223,4229 **** ; break;} case 327: ! #line 1910 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { /* We add a block to define a scope for formal_parameter (CCBP). The formal parameter is --- 4247,4253 ---- ; break;} case 327: ! #line 1916 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { /* We add a block to define a scope for formal_parameter (CCBP). The formal parameter is *************** case 327: *** 4241,4328 **** ; break;} case 328: ! #line 1926 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER; yyval.node = NULL_TREE;; break;} case 329: ! #line 1928 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyerror ("Missing term or ')' expected"); RECOVER; yyval.node = NULL_TREE; ; break;} case 330: ! #line 1933 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; yyval.node = NULL_TREE;; break;} case 331: ! #line 1938 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 332: ! #line 1940 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'{' expected"); RECOVER; ; break;} case 336: ! #line 1952 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_this (yyvsp[0].operator.location); ; break;} case 337: ! #line 1954 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyval.node = yyvsp[-1].node;; break;} case 343: ! #line 1964 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { tree wfl = build_wfl_node (this_identifier_node); yyval.node = make_qualified_primary (yyvsp[-2].node, wfl, EXPR_WFL_LINECOL (yyvsp[-2].node)); ; break;} case 344: ! #line 1969 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 345: ! #line 1971 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'class' or 'this' expected" ); RECOVER;; break;} case 346: ! #line 1973 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'class' expected" ); RECOVER;; break;} case 347: ! #line 1975 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'class' expected" ); RECOVER;; break;} case 348: ! #line 1980 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_incomplete_class_ref (yyvsp[-1].operator.location, yyvsp[-2].node); ; break;} case 349: ! #line 1982 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_incomplete_class_ref (yyvsp[-1].operator.location, yyvsp[-2].node); ; break;} case 350: ! #line 1984 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_incomplete_class_ref (yyvsp[-1].operator.location, yyvsp[-2].node); ; break;} case 351: ! #line 1986 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_incomplete_class_ref (yyvsp[-1].operator.location, void_type_node); ; break;} case 352: ! #line 1994 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_new_invocation (yyvsp[-3].node, yyvsp[-1].node); ; break;} case 353: ! #line 1996 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_new_invocation (yyvsp[-2].node, NULL_TREE); ; break;} case 355: ! #line 2002 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { tree ctor = build_new_invocation (yyvsp[-2].node, NULL_TREE); yyval.node = make_qualified_primary (yyvsp[-3].node, ctor, --- 4265,4352 ---- ; break;} case 328: ! #line 1932 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER; yyval.node = NULL_TREE;; break;} case 329: ! #line 1934 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyerror ("Missing term or ')' expected"); RECOVER; yyval.node = NULL_TREE; ; break;} case 330: ! #line 1939 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; yyval.node = NULL_TREE;; break;} case 331: ! #line 1944 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 332: ! #line 1946 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'{' expected"); RECOVER; ; break;} case 336: ! #line 1958 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_this (yyvsp[0].operator.location); ; break;} case 337: ! #line 1960 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyval.node = yyvsp[-1].node;; break;} case 343: ! #line 1970 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { tree wfl = build_wfl_node (this_identifier_node); yyval.node = make_qualified_primary (yyvsp[-2].node, wfl, EXPR_WFL_LINECOL (yyvsp[-2].node)); ; break;} case 344: ! #line 1975 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 345: ! #line 1977 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'class' or 'this' expected" ); RECOVER;; break;} case 346: ! #line 1979 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'class' expected" ); RECOVER;; break;} case 347: ! #line 1981 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'class' expected" ); RECOVER;; break;} case 348: ! #line 1986 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_incomplete_class_ref (yyvsp[-1].operator.location, yyvsp[-2].node); ; break;} case 349: ! #line 1988 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_incomplete_class_ref (yyvsp[-1].operator.location, yyvsp[-2].node); ; break;} case 350: ! #line 1990 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_incomplete_class_ref (yyvsp[-1].operator.location, yyvsp[-2].node); ; break;} case 351: ! #line 1992 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_incomplete_class_ref (yyvsp[-1].operator.location, void_type_node); ; break;} case 352: ! #line 2000 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_new_invocation (yyvsp[-3].node, yyvsp[-1].node); ; break;} case 353: ! #line 2002 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_new_invocation (yyvsp[-2].node, NULL_TREE); ; break;} case 355: ! #line 2008 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { tree ctor = build_new_invocation (yyvsp[-2].node, NULL_TREE); yyval.node = make_qualified_primary (yyvsp[-3].node, ctor, *************** case 355: *** 4330,4336 **** ; break;} case 357: ! #line 2009 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { tree ctor = build_new_invocation (yyvsp[-3].node, yyvsp[-1].node); yyval.node = make_qualified_primary (yyvsp[-4].node, ctor, --- 4354,4360 ---- ; break;} case 357: ! #line 2015 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { tree ctor = build_new_invocation (yyvsp[-3].node, yyvsp[-1].node); yyval.node = make_qualified_primary (yyvsp[-4].node, ctor, *************** case 357: *** 4338,4372 **** ; break;} case 359: ! #line 2016 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'(' expected"); DRECOVER(new_1);; break;} case 360: ! #line 2018 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 361: ! #line 2020 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("')' or term expected"); RECOVER;; break;} case 362: ! #line 2022 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 363: ! #line 2024 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {YYERROR_NOW; yyerror ("Identifier expected"); RECOVER;; break;} case 364: ! #line 2026 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 365: ! #line 2036 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { create_anonymous_class (yyvsp[-4].operator.location, yyvsp[-3].node); ; break;} case 366: ! #line 2038 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { tree id = build_wfl_node (DECL_NAME (GET_CPC ())); EXPR_WFL_LINECOL (id) = EXPR_WFL_LINECOL (yyvsp[-5].node); --- 4362,4396 ---- ; break;} case 359: ! #line 2022 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'(' expected"); DRECOVER(new_1);; break;} case 360: ! #line 2024 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 361: ! #line 2026 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("')' or term expected"); RECOVER;; break;} case 362: ! #line 2028 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 363: ! #line 2030 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {YYERROR_NOW; yyerror ("Identifier expected"); RECOVER;; break;} case 364: ! #line 2032 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 365: ! #line 2042 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { create_anonymous_class (yyvsp[-4].operator.location, yyvsp[-3].node); ; break;} case 366: ! #line 2044 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { tree id = build_wfl_node (DECL_NAME (GET_CPC ())); EXPR_WFL_LINECOL (id) = EXPR_WFL_LINECOL (yyvsp[-5].node); *************** case 366: *** 4399,4409 **** ; break;} case 367: ! #line 2069 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { create_anonymous_class (yyvsp[-3].operator.location, yyvsp[-2].node); ; break;} case 368: ! #line 2071 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { tree id = build_wfl_node (DECL_NAME (GET_CPC ())); EXPR_WFL_LINECOL (id) = EXPR_WFL_LINECOL (yyvsp[-4].node); --- 4423,4433 ---- ; break;} case 367: ! #line 2075 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { create_anonymous_class (yyvsp[-3].operator.location, yyvsp[-2].node); ; break;} case 368: ! #line 2077 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { tree id = build_wfl_node (DECL_NAME (GET_CPC ())); EXPR_WFL_LINECOL (id) = EXPR_WFL_LINECOL (yyvsp[-4].node); *************** case 368: *** 4418,4466 **** ; break;} case 369: ! #line 2087 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = yyvsp[-2].node; ; break;} case 370: ! #line 2089 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = yyvsp[-2].node; ; break;} case 371: ! #line 2094 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = tree_cons (NULL_TREE, yyvsp[0].node, NULL_TREE); ctxp->formal_parameter_number = 1; ; break;} case 372: ! #line 2099 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { ctxp->formal_parameter_number += 1; yyval.node = tree_cons (NULL_TREE, yyvsp[0].node, yyvsp[-2].node); ; break;} case 373: ! #line 2104 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 374: ! #line 2109 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_newarray_node (yyvsp[-1].node, yyvsp[0].node, 0); ; break;} case 375: ! #line 2111 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_newarray_node (yyvsp[-1].node, yyvsp[0].node, 0); ; break;} case 376: ! #line 2113 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_newarray_node (yyvsp[-2].node, yyvsp[-1].node, pop_current_osb (ctxp));; break;} case 377: ! #line 2115 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_newarray_node (yyvsp[-2].node, yyvsp[-1].node, pop_current_osb (ctxp));; break;} case 378: ! #line 2119 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { char *sig; int osb = pop_current_osb (ctxp); --- 4442,4490 ---- ; break;} case 369: ! #line 2093 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = yyvsp[-2].node; ; break;} case 370: ! #line 2095 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = yyvsp[-2].node; ; break;} case 371: ! #line 2100 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = tree_cons (NULL_TREE, yyvsp[0].node, NULL_TREE); ctxp->formal_parameter_number = 1; ; break;} case 372: ! #line 2105 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { ctxp->formal_parameter_number += 1; yyval.node = tree_cons (NULL_TREE, yyvsp[0].node, yyvsp[-2].node); ; break;} case 373: ! #line 2110 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 374: ! #line 2115 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_newarray_node (yyvsp[-1].node, yyvsp[0].node, 0); ; break;} case 375: ! #line 2117 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_newarray_node (yyvsp[-1].node, yyvsp[0].node, 0); ; break;} case 376: ! #line 2119 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_newarray_node (yyvsp[-2].node, yyvsp[-1].node, pop_current_osb (ctxp));; break;} case 377: ! #line 2121 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_newarray_node (yyvsp[-2].node, yyvsp[-1].node, pop_current_osb (ctxp));; break;} case 378: ! #line 2125 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { char *sig; int osb = pop_current_osb (ctxp); *************** case 378: *** 4473,4479 **** ; break;} case 379: ! #line 2130 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { int osb = pop_current_osb (ctxp); tree type = yyvsp[-2].node; --- 4497,4503 ---- ; break;} case 379: ! #line 2136 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { int osb = pop_current_osb (ctxp); tree type = yyvsp[-2].node; *************** case 379: *** 4484,4506 **** ; break;} case 380: ! #line 2139 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("'[' expected"); DRECOVER ("]");; break;} case 381: ! #line 2141 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("']' expected"); RECOVER;; break;} case 382: ! #line 2146 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_tree_list (NULL_TREE, yyvsp[0].node); ; break;} case 383: ! #line 2148 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = tree_cons (NULL_TREE, yyvsp[0].node, yyval.node); ; break;} case 384: ! #line 2153 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { if (JNUMERIC_TYPE_P (TREE_TYPE (yyvsp[-1].node))) { --- 4508,4530 ---- ; break;} case 380: ! #line 2145 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("'[' expected"); DRECOVER ("]");; break;} case 381: ! #line 2147 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("']' expected"); RECOVER;; break;} case 382: ! #line 2152 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_tree_list (NULL_TREE, yyvsp[0].node); ; break;} case 383: ! #line 2154 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = tree_cons (NULL_TREE, yyvsp[0].node, yyval.node); ; break;} case 384: ! #line 2159 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { if (JNUMERIC_TYPE_P (TREE_TYPE (yyvsp[-1].node))) { *************** case 384: *** 4512,4522 **** ; break;} case 385: ! #line 2163 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("']' expected"); RECOVER;; break;} case 386: ! #line 2165 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyerror ("Missing term"); yyerror ("']' expected"); --- 4536,4546 ---- ; break;} case 385: ! #line 2169 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("']' expected"); RECOVER;; break;} case 386: ! #line 2171 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyerror ("Missing term"); yyerror ("']' expected"); *************** case 386: *** 4524,4530 **** ; break;} case 387: ! #line 2174 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { int allocate = 0; /* If not initialized, allocate memory for the osb --- 4548,4554 ---- ; break;} case 387: ! #line 2180 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { int allocate = 0; /* If not initialized, allocate memory for the osb *************** case 387: *** 4552,4570 **** ; break;} case 388: ! #line 2200 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { CURRENT_OSB (ctxp)++; ; break;} case 389: ! #line 2202 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyerror ("']' expected"); RECOVER;; break;} case 390: ! #line 2207 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = make_qualified_primary (yyvsp[-2].node, yyvsp[0].node, yyvsp[-1].operator.location); ; break;} case 391: ! #line 2211 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { tree super_wfl = build_wfl_node (super_identifier_node); EXPR_WFL_LINECOL (super_wfl) = yyvsp[-2].operator.location; --- 4576,4594 ---- ; break;} case 388: ! #line 2206 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { CURRENT_OSB (ctxp)++; ; break;} case 389: ! #line 2208 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyerror ("']' expected"); RECOVER;; break;} case 390: ! #line 2213 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = make_qualified_primary (yyvsp[-2].node, yyvsp[0].node, yyvsp[-1].operator.location); ; break;} case 391: ! #line 2217 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { tree super_wfl = build_wfl_node (super_identifier_node); EXPR_WFL_LINECOL (super_wfl) = yyvsp[-2].operator.location; *************** case 391: *** 4572,4590 **** ; break;} case 392: ! #line 2217 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Field expected"); DRECOVER (super_field_acces);; break;} case 393: ! #line 2222 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_method_invocation (yyvsp[-2].node, NULL_TREE); ; break;} case 394: ! #line 2224 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_method_invocation (yyvsp[-3].node, yyvsp[-1].node); ; break;} case 395: ! #line 2226 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { if (TREE_CODE (yyvsp[-4].node) == THIS_EXPR) yyval.node = build_this_super_qualified_invocation --- 4596,4614 ---- ; break;} case 392: ! #line 2223 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Field expected"); DRECOVER (super_field_acces);; break;} case 393: ! #line 2228 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_method_invocation (yyvsp[-2].node, NULL_TREE); ; break;} case 394: ! #line 2230 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_method_invocation (yyvsp[-3].node, yyvsp[-1].node); ; break;} case 395: ! #line 2232 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { if (TREE_CODE (yyvsp[-4].node) == THIS_EXPR) yyval.node = build_this_super_qualified_invocation *************** case 395: *** 4597,4603 **** ; break;} case 396: ! #line 2237 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { if (TREE_CODE (yyvsp[-5].node) == THIS_EXPR) yyval.node = build_this_super_qualified_invocation --- 4621,4627 ---- ; break;} case 396: ! #line 2243 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { if (TREE_CODE (yyvsp[-5].node) == THIS_EXPR) yyval.node = build_this_super_qualified_invocation *************** case 396: *** 4610,4737 **** ; break;} case 397: ! #line 2248 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_this_super_qualified_invocation (0, yyvsp[-2].node, NULL_TREE, yyvsp[-4].operator.location, yyvsp[-3].operator.location); ; break;} case 398: ! #line 2253 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_this_super_qualified_invocation (0, yyvsp[-3].node, yyvsp[-1].node, yyvsp[-5].operator.location, yyvsp[-4].operator.location); ; break;} case 399: ! #line 2262 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyerror ("'(' expected"); DRECOVER (method_invocation); ; break;} case 400: ! #line 2264 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyerror ("'(' expected"); DRECOVER (method_invocation); ; break;} case 401: ! #line 2269 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_array_ref (yyvsp[-2].operator.location, yyvsp[-3].node, yyvsp[-1].node); ; break;} case 402: ! #line 2271 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_array_ref (yyvsp[-2].operator.location, yyvsp[-3].node, yyvsp[-1].node); ; break;} case 403: ! #line 2273 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyerror ("Missing term and ']' expected"); DRECOVER(array_access); ; break;} case 404: ! #line 2278 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyerror ("']' expected"); DRECOVER(array_access); ; break;} case 405: ! #line 2283 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyerror ("Missing term and ']' expected"); DRECOVER(array_access); ; break;} case 406: ! #line 2288 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyerror ("']' expected"); DRECOVER(array_access); ; break;} case 411: ! #line 2303 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_incdec (yyvsp[0].operator.token, yyvsp[0].operator.location, yyvsp[-1].node, 1); ; break;} case 412: ! #line 2308 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_incdec (yyvsp[0].operator.token, yyvsp[0].operator.location, yyvsp[-1].node, 1); ; break;} case 415: ! #line 2315 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyval.node = build_unaryop (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node); ; break;} case 417: ! #line 2318 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 418: ! #line 2323 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { error_if_numeric_overflow (yyvsp[0].node); yyval.node = yyvsp[0].node; ; break;} case 419: ! #line 2328 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyval.node = build_unaryop (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node); ; break;} case 420: ! #line 2330 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 421: ! #line 2335 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyval.node = build_incdec (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node, 0); ; break;} case 422: ! #line 2337 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 423: ! #line 2342 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyval.node = build_incdec (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node, 0); ; break;} case 424: ! #line 2344 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 426: ! #line 2350 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyval.node = build_unaryop (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node); ; break;} case 427: ! #line 2352 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyval.node = build_unaryop (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node); ; break;} case 429: ! #line 2355 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 430: ! #line 2357 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 431: ! #line 2362 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { tree type = yyvsp[-3].node; int osb = pop_current_osb (ctxp); --- 4634,4761 ---- ; break;} case 397: ! #line 2254 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_this_super_qualified_invocation (0, yyvsp[-2].node, NULL_TREE, yyvsp[-4].operator.location, yyvsp[-3].operator.location); ; break;} case 398: ! #line 2259 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_this_super_qualified_invocation (0, yyvsp[-3].node, yyvsp[-1].node, yyvsp[-5].operator.location, yyvsp[-4].operator.location); ; break;} case 399: ! #line 2268 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyerror ("'(' expected"); DRECOVER (method_invocation); ; break;} case 400: ! #line 2270 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyerror ("'(' expected"); DRECOVER (method_invocation); ; break;} case 401: ! #line 2275 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_array_ref (yyvsp[-2].operator.location, yyvsp[-3].node, yyvsp[-1].node); ; break;} case 402: ! #line 2277 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_array_ref (yyvsp[-2].operator.location, yyvsp[-3].node, yyvsp[-1].node); ; break;} case 403: ! #line 2279 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyerror ("Missing term and ']' expected"); DRECOVER(array_access); ; break;} case 404: ! #line 2284 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyerror ("']' expected"); DRECOVER(array_access); ; break;} case 405: ! #line 2289 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyerror ("Missing term and ']' expected"); DRECOVER(array_access); ; break;} case 406: ! #line 2294 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyerror ("']' expected"); DRECOVER(array_access); ; break;} case 411: ! #line 2309 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_incdec (yyvsp[0].operator.token, yyvsp[0].operator.location, yyvsp[-1].node, 1); ; break;} case 412: ! #line 2314 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_incdec (yyvsp[0].operator.token, yyvsp[0].operator.location, yyvsp[-1].node, 1); ; break;} case 415: ! #line 2321 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyval.node = build_unaryop (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node); ; break;} case 417: ! #line 2324 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 418: ! #line 2329 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { error_if_numeric_overflow (yyvsp[0].node); yyval.node = yyvsp[0].node; ; break;} case 419: ! #line 2334 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyval.node = build_unaryop (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node); ; break;} case 420: ! #line 2336 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 421: ! #line 2341 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyval.node = build_incdec (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node, 0); ; break;} case 422: ! #line 2343 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 423: ! #line 2348 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyval.node = build_incdec (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node, 0); ; break;} case 424: ! #line 2350 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 426: ! #line 2356 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyval.node = build_unaryop (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node); ; break;} case 427: ! #line 2358 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyval.node = build_unaryop (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[0].node); ; break;} case 429: ! #line 2361 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 430: ! #line 2363 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 431: ! #line 2368 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { tree type = yyvsp[-3].node; int osb = pop_current_osb (ctxp); *************** case 431: *** 4741,4755 **** ; break;} case 432: ! #line 2370 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_cast (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 433: ! #line 2372 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_cast (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 434: ! #line 2374 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { const char *ptr; int osb = pop_current_osb (ctxp); --- 4765,4779 ---- ; break;} case 432: ! #line 2376 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_cast (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 433: ! #line 2378 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_cast (yyvsp[-3].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 434: ! #line 2380 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { const char *ptr; int osb = pop_current_osb (ctxp); *************** case 434: *** 4765,5018 **** ; break;} case 435: ! #line 2388 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("']' expected, invalid type expression");; break;} case 436: ! #line 2390 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { YYNOT_TWICE yyerror ("Invalid type expression"); RECOVER; RECOVER; ; break;} case 437: ! #line 2395 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 438: ! #line 2397 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 439: ! #line 2399 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 441: ! #line 2405 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 442: ! #line 2410 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 443: ! #line 2415 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 444: ! #line 2420 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 445: ! #line 2422 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 446: ! #line 2424 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 448: ! #line 2430 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 449: ! #line 2435 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 450: ! #line 2440 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 451: ! #line 2442 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 453: ! #line 2448 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 454: ! #line 2453 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 455: ! #line 2458 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 456: ! #line 2463 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 457: ! #line 2465 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 458: ! #line 2467 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 460: ! #line 2473 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 461: ! #line 2478 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 462: ! #line 2483 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 463: ! #line 2488 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 464: ! #line 2493 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_binop (INSTANCEOF_EXPR, yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 465: ! #line 2495 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 466: ! #line 2497 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 467: ! #line 2499 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 468: ! #line 2501 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 469: ! #line 2503 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Invalid reference type"); RECOVER;; break;} case 471: ! #line 2509 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 472: ! #line 2514 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 473: ! #line 2519 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 474: ! #line 2521 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 476: ! #line 2527 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 477: ! #line 2532 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 479: ! #line 2538 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 480: ! #line 2543 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 482: ! #line 2549 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 483: ! #line 2554 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 485: ! #line 2560 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 486: ! #line 2565 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 488: ! #line 2571 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 489: ! #line 2576 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 491: ! #line 2582 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build (CONDITIONAL_EXPR, NULL_TREE, yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node); EXPR_WFL_LINECOL (yyval.node) = yyvsp[-3].operator.location; ; break;} case 492: ! #line 2587 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { YYERROR_NOW; yyerror ("Missing term"); --- 4789,5042 ---- ; break;} case 435: ! #line 2394 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("']' expected, invalid type expression");; break;} case 436: ! #line 2396 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { YYNOT_TWICE yyerror ("Invalid type expression"); RECOVER; RECOVER; ; break;} case 437: ! #line 2401 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 438: ! #line 2403 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 439: ! #line 2405 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 441: ! #line 2411 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 442: ! #line 2416 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 443: ! #line 2421 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 444: ! #line 2426 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 445: ! #line 2428 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 446: ! #line 2430 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 448: ! #line 2436 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 449: ! #line 2441 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 450: ! #line 2446 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 451: ! #line 2448 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 453: ! #line 2454 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 454: ! #line 2459 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 455: ! #line 2464 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 456: ! #line 2469 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 457: ! #line 2471 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 458: ! #line 2473 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 460: ! #line 2479 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 461: ! #line 2484 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 462: ! #line 2489 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 463: ! #line 2494 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 464: ! #line 2499 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_binop (INSTANCEOF_EXPR, yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 465: ! #line 2501 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 466: ! #line 2503 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 467: ! #line 2505 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 468: ! #line 2507 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 469: ! #line 2509 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Invalid reference type"); RECOVER;; break;} case 471: ! #line 2515 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 472: ! #line 2520 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 473: ! #line 2525 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 474: ! #line 2527 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 476: ! #line 2533 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 477: ! #line 2538 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 479: ! #line 2544 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 480: ! #line 2549 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 482: ! #line 2555 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 483: ! #line 2560 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 485: ! #line 2566 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 486: ! #line 2571 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 488: ! #line 2577 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_binop (BINOP_LOOKUP (yyvsp[-1].operator.token), yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 489: ! #line 2582 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 491: ! #line 2588 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build (CONDITIONAL_EXPR, NULL_TREE, yyvsp[-4].node, yyvsp[-2].node, yyvsp[0].node); EXPR_WFL_LINECOL (yyval.node) = yyvsp[-3].operator.location; ; break;} case 492: ! #line 2593 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { YYERROR_NOW; yyerror ("Missing term"); *************** case 492: *** 5020,5038 **** ; break;} case 493: ! #line 2593 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); DRECOVER (2);; break;} case 494: ! #line 2595 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" {yyerror ("Missing term"); DRECOVER (3);; break;} case 497: ! #line 2605 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { yyval.node = build_assignment (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 498: ! #line 2607 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" { YYNOT_TWICE yyerror ("Missing term"); DRECOVER (assign); --- 5044,5062 ---- ; break;} case 493: ! #line 2599 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); DRECOVER (2);; break;} case 494: ! #line 2601 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" {yyerror ("Missing term"); DRECOVER (3);; break;} case 497: ! #line 2611 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { yyval.node = build_assignment (yyvsp[-1].operator.token, yyvsp[-1].operator.location, yyvsp[-2].node, yyvsp[0].node); ; break;} case 498: ! #line 2613 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" { YYNOT_TWICE yyerror ("Missing term"); DRECOVER (assign); *************** yyerrhandle: *** 5260,5266 **** } return 1; } ! #line 2632 "/home/mitchell/gcc-3.2/gcc-3.2/gcc/java/parse.y" /* Helper function to retrieve an OSB count. Should be used when the --- 5284,5290 ---- } return 1; } ! #line 2638 "/home/mitchell/gcc-3.2.1/gcc-3.2.1/gcc/java/parse.y" /* Helper function to retrieve an OSB count. Should be used when the diff -Nrc3pad gcc-3.2/gcc/java/parse.y gcc-3.2.1/gcc/java/parse.y *** gcc-3.2/gcc/java/parse.y Tue Jun 4 16:45:55 2002 --- gcc-3.2.1/gcc/java/parse.y Mon Oct 21 18:40:12 2002 *************** static tree src_parse_roots[1]; *** 522,533 **** %type type_declaration compilation_unit field_declaration method_declaration extends_interfaces interfaces interface_type_list - class_member_declaration import_declarations package_declaration type_declarations interface_body interface_member_declaration constant_declaration interface_member_declarations interface_type ! abstract_method_declaration interface_type_list %type class_body_declaration class_member_declaration static_initializer constructor_declaration block %type class_body_declarations constructor_header --- 522,532 ---- %type type_declaration compilation_unit field_declaration method_declaration extends_interfaces interfaces interface_type_list import_declarations package_declaration type_declarations interface_body interface_member_declaration constant_declaration interface_member_declarations interface_type ! abstract_method_declaration %type class_body_declaration class_member_declaration static_initializer constructor_declaration block %type class_body_declarations constructor_header *************** static tree src_parse_roots[1]; *** 556,562 **** post_increment_expression post_decrement_expression unary_expression_not_plus_minus unary_expression pre_increment_expression pre_decrement_expression ! unary_expression_not_plus_minus cast_expression multiplicative_expression additive_expression shift_expression relational_expression equality_expression and_expression --- 555,561 ---- post_increment_expression post_decrement_expression unary_expression_not_plus_minus unary_expression pre_increment_expression pre_decrement_expression ! cast_expression multiplicative_expression additive_expression shift_expression relational_expression equality_expression and_expression *************** class_declaration: *** 852,860 **** --- 851,861 ---- modifiers CLASS_TK identifier super interfaces { create_class ($1, $3, $4, $5); } class_body + {;} | CLASS_TK identifier super interfaces { create_class (0, $2, $3, $4); } class_body + {;} | modifiers CLASS_TK error {yyerror ("Missing class name"); RECOVER;} | CLASS_TK error *************** interface_declaration: *** 1276,1290 **** --- 1277,1295 ---- INTERFACE_TK identifier { create_interface (0, $2, NULL_TREE); } interface_body + { ; } | modifiers INTERFACE_TK identifier { create_interface ($1, $3, NULL_TREE); } interface_body + { ; } | INTERFACE_TK identifier extends_interfaces { create_interface (0, $2, $3); } interface_body + { ; } | modifiers INTERFACE_TK identifier extends_interfaces { create_interface ($1, $3, $4); } interface_body + { ; } | INTERFACE_TK identifier error {yyerror ("'{' expected"); RECOVER;} | modifiers INTERFACE_TK identifier error *************** catch_clause: *** 1904,1909 **** --- 1909,1915 ---- exit_block (); $$ = $1; } + ; catch_clause_parameter: CATCH_TK OP_TK formal_parameter CP_TK diff -Nrc3pad gcc-3.2/gcc/java/rmic.1 gcc-3.2.1/gcc/java/rmic.1 *** gcc-3.2/gcc/java/rmic.1 Wed Aug 14 09:36:44 2002 --- gcc-3.2.1/gcc/java/rmic.1 Tue Nov 19 18:17:22 2002 *************** *** 1,5 **** .\" Automatically generated by Pod::Man version 1.15 ! .\" Wed Aug 14 09:36:44 2002 .\" .\" Standard preamble: .\" ====================================================================== --- 1,5 ---- .\" Automatically generated by Pod::Man version 1.15 ! .\" Tue Nov 19 18:17:22 2002 .\" .\" Standard preamble: .\" ====================================================================== *************** *** 138,144 **** .\" ====================================================================== .\" .IX Title "RMIC 1" ! .TH RMIC 1 "gcc-3.2" "2002-08-14" "GNU" .UC .SH "NAME" rmic \- Generate stubs for Remote Method Invocation --- 138,144 ---- .\" ====================================================================== .\" .IX Title "RMIC 1" ! .TH RMIC 1 "gcc-3.2.1" "2002-11-19" "GNU" .UC .SH "NAME" rmic \- Generate stubs for Remote Method Invocation diff -Nrc3pad gcc-3.2/gcc/java/rmiregistry.1 gcc-3.2.1/gcc/java/rmiregistry.1 *** gcc-3.2/gcc/java/rmiregistry.1 Wed Aug 14 09:36:44 2002 --- gcc-3.2.1/gcc/java/rmiregistry.1 Tue Nov 19 18:17:23 2002 *************** *** 1,5 **** .\" Automatically generated by Pod::Man version 1.15 ! .\" Wed Aug 14 09:36:44 2002 .\" .\" Standard preamble: .\" ====================================================================== --- 1,5 ---- .\" Automatically generated by Pod::Man version 1.15 ! .\" Tue Nov 19 18:17:23 2002 .\" .\" Standard preamble: .\" ====================================================================== *************** *** 138,144 **** .\" ====================================================================== .\" .IX Title "RMIREGISTRY 1" ! .TH RMIREGISTRY 1 "gcc-3.2" "2002-08-14" "GNU" .UC .SH "NAME" rmiregistry \- Remote object registry --- 138,144 ---- .\" ====================================================================== .\" .IX Title "RMIREGISTRY 1" ! .TH RMIREGISTRY 1 "gcc-3.2.1" "2002-11-19" "GNU" .UC .SH "NAME" rmiregistry \- Remote object registry diff -Nrc3pad gcc-3.2/libffi/ChangeLog gcc-3.2.1/libffi/ChangeLog *** gcc-3.2/libffi/ChangeLog Wed Aug 14 09:00:44 2002 --- gcc-3.2.1/libffi/ChangeLog Tue Nov 19 17:49:50 2002 *************** *** 1,3 **** --- 1,19 ---- + 2002-11-19 Release Manager + + * GCC 3.2.1 Released. + + 2002-11-19 Release Manager + + * GCC 3.2.1 Released. + + 2002-11-18 Release Manager + + * GCC 3.2.1 Released. + + 2002-10-07 Kaveh R. Ghazi + + * Makefile.am (all-multi): Fix multilib parallel build. + 2002-08-14 Release Manager * GCC 3.2 Released. diff -Nrc3pad gcc-3.2/libffi/Makefile.am gcc-3.2.1/libffi/Makefile.am *** gcc-3.2/libffi/Makefile.am Sun Mar 17 01:04:48 2002 --- gcc-3.2.1/libffi/Makefile.am Mon Oct 7 04:37:02 2002 *************** distclean-recursive: distclean-multi *** 195,201 **** maintainer-clean-recursive: maintainer-clean-multi all-multi: ! $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: --- 195,201 ---- maintainer-clean-recursive: maintainer-clean-multi all-multi: ! : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: diff -Nrc3pad gcc-3.2/libffi/Makefile.in gcc-3.2.1/libffi/Makefile.in *** gcc-3.2/libffi/Makefile.in Sun Mar 17 01:04:48 2002 --- gcc-3.2.1/libffi/Makefile.in Mon Oct 7 04:37:02 2002 *************** distclean-recursive: distclean-multi *** 735,741 **** maintainer-clean-recursive: maintainer-clean-multi all-multi: ! $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: --- 735,741 ---- maintainer-clean-recursive: maintainer-clean-multi all-multi: ! : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: diff -Nrc3pad gcc-3.2/libjava/ChangeLog gcc-3.2.1/libjava/ChangeLog *** gcc-3.2/libjava/ChangeLog Wed Aug 14 09:00:52 2002 --- gcc-3.2.1/libjava/ChangeLog Tue Nov 19 17:49:56 2002 *************** *** 1,3 **** --- 1,19 ---- + 2002-11-19 Release Manager + + * GCC 3.2.1 Released. + + 2002-11-19 Release Manager + + * GCC 3.2.1 Released. + + 2002-11-18 Release Manager + + * GCC 3.2.1 Released. + + 2002-10-07 Kaveh R. Ghazi + + * Makefile.am (all-multi): Fix multilib parallel build. + 2002-08-14 Release Manager * GCC 3.2 Released. diff -Nrc3pad gcc-3.2/libjava/Makefile.am gcc-3.2.1/libjava/Makefile.am *** gcc-3.2/libjava/Makefile.am Mon Jun 24 00:15:47 2002 --- gcc-3.2.1/libjava/Makefile.am Mon Oct 7 04:37:03 2002 *************** distclean-recursive: distclean-multi *** 1964,1970 **** maintainer-clean-recursive: maintainer-clean-multi all-multi: ! $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: --- 1964,1970 ---- maintainer-clean-recursive: maintainer-clean-multi all-multi: ! : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: diff -Nrc3pad gcc-3.2/libjava/Makefile.in gcc-3.2.1/libjava/Makefile.in *** gcc-3.2/libjava/Makefile.in Wed Aug 14 09:31:10 2002 --- gcc-3.2.1/libjava/Makefile.in Tue Nov 19 18:11:44 2002 *************** distclean-recursive: distclean-multi *** 3477,3483 **** maintainer-clean-recursive: maintainer-clean-multi all-multi: ! $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: --- 3477,3483 ---- maintainer-clean-recursive: maintainer-clean-multi all-multi: ! : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: diff -Nrc3pad gcc-3.2/libjava/libltdl/ChangeLog gcc-3.2.1/libjava/libltdl/ChangeLog *** gcc-3.2/libjava/libltdl/ChangeLog Wed Aug 14 09:00:55 2002 --- gcc-3.2.1/libjava/libltdl/ChangeLog Tue Nov 19 17:49:59 2002 *************** *** 1,3 **** --- 1,15 ---- + 2002-11-19 Release Manager + + * GCC 3.2.1 Released. + + 2002-11-19 Release Manager + + * GCC 3.2.1 Released. + + 2002-11-18 Release Manager + + * GCC 3.2.1 Released. + 2002-08-14 Release Manager * GCC 3.2 Released. diff -Nrc3pad gcc-3.2/libjava/testsuite/ChangeLog gcc-3.2.1/libjava/testsuite/ChangeLog *** gcc-3.2/libjava/testsuite/ChangeLog Wed Aug 14 09:00:59 2002 --- gcc-3.2.1/libjava/testsuite/ChangeLog Tue Nov 19 17:50:02 2002 *************** *** 1,3 **** --- 1,27 ---- + 2002-11-19 Release Manager + + * GCC 3.2.1 Released. + + 2002-11-19 Release Manager + + * GCC 3.2.1 Released. + + 2002-11-18 Release Manager + + * GCC 3.2.1 Released. + + 2002-10-24 Tom Tromey + + * libjava.lang/Primes.java: Removed. + * libjava.lang/Primes.out: Removed. + + 2002-08-16 H.J. Lu + + * lib/libjava.exp (gcc_version): Removed. + (libgcj_jar): New. + (libjava_init): Set libgcj_jar with tcl glob. + (libjava_arguments): Use libgcj_jar. + 2002-08-14 Release Manager * GCC 3.2 Released. diff -Nrc3pad gcc-3.2/libjava/testsuite/lib/libjava.exp gcc-3.2.1/libjava/testsuite/lib/libjava.exp *** gcc-3.2/libjava/testsuite/lib/libjava.exp Fri May 17 21:11:35 2002 --- gcc-3.2.1/libjava/testsuite/lib/libjava.exp Fri Aug 16 21:08:37 2002 *************** proc libjava_init { args } { *** 112,118 **** global TOOL_EXECUTABLE global original_ld_library_path global env objdir ! global env gcc_version global tool_root_dir global libjava_libgcc_s_path --- 112,118 ---- global TOOL_EXECUTABLE global original_ld_library_path global env objdir ! global env libgcj_jar global tool_root_dir global libjava_libgcc_s_path *************** proc libjava_init { args } { *** 130,139 **** } } ! # Determine the version so we can find the libgcj jar file. ! set text [eval exec "$GCJ_UNDER_TEST --version 2>@ stdout"] ! regexp -- "gcj \[^ \]+ (\[^ \]+) .*" $text ignore gcc_version ! verbose "jar file is libgcj-$gcc_version.jar" # FIXME: This finds libgcj.spec for the default multilib. # If thread models differ between multilibs, this has to be moved --- 130,138 ---- } } ! # Find the libgcj jar file. ! set libgcj_jar [glob $objdir/../libgcj-*.jar] ! verbose "jar file is $libgcj_jar" # FIXME: This finds libgcj.spec for the default multilib. # If thread models differ between multilibs, this has to be moved *************** proc libjava_arguments {{mode compile}} *** 271,277 **** global runtests global env global tool_root_dir ! global gcc_version global libjava_libgcc_s_path if [info exists LIBJAVA] { --- 270,276 ---- global runtests global env global tool_root_dir ! global libgcj_jar global libjava_libgcc_s_path if [info exists LIBJAVA] { *************** proc libjava_arguments {{mode compile}} *** 337,345 **** verbose "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)" # Set the CLASSPATH environment variable ! verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj-$gcc_version.jar" global env ! set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj-$gcc_version.jar" if {$mode == "link"} { global wrapper_file wrap_compile_flags; --- 336,344 ---- verbose "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)" # Set the CLASSPATH environment variable ! verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$libgcj_jar" global env ! set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$libgcj_jar" if {$mode == "link"} { global wrapper_file wrap_compile_flags; diff -Nrc3pad gcc-3.2/libjava/testsuite/libjava.lang/Primes.java gcc-3.2.1/libjava/testsuite/libjava.lang/Primes.java *** gcc-3.2/libjava/testsuite/libjava.lang/Primes.java Mon Aug 9 06:35:56 1999 --- gcc-3.2.1/libjava/testsuite/libjava.lang/Primes.java Thu Jan 1 00:00:00 1970 *************** *** 1,213 **** - // Primes.java - - /** Copyright 1998 - * Roedy Green - * Canadian Mind Products - * 5317 Barker Avenue - * Burnaby, BC Canada V5H 2N6 - * tel: (604) 435-3016 - * mailto:roedy@mindprod.com - * http://mindprod.com - */ - // May be freely distributed for any purpose but military - - import java.util.BitSet; - - /** - * @author Roedy Green - * @version 1.10 1998 November 10 - * Calculate primes using Eratostheses Sieve. - * Tell if a given number is prime. - * Find a prime just below a given number. - * Find a prime just above a given number. - */ - - /* - * version 1.1 1998 November 10 - new address and phone. - */ - class Primes - { - - /** - * constructors - */ - Primes() - { - ensureCapacity(1000); - } - - /** - * @param capacity - largest number you will be asking if prime. - * If give too small a number, it will automatically grow by - * recomputing the sieve array. - */ - Primes (int capacity) - { - ensureCapacity(capacity); - } - - /** - * @param candidate - is this a prime? - */ - public boolean isPrime(int candidate) - { - ensureCapacity(candidate); - if (candidate < 3) return candidate != 0; - if (candidate % 2 == 0 ) return false; - return !b.get(candidate/2); - } - - /** - * @return first prime higher than candidate - */ - public int above(int candidate) - { - do - { - // see what we can find in the existing sieve - for (int i=candidate+1; i<= sieveCapacity; i++) - { - if (isPrime(i)) return i; - } - // Keep building ever bigger sieves till we succeed. - // The next prime P' is between P+2 and P^2 - 2. - // However that is a rather pessimistic upper bound. - // Ideally some theorem would tell us how big we need to build - // to find one. - ensureCapacity(Math.max(candidate*2, sieveCapacity*2)); - } // end do - while (true); - } // end above - - /** - * @param return first prime less than candidate - */ - public int below (int candidate) - { - for (candidate--; candidate > 0; candidate--) - { - if (isPrime(candidate)) return candidate; - } - // candidate was 1 or 0 or -ve - return 0; - } - - /** - * calc all primes in the range 1..n, - * not the first n primes. - * @param n, highest candidate, not necessarily prime. - * @return list of primes 1..n in an array - */ - public final int[] getPrimes(int n) - { - // calculate the primes - ensureCapacity(n); - - // pass 1: count primes - int countPrimes = 0; - for (int i = 0; i <= n; i++) - { - if (isPrime(i)) countPrimes++; - } - - // pass 2: construct array of primes - int [] primes = new int[countPrimes]; - countPrimes = 0; - for (int i = 0; i <= n; i++) - { - if (isPrime(i)) primes[countPrimes++] = i; - } - return primes; - } // end getPrimes - - /** - * calculate the sieve, bit map of all primes 0..n - * @param n highest number evalutated by the sieve, not necessarily prime. - */ - private final void sieve ( int n ) - { - // Presume BitSet b set is big enough for our purposes. - // Presume all even numbers are already marked composite, effectively. - // Presume all odd numbers are already marked prime (0 in bit map). - int last = (int)(Math.sqrt(n))+1; - for (int candidate = 3; candidate <= last; candidate += 2) - { - // only look at odd numbers - if (!b.get(candidate/2) /* if candidate is prime */) - { - // Our candidate is prime. - // Only bother to mark multiples of primes. Others already done. - // no need to mark even multiples, already done - int incr = candidate*2; - for ( int multiple = candidate + incr; multiple < n; multiple += incr) - { - b.set(multiple/2); // mark multiple as composite - } // end for multiple - } // end if - } // end for candidate - // at this point our sieve b is correct, except for 0..2 - } // end sieve - - /** - * Ensure have a sieve to tackle primes as big as n. - * If we don't allocate a sieve big enough and calculate it. - * @param n - ensure sieve big enough to evaluate n for primality. - */ - private void ensureCapacity (int n) - { - if ( n > sieveCapacity ) - { - b = new BitSet((n+1)/2); - // starts out all 0, presume all numbers prime - sieveCapacity = n; - sieve(n); - } - // otherwise existing sieve is fine - } // end ensureCapacity - - private int sieveCapacity; - // biggest number we have computed in our sieve. - // our BitSet array is indexed 0..N (odd only) - - private BitSet b; /* true for each odd number if is composite */ - - /** - * Demonstrate and test the methods - */ - public static void main (String[] args) - { - // print primes 1..101 - Primes calc = new Primes(106); - int[] primes = calc.getPrimes(101); - for (int i=0; i + + * Makefile.am (all-multi): Fix multilib parallel build. + 2002-08-14 Release Manager * GCC 3.2 Released. *************** Changes in 1.0.6 (19 Jan 1998) *** 253,259 **** - use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau) - added makelcc.bat for lcc-win32 (Tom St Denis) - in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe) ! - Avoid expanded $Id: ChangeLog,v 1.2.16.5.2.1 2002/08/14 09:01:14 mmitchel Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion. - check for unistd.h in configure (for off_t) - remove useless check parameter in inflate_blocks_free - avoid useless assignment of s->check to itself in inflate_blocks_new --- 269,275 ---- - use _fdopen instead of fdopen for MSC >= 6.0 (Thomas Fanslau) - added makelcc.bat for lcc-win32 (Tom St Denis) - in Makefile.dj2, use copy and del instead of install and rm (Frank Donahoe) ! - Avoid expanded $Id: ChangeLog,v 1.2.16.5.2.5 2002/11/19 17:50:19 mmitchel Exp $. Use "rcs -kb" or "cvs admin -kb" to avoid Id expansion. - check for unistd.h in configure (for off_t) - remove useless check parameter in inflate_blocks_free - avoid useless assignment of s->check to itself in inflate_blocks_new diff -Nrc3pad gcc-3.2/zlib/Makefile.am gcc-3.2.1/zlib/Makefile.am *** gcc-3.2/zlib/Makefile.am Sun Mar 17 00:45:47 2002 --- gcc-3.2.1/zlib/Makefile.am Mon Oct 7 04:37:05 2002 *************** distclean-am: distclean-multi *** 85,91 **** maintainer-clean-am: maintainer-clean-multi all-multi: ! $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: --- 85,91 ---- maintainer-clean-am: maintainer-clean-multi all-multi: ! : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: diff -Nrc3pad gcc-3.2/zlib/Makefile.in gcc-3.2.1/zlib/Makefile.in *** gcc-3.2/zlib/Makefile.in Sun Mar 17 00:45:47 2002 --- gcc-3.2.1/zlib/Makefile.in Mon Oct 7 04:37:05 2002 *************** distclean-am: distclean-multi *** 480,486 **** maintainer-clean-am: maintainer-clean-multi all-multi: ! $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: --- 480,486 ---- maintainer-clean-am: maintainer-clean-multi all-multi: ! : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do install-multi: $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do mostlyclean-multi: