diff -Nrc3pad gcc-3.1/boehm-gc/ChangeLog gcc-3.1.1/boehm-gc/ChangeLog *** gcc-3.1/boehm-gc/ChangeLog Wed May 15 02:14:58 2002 --- gcc-3.1.1/boehm-gc/ChangeLog Thu Jul 25 23:34:09 2002 *************** *** 1,3 **** --- 1,12 ---- + 2002-07-25 Release Manager + + * GCC 3.1.1 Released. + + 2002-06-28 Hans Boehm + Jonathan Clark + + * win32_threads.c (GC_push_all_stacks): Tolerate bad sp. + 2002-05-14 Release Manager * GCC 3.1 Released. diff -Nrc3pad gcc-3.1/boehm-gc/win32_threads.c gcc-3.1.1/boehm-gc/win32_threads.c *** gcc-3.1/boehm-gc/win32_threads.c Tue Mar 12 18:31:12 2002 --- gcc-3.1.1/boehm-gc/win32_threads.c Sat Jun 29 17:29:51 2002 *************** void GC_push_all_stacks() *** 144,151 **** GC_push_one ((word) thread_table[i].context.Edx); GC_push_one ((word) thread_table[i].context.Ecx); GC_push_one ((word) thread_table[i].context.Eax); ! GC_push_all_stack((char *) thread_table[i].context.Esp, ! thread_table[i].stack); # else # ifdef ARM32 if (thread_table[i].context.Sp >= (DWORD)thread_table[i].stack --- 144,158 ---- GC_push_one ((word) thread_table[i].context.Edx); GC_push_one ((word) thread_table[i].context.Ecx); GC_push_one ((word) thread_table[i].context.Eax); ! if (thread_table[i].context.Esp >= (DWORD)thread_table[i].stack ! || thread_table[i].context.Esp < (DWORD)bottom) { ! WARN("Thread stack pointer 0x%lx out of range, pushing everything", ! thread_table[i].context.Esp); ! GC_push_all_stack((char *) bottom, thread_table[i].stack); ! } else { ! GC_push_all_stack((char *) thread_table[i].context.Esp, ! thread_table[i].stack); ! } # else # ifdef ARM32 if (thread_table[i].context.Sp >= (DWORD)thread_table[i].stack diff -Nrc3pad gcc-3.1/fastjar/ChangeLog gcc-3.1.1/fastjar/ChangeLog *** gcc-3.1/fastjar/ChangeLog Wed May 15 02:15:21 2002 --- gcc-3.1.1/fastjar/ChangeLog Thu Jul 25 23:34:19 2002 *************** *** 1,3 **** --- 1,7 ---- + 2002-07-25 Release Manager + + * GCC 3.1.1 Released. + 2002-05-14 Release Manager * GCC 3.1 Released. diff -Nrc3pad gcc-3.1/gcc/java/ChangeLog gcc-3.1.1/gcc/java/ChangeLog *** gcc-3.1/gcc/java/ChangeLog Wed May 15 02:23:16 2002 --- gcc-3.1.1/gcc/java/ChangeLog Thu Jul 25 23:39:32 2002 *************** *** 1,3 **** --- 1,54 ---- + 2002-07-25 Release Manager + + * GCC 3.1.1 Released. + + 2002-06-25 Andreas Schwab + + * expr.c (JSR): Avoid undefined operation on PC. + + 2002-06-10 Bryce McKinlay + + Don't use RTL inlining. Fix for PR java/6820. + * lang.c (LANG_HOOKS_POST_OPTIONS): Define. + (flag_really_inline): New. + (java_decode_option): Set flag_really_inline if -finline-functions + is seen. + (java_post_options): New function. Turn off inlining unless + flag_really_inline is set. + + 2002-06-08 H.J. Lu (hjl@gnu.org) + + * jcf-path.c (jcf_path_init): Allocate 1 more byte for string. + + 2002-06-03 Mark Mitchell + + 2002-05-18 Mark Mitchell + * java-tree.h (CLASS_BEING_LAIDOUT): Remove duplicate definition. + * jcf-io.c (dirent.h): Include it. + (fnmatch.h): Likewise. + (compare_path): New function. + (java_or_class_file): Likewise. + (memoized_dirlist_entry): New type. + (memoized_dirlist_lookup_eq): New function. + (memoized_dirlists): New variable. + (caching_stat): New function. + (memoized_class_lookup_eq): New function. + (memoized_class_lookups): Likewise. + (find_class): Use memoized_class_lookups and caching_stat. + * jcf.h (JCF_USE_SCANDIR): Define. + * parse.y (java_expand_classes): Write the class files in reverse + order. + + 2002-05-13 Mark Mitchell + * jcf-write.c (write_classfile): Unlink the temporary file if it + cannot be renamed. Use concat to build up the name of the + temporary file. + + 2002-05-13 Mark Mitchell + * jcf-write.c (write_classfile): Unlink the temporary file if it + cannot be renamed. Use concat to build up the name of the + temporary file. + 2002-05-14 Release Manager * GCC 3.1 Released. diff -Nrc3pad gcc-3.1/gcc/java/expr.c gcc-3.1.1/gcc/java/expr.c *** gcc-3.1/gcc/java/expr.c Wed Apr 24 22:16:08 2002 --- gcc-3.1.1/gcc/java/expr.c Tue Jun 25 13:26:04 2002 *************** process_jvm_instruction (PC, byte_ops, l *** 2981,2987 **** } #define JSR(OPERAND_TYPE, OPERAND_VALUE) \ ! build_java_jsr (oldpc+OPERAND_VALUE, PC); /* Push a constant onto the stack. */ #define PUSHC(OPERAND_TYPE, OPERAND_VALUE) \ --- 2981,2991 ---- } #define JSR(OPERAND_TYPE, OPERAND_VALUE) \ ! { \ ! /* OPERAND_VALUE may have side-effects on PC */ \ ! int opvalue = OPERAND_VALUE; \ ! build_java_jsr (oldpc + opvalue, PC); \ ! } /* Push a constant onto the stack. */ #define PUSHC(OPERAND_TYPE, OPERAND_VALUE) \ diff -Nrc3pad gcc-3.1/gcc/java/gcj.1 gcc-3.1.1/gcc/java/gcj.1 *** gcc-3.1/gcc/java/gcj.1 Wed May 15 02:46:01 2002 --- gcc-3.1.1/gcc/java/gcj.1 Thu Jul 25 23:56:28 2002 *************** *** 1,5 **** .\" Automatically generated by Pod::Man version 1.15 ! .\" Wed May 15 02:46:01 2002 .\" .\" Standard preamble: .\" ====================================================================== --- 1,5 ---- .\" Automatically generated by Pod::Man version 1.15 ! .\" Thu Jul 25 23:56:27 2002 .\" .\" Standard preamble: .\" ====================================================================== *************** *** 138,144 **** .\" ====================================================================== .\" .IX Title "GCJ 1" ! .TH GCJ 1 "gcc-3.1" "2002-05-15" "GNU" .UC .SH "NAME" gcj \- Ahead-of-time compiler for the Java language --- 138,144 ---- .\" ====================================================================== .\" .IX Title "GCJ 1" ! .TH GCJ 1 "gcc-3.1.1" "2002-07-25" "GNU" .UC .SH "NAME" gcj \- Ahead-of-time compiler for the Java language diff -Nrc3pad gcc-3.1/gcc/java/gcjh.1 gcc-3.1.1/gcc/java/gcjh.1 *** gcc-3.1/gcc/java/gcjh.1 Wed May 15 02:46:01 2002 --- gcc-3.1.1/gcc/java/gcjh.1 Thu Jul 25 23:56:28 2002 *************** *** 1,5 **** .\" Automatically generated by Pod::Man version 1.15 ! .\" Wed May 15 02:46:01 2002 .\" .\" Standard preamble: .\" ====================================================================== --- 1,5 ---- .\" Automatically generated by Pod::Man version 1.15 ! .\" Thu Jul 25 23:56:28 2002 .\" .\" Standard preamble: .\" ====================================================================== *************** *** 138,144 **** .\" ====================================================================== .\" .IX Title "GCJH 1" ! .TH GCJH 1 "gcc-3.1" "2002-05-15" "GNU" .UC .SH "NAME" gcjh \- generate header files from Java class files --- 138,144 ---- .\" ====================================================================== .\" .IX Title "GCJH 1" ! .TH GCJH 1 "gcc-3.1.1" "2002-07-25" "GNU" .UC .SH "NAME" gcjh \- generate header files from Java class files diff -Nrc3pad gcc-3.1/gcc/java/gij.1 gcc-3.1.1/gcc/java/gij.1 *** gcc-3.1/gcc/java/gij.1 Wed May 15 02:46:02 2002 --- gcc-3.1.1/gcc/java/gij.1 Thu Jul 25 23:56:29 2002 *************** *** 1,5 **** .\" Automatically generated by Pod::Man version 1.15 ! .\" Wed May 15 02:46:02 2002 .\" .\" Standard preamble: .\" ====================================================================== --- 1,5 ---- .\" Automatically generated by Pod::Man version 1.15 ! .\" Thu Jul 25 23:56:29 2002 .\" .\" Standard preamble: .\" ====================================================================== *************** *** 138,144 **** .\" ====================================================================== .\" .IX Title "GIJ 1" ! .TH GIJ 1 "gcc-3.1" "2002-05-15" "GNU" .UC .SH "NAME" gij \- \s-1GNU\s0 interpreter for Java bytecode --- 138,144 ---- .\" ====================================================================== .\" .IX Title "GIJ 1" ! .TH GIJ 1 "gcc-3.1.1" "2002-07-25" "GNU" .UC .SH "NAME" gij \- \s-1GNU\s0 interpreter for Java bytecode diff -Nrc3pad gcc-3.1/gcc/java/java-tree.h gcc-3.1.1/gcc/java/java-tree.h *** gcc-3.1/gcc/java/java-tree.h Wed Apr 24 22:16:08 2002 --- gcc-3.1.1/gcc/java/java-tree.h Tue Jun 4 16:45:52 2002 *************** extern tree *type_map; *** 1424,1434 **** layout of a class. */ #define CLASS_BEING_LAIDOUT(TYPE) TYPE_LANG_FLAG_6 (TYPE) - /* True if class TYPE is currently being laid out. Helps in detection - of inheritance cycle occurring as a side effect of performing the - layout of a class. */ - #define CLASS_BEING_LAIDOUT(TYPE) TYPE_LANG_FLAG_6 (TYPE) - /* True if class TYPE has a field initializer finit$ function */ #define CLASS_HAS_FINIT_P(TYPE) TYPE_FINIT_STMT_LIST (TYPE) --- 1424,1429 ---- diff -Nrc3pad gcc-3.1/gcc/java/jcf-dump.1 gcc-3.1.1/gcc/java/jcf-dump.1 *** gcc-3.1/gcc/java/jcf-dump.1 Wed May 15 02:46:02 2002 --- gcc-3.1.1/gcc/java/jcf-dump.1 Thu Jul 25 23:56:28 2002 *************** *** 1,5 **** .\" Automatically generated by Pod::Man version 1.15 ! .\" Wed May 15 02:46:02 2002 .\" .\" Standard preamble: .\" ====================================================================== --- 1,5 ---- .\" Automatically generated by Pod::Man version 1.15 ! .\" Thu Jul 25 23:56:28 2002 .\" .\" Standard preamble: .\" ====================================================================== *************** *** 138,144 **** .\" ====================================================================== .\" .IX Title "JCF-DUMP 1" ! .TH JCF-DUMP 1 "gcc-3.1" "2002-05-15" "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.1.1" "2002-07-25" "GNU" .UC .SH "NAME" jcf-dump \- print information about Java class files diff -Nrc3pad gcc-3.1/gcc/java/jcf-io.c gcc-3.1.1/gcc/java/jcf-io.c *** gcc-3.1/gcc/java/jcf-io.c Mon Dec 3 19:13:40 2001 --- gcc-3.1.1/gcc/java/jcf-io.c Tue Jun 4 16:45:54 2002 *************** *** 1,5 **** /* Utility routines for finding and reading Java(TM) .class files. ! Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. 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 --- 1,5 ---- /* Utility routines for finding and reading Java(TM) .class files. ! Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc. 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 is independ *** 29,34 **** --- 29,39 ---- #include "tree.h" #include "toplev.h" #include "java-tree.h" + #include "hashtab.h" + #if JCF_USE_SCANDIR + #include + #include + #endif #include "zlib.h" *************** DEFUN(find_classfile, (filename, jcf, de *** 304,313 **** #endif } /* Returns a freshly malloc'd string with the fully qualified pathname ! of the .class file for the class CLASSNAME. Returns NULL on ! failure. If JCF != NULL, it is suitably initialized. ! SOURCE_OK is true if we should also look for .java file. */ const char * DEFUN(find_class, (classname, classname_length, jcf, source_ok), --- 309,460 ---- #endif } + #if JCF_USE_SCANDIR + + /* A comparison function (as for qsort) that compares KEY (a char * + giving the basename of a file) with the name stored in ENTRY (a + dirent **). */ + + static int + DEFUN(compare_path, (key, entry), + const void *key AND const void *entry) + { + return strcmp ((const char *) key, + (*((const struct dirent **) entry))->d_name); + } + + /* Returns nonzero if ENTRY names a .java or .class file. */ + + static int + DEFUN(java_or_class_file, (entry), + const struct dirent *entry) + { + const char *base = basename (entry->d_name); + return (fnmatch ("*.java", base, 0) == 0 || + fnmatch ("*.class", base, 0) == 0); + } + + /* Information about the files present in a particular directory. */ + typedef struct memoized_dirlist_entry + { + /* The name of the directory. */ + const char *dir; + /* The number of .java and .class files present, or -1 if we could + not, for some reason, obtain the list. */ + int num_files; + /* The .java and .class files in the directory, in alphabetical + order. */ + struct dirent **files; + } memoized_dirlist_entry; + + /* Returns true if ENTRY (a memoized_dirlist_entry *) correponds to + the directory given by KEY (a char *) giving the directory + name. */ + + static int + DEFUN(memoized_dirlist_lookup_eq, (entry, key), + const void *entry AND const void *key) + { + return strcmp ((const char *) key, + ((const memoized_dirlist_entry *) entry)->dir) == 0; + } + + /* A hash table mapping directory names to the lists of .java and + .class files in that directory. */ + + static htab_t memoized_dirlists; + + #endif + + /* Like stat, but avoids actually making the stat system call if we + know that it cannot succeed. FILENAME and BUF are as for stat. */ + + static int + DEFUN(caching_stat, (filename, buf), + char *filename AND struct stat *buf) + { + #if JCF_USE_SCANDIR + char *sep; + char *base; + memoized_dirlist_entry *dent; + void **slot; + + /* If the hashtable has not already been created, create it now. */ + if (!memoized_dirlists) + memoized_dirlists = htab_create (37, + htab_hash_string, + memoized_dirlist_lookup_eq, + NULL); + + /* Get the name of the directory. */ + sep = strrchr (filename, DIR_SEPARATOR); + if (sep) + { + *sep = '\0'; + base = sep + 1; + } + else + base = filename; + + /* Obtain the entry for this directory form the hash table. */ + slot = htab_find_slot (memoized_dirlists, filename, INSERT); + if (!*slot) + { + /* We have not already scanned this directory; scan it now. */ + dent = ((memoized_dirlist_entry *) + ALLOC (sizeof (memoized_dirlist_entry))); + dent->dir = xstrdup (filename); + /* Unfortunately, scandir is not fully standardized. In + particular, the type of the function pointer passed as the + third argument sometimes takes a "const struct dirent *" + parameter, and sometimes just a "struct dirent *". We rely + on the ability to interchange these two types of function + pointers. */ + dent->num_files = scandir (filename, &dent->files, + java_or_class_file, + alphasort); + *slot = dent; + } + else + dent = *((memoized_dirlist_entry **) slot); + + /* Put the spearator back. */ + if (sep) + *sep = DIR_SEPARATOR; + + /* If the file is not in the list, there is no need to stat it; it + does not exist. */ + if (dent->num_files != -1 + && !bsearch (base, dent->files, dent->num_files, + sizeof (struct dirent *), compare_path)) + return -1; + #endif + + return stat (filename, buf); + } + + /* Returns 1 if the CLASSNAME (really a char *) matches the name + stored in TABLE_ENTRY (also a char *). */ + + static int + DEFUN(memoized_class_lookup_eq, (table_entry, classname), + const void *table_entry AND const void *classname) + { + return strcmp ((const char *)classname, (const char *)table_entry) == 0; + } + + /* A hash table keeping track of class names that were not found + during class lookup. (There is no need to cache the values + associated with names that were found; they are saved in + IDENTIFIER_CLASS_VALUE.) */ + static htab_t memoized_class_lookups; + /* Returns a freshly malloc'd string with the fully qualified pathname ! of the .class file for the class CLASSNAME. CLASSNAME must be ! allocated in permanent storage; this function may retain a pointer ! to it. Returns NULL on failure. If JCF != NULL, it is suitably ! initialized. SOURCE_OK is true if we should also look for .java ! file. */ const char * DEFUN(find_class, (classname, classname_length, jcf, source_ok), *************** DEFUN(find_class, (classname, classname_ *** 324,334 **** char *dep_file; void *entry; char *java_buffer; /* Allocate and zero out the buffer, since we don't explicitly put a null pointer when we're copying it below. */ ! int buflen = jcf_path_max_len () + classname_length + 10; ! char *buffer = (char *) ALLOC (buflen); memset (buffer, 0, buflen); java_buffer = (char *) alloca (buflen); --- 471,497 ---- char *dep_file; void *entry; char *java_buffer; + int buflen; + char *buffer; + hashval_t hash; + + /* Create the hash table, if it does not already exist. */ + if (!memoized_class_lookups) + memoized_class_lookups = htab_create (37, + htab_hash_string, + memoized_class_lookup_eq, + NULL); + + /* Loop for this class in the hashtable. If it is present, we've + already looked for this class and failed to find it. */ + hash = htab_hash_string (classname); + if (htab_find_with_hash (memoized_class_lookups, classname, hash)) + return NULL; /* Allocate and zero out the buffer, since we don't explicitly put a null pointer when we're copying it below. */ ! buflen = jcf_path_max_len () + classname_length + 10; ! buffer = (char *) ALLOC (buflen); memset (buffer, 0, buflen); java_buffer = (char *) alloca (buflen); *************** DEFUN(find_class, (classname, classname_ *** 381,387 **** else continue; } ! class = stat (buffer, &class_buf); } if (source_ok) --- 544,550 ---- else continue; } ! class = caching_stat(buffer, &class_buf); } if (source_ok) *************** DEFUN(find_class, (classname, classname_ *** 393,399 **** for (m = 0; m < classname_length; ++m) java_buffer[m + l] = (classname[m] == '.' ? '/' : classname[m]); strcpy (java_buffer + m + l, ".java"); ! java = stat (java_buffer, &java_buf); if (java == 0) break; } --- 556,562 ---- for (m = 0; m < classname_length; ++m) java_buffer[m + l] = (classname[m] == '.' ? '/' : classname[m]); strcpy (java_buffer + m + l, ".java"); ! java = caching_stat (java_buffer, &java_buf); if (java == 0) break; } *************** DEFUN(find_class, (classname, classname_ *** 464,469 **** --- 627,638 ---- #endif free (buffer); + + /* Remember that this class could not be found so that we do not + have to look again. */ + *htab_find_slot_with_hash (memoized_class_lookups, classname, hash, INSERT) + = (void *) classname; + return NULL; found: #if JCF_USE_STDIO diff -Nrc3pad gcc-3.1/gcc/java/jcf-path.c gcc-3.1.1/gcc/java/jcf-path.c *** gcc-3.1/gcc/java/jcf-path.c Wed Apr 10 15:23:05 2002 --- gcc-3.1.1/gcc/java/jcf-path.c Sat Jun 8 16:33:46 2002 *************** jcf_path_init () *** 305,311 **** /* Desperation: use the installed one. */ char *extdirs; add_entry (&sys_dirs, LIBGCJ_ZIP_FILE, 1); ! extdirs = (char *) alloca (strlen (LIBGCJ_ZIP_FILE)); strcpy (extdirs, LIBGCJ_ZIP_FILE); strcpy (&extdirs[strlen (LIBGCJ_ZIP_FILE) - strlen ("libgcj-" DEFAULT_TARGET_VERSION ".jar")], --- 305,311 ---- /* Desperation: use the installed one. */ char *extdirs; add_entry (&sys_dirs, LIBGCJ_ZIP_FILE, 1); ! extdirs = (char *) alloca (strlen (LIBGCJ_ZIP_FILE) + 1); strcpy (extdirs, LIBGCJ_ZIP_FILE); strcpy (&extdirs[strlen (LIBGCJ_ZIP_FILE) - strlen ("libgcj-" DEFAULT_TARGET_VERSION ".jar")], diff -Nrc3pad gcc-3.1/gcc/java/jcf-write.c gcc-3.1.1/gcc/java/jcf-write.c *** gcc-3.1/gcc/java/jcf-write.c Mon Apr 22 12:53:21 2002 --- gcc-3.1.1/gcc/java/jcf-write.c Tue Jun 4 16:45:54 2002 *************** write_classfile (clas) *** 3374,3389 **** if (class_file_name != NULL) { ! FILE *stream = fopen (class_file_name, "wb"); if (stream == NULL) ! fatal_io_error ("can't open %s for writing", class_file_name); jcf_dependency_add_target (class_file_name); init_jcf_state (state, work); chunks = generate_classfile (clas, state); write_chunks (stream, chunks); if (fclose (stream)) ! fatal_io_error ("error closing %s", class_file_name); free (class_file_name); } release_jcf_state (state); --- 3374,3402 ---- if (class_file_name != NULL) { ! FILE *stream; ! char *temporary_file_name; ! ! /* The .class file is initially written to a ".tmp" file so that ! if multiple instances of the compiler are running at once ! they do not see partially formed class files. */ ! temporary_file_name = concat (class_file_name, ".tmp", NULL); ! stream = fopen (temporary_file_name, "wb"); if (stream == NULL) ! fatal_io_error ("can't open %s for writing", temporary_file_name); jcf_dependency_add_target (class_file_name); init_jcf_state (state, work); chunks = generate_classfile (clas, state); write_chunks (stream, chunks); if (fclose (stream)) ! fatal_io_error ("error closing %s", temporary_file_name); ! if (rename (temporary_file_name, class_file_name) == -1) ! { ! remove (temporary_file_name); ! fatal_io_error ("can't create %s", class_file_name); ! } ! free (temporary_file_name); free (class_file_name); } release_jcf_state (state); diff -Nrc3pad gcc-3.1/gcc/java/jcf.h gcc-3.1.1/gcc/java/jcf.h *** gcc-3.1/gcc/java/jcf.h Wed Apr 10 13:09:01 2002 --- gcc-3.1.1/gcc/java/jcf.h Tue Jun 4 16:45:55 2002 *************** The Free Software Foundation is independ *** 63,68 **** --- 63,76 ---- #define JCF_word JCF_u4 #endif + /* If we have both "scandir" and "alphasort", we can cache directory + listings to reduce the time taken to search the classpath. */ + #if defined(HAVE_SCANDIR) && defined(HAVE_ALPHASORT) + #define JCF_USE_SCANDIR 1 + #else + #define JCF_USE_SCANDIR 0 + #endif + struct JCF; typedef int (*jcf_filbuf_t) PARAMS ((struct JCF*, int needed)); diff -Nrc3pad gcc-3.1/gcc/java/jv-convert.1 gcc-3.1.1/gcc/java/jv-convert.1 *** gcc-3.1/gcc/java/jv-convert.1 Wed May 15 02:46:02 2002 --- gcc-3.1.1/gcc/java/jv-convert.1 Thu Jul 25 23:56:29 2002 *************** *** 1,5 **** .\" Automatically generated by Pod::Man version 1.15 ! .\" Wed May 15 02:46:02 2002 .\" .\" Standard preamble: .\" ====================================================================== --- 1,5 ---- .\" Automatically generated by Pod::Man version 1.15 ! .\" Thu Jul 25 23:56:29 2002 .\" .\" Standard preamble: .\" ====================================================================== *************** *** 138,144 **** .\" ====================================================================== .\" .IX Title "JV-CONVERT 1" ! .TH JV-CONVERT 1 "gcc-3.1" "2002-05-15" "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.1.1" "2002-07-25" "GNU" .UC .SH "NAME" jv-convert \- Convert file from one encoding to another diff -Nrc3pad gcc-3.1/gcc/java/jv-scan.1 gcc-3.1.1/gcc/java/jv-scan.1 *** gcc-3.1/gcc/java/jv-scan.1 Wed May 15 02:46:02 2002 --- gcc-3.1.1/gcc/java/jv-scan.1 Thu Jul 25 23:56:28 2002 *************** *** 1,5 **** .\" Automatically generated by Pod::Man version 1.15 ! .\" Wed May 15 02:46:02 2002 .\" .\" Standard preamble: .\" ====================================================================== --- 1,5 ---- .\" Automatically generated by Pod::Man version 1.15 ! .\" Thu Jul 25 23:56:28 2002 .\" .\" Standard preamble: .\" ====================================================================== *************** *** 138,144 **** .\" ====================================================================== .\" .IX Title "JV-SCAN 1" ! .TH JV-SCAN 1 "gcc-3.1" "2002-05-15" "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.1.1" "2002-07-25" "GNU" .UC .SH "NAME" jv-scan \- print information about Java source file diff -Nrc3pad gcc-3.1/gcc/java/lang.c gcc-3.1.1/gcc/java/lang.c *** gcc-3.1/gcc/java/lang.c Wed Apr 10 13:09:03 2002 --- gcc-3.1.1/gcc/java/lang.c Tue Jun 11 06:20:12 2002 *************** struct string_option *** 51,56 **** --- 51,58 ---- static const char *java_init PARAMS ((const char *)); static void java_finish PARAMS ((void)); static void java_init_options PARAMS ((void)); + static void java_post_options PARAMS ((void)); + static int java_decode_option PARAMS ((int, char **)); static void put_decl_string PARAMS ((const char *, int)); static void put_decl_node PARAMS ((tree)); *************** int flag_store_check = 1; *** 163,168 **** --- 165,174 ---- /* When non zero, print extra version information. */ static int version_flag = 0; + /* Set non-zero if the user specified -finline-functions on the command + line. */ + int flag_really_inline = 0; + /* Table of language-dependent -f options. STRING is the option name. VARIABLE is the address of the variable. ON_VALUE is the value to store in VARIABLE *************** static int dependency_tracking = 0; *** 216,221 **** --- 222,229 ---- #define LANG_HOOKS_INIT_OPTIONS java_init_options #undef LANG_HOOKS_DECODE_OPTION #define LANG_HOOKS_DECODE_OPTION java_decode_option + #undef LANG_HOOKS_POST_OPTIONS + #define LANG_HOOKS_POST_OPTIONS java_post_options #undef LANG_HOOKS_SET_YYDEBUG #define LANG_HOOKS_SET_YYDEBUG java_set_yydebug *************** java_decode_option (argc, argv) *** 353,358 **** --- 361,374 ---- return 1; } #undef ARG + #define ARG "-finline-functions" + if (strncmp (p, ARG, sizeof (ARG) - 1) == 0) + { + flag_inline_functions = 1; + flag_really_inline = 1; + return 1; + } + #undef ARG if (p[0] == '-' && p[1] == 'f') { *************** java_init_options () *** 762,764 **** --- 778,792 ---- flag_exceptions = 1; flag_non_call_exceptions = 1; } + + /* Post-switch processing. */ + static void + java_post_options () + { + /* Turn off RTL inliner unless -finline-functions was really specified. */ + if (flag_really_inline == 0) + { + flag_no_inline = 1; + flag_inline_functions = 0; + } + } diff -Nrc3pad gcc-3.1/gcc/java/parse-scan.c gcc-3.1.1/gcc/java/parse-scan.c *** gcc-3.1/gcc/java/parse-scan.c Wed May 15 03:00:47 2002 --- gcc-3.1.1/gcc/java/parse-scan.c Fri Jul 26 00:14:29 2002 *************** *** 1,5 **** ! /* A Bison parser, made from /home/mitchell/gcc-3.1/gcc-3.1/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.1.1/gcc-3.1.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.1/gcc-3.1/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.1.1/gcc-3.1.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.1/gcc-3.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.1/gcc-3.1/gcc/java/parse-scan.y" #include "lex.c" #ifndef YYDEBUG --- 189,201 ---- #include "lex.h" #include "parse.h" ! #line 113 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1.1/gcc-3.1.1/gcc/java/parse-scan.y" #include "lex.c" #ifndef YYDEBUG *************** yyreduce: *** 1939,1990 **** switch (yyn) { case 10: ! #line 211 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { /* use preset global here. FIXME */ yyval.node = xstrdup ("int"); ; break;} case 11: ! #line 216 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { /* use preset global here. FIXME */ yyval.node = xstrdup ("double"); ; break;} case 12: ! #line 221 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { /* use preset global here. FIXME */ yyval.node = xstrdup ("boolean"); ; break;} case 18: ! #line 246 "/home/mitchell/gcc-3.1/gcc-3.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.1/gcc-3.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.1/gcc-3.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.1/gcc-3.1/gcc/java/parse-scan.y" { package_name = yyvsp[-1].node; ; break;} case 45: ! #line 328 "/home/mitchell/gcc-3.1/gcc-3.1/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.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { /* use preset global here. FIXME */ yyval.node = xstrdup ("int"); ; break;} case 11: ! #line 216 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { /* use preset global here. FIXME */ yyval.node = xstrdup ("double"); ; break;} case 12: ! #line 221 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { /* use preset global here. FIXME */ yyval.node = xstrdup ("boolean"); ; break;} case 18: ! #line 246 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1.1/gcc-3.1.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.1.1/gcc-3.1.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.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { package_name = yyvsp[-1].node; ; break;} case 45: ! #line 328 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse-scan.y" { if (yyvsp[0].value == PUBLIC_TK) modifier_value++; --- 1994,2000 ---- ; break;} case 46: ! #line 336 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse-scan.y" { report_class_declaration(yyvsp[-2].node); modifier_value = 0; ; break;} case 49: ! #line 354 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { report_class_declaration(yyvsp[-2].node); ; break;} case 55: ! #line 368 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 56: ! #line 370 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 57: ! #line 375 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { pop_class_context (); ; break;} case 58: ! #line 377 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { pop_class_context (); ; break;} case 70: ! #line 403 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 71: ! #line 405 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { modifier_value = 0; ; break;} case 76: ! #line 421 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { bracket_count = 0; USE_ABSORBER; ; break;} case 77: ! #line 423 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { ++bracket_count; ; break;} case 81: ! #line 438 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 83: ! #line 441 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { modifier_value = 0; ; break;} case 84: ! #line 443 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { report_main_declaration (yyvsp[-1].declarator); modifier_value = 0; ; break;} case 85: ! #line 451 "/home/mitchell/gcc-3.1/gcc-3.1/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.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { report_class_declaration(yyvsp[-2].node); modifier_value = 0; ; break;} case 49: ! #line 354 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { report_class_declaration(yyvsp[-2].node); ; break;} case 55: ! #line 368 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 56: ! #line 370 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 57: ! #line 375 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { pop_class_context (); ; break;} case 58: ! #line 377 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { pop_class_context (); ; break;} case 70: ! #line 403 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 71: ! #line 405 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { modifier_value = 0; ; break;} case 76: ! #line 421 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { bracket_count = 0; USE_ABSORBER; ; break;} case 77: ! #line 423 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { ++bracket_count; ; break;} case 81: ! #line 438 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 83: ! #line 441 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { modifier_value = 0; ; break;} case 84: ! #line 443 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { report_main_declaration (yyvsp[-1].declarator); modifier_value = 0; ; break;} case 85: ! #line 451 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/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.1.1/gcc-3.1.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.1/gcc-3.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.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; if (bracket_count) --- 2078,2090 ---- ; break;} case 89: ! #line 468 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; if (bracket_count) *************** case 90: *** 2101,2107 **** ; break;} case 91: ! #line 490 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { if (bracket_count) { --- 2101,2107 ---- ; break;} case 91: ! #line 490 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { if (bracket_count) { *************** case 91: *** 2117,2327 **** ; break;} case 94: ! #line 511 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 95: ! #line 513 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 99: ! #line 528 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 101: ! #line 539 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { modifier_value = 0; ; break;} case 103: ! #line 544 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { modifier_value = 0; ; break;} case 104: ! #line 551 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 105: ! #line 553 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 112: ! #line 570 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 113: ! #line 572 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 116: ! #line 584 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { report_class_declaration (yyvsp[0].node); modifier_value = 0; ; break;} case 118: ! #line 587 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { report_class_declaration (yyvsp[0].node); modifier_value = 0; ; break;} case 120: ! #line 590 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { report_class_declaration (yyvsp[-1].node); modifier_value = 0; ; break;} case 122: ! #line 593 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { report_class_declaration (yyvsp[-1].node); modifier_value = 0; ; break;} case 126: ! #line 604 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { pop_class_context (); ; break;} case 127: ! #line 606 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { pop_class_context (); ; break;} case 150: ! #line 665 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 151: ! #line 667 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { modifier_value = 0; ; break;} case 175: ! #line 707 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 186: ! #line 735 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 187: ! #line 740 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 188: ! #line 745 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 196: ! #line 765 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 201: ! #line 780 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 205: ! #line 797 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 211: ! #line 815 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 222: ! #line 840 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 225: ! #line 849 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 228: ! #line 859 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 234: ! #line 874 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 235: ! #line 878 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 246: ! #line 900 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 247: ! #line 905 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 248: ! #line 907 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 249: ! #line 909 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 250: ! #line 911 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 258: ! #line 926 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { report_class_declaration (NULL); ; break;} case 260: ! #line 929 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { report_class_declaration (NULL); ; break;} case 262: ! #line 935 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 276: ! #line 967 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { bracket_count = 1; ; break;} case 277: ! #line 969 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { bracket_count++; ; break;} case 280: ! #line 982 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ++complexity; ; break;} case 281: ! #line 984 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ++complexity; ; break;} case 282: ! #line 985 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 283: ! #line 986 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 284: ! #line 987 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 285: ! #line 988 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 286: ! #line 993 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 289: ! #line 1000 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 336: ! #line 1096 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 338: ! #line 1102 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 340: ! #line 1108 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 344: ! #line 1122 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} } --- 2117,2327 ---- ; break;} case 94: ! #line 511 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 95: ! #line 513 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 99: ! #line 528 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 101: ! #line 539 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { modifier_value = 0; ; break;} case 103: ! #line 544 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { modifier_value = 0; ; break;} case 104: ! #line 551 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 105: ! #line 553 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 112: ! #line 570 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 113: ! #line 572 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 116: ! #line 584 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { report_class_declaration (yyvsp[0].node); modifier_value = 0; ; break;} case 118: ! #line 587 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { report_class_declaration (yyvsp[0].node); modifier_value = 0; ; break;} case 120: ! #line 590 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { report_class_declaration (yyvsp[-1].node); modifier_value = 0; ; break;} case 122: ! #line 593 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { report_class_declaration (yyvsp[-1].node); modifier_value = 0; ; break;} case 126: ! #line 604 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { pop_class_context (); ; break;} case 127: ! #line 606 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { pop_class_context (); ; break;} case 150: ! #line 665 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 151: ! #line 667 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { modifier_value = 0; ; break;} case 175: ! #line 707 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 186: ! #line 735 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 187: ! #line 740 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 188: ! #line 745 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 196: ! #line 765 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 201: ! #line 780 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 205: ! #line 797 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 211: ! #line 815 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 222: ! #line 840 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 225: ! #line 849 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 228: ! #line 859 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 234: ! #line 874 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 235: ! #line 878 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 246: ! #line 900 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 247: ! #line 905 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 248: ! #line 907 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 249: ! #line 909 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 250: ! #line 911 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 258: ! #line 926 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { report_class_declaration (NULL); ; break;} case 260: ! #line 929 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { report_class_declaration (NULL); ; break;} case 262: ! #line 935 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 276: ! #line 967 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { bracket_count = 1; ; break;} case 277: ! #line 969 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { bracket_count++; ; break;} case 280: ! #line 982 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ++complexity; ; break;} case 281: ! #line 984 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ++complexity; ; break;} case 282: ! #line 985 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 283: ! #line 986 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 284: ! #line 987 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 285: ! #line 988 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 286: ! #line 993 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 289: ! #line 1000 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} case 336: ! #line 1096 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 338: ! #line 1102 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 340: ! #line 1108 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { ++complexity; ; break;} case 344: ! #line 1122 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" { USE_ABSORBER; ; break;} } *************** yyerrhandle: *** 2546,2552 **** } return 1; } ! #line 1140 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse-scan.y" /* Create a new parser context */ --- 2546,2552 ---- } return 1; } ! #line 1140 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse-scan.y" /* Create a new parser context */ diff -Nrc3pad gcc-3.1/gcc/java/parse.c gcc-3.1.1/gcc/java/parse.c *** gcc-3.1/gcc/java/parse.c Wed May 15 02:59:19 2002 --- gcc-3.1.1/gcc/java/parse.c Fri Jul 26 00:13:01 2002 *************** *** 1,5 **** ! /* A Bison parser, made from /home/mitchell/gcc-3.1/gcc-3.1/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.1.1/gcc-3.1.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.1/gcc-3.1/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.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" typedef union { tree node; int sub_token; --- 518,524 ---- } while (0) ! #line 446 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" #include "lex.c" #ifndef YYDEBUG --- 528,534 ---- } operator; int value; } YYSTYPE; ! #line 456 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" #include "lex.c" #ifndef YYDEBUG *************** yyreduce: *** 2897,2903 **** switch (yyn) { case 1: ! #line 607 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { /* Register static variables with the garbage collector. */ --- 2897,2903 ---- switch (yyn) { case 1: ! #line 607 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" {; break;} case 19: ! #line 676 "/home/mitchell/gcc-3.1/gcc-3.1/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 632 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {; break;} case 19: ! #line 676 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { int osb = pop_current_osb (ctxp); tree t = yyvsp[-1].node; --- 2938,2944 ---- ; break;} case 20: ! #line 684 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" {yyval.node = NULL;; break;} case 34: ! #line 726 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = NULL; ; break;} case 35: ! #line 730 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = NULL; ; break;} case 38: ! #line 742 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing name"); RECOVER;; break;} case 40: ! #line 749 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 43: ! #line 759 "/home/mitchell/gcc-3.1/gcc-3.1/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 705 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" {yyval.node = NULL;; break;} case 34: ! #line 726 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = NULL; ; break;} case 35: ! #line 730 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = NULL; ; break;} case 38: ! #line 742 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing name"); RECOVER;; break;} case 40: ! #line 749 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 43: ! #line 759 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing name"); RECOVER;; break;} case 45: ! #line 787 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 46: ! #line 792 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { tree name = EXPR_WFL_NODE (yyvsp[-3].node); tree it; --- 3011,3025 ---- ; break;} case 44: ! #line 785 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing name"); RECOVER;; break;} case 45: ! #line 787 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 46: ! #line 792 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'*' expected"); RECOVER;; break;} case 48: ! #line 812 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 49: ! #line 817 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { end_class_declaration (0); ; break;} case 50: ! #line 819 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { end_class_declaration (0); ; break;} case 52: ! #line 822 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { YYERROR_NOW; yyerror ("Class or interface declaration expected"); ; break;} case 53: ! #line 833 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.value = (1 << yyvsp[0].value); ; break;} case 54: ! #line 837 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { int acc = (1 << yyvsp[0].value); if (yyval.value & acc) --- 3039,3074 ---- ; break;} case 47: ! #line 810 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'*' expected"); RECOVER;; break;} case 48: ! #line 812 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 49: ! #line 817 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { end_class_declaration (0); ; break;} case 50: ! #line 819 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { end_class_declaration (0); ; break;} case 52: ! #line 822 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { YYERROR_NOW; yyerror ("Class or interface declaration expected"); ; break;} case 53: ! #line 833 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.value = (1 << yyvsp[0].value); ; break;} case 54: ! #line 837 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing class name"); RECOVER;; break;} case 60: ! #line 861 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing class name"); RECOVER;; break;} case 61: ! #line 863 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { if (!ctxp->class_err) yyerror ("'{' expected"); DRECOVER(class1); ; break;} case 62: ! #line 868 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {if (!ctxp->class_err) yyerror ("'{' expected"); RECOVER;; break;} case 63: ! #line 872 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = NULL; ; break;} case 64: ! #line 874 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 65: ! #line 876 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'{' expected"); ctxp->class_err=1;; break;} case 66: ! #line 878 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing super class name"); ctxp->class_err=1;; break;} case 67: ! #line 882 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 68: ! #line 884 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 69: ! #line 886 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { ctxp->class_err=1; yyerror ("Missing interface name"); ; break;} case 70: ! #line 894 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.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 904 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing interface name"); RECOVER;; break;} case 73: ! #line 909 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { /* Store the location of the `}' when doing xrefs */ if (flag_emit_xref) --- 3082,3164 ---- ; break;} case 55: ! #line 853 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing class name"); RECOVER;; break;} case 60: ! #line 861 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing class name"); RECOVER;; break;} case 61: ! #line 863 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { if (!ctxp->class_err) yyerror ("'{' expected"); DRECOVER(class1); ; break;} case 62: ! #line 868 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {if (!ctxp->class_err) yyerror ("'{' expected"); RECOVER;; break;} case 63: ! #line 872 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = NULL; ; break;} case 64: ! #line 874 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 65: ! #line 876 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'{' expected"); ctxp->class_err=1;; break;} case 66: ! #line 878 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing super class name"); ctxp->class_err=1;; break;} case 67: ! #line 882 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 68: ! #line 884 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 69: ! #line 886 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { ctxp->class_err=1; yyerror ("Missing interface name"); ; break;} case 70: ! #line 894 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.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 904 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing interface name"); RECOVER;; break;} case 73: ! #line 909 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { /* Store the location of the `}' when doing xrefs */ if (flag_emit_xref) --- 3168,3174 ---- ; break;} case 74: ! #line 917 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { if (yyvsp[0].node != empty_stmt_node) { --- 3178,3184 ---- ; break;} case 80: ! #line 936 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { end_class_declaration (1); ; break;} case 84: ! #line 951 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { end_class_declaration (1); ; break;} case 86: ! #line 958 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { register_fields (0, yyvsp[-2].node, yyvsp[-1].node); ; break;} case 87: ! #line 960 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { check_modifiers ("Illegal modifier `%s' for field declaration", --- 3188,3206 ---- ; break;} case 83: ! #line 949 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { end_class_declaration (1); ; break;} case 84: ! #line 951 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { end_class_declaration (1); ; break;} case 86: ! #line 958 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { register_fields (0, yyvsp[-2].node, yyvsp[-1].node); ; break;} case 87: ! #line 960 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { yyval.node = chainon (yyvsp[-2].node, yyvsp[0].node); ; break;} case 90: ! #line 975 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 91: ! #line 980 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = build_tree_list (yyvsp[0].node, NULL_TREE); ; break;} case 92: ! #line 982 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { if (java_error_count) yyvsp[0].node = NULL_TREE; --- 3210,3228 ---- ; break;} case 89: ! #line 973 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = chainon (yyvsp[-2].node, yyvsp[0].node); ; break;} case 90: ! #line 975 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 91: ! #line 980 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = build_tree_list (yyvsp[0].node, NULL_TREE); ; break;} case 92: ! #line 982 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { yyerror ("Missing variable initializer"); yyval.node = build_tree_list (yyvsp[-2].node, NULL_TREE); --- 3231,3237 ---- ; break;} case 93: ! #line 989 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { yyerror ("';' expected"); yyval.node = build_tree_list (yyvsp[-3].node, NULL_TREE); --- 3239,3245 ---- ; break;} case 94: ! #line 995 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { yyval.node = build_unresolved_array_type (yyvsp[-2].node); ; break;} case 97: ! #line 1007 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Invalid declaration"); DRECOVER(vdi);; break;} case 98: ! #line 1009 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { tree node = java_lval.node; if (node && (TREE_CODE (node) == INTEGER_CST --- 3247,3261 ---- ; break;} case 96: ! #line 1005 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = build_unresolved_array_type (yyvsp[-2].node); ; break;} case 97: ! #line 1007 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Invalid declaration"); DRECOVER(vdi);; break;} case 98: ! #line 1009 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Unbalanced ']'"); DRECOVER(vdi);; break;} case 102: ! #line 1030 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { current_function_decl = yyvsp[0].node; if (current_function_decl --- 3267,3277 ---- ; break;} case 99: ! #line 1019 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Unbalanced ']'"); DRECOVER(vdi);; break;} case 102: ! #line 1030 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { finish_method_declaration (yyvsp[0].node); ; break;} case 104: ! #line 1041 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {YYNOT_TWICE yyerror ("'{' expected"); RECOVER;; break;} case 105: ! #line 1046 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.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 1052 "/home/mitchell/gcc-3.1/gcc-3.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 1054 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyerror ("Invalid method declaration, method name required"); RECOVER; ; break;} case 110: ! #line 1059 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {RECOVER;; break;} case 111: ! #line 1061 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Identifier expected"); RECOVER;; break;} case 112: ! #line 1063 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Identifier expected"); RECOVER;; break;} case 113: ! #line 1065 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyerror ("Invalid method declaration, return type required"); RECOVER; ; break;} case 114: ! #line 1073 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" { yyval.node = method_declarator (yyvsp[-3].node, yyvsp[-1].node); ; break;} case 116: ! #line 1080 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { EXPR_WFL_LINECOL (wfl_operator) = yyvsp[-1].operator.location; TREE_PURPOSE (yyvsp[-2].node) = --- 3282,3349 ---- ; break;} case 103: ! #line 1039 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { finish_method_declaration (yyvsp[0].node); ; break;} case 104: ! #line 1041 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {YYNOT_TWICE yyerror ("'{' expected"); RECOVER;; break;} case 105: ! #line 1046 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.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 1052 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 1054 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyerror ("Invalid method declaration, method name required"); RECOVER; ; break;} case 110: ! #line 1059 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {RECOVER;; break;} case 111: ! #line 1061 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Identifier expected"); RECOVER;; break;} case 112: ! #line 1063 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Identifier expected"); RECOVER;; break;} case 113: ! #line 1065 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyerror ("Invalid method declaration, return type required"); RECOVER; ; break;} case 114: ! #line 1073 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = method_declarator (yyvsp[-3].node, yyvsp[-1].node); ; break;} case 116: ! #line 1080 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("')' expected"); DRECOVER(method_declarator);; break;} case 118: ! #line 1091 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("']' expected"); RECOVER;; break;} case 119: ! #line 1096 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { ctxp->formal_parameter_number = 1; ; break;} case 120: ! #line 1100 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" { yyerror ("Missing formal parameter term"); RECOVER; ; break;} case 122: ! #line 1110 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = build_tree_list (yyvsp[0].node, yyvsp[-1].node); ; break;} case 123: ! #line 1114 "/home/mitchell/gcc-3.1/gcc-3.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 1119 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyerror ("Missing identifier"); RECOVER; yyval.node = NULL_TREE; ; break;} case 125: ! #line 1124 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyerror ("Missing identifier"); RECOVER; yyval.node = NULL_TREE; ; break;} case 126: ! #line 1132 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { check_modifiers ("Illegal modifier `%s'. Only `final' was expected here", yyvsp[0].value, ACC_FINAL); --- 3354,3412 ---- ; break;} case 117: ! #line 1089 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("')' expected"); DRECOVER(method_declarator);; break;} case 118: ! #line 1091 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("']' expected"); RECOVER;; break;} case 119: ! #line 1096 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { ctxp->formal_parameter_number = 1; ; break;} case 120: ! #line 1100 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" { yyerror ("Missing formal parameter term"); RECOVER; ; break;} case 122: ! #line 1110 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = build_tree_list (yyvsp[0].node, yyvsp[-1].node); ; break;} case 123: ! #line 1114 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 1119 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyerror ("Missing identifier"); RECOVER; yyval.node = NULL_TREE; ; break;} case 125: ! #line 1124 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyerror ("Missing identifier"); RECOVER; yyval.node = NULL_TREE; ; break;} case 126: ! #line 1132 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 128: ! #line 1143 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 129: ! #line 1145 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing class type term"); RECOVER;; break;} case 130: ! #line 1150 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = build_tree_list (yyvsp[0].node, yyvsp[0].node); ; break;} case 131: ! #line 1152 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing class type term"); RECOVER;; break;} case 134: ! #line 1159 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 135: ! #line 1165 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { TREE_CHAIN (yyvsp[0].node) = CPC_STATIC_INITIALIZER_STMT (ctxp); SET_CPC_STATIC_INITIALIZER_STMT (ctxp, yyvsp[0].node); --- 3415,3449 ---- ; break;} case 127: ! #line 1141 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 128: ! #line 1143 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 129: ! #line 1145 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing class type term"); RECOVER;; break;} case 130: ! #line 1150 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = build_tree_list (yyvsp[0].node, yyvsp[0].node); ; break;} case 131: ! #line 1152 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing class type term"); RECOVER;; break;} case 134: ! #line 1159 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 135: ! #line 1165 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.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 */ --- 3451,3457 ---- ; break;} case 136: ! #line 1174 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" { finish_method_declaration (yyvsp[0].node); ; break;} case 139: ! #line 1200 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" { yyval.node = method_declarator (yyvsp[-3].node, yyvsp[-1].node); ; break;} case 143: ! #line 1220 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 145: ! #line 1227 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 146: ! #line 1229 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 148: ! #line 1239 "/home/mitchell/gcc-3.1/gcc-3.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); --- 3465,3520 ---- ; break;} case 137: ! #line 1190 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" { finish_method_declaration (yyvsp[0].node); ; break;} case 139: ! #line 1200 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = method_declarator (yyvsp[-3].node, yyvsp[-1].node); ; break;} case 143: ! #line 1220 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 145: ! #line 1227 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 146: ! #line 1229 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 148: ! #line 1239 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.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); --- 3522,3528 ---- ; break;} case 149: ! #line 1245 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" {yyval.node = parse_jdk1_1_error ("explicit constructor invocation"); ; break;} case 151: ! #line 1255 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyval.node = parse_jdk1_1_error ("explicit constructor invocation"); ; break;} case 152: ! #line 1260 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { tree wfl = build_wfl_node (this_identifier_node); EXPR_WFL_LINECOL (wfl) = yyvsp[0].operator.location; --- 3530,3544 ---- ; break;} case 150: ! #line 1253 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyval.node = parse_jdk1_1_error ("explicit constructor invocation"); ; break;} case 151: ! #line 1255 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyval.node = parse_jdk1_1_error ("explicit constructor invocation"); ; break;} case 152: ! #line 1260 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { tree wfl = build_wfl_node (super_identifier_node); EXPR_WFL_LINECOL (wfl) = yyvsp[0].operator.location; --- 3546,3552 ---- ; break;} case 153: ! #line 1266 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { create_interface (0, yyvsp[0].node, NULL_TREE); ; break;} case 156: ! #line 1280 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { create_interface (yyvsp[-2].value, yyvsp[0].node, NULL_TREE); ; break;} case 158: ! #line 1283 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { create_interface (0, yyvsp[-1].node, yyvsp[0].node); ; break;} case 160: ! #line 1286 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { create_interface (yyvsp[-3].value, yyvsp[-1].node, yyvsp[0].node); ; break;} case 162: ! #line 1289 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'{' expected"); RECOVER;; break;} case 163: ! #line 1291 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'{' expected"); RECOVER;; break;} case 164: ! #line 1296 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.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 1306 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Invalid interface type"); RECOVER;; break;} case 167: ! #line 1308 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 168: ! #line 1313 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 169: ! #line 1315 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 174: ! #line 1327 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { end_class_declaration (1); ; break;} case 175: ! #line 1329 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { end_class_declaration (1); ; break;} case 177: ! #line 1338 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 179: ! #line 1349 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.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 1365 "/home/mitchell/gcc-3.1/gcc-3.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 1369 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 186: ! #line 1375 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { /* Store the location of the `}' when doing xrefs */ if (current_function_decl && flag_emit_xref) --- 3554,3666 ---- ; break;} case 154: ! #line 1277 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { create_interface (0, yyvsp[0].node, NULL_TREE); ; break;} case 156: ! #line 1280 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { create_interface (yyvsp[-2].value, yyvsp[0].node, NULL_TREE); ; break;} case 158: ! #line 1283 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { create_interface (0, yyvsp[-1].node, yyvsp[0].node); ; break;} case 160: ! #line 1286 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { create_interface (yyvsp[-3].value, yyvsp[-1].node, yyvsp[0].node); ; break;} case 162: ! #line 1289 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'{' expected"); RECOVER;; break;} case 163: ! #line 1291 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'{' expected"); RECOVER;; break;} case 164: ! #line 1296 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.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 1306 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Invalid interface type"); RECOVER;; break;} case 167: ! #line 1308 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 168: ! #line 1313 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 169: ! #line 1315 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 174: ! #line 1327 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { end_class_declaration (1); ; break;} case 175: ! #line 1329 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { end_class_declaration (1); ; break;} case 177: ! #line 1338 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 179: ! #line 1349 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.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 1365 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 1369 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 186: ! #line 1375 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 188: ! #line 1388 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { enter_block (); ; break;} case 189: ! #line 1393 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { maybe_absorb_scoping_blocks (); /* Store the location of the `}' when doing xrefs */ --- 3670,3684 ---- ; break;} case 187: ! #line 1383 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 188: ! #line 1388 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { enter_block (); ; break;} case 189: ! #line 1393 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { java_method_add_stmt (current_function_decl, yyvsp[0].node); ; break;} case 194: ! #line 1415 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" { declare_local_variables (0, yyvsp[-1].node, yyvsp[0].node); ; break;} case 197: ! #line 1429 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" { yyval.node = exit_block (); ; break;} case 208: ! #line 1448 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = exit_block (); ; break;} case 220: ! #line 1467 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { if (flag_extraneous_semicolon && ! current_static_block --- 3691,3724 ---- ; break;} case 193: ! #line 1413 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { java_method_add_stmt (current_function_decl, yyvsp[0].node); ; break;} case 194: ! #line 1415 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" { declare_local_variables (0, yyvsp[-1].node, yyvsp[0].node); ; break;} case 197: ! #line 1429 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = exit_block (); ; break;} case 208: ! #line 1448 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = exit_block (); ; break;} case 220: ! #line 1467 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { yyval.node = build_labeled_block (EXPR_WFL_LINECOL (yyvsp[-1].node), EXPR_WFL_NODE (yyvsp[-1].node)); --- 3735,3741 ---- ; break;} case 221: ! #line 1485 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { yyval.node = finish_labeled_statement (yyvsp[-1].node, yyvsp[0].node); ; break;} case 223: ! #line 1498 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("':' expected"); RECOVER;; break;} case 224: ! #line 1503 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = finish_labeled_statement (yyvsp[-1].node, yyvsp[0].node); ; break;} case 225: ! #line 1510 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { /* We have a statement. Generate a WFL around it so we can debug it */ --- 3745,3763 ---- ; break;} case 222: ! #line 1496 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = finish_labeled_statement (yyvsp[-1].node, yyvsp[0].node); ; break;} case 223: ! #line 1498 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("':' expected"); RECOVER;; break;} case 224: ! #line 1503 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = finish_labeled_statement (yyvsp[-1].node, yyvsp[0].node); ; break;} case 225: ! #line 1510 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { YYNOT_TWICE yyerror ("Invalid expression statement"); DRECOVER (expr_stmt); ; break;} case 227: ! #line 1524 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { YYNOT_TWICE yyerror ("Invalid expression statement"); DRECOVER (expr_stmt); ; break;} case 228: ! #line 1529 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { YYNOT_TWICE yyerror ("Invalid expression statement"); DRECOVER (expr_stmt); ; break;} case 229: ! #line 1534 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 230: ! #line 1536 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { parse_ctor_invocation_error (); RECOVER; ; break;} case 231: ! #line 1541 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 232: ! #line 1543 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { parse_ctor_invocation_error (); RECOVER; ; break;} case 233: ! #line 1548 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 234: ! #line 1550 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 235: ! #line 1552 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 236: ! #line 1554 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 237: ! #line 1556 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 245: ! #line 1571 "/home/mitchell/gcc-3.1/gcc-3.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 1576 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 247: ! #line 1578 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 248: ! #line 1580 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 249: ! #line 1585 "/home/mitchell/gcc-3.1/gcc-3.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 1590 "/home/mitchell/gcc-3.1/gcc-3.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 1595 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { enter_block (); ; break;} case 252: ! #line 1599 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { /* Make into "proper list" of COMPOUND_EXPRs. I.e. make the last statement also have its own --- 3768,3870 ---- ; break;} case 226: ! #line 1519 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { YYNOT_TWICE yyerror ("Invalid expression statement"); DRECOVER (expr_stmt); ; break;} case 227: ! #line 1524 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { YYNOT_TWICE yyerror ("Invalid expression statement"); DRECOVER (expr_stmt); ; break;} case 228: ! #line 1529 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { YYNOT_TWICE yyerror ("Invalid expression statement"); DRECOVER (expr_stmt); ; break;} case 229: ! #line 1534 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 230: ! #line 1536 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { parse_ctor_invocation_error (); RECOVER; ; break;} case 231: ! #line 1541 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 232: ! #line 1543 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { parse_ctor_invocation_error (); RECOVER; ; break;} case 233: ! #line 1548 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 234: ! #line 1550 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 235: ! #line 1552 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 236: ! #line 1554 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 237: ! #line 1556 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 245: ! #line 1571 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 1576 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 247: ! #line 1578 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 248: ! #line 1580 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 249: ! #line 1585 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 1590 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 1595 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { enter_block (); ; break;} case 252: ! #line 1599 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.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 1616 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 255: ! #line 1618 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term or ')'"); DRECOVER(switch_statement);; break;} case 256: ! #line 1620 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'{' expected"); RECOVER;; break;} case 257: ! #line 1628 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 258: ! #line 1630 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 259: ! #line 1632 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 260: ! #line 1634 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 266: ! #line 1653 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { tree lab = build1 (CASE_EXPR, NULL_TREE, yyvsp[-1].node); EXPR_WFL_LINECOL (lab) = yyvsp[-2].operator.location; --- 3875,3916 ---- ; break;} case 253: ! #line 1611 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 1616 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 255: ! #line 1618 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term or ')'"); DRECOVER(switch_statement);; break;} case 256: ! #line 1620 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'{' expected"); RECOVER;; break;} case 257: ! #line 1628 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 258: ! #line 1630 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 259: ! #line 1632 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 260: ! #line 1634 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = NULL_TREE; ; break;} case 266: ! #line 1653 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { tree lab = build (DEFAULT_EXPR, NULL_TREE, NULL_TREE); EXPR_WFL_LINECOL (lab) = yyvsp[-1].operator.location; --- 3918,3924 ---- ; break;} case 267: ! #line 1659 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing or invalid constant expression"); RECOVER;; break;} case 269: ! #line 1667 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("':' expected"); RECOVER;; break;} case 270: ! #line 1669 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("':' expected"); RECOVER;; break;} case 271: ! #line 1674 "/home/mitchell/gcc-3.1/gcc-3.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 1682 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" {YYERROR_NOW; yyerror ("'(' expected"); RECOVER;; break;} case 274: ! #line 1686 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term and ')' expected"); RECOVER;; break;} case 275: ! #line 1688 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 276: ! #line 1693 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.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 1712 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { if (TREE_CODE_CLASS (TREE_CODE (yyvsp[-4].node)) == 'c') yyvsp[-4].node = build_wfl_node (yyvsp[-4].node); --- 3926,3982 ---- ; break;} case 268: ! #line 1665 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing or invalid constant expression"); RECOVER;; break;} case 269: ! #line 1667 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("':' expected"); RECOVER;; break;} case 270: ! #line 1669 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("':' expected"); RECOVER;; break;} case 271: ! #line 1674 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 1682 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" {YYERROR_NOW; yyerror ("'(' expected"); RECOVER;; break;} case 274: ! #line 1686 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term and ')' expected"); RECOVER;; break;} case 275: ! #line 1688 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 276: ! #line 1693 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.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 1712 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.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 */ --- 3984,3990 ---- ; break;} case 280: ! #line 1718 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Invalid control expression"); RECOVER;; break;} case 282: ! #line 1727 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Invalid update expression"); RECOVER;; break;} case 283: ! #line 1729 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Invalid update expression"); RECOVER;; break;} case 284: ! #line 1734 "/home/mitchell/gcc-3.1/gcc-3.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 1736 "/home/mitchell/gcc-3.1/gcc-3.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 */ --- 3993,4015 ---- ; break;} case 281: ! #line 1725 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Invalid control expression"); RECOVER;; break;} case 282: ! #line 1727 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Invalid update expression"); RECOVER;; break;} case 283: ! #line 1729 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Invalid update expression"); RECOVER;; break;} case 284: ! #line 1734 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 1736 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { /* This scope defined for local variable that may be defined within the scope of the for loop */ --- 4018,4024 ---- ; break;} case 286: ! #line 1746 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'(' expected"); DRECOVER(for_1);; break;} case 288: ! #line 1754 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Invalid init statement"); RECOVER;; break;} case 289: ! #line 1759 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { /* We now declare the loop body. The loop is declared as a for loop. */ --- 4026,4040 ---- ; break;} case 287: ! #line 1752 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'(' expected"); DRECOVER(for_1);; break;} case 288: ! #line 1754 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Invalid init statement"); RECOVER;; break;} case 289: ! #line 1759 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { yyval.node = empty_stmt_node; ; break;} case 291: ! #line 1773 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { /* Init statement recorded within the previously defined block scope */ --- 4047,4057 ---- ; break;} case 290: ! #line 1771 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = empty_stmt_node; ; break;} case 291: ! #line 1773 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { /* Local variable are recorded within the previously defined block scope */ --- 4059,4065 ---- ; break;} case 292: ! #line 1779 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("';' expected"); DRECOVER(for_init_1);; break;} case 294: ! #line 1789 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyval.node = empty_stmt_node;; break;} case 295: ! #line 1791 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = build_debugable_stmt (BUILD_LOCATION (), yyvsp[0].node); ; break;} case 296: ! #line 1796 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 299: ! #line 1805 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 302: ! #line 1811 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 303: ! #line 1816 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 306: ! #line 1822 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 307: ! #line 1827 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = build_return (yyvsp[-1].operator.location, NULL_TREE); ; break;} case 308: ! #line 1829 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = build_return (yyvsp[-2].operator.location, yyvsp[-1].node); ; break;} case 309: ! #line 1831 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 310: ! #line 1833 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 311: ! #line 1838 "/home/mitchell/gcc-3.1/gcc-3.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 1843 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 313: ! #line 1845 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 314: ! #line 1850 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = build (SYNCHRONIZED_EXPR, NULL_TREE, yyvsp[-2].node, yyvsp[0].node); EXPR_WFL_LINECOL (yyval.node) = --- 4067,4160 ---- ; break;} case 293: ! #line 1785 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("';' expected"); DRECOVER(for_init_1);; break;} case 294: ! #line 1789 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyval.node = empty_stmt_node;; break;} case 295: ! #line 1791 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = build_debugable_stmt (BUILD_LOCATION (), yyvsp[0].node); ; break;} case 296: ! #line 1796 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 299: ! #line 1805 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 302: ! #line 1811 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 303: ! #line 1816 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 306: ! #line 1822 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 307: ! #line 1827 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = build_return (yyvsp[-1].operator.location, NULL_TREE); ; break;} case 308: ! #line 1829 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = build_return (yyvsp[-2].operator.location, yyvsp[-1].node); ; break;} case 309: ! #line 1831 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 310: ! #line 1833 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 311: ! #line 1838 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 1843 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 313: ! #line 1845 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("';' expected"); RECOVER;; break;} case 314: ! #line 1850 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'{' expected"); RECOVER;; break;} case 316: ! #line 1858 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 317: ! #line 1860 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 318: ! #line 1862 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 319: ! #line 1867 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { check_modifiers ( "Illegal modifier `%s'. Only `synchronized' was expected here", --- 4162,4184 ---- ; break;} case 315: ! #line 1856 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'{' expected"); RECOVER;; break;} case 316: ! #line 1858 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 317: ! #line 1860 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 318: ! #line 1862 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 319: ! #line 1867 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/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.1/gcc-3.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 1883 "/home/mitchell/gcc-3.1/gcc-3.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 1888 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'{' expected"); DRECOVER (try_statement);; break;} case 325: ! #line 1894 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" { java_method_add_stmt (current_function_decl, yyvsp[0].node); exit_block (); --- 4189,4221 ---- ; break;} case 320: ! #line 1879 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.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 1883 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 1888 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'{' expected"); DRECOVER (try_statement);; break;} case 325: ! #line 1894 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { /* We add a block to define a scope for formal_parameter (CCBP). The formal parameter is --- 4223,4229 ---- ; break;} case 327: ! #line 1910 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER; yyval.node = NULL_TREE;; break;} case 329: ! #line 1928 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyerror ("Missing term or ')' expected"); RECOVER; yyval.node = NULL_TREE; ; break;} case 330: ! #line 1933 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; yyval.node = NULL_TREE;; break;} case 331: ! #line 1938 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 332: ! #line 1940 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'{' expected"); RECOVER; ; break;} case 336: ! #line 1952 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = build_this (yyvsp[0].operator.location); ; break;} case 337: ! #line 1954 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyval.node = yyvsp[-1].node;; break;} case 343: ! #line 1964 "/home/mitchell/gcc-3.1/gcc-3.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 1969 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 345: ! #line 1971 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'class' or 'this' expected" ); RECOVER;; break;} case 346: ! #line 1973 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'class' expected" ); RECOVER;; break;} case 347: ! #line 1975 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'class' expected" ); RECOVER;; break;} case 348: ! #line 1980 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" { yyval.node = build_new_invocation (yyvsp[-3].node, yyvsp[-1].node); ; break;} case 353: ! #line 1996 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = build_new_invocation (yyvsp[-2].node, NULL_TREE); ; break;} case 355: ! #line 2002 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { tree ctor = build_new_invocation (yyvsp[-2].node, NULL_TREE); yyval.node = make_qualified_primary (yyvsp[-3].node, ctor, --- 4241,4328 ---- ; break;} case 328: ! #line 1926 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER; yyval.node = NULL_TREE;; break;} case 329: ! #line 1928 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyerror ("Missing term or ')' expected"); RECOVER; yyval.node = NULL_TREE; ; break;} case 330: ! #line 1933 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; yyval.node = NULL_TREE;; break;} case 331: ! #line 1938 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = yyvsp[0].node; ; break;} case 332: ! #line 1940 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'{' expected"); RECOVER; ; break;} case 336: ! #line 1952 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = build_this (yyvsp[0].operator.location); ; break;} case 337: ! #line 1954 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyval.node = yyvsp[-1].node;; break;} case 343: ! #line 1964 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 1969 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 345: ! #line 1971 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'class' or 'this' expected" ); RECOVER;; break;} case 346: ! #line 1973 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'class' expected" ); RECOVER;; break;} case 347: ! #line 1975 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'class' expected" ); RECOVER;; break;} case 348: ! #line 1980 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = build_new_invocation (yyvsp[-3].node, yyvsp[-1].node); ; break;} case 353: ! #line 1996 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = build_new_invocation (yyvsp[-2].node, NULL_TREE); ; break;} case 355: ! #line 2002 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.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, --- 4330,4336 ---- ; break;} case 357: ! #line 2009 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'(' expected"); DRECOVER(new_1);; break;} case 360: ! #line 2018 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 361: ! #line 2020 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("')' or term expected"); RECOVER;; break;} case 362: ! #line 2022 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 363: ! #line 2024 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {YYERROR_NOW; yyerror ("Identifier expected"); RECOVER;; break;} case 364: ! #line 2026 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 365: ! #line 2036 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { create_anonymous_class (yyvsp[-4].operator.location, yyvsp[-3].node); ; break;} case 366: ! #line 2038 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { tree id = build_wfl_node (DECL_NAME (GET_CPC ())); EXPR_WFL_LINECOL (id) = EXPR_WFL_LINECOL (yyvsp[-5].node); --- 4338,4372 ---- ; break;} case 359: ! #line 2016 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'(' expected"); DRECOVER(new_1);; break;} case 360: ! #line 2018 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 361: ! #line 2020 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("')' or term expected"); RECOVER;; break;} case 362: ! #line 2022 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("')' expected"); RECOVER;; break;} case 363: ! #line 2024 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {YYERROR_NOW; yyerror ("Identifier expected"); RECOVER;; break;} case 364: ! #line 2026 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'(' expected"); RECOVER;; break;} case 365: ! #line 2036 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { create_anonymous_class (yyvsp[-4].operator.location, yyvsp[-3].node); ; break;} case 366: ! #line 2038 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { create_anonymous_class (yyvsp[-3].operator.location, yyvsp[-2].node); ; break;} case 368: ! #line 2071 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { tree id = build_wfl_node (DECL_NAME (GET_CPC ())); EXPR_WFL_LINECOL (id) = EXPR_WFL_LINECOL (yyvsp[-4].node); --- 4399,4409 ---- ; break;} case 367: ! #line 2069 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { create_anonymous_class (yyvsp[-3].operator.location, yyvsp[-2].node); ; break;} case 368: ! #line 2071 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { yyval.node = yyvsp[-2].node; ; break;} case 370: ! #line 2089 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = yyvsp[-2].node; ; break;} case 371: ! #line 2094 "/home/mitchell/gcc-3.1/gcc-3.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 2099 "/home/mitchell/gcc-3.1/gcc-3.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 2104 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 374: ! #line 2109 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" { char *sig; int osb = pop_current_osb (ctxp); --- 4418,4466 ---- ; break;} case 369: ! #line 2087 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = yyvsp[-2].node; ; break;} case 370: ! #line 2089 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = yyvsp[-2].node; ; break;} case 371: ! #line 2094 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2099 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2104 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 374: ! #line 2109 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { int osb = pop_current_osb (ctxp); tree type = yyvsp[-2].node; --- 4473,4479 ---- ; break;} case 379: ! #line 2130 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("'[' expected"); DRECOVER ("]");; break;} case 381: ! #line 2141 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("']' expected"); RECOVER;; break;} case 382: ! #line 2146 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = build_tree_list (NULL_TREE, yyvsp[0].node); ; break;} case 383: ! #line 2148 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = tree_cons (NULL_TREE, yyvsp[0].node, yyval.node); ; break;} case 384: ! #line 2153 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { if (JNUMERIC_TYPE_P (TREE_TYPE (yyvsp[-1].node))) { --- 4484,4506 ---- ; break;} case 380: ! #line 2139 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("'[' expected"); DRECOVER ("]");; break;} case 381: ! #line 2141 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("']' expected"); RECOVER;; break;} case 382: ! #line 2146 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = build_tree_list (NULL_TREE, yyvsp[0].node); ; break;} case 383: ! #line 2148 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = tree_cons (NULL_TREE, yyvsp[0].node, yyval.node); ; break;} case 384: ! #line 2153 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("']' expected"); RECOVER;; break;} case 386: ! #line 2165 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyerror ("Missing term"); yyerror ("']' expected"); --- 4512,4522 ---- ; break;} case 385: ! #line 2163 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("']' expected"); RECOVER;; break;} case 386: ! #line 2165 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyerror ("Missing term"); yyerror ("']' expected"); *************** case 386: *** 4524,4530 **** ; break;} case 387: ! #line 2174 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { int allocate = 0; /* If not initialized, allocate memory for the osb --- 4524,4530 ---- ; break;} case 387: ! #line 2174 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { CURRENT_OSB (ctxp)++; ; break;} case 389: ! #line 2202 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyerror ("']' expected"); RECOVER;; break;} case 390: ! #line 2207 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" { tree super_wfl = build_wfl_node (super_identifier_node); EXPR_WFL_LINECOL (super_wfl) = yyvsp[-2].operator.location; --- 4552,4570 ---- ; break;} case 388: ! #line 2200 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { CURRENT_OSB (ctxp)++; ; break;} case 389: ! #line 2202 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyerror ("']' expected"); RECOVER;; break;} case 390: ! #line 2207 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Field expected"); DRECOVER (super_field_acces);; break;} case 393: ! #line 2222 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = build_method_invocation (yyvsp[-2].node, NULL_TREE); ; break;} case 394: ! #line 2224 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyval.node = build_method_invocation (yyvsp[-3].node, yyvsp[-1].node); ; break;} case 395: ! #line 2226 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { if (TREE_CODE (yyvsp[-4].node) == THIS_EXPR) yyval.node = build_this_super_qualified_invocation --- 4572,4590 ---- ; break;} case 392: ! #line 2217 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Field expected"); DRECOVER (super_field_acces);; break;} case 393: ! #line 2222 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = build_method_invocation (yyvsp[-2].node, NULL_TREE); ; break;} case 394: ! #line 2224 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyval.node = build_method_invocation (yyvsp[-3].node, yyvsp[-1].node); ; break;} case 395: ! #line 2226 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" { if (TREE_CODE (yyvsp[-5].node) == THIS_EXPR) yyval.node = build_this_super_qualified_invocation --- 4597,4603 ---- ; break;} case 396: ! #line 2237 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.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 2253 "/home/mitchell/gcc-3.1/gcc-3.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 2262 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyerror ("'(' expected"); DRECOVER (method_invocation); ; break;} case 400: ! #line 2264 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyerror ("'(' expected"); DRECOVER (method_invocation); ; break;} case 401: ! #line 2269 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" { yyerror ("Missing term and ']' expected"); DRECOVER(array_access); ; break;} case 404: ! #line 2278 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyerror ("']' expected"); DRECOVER(array_access); ; break;} case 405: ! #line 2283 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyerror ("Missing term and ']' expected"); DRECOVER(array_access); ; break;} case 406: ! #line 2288 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { yyerror ("']' expected"); DRECOVER(array_access); ; break;} case 411: ! #line 2303 "/home/mitchell/gcc-3.1/gcc-3.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 2308 "/home/mitchell/gcc-3.1/gcc-3.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 2315 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 418: ! #line 2323 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 421: ! #line 2335 "/home/mitchell/gcc-3.1/gcc-3.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 2337 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 423: ! #line 2342 "/home/mitchell/gcc-3.1/gcc-3.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 2344 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 426: ! #line 2350 "/home/mitchell/gcc-3.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 430: ! #line 2357 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 431: ! #line 2362 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { tree type = yyvsp[-3].node; int osb = pop_current_osb (ctxp); --- 4610,4737 ---- ; break;} case 397: ! #line 2248 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2253 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2262 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyerror ("'(' expected"); DRECOVER (method_invocation); ; break;} case 400: ! #line 2264 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyerror ("'(' expected"); DRECOVER (method_invocation); ; break;} case 401: ! #line 2269 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" { yyerror ("Missing term and ']' expected"); DRECOVER(array_access); ; break;} case 404: ! #line 2278 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyerror ("']' expected"); DRECOVER(array_access); ; break;} case 405: ! #line 2283 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyerror ("Missing term and ']' expected"); DRECOVER(array_access); ; break;} case 406: ! #line 2288 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { yyerror ("']' expected"); DRECOVER(array_access); ; break;} case 411: ! #line 2303 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2308 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2315 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 418: ! #line 2323 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 421: ! #line 2335 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2337 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 423: ! #line 2342 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2344 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 426: ! #line 2350 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 430: ! #line 2357 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER; break;} case 431: ! #line 2362 "/home/mitchell/gcc-3.1.1/gcc-3.1.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.1/gcc-3.1/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.1/gcc-3.1/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.1/gcc-3.1/gcc/java/parse.y" { const char *ptr; int osb = pop_current_osb (ctxp); --- 4741,4755 ---- ; break;} case 432: ! #line 2370 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/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.1.1/gcc-3.1.1/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.1.1/gcc-3.1.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.1/gcc-3.1/gcc/java/parse.y" {yyerror ("']' expected, invalid type expression");; break;} case 436: ! #line 2390 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { YYNOT_TWICE yyerror ("Invalid type expression"); RECOVER; RECOVER; ; break;} case 437: ! #line 2395 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 438: ! #line 2397 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 439: ! #line 2399 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 441: ! #line 2405 "/home/mitchell/gcc-3.1/gcc-3.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 2410 "/home/mitchell/gcc-3.1/gcc-3.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 2415 "/home/mitchell/gcc-3.1/gcc-3.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 2420 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 445: ! #line 2422 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 446: ! #line 2424 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 448: ! #line 2430 "/home/mitchell/gcc-3.1/gcc-3.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 2435 "/home/mitchell/gcc-3.1/gcc-3.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 2440 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 451: ! #line 2442 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 453: ! #line 2448 "/home/mitchell/gcc-3.1/gcc-3.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 2453 "/home/mitchell/gcc-3.1/gcc-3.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 2458 "/home/mitchell/gcc-3.1/gcc-3.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 2463 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 457: ! #line 2465 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 458: ! #line 2467 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 460: ! #line 2473 "/home/mitchell/gcc-3.1/gcc-3.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 2478 "/home/mitchell/gcc-3.1/gcc-3.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 2483 "/home/mitchell/gcc-3.1/gcc-3.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 2488 "/home/mitchell/gcc-3.1/gcc-3.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 2493 "/home/mitchell/gcc-3.1/gcc-3.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 2495 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 466: ! #line 2497 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 467: ! #line 2499 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 468: ! #line 2501 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 469: ! #line 2503 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Invalid reference type"); RECOVER;; break;} case 471: ! #line 2509 "/home/mitchell/gcc-3.1/gcc-3.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 2514 "/home/mitchell/gcc-3.1/gcc-3.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 2519 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 474: ! #line 2521 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 476: ! #line 2527 "/home/mitchell/gcc-3.1/gcc-3.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 2532 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 479: ! #line 2538 "/home/mitchell/gcc-3.1/gcc-3.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 2543 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 482: ! #line 2549 "/home/mitchell/gcc-3.1/gcc-3.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 2554 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 485: ! #line 2560 "/home/mitchell/gcc-3.1/gcc-3.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 2565 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 488: ! #line 2571 "/home/mitchell/gcc-3.1/gcc-3.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 2576 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 491: ! #line 2582 "/home/mitchell/gcc-3.1/gcc-3.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 2587 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { YYERROR_NOW; yyerror ("Missing term"); --- 4765,5018 ---- ; break;} case 435: ! #line 2388 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("']' expected, invalid type expression");; break;} case 436: ! #line 2390 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { YYNOT_TWICE yyerror ("Invalid type expression"); RECOVER; RECOVER; ; break;} case 437: ! #line 2395 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 438: ! #line 2397 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 439: ! #line 2399 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 441: ! #line 2405 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2410 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2415 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2420 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 445: ! #line 2422 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 446: ! #line 2424 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 448: ! #line 2430 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2435 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2440 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 451: ! #line 2442 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 453: ! #line 2448 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2453 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2458 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2463 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 457: ! #line 2465 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 458: ! #line 2467 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 460: ! #line 2473 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2478 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2483 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2488 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2493 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2495 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 466: ! #line 2497 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 467: ! #line 2499 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 468: ! #line 2501 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 469: ! #line 2503 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Invalid reference type"); RECOVER;; break;} case 471: ! #line 2509 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2514 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2519 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 474: ! #line 2521 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 476: ! #line 2527 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2532 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 479: ! #line 2538 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2543 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 482: ! #line 2549 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2554 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 485: ! #line 2560 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2565 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 488: ! #line 2571 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2576 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); RECOVER;; break;} case 491: ! #line 2582 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2587 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { YYERROR_NOW; yyerror ("Missing term"); *************** case 492: *** 5020,5038 **** ; break;} case 493: ! #line 2593 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); DRECOVER (2);; break;} case 494: ! #line 2595 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" {yyerror ("Missing term"); DRECOVER (3);; break;} case 497: ! #line 2605 "/home/mitchell/gcc-3.1/gcc-3.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 2607 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" { YYNOT_TWICE yyerror ("Missing term"); DRECOVER (assign); --- 5020,5038 ---- ; break;} case 493: ! #line 2593 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); DRECOVER (2);; break;} case 494: ! #line 2595 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" {yyerror ("Missing term"); DRECOVER (3);; break;} case 497: ! #line 2605 "/home/mitchell/gcc-3.1.1/gcc-3.1.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 2607 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" { YYNOT_TWICE yyerror ("Missing term"); DRECOVER (assign); *************** yyerrhandle: *** 5260,5266 **** } return 1; } ! #line 2632 "/home/mitchell/gcc-3.1/gcc-3.1/gcc/java/parse.y" /* Helper function to retrieve an OSB count. Should be used when the --- 5260,5266 ---- } return 1; } ! #line 2632 "/home/mitchell/gcc-3.1.1/gcc-3.1.1/gcc/java/parse.y" /* Helper function to retrieve an OSB count. Should be used when the *************** java_expand_classes () *** 11678,11687 **** for (cur_ctxp = ctxp_for_generation; cur_ctxp; cur_ctxp = cur_ctxp->next) { tree current; ctxp = cur_ctxp; ! for (current = ctxp->class_list; current; current = TREE_CHAIN (current)) { ! current_class = TREE_TYPE (current); outgoing_cpool = TYPE_CPOOL (current_class); if (flag_emit_class_files) write_classfile (current_class); --- 11678,11707 ---- for (cur_ctxp = ctxp_for_generation; cur_ctxp; cur_ctxp = cur_ctxp->next) { tree current; + tree reversed_class_list = NULL; + ctxp = cur_ctxp; ! ! /* We write out the classes in reverse order. This ensures that ! inner classes are written before their containing classes, ! which is important for parallel builds. Otherwise, the ! class file for the outer class may be found, but the class ! file for the inner class may not be present. In that ! situation, the compiler cannot fall back to the original ! source, having already read the outer class, so we must ! prevent that situation. */ ! for (current = ctxp->class_list; ! current; ! current = TREE_CHAIN (current)) ! reversed_class_list ! = tree_cons (NULL_TREE, current, reversed_class_list); ! ggc_add_tree_root (&reversed_class_list, 1); ! ! for (current = reversed_class_list; ! current; ! current = TREE_CHAIN (current)) { ! current_class = TREE_TYPE (TREE_VALUE (current)); outgoing_cpool = TYPE_CPOOL (current_class); if (flag_emit_class_files) write_classfile (current_class); *************** java_expand_classes () *** 11693,11698 **** --- 11713,11720 ---- finish_class (); } } + + ggc_del_root (&reversed_class_list); } } diff -Nrc3pad gcc-3.1/gcc/java/parse.y gcc-3.1.1/gcc/java/parse.y *** gcc-3.1/gcc/java/parse.y Thu Apr 25 01:08:29 2002 --- gcc-3.1.1/gcc/java/parse.y Tue Jun 4 16:45:55 2002 *************** java_expand_classes () *** 9046,9055 **** for (cur_ctxp = ctxp_for_generation; cur_ctxp; cur_ctxp = cur_ctxp->next) { tree current; ctxp = cur_ctxp; ! for (current = ctxp->class_list; current; current = TREE_CHAIN (current)) { ! current_class = TREE_TYPE (current); outgoing_cpool = TYPE_CPOOL (current_class); if (flag_emit_class_files) write_classfile (current_class); --- 9046,9075 ---- for (cur_ctxp = ctxp_for_generation; cur_ctxp; cur_ctxp = cur_ctxp->next) { tree current; + tree reversed_class_list = NULL; + ctxp = cur_ctxp; ! ! /* We write out the classes in reverse order. This ensures that ! inner classes are written before their containing classes, ! which is important for parallel builds. Otherwise, the ! class file for the outer class may be found, but the class ! file for the inner class may not be present. In that ! situation, the compiler cannot fall back to the original ! source, having already read the outer class, so we must ! prevent that situation. */ ! for (current = ctxp->class_list; ! current; ! current = TREE_CHAIN (current)) ! reversed_class_list ! = tree_cons (NULL_TREE, current, reversed_class_list); ! ggc_add_tree_root (&reversed_class_list, 1); ! ! for (current = reversed_class_list; ! current; ! current = TREE_CHAIN (current)) { ! current_class = TREE_TYPE (TREE_VALUE (current)); outgoing_cpool = TYPE_CPOOL (current_class); if (flag_emit_class_files) write_classfile (current_class); *************** java_expand_classes () *** 9061,9066 **** --- 9081,9088 ---- finish_class (); } } + + ggc_del_root (&reversed_class_list); } } diff -Nrc3pad gcc-3.1/gcc/java/rmic.1 gcc-3.1.1/gcc/java/rmic.1 *** gcc-3.1/gcc/java/rmic.1 Wed May 15 02:46:03 2002 --- gcc-3.1.1/gcc/java/rmic.1 Thu Jul 25 23:56:29 2002 *************** *** 1,5 **** .\" Automatically generated by Pod::Man version 1.15 ! .\" Wed May 15 02:46:03 2002 .\" .\" Standard preamble: .\" ====================================================================== --- 1,5 ---- .\" Automatically generated by Pod::Man version 1.15 ! .\" Thu Jul 25 23:56:29 2002 .\" .\" Standard preamble: .\" ====================================================================== *************** *** 138,144 **** .\" ====================================================================== .\" .IX Title "RMIC 1" ! .TH RMIC 1 "gcc-3.1" "2002-05-15" "GNU" .UC .SH "NAME" rmic \- Generate stubs for Remote Method Invocation --- 138,144 ---- .\" ====================================================================== .\" .IX Title "RMIC 1" ! .TH RMIC 1 "gcc-3.1.1" "2002-07-25" "GNU" .UC .SH "NAME" rmic \- Generate stubs for Remote Method Invocation diff -Nrc3pad gcc-3.1/gcc/java/rmiregistry.1 gcc-3.1.1/gcc/java/rmiregistry.1 *** gcc-3.1/gcc/java/rmiregistry.1 Wed May 15 02:46:03 2002 --- gcc-3.1.1/gcc/java/rmiregistry.1 Thu Jul 25 23:56:29 2002 *************** *** 1,5 **** .\" Automatically generated by Pod::Man version 1.15 ! .\" Wed May 15 02:46:03 2002 .\" .\" Standard preamble: .\" ====================================================================== --- 1,5 ---- .\" Automatically generated by Pod::Man version 1.15 ! .\" Thu Jul 25 23:56:29 2002 .\" .\" Standard preamble: .\" ====================================================================== *************** *** 138,144 **** .\" ====================================================================== .\" .IX Title "RMIREGISTRY 1" ! .TH RMIREGISTRY 1 "gcc-3.1" "2002-05-15" "GNU" .UC .SH "NAME" rmiregistry \- Remote object registry --- 138,144 ---- .\" ====================================================================== .\" .IX Title "RMIREGISTRY 1" ! .TH RMIREGISTRY 1 "gcc-3.1.1" "2002-07-25" "GNU" .UC .SH "NAME" rmiregistry \- Remote object registry diff -Nrc3pad gcc-3.1/libffi/ChangeLog gcc-3.1.1/libffi/ChangeLog *** gcc-3.1/libffi/ChangeLog Wed May 15 02:24:39 2002 --- gcc-3.1.1/libffi/ChangeLog Thu Jul 25 23:39:54 2002 *************** *** 1,3 **** --- 1,21 ---- + 2002-07-25 Release Manager + + * GCC 3.1.1 Released. + + 2002-05-28 Bo Thorsen + + * src/x86/ffi.c (ffi_prep_incoming_args_SYSV): Remove avn + here too. + + 2002-05-27 Roger Sayle + + * src/x86/ffi.c (ffi_prep_args): Remove reference to avn. + + 2002-05-27 Bo Thorsen + + * src/x86/ffi.c (ffi_prep_args): Remove unused variable and + fix formatting. + 2002-05-14 Release Manager * GCC 3.1 Released. diff -Nrc3pad gcc-3.1/libffi/src/x86/ffi.c gcc-3.1.1/libffi/src/x86/ffi.c *** gcc-3.1/libffi/src/x86/ffi.c Sun Oct 7 18:02:45 2001 --- gcc-3.1.1/libffi/src/x86/ffi.c Tue May 28 09:22:08 2002 *************** void ffi_prep_args(char *stack, extended *** 37,43 **** { register unsigned int i; register int tmp; - register unsigned int avn; register void **p_argv; register char *argp; register ffi_type **p_arg; --- 37,42 ---- *************** void ffi_prep_args(char *stack, extended *** 45,117 **** tmp = 0; argp = stack; ! if ( ecif->cif->rtype->type == FFI_TYPE_STRUCT ) { ! *(void **) argp = ecif->rvalue; ! argp += 4; ! } - avn = ecif->cif->nargs; p_argv = ecif->avalue; for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types; ! (i != 0) && (avn != 0); i--, p_arg++) { size_t z; /* Align if necessary */ ! if (((*p_arg)->alignment - 1) & (unsigned) argp) { argp = (char *) ALIGN(argp, (*p_arg)->alignment); - } ! if (avn != 0) { ! avn--; ! z = (*p_arg)->size; ! if (z < sizeof(int)) { ! z = sizeof(int); ! switch ((*p_arg)->type) ! { ! case FFI_TYPE_SINT8: ! *(signed int *) argp = (signed int)*(SINT8 *)(* p_argv); ! break; ! ! case FFI_TYPE_UINT8: ! *(unsigned int *) argp = (unsigned int)*(UINT8 *)(* p_argv); ! break; ! ! case FFI_TYPE_SINT16: ! *(signed int *) argp = (signed int)*(SINT16 *)(* p_argv); ! break; ! ! case FFI_TYPE_UINT16: ! *(unsigned int *) argp = (unsigned int)*(UINT16 *)(* p_argv); ! break; ! ! case FFI_TYPE_SINT32: ! *(signed int *) argp = (signed int)*(SINT32 *)(* p_argv); ! break; ! ! case FFI_TYPE_UINT32: ! *(unsigned int *) argp = (unsigned int)*(UINT32 *)(* p_argv); ! break; ! case FFI_TYPE_STRUCT: ! *(unsigned int *) argp = (unsigned int)*(UINT32 *)(* p_argv); ! break; ! default: ! FFI_ASSERT(0); ! } ! } ! else ! { ! memcpy(argp, *p_argv, z); } - p_argv++; - argp += z; } } return; --- 44,111 ---- tmp = 0; argp = stack; ! if (ecif->cif->rtype->type == FFI_TYPE_STRUCT) ! { ! *(void **) argp = ecif->rvalue; ! argp += 4; ! } p_argv = ecif->avalue; for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types; ! i != 0; i--, p_arg++) { size_t z; /* Align if necessary */ ! if (((*p_arg)->alignment - 1) & (unsigned) argp) argp = (char *) ALIGN(argp, (*p_arg)->alignment); ! z = (*p_arg)->size; ! if (z < sizeof(int)) { ! z = sizeof(int); ! switch ((*p_arg)->type) { ! case FFI_TYPE_SINT8: ! *(signed int *) argp = (signed int)*(SINT8 *)(* p_argv); ! break; ! case FFI_TYPE_UINT8: ! *(unsigned int *) argp = (unsigned int)*(UINT8 *)(* p_argv); ! break; ! case FFI_TYPE_SINT16: ! *(signed int *) argp = (signed int)*(SINT16 *)(* p_argv); ! break; ! ! case FFI_TYPE_UINT16: ! *(unsigned int *) argp = (unsigned int)*(UINT16 *)(* p_argv); ! break; ! ! case FFI_TYPE_SINT32: ! *(signed int *) argp = (signed int)*(SINT32 *)(* p_argv); ! break; ! ! case FFI_TYPE_UINT32: ! *(unsigned int *) argp = (unsigned int)*(UINT32 *)(* p_argv); ! break; ! ! case FFI_TYPE_STRUCT: ! *(unsigned int *) argp = (unsigned int)*(UINT32 *)(* p_argv); ! break; ! ! default: ! FFI_ASSERT(0); } } + else + { + memcpy(argp, *p_argv, z); + } + p_argv++; + argp += z; } return; *************** ffi_prep_incoming_args_SYSV(char *stack, *** 273,279 **** { register unsigned int i; register int tmp; - register unsigned int avn; register void **p_argv; register char *argp; register ffi_type **p_arg; --- 267,272 ---- *************** ffi_prep_incoming_args_SYSV(char *stack, *** 286,320 **** argp += 4; } - avn = cif->nargs; p_argv = avalue; ! for (i = cif->nargs, p_arg = cif->arg_types; ! (i != 0) && (avn != 0); ! i--, p_arg++) { size_t z; /* Align if necessary */ ! if (((*p_arg)->alignment - 1) & (unsigned) argp) { argp = (char *) ALIGN(argp, (*p_arg)->alignment); - } ! if (avn != 0) ! { ! avn--; ! z = (*p_arg)->size; ! /* because we're little endian, this is ! what it turns into. */ ! *p_argv = (void*) argp; ! p_argv++; ! argp += z; ! } } ! return; } --- 279,304 ---- argp += 4; } p_argv = avalue; ! for (i = cif->nargs, p_arg = cif->arg_types; i != 0; i--, p_arg++) { size_t z; /* Align if necessary */ ! if (((*p_arg)->alignment - 1) & (unsigned) argp) argp = (char *) ALIGN(argp, (*p_arg)->alignment); ! z = (*p_arg)->size; ! /* because we're little endian, this is what it turns into. */ ! *p_argv = (void*) argp; ! p_argv++; ! argp += z; } ! return; } diff -Nrc3pad gcc-3.1/libjava/ChangeLog gcc-3.1.1/libjava/ChangeLog *** gcc-3.1/libjava/ChangeLog Wed May 15 02:25:00 2002 --- gcc-3.1.1/libjava/ChangeLog Thu Jul 25 23:40:12 2002 *************** *** 1,3 **** --- 1,42 ---- + 2002-07-25 Release Manager + + * GCC 3.1.1 Released. + + 2002-07-12 Jesse Rosenstock + + For PR libgcj/7292: + * java/lang/Character.java (toString(char)): Now static. + + 2002-06-23 Tom Tromey + + * Makefile.in: Rebuilt. + * Makefile.am ($(srcdir)/java/lang/Object.h, + $(srcdir)/java/lang/Class.h): Added dummy targets. + + 2002-06-10 Bryce McKinlay + + * configure.host: Disable hash synchronization and slow_pthread_self + for cygwin. + + 2002-06-06 Adam Megacz + + * java/io/natFileDescriptorWin32.cc (open): Disable Win32 file + locking, just like the Sun JVM does. + + 2002-06-03 Mark Mitchell + + 2002-05-23 Bryce McKinlay + * Makefile.am (all-recursive): Depend on $all_java_class_files so that + they build first. + * Makefile.in: Rebuilt. + + 2002-05-08 Mark Mitchell + * Makefile.am (all_java_source_files): New variable. + (all_java_class_files): Likewise. + .java.class: New rule. + (CLEANFILES): Remove tmp-list. + * Makefile.in: Regenerated. + 2002-05-14 Release Manager * GCC 3.1 Released. diff -Nrc3pad gcc-3.1/libjava/Makefile.am gcc-3.1.1/libjava/Makefile.am *** gcc-3.1/libjava/Makefile.am Fri May 3 18:22:15 2002 --- gcc-3.1.1/libjava/Makefile.am Mon Jun 24 00:15:47 2002 *************** install-exec-hook: *** 163,207 **** $(LN_S) libgcjx.la gnu-awt-xlib.la; \ fi ! ## Make the .class files depend on the .zip file. This seems ! ## backwards, but is right. This doesn't catch all the .class files, ! ## but that is ok, because the ones it fails to pick up are defined in ! ## a .java file with some other class which is caught. Note that we ! ## only want to create headers for those files which do not have ! ## hand-maintained headers. ! $(built_java_source_files:.java=.class): libgcj-@gcc_version@.jar ! $(java_source_files:.java=.class): libgcj-@gcc_version@.jar ! ## The .class files for X will not be included in libgcj.jar, but the ! ## rule for libgcj.jar will cause all out-of-date .class files to be ! ## built. We need this to generate headers for the nat-files. ! $(x_java_source_files:.java=.class): libgcj-@gcc_version@.jar ! ## We have the zip file depend on the java sources and not the class ! ## files, because we don't know the names of all the class files. ! ## FIXME: this method fails in a peculiar case: if libgcj.jar is ! ## up-to-date, and foo.class is removed, and bar.java is touched, then ! ## `make libgcj.jar' will not rebuilt foo.class. That's because ! ## libgcj.jar is not out-of-date with respect to foo.java. ! libgcj-@gcc_version@.jar: $(built_java_source_files) $(java_source_files) $(x_java_source_files) ! ## Create a list of all Java sources, without exceeding any shell limits. ! @: $(shell echo Creating list of files to compile...) $(shell rm -f tmp-list || :) $(shell touch tmp-list) $(foreach source,$?,$(shell echo $(source) >> tmp-list)) ! @set fnord $(MAKEFLAGS); amf=$$2; fail=no; \ ! javac="$(JAVAC)"; \ ! cat tmp-list | (while read f; do \ ! echo $$javac $(JCFLAGS) -classpath \'\' -bootclasspath $(here):$(srcdir) -d $(here) $$f; \ ! $$javac $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) -d $(here) $$f \ ! || case "$$amf" in *=*) exit 1;; *k*) fail=yes ;; *) exit 1;; esac; \ ! done; \ ! test "$$fail" = no) ! -@rm -f tmp-list libgcj-@gcc_version@.jar ## Note that we explicitly want to include directory information. find java gnu javax org -type d -o -type f -name '*.class' | \ sed -e '/\/\./d' -e '/\/xlib/d' | \ $(ZIP) cfM0E@ $@ MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) $(x_javao_files) $(x_nat_files) $(x_nat_headers) ! CLEANFILES = tmp-list libgcj-@gcc_version@.jar clean-local: ## We just remove every .class file that was created. --- 163,188 ---- $(LN_S) libgcjx.la gnu-awt-xlib.la; \ fi ! all_java_source_files = \ ! $(java_source_files) \ ! $(built_java_source_files) \ ! $(x_java_source_files) ! all_java_class_files = $(all_java_source_files:.java=.class) ! .java.class: ! $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) \ ! -d $(here) $< ! ! libgcj-@gcc_version@.jar: $(all_java_class_files) ! -@rm -f libgcj-@gcc_version@.jar ## Note that we explicitly want to include directory information. find java gnu javax org -type d -o -type f -name '*.class' | \ sed -e '/\/\./d' -e '/\/xlib/d' | \ $(ZIP) cfM0E@ $@ MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) $(x_javao_files) $(x_nat_files) $(x_nat_headers) ! CLEANFILES = libgcj-@gcc_version@.jar clean-local: ## We just remove every .class file that was created. *************** java/io/ObjectOutputStream$$PutField.h: *** 341,347 **** ## Headers we maintain by hand and which we want to install. extra_headers = java/lang/Object.h java/lang/Class.h ! $(extra_headers): @: ## Install the headers. It is fairly ugly that we have to do this by --- 322,328 ---- ## Headers we maintain by hand and which we want to install. extra_headers = java/lang/Object.h java/lang/Class.h ! $(extra_headers) $(srcdir)/java/lang/Object.h $(srcdir)/java/lang/Class.h: @: ## Install the headers. It is fairly ugly that we have to do this by *************** texinfo: TexinfoDoclet.class *** 1910,1916 **** ## internally by libgcj. We can't make the .o files depend on nat_headers, ## because in that case we'll force a complete rebuild of ## the C++ code whenever any .java file is touched. ! all-recursive: $(nat_headers) $(x_nat_headers) ## ################################################################ --- 1891,1899 ---- ## internally by libgcj. We can't make the .o files depend on nat_headers, ## because in that case we'll force a complete rebuild of ## the C++ code whenever any .java file is touched. ! ## Also force all the class files to build first. This makes them build in ! ## the right order to improve performance. ! all-recursive: $(all_java_class_files) $(nat_headers) $(x_nat_headers) ## ################################################################ diff -Nrc3pad gcc-3.1/libjava/Makefile.in gcc-3.1.1/libjava/Makefile.in *** gcc-3.1/libjava/Makefile.in Wed May 15 02:40:18 2002 --- gcc-3.1.1/libjava/Makefile.in Thu Jul 25 23:50:38 2002 *************** *** 1,6 **** ! # Makefile.in generated automatically by automake 1.4 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. --- 1,6 ---- ! # Makefile.in generated automatically by automake 1.4-p5 from Makefile.am ! # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. *************** libgcjx_la_LDFLAGS = @X_PRE_LIBS@ @X_LIB *** 227,234 **** libgcjx_la_LINK = $(LIBLINK) MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) $(x_javao_files) $(x_nat_files) $(x_nat_headers) ! CLEANFILES = tmp-list libgcj-@gcc_version@.jar SUFFIXES = .class .java .h --- 227,242 ---- libgcjx_la_LINK = $(LIBLINK) + all_java_source_files = \ + $(java_source_files) \ + $(built_java_source_files) \ + $(x_java_source_files) + + + all_java_class_files = $(all_java_source_files:.java=.class) + MOSTLYCLEANFILES = $(javao_files) $(nat_files) $(nat_headers) $(c_files) $(x_javao_files) $(x_nat_files) $(x_nat_headers) ! CLEANFILES = libgcj-@gcc_version@.jar SUFFIXES = .class .java .h *************** LINK = $(LIBTOOL) --mode=link $(CCLD) $( *** 1724,1732 **** DATA = $(jar_DATA) $(toolexeclib_DATA) DIST_COMMON = README COPYING ChangeLog Makefile.am Makefile.in NEWS \ ! THANKS acconfig.h acinclude.m4 aclocal.m4 configure configure.in \ ! gcj/libgcj-config.h.in gcj/stamp-h2.in include/config.h.in \ ! include/stamp-h1.in libgcj-test.spec.in libgcj.spec.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) --- 1732,1739 ---- DATA = $(jar_DATA) $(toolexeclib_DATA) DIST_COMMON = README COPYING ChangeLog Makefile.am Makefile.in NEWS \ ! THANKS acinclude.m4 aclocal.m4 configure configure.in \ ! libgcj-test.spec.in libgcj.spec.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) *************** config.status: $(srcdir)/configure $(CON *** 2712,2764 **** $(SHELL) ./config.status --recheck $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) - - include/config.h: include/stamp-h1 - @if test ! -f $@; then \ - rm -f include/stamp-h1; \ - $(MAKE) include/stamp-h1; \ - else :; fi - include/stamp-h1: $(srcdir)/include/config.h.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=include/config.h \ - $(SHELL) ./config.status - @echo timestamp > include/stamp-h1 2> /dev/null - $(srcdir)/include/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/include/stamp-h1.in - @if test ! -f $@; then \ - rm -f $(srcdir)/include/stamp-h1.in; \ - $(MAKE) $(srcdir)/include/stamp-h1.in; \ - else :; fi - $(srcdir)/include/stamp-h1.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h - cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/include/stamp-h1.in 2> /dev/null - - gcj/libgcj-config.h: gcj/stamp-h2 - @if test ! -f $@; then \ - rm -f gcj/stamp-h2; \ - $(MAKE) gcj/stamp-h2; \ - else :; fi - gcj/stamp-h2: $(srcdir)/gcj/libgcj-config.h.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=gcj/libgcj-config.h \ - $(SHELL) ./config.status - @echo timestamp > gcj/stamp-h2 2> /dev/null - $(srcdir)/gcj/libgcj-config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/gcj/stamp-h2.in - @if test ! -f $@; then \ - rm -f $(srcdir)/gcj/stamp-h2.in; \ - $(MAKE) $(srcdir)/gcj/stamp-h2.in; \ - else :; fi - $(srcdir)/gcj/stamp-h2.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h - cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/gcj/stamp-h2.in 2> /dev/null - - mostlyclean-hdr: - - clean-hdr: - - distclean-hdr: - -rm -f include/config.h gcj/libgcj-config.h - - maintainer-clean-hdr: libgcj.spec: $(top_builddir)/config.status libgcj.spec.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status libgcj-test.spec: $(top_builddir)/config.status libgcj-test.spec.in --- 2719,2724 ---- *************** maintainer-clean-recursive: *** 2980,2986 **** dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ ! test "$$subdir" = "." && dot_seen=yes; \ done; \ test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ --- 2940,2946 ---- dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ ! test "$$subdir" != "." || dot_seen=yes; \ done; \ test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ *************** distclean-generic: *** 3193,3224 **** -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-hdr mostlyclean-toolexeclibLTLIBRARIES \ ! mostlyclean-compile mostlyclean-libtool \ ! mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \ ! mostlyclean-tags mostlyclean-depend mostlyclean-generic mostlyclean: mostlyclean-recursive ! clean-am: clean-hdr clean-toolexeclibLTLIBRARIES clean-compile \ ! clean-libtool clean-binPROGRAMS clean-noinstPROGRAMS \ ! clean-tags clean-depend clean-generic mostlyclean-am \ ! clean-local clean: clean-recursive ! distclean-am: distclean-hdr distclean-toolexeclibLTLIBRARIES \ ! distclean-compile distclean-libtool \ ! distclean-binPROGRAMS distclean-noinstPROGRAMS \ ! distclean-tags distclean-depend distclean-generic \ ! clean-am -rm -f libtool distclean: distclean-recursive -rm -f config.status ! maintainer-clean-am: maintainer-clean-hdr \ ! maintainer-clean-toolexeclibLTLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-binPROGRAMS \ maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ --- 3153,3181 ---- -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: ! mostlyclean-am: mostlyclean-toolexeclibLTLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-binPROGRAMS \ ! mostlyclean-noinstPROGRAMS mostlyclean-tags \ ! mostlyclean-depend mostlyclean-generic mostlyclean: mostlyclean-recursive ! clean-am: clean-toolexeclibLTLIBRARIES clean-compile clean-libtool \ ! clean-binPROGRAMS clean-noinstPROGRAMS clean-tags \ ! clean-depend clean-generic mostlyclean-am clean-local clean: clean-recursive ! distclean-am: distclean-toolexeclibLTLIBRARIES distclean-compile \ ! distclean-libtool distclean-binPROGRAMS \ ! distclean-noinstPROGRAMS distclean-tags \ ! distclean-depend distclean-generic clean-am -rm -f libtool distclean: distclean-recursive -rm -f config.status ! maintainer-clean-am: maintainer-clean-toolexeclibLTLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-binPROGRAMS \ maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ *************** maintainer-clean-am: maintainer-clean-h *** 3230,3238 **** maintainer-clean: maintainer-clean-recursive -rm -f config.status ! .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ ! mostlyclean-toolexeclibLTLIBRARIES distclean-toolexeclibLTLIBRARIES \ ! clean-toolexeclibLTLIBRARIES maintainer-clean-toolexeclibLTLIBRARIES \ uninstall-toolexeclibLTLIBRARIES install-toolexeclibLTLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ --- 3187,3195 ---- maintainer-clean: maintainer-clean-recursive -rm -f config.status ! .PHONY: mostlyclean-toolexeclibLTLIBRARIES \ ! distclean-toolexeclibLTLIBRARIES clean-toolexeclibLTLIBRARIES \ ! maintainer-clean-toolexeclibLTLIBRARIES \ uninstall-toolexeclibLTLIBRARIES install-toolexeclibLTLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ *************** install-exec-hook: *** 3265,3286 **** $(LN_S) libgcjx.la gnu-awt-xlib.la; \ fi ! $(built_java_source_files:.java=.class): libgcj-@gcc_version@.jar ! $(java_source_files:.java=.class): libgcj-@gcc_version@.jar ! ! $(x_java_source_files:.java=.class): libgcj-@gcc_version@.jar ! libgcj-@gcc_version@.jar: $(built_java_source_files) $(java_source_files) $(x_java_source_files) ! @: $(shell echo Creating list of files to compile...) $(shell rm -f tmp-list || :) $(shell touch tmp-list) $(foreach source,$?,$(shell echo $(source) >> tmp-list)) ! @set fnord $(MAKEFLAGS); amf=$$2; fail=no; \ ! javac="$(JAVAC)"; \ ! cat tmp-list | (while read f; do \ ! echo $$javac $(JCFLAGS) -classpath \'\' -bootclasspath $(here):$(srcdir) -d $(here) $$f; \ ! $$javac $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) -d $(here) $$f \ ! || case "$$amf" in *=*) exit 1;; *k*) fail=yes ;; *) exit 1;; esac; \ ! done; \ ! test "$$fail" = no) ! -@rm -f tmp-list libgcj-@gcc_version@.jar find java gnu javax org -type d -o -type f -name '*.class' | \ sed -e '/\/\./d' -e '/\/xlib/d' | \ $(ZIP) cfM0E@ $@ --- 3222,3233 ---- $(LN_S) libgcjx.la gnu-awt-xlib.la; \ fi ! .java.class: ! $(JAVAC) $(JCFLAGS) -classpath '' -bootclasspath $(here):$(srcdir) \ ! -d $(here) $< ! libgcj-@gcc_version@.jar: $(all_java_class_files) ! -@rm -f libgcj-@gcc_version@.jar find java gnu javax org -type d -o -type f -name '*.class' | \ sed -e '/\/\./d' -e '/\/xlib/d' | \ $(ZIP) cfM0E@ $@ *************** java/io/ObjectOutputStream$$PutField.h: *** 3391,3397 **** $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ 'java/io/ObjectOutputStream$$PutField' ! $(extra_headers): @: install-data-local: --- 3338,3344 ---- $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ 'java/io/ObjectOutputStream$$PutField' ! $(extra_headers) $(srcdir)/java/lang/Object.h $(srcdir)/java/lang/Class.h: @: install-data-local: *************** texinfo: TexinfoDoclet.class *** 3516,3522 **** -include deps.mk ! all-recursive: $(nat_headers) $(x_nat_headers) # Multilib support. .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \ --- 3463,3469 ---- -include deps.mk ! all-recursive: $(all_java_class_files) $(nat_headers) $(x_nat_headers) # Multilib support. .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \ diff -Nrc3pad gcc-3.1/libjava/configure.host gcc-3.1.1/libjava/configure.host *** gcc-3.1/libjava/configure.host Sun Apr 21 09:35:59 2002 --- gcc-3.1.1/libjava/configure.host Mon Jun 10 04:15:26 2002 *************** case "${host}" in *** 136,141 **** --- 136,147 ---- *-*-freebsd*) slow_pthread_self= ;; + *-cygwin*) + # The cygwin linker doesn't do 8-byte alignment by default, so + # disable hash synchronization for now. + enable_hash_synchronization_default=no + slow_pthread_self= + ;; esac libgcj_cflags="${libgcj_cflags} ${libgcj_flags}" diff -Nrc3pad gcc-3.1/libjava/java/io/natFileDescriptorWin32.cc gcc-3.1.1/libjava/java/io/natFileDescriptorWin32.cc *** gcc-3.1/libjava/java/io/natFileDescriptorWin32.cc Sun Mar 10 03:34:59 2002 --- gcc-3.1.1/libjava/java/io/natFileDescriptorWin32.cc Thu Jun 6 20:06:03 2002 *************** java::io::FileDescriptor::open (jstring *** 82,88 **** HANDLE handle = NULL; DWORD access = 0; - DWORD share = FILE_SHARE_READ; DWORD create = OPEN_EXISTING; char buf[MAX_PATH] = ""; --- 82,87 ---- *************** java::io::FileDescriptor::open (jstring *** 94,100 **** if ((jflags & READ) && (jflags & WRITE)) { access = GENERIC_READ | GENERIC_WRITE; - share = 0; if (jflags & APPEND) create = OPEN_ALWAYS; else --- 93,98 ---- *************** java::io::FileDescriptor::open (jstring *** 105,118 **** else { access = GENERIC_WRITE; - share = 0; if (jflags & APPEND) create = OPEN_ALWAYS; else create = CREATE_ALWAYS; } ! handle = CreateFile(buf, access, share, NULL, create, 0, NULL); if (handle == INVALID_HANDLE_VALUE) { --- 103,115 ---- else { access = GENERIC_WRITE; if (jflags & APPEND) create = OPEN_ALWAYS; else create = CREATE_ALWAYS; } ! handle = CreateFile(buf, access, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, create, 0, NULL); if (handle == INVALID_HANDLE_VALUE) { diff -Nrc3pad gcc-3.1/libjava/java/lang/Character.java gcc-3.1.1/libjava/java/lang/Character.java *** gcc-3.1/libjava/java/lang/Character.java Sun Apr 7 07:43:37 2002 --- gcc-3.1.1/libjava/java/lang/Character.java Fri Jul 12 21:13:22 2002 *************** public final class Character implements *** 1488,1494 **** * @return a String containing the character * @since 1.4 */ ! public String toString(char ch) { // This assumes that String.valueOf(char) can create a single-character // String more efficiently than through the public API. --- 1488,1494 ---- * @return a String containing the character * @since 1.4 */ ! public static String toString(char ch) { // This assumes that String.valueOf(char) can create a single-character // String more efficiently than through the public API. diff -Nrc3pad gcc-3.1/libjava/libltdl/ChangeLog gcc-3.1.1/libjava/libltdl/ChangeLog *** gcc-3.1/libjava/libltdl/ChangeLog Wed May 15 02:25:07 2002 --- gcc-3.1.1/libjava/libltdl/ChangeLog Thu Jul 25 23:40:15 2002 *************** *** 1,3 **** --- 1,7 ---- + 2002-07-25 Release Manager + + * GCC 3.1.1 Released. + 2002-05-14 Release Manager * GCC 3.1 Released. diff -Nrc3pad gcc-3.1/libjava/testsuite/ChangeLog gcc-3.1.1/libjava/testsuite/ChangeLog *** gcc-3.1/libjava/testsuite/ChangeLog Wed May 15 02:25:12 2002 --- gcc-3.1.1/libjava/testsuite/ChangeLog Thu Jul 25 23:40:17 2002 *************** *** 1,3 **** --- 1,11 ---- + 2002-07-25 Release Manager + + * GCC 3.1.1 Released. + + 2002-04-12 Anthony Green + + * lib/libjava.exp: Use libgcj-VERSION.jar, not libgcj-3.1.jar. + 2002-05-14 Release Manager * GCC 3.1 Released. diff -Nrc3pad gcc-3.1/libjava/testsuite/lib/libjava.exp gcc-3.1.1/libjava/testsuite/lib/libjava.exp *** gcc-3.1/libjava/testsuite/lib/libjava.exp Wed May 8 23:18:37 2002 --- gcc-3.1.1/libjava/testsuite/lib/libjava.exp Fri May 17 21:11:35 2002 *************** proc libjava_init { args } { *** 112,117 **** --- 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 *************** proc libjava_init { args } { *** 129,134 **** --- 130,140 ---- } } + # 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 # to libjava_arguments *************** proc libjava_arguments {{mode compile}} *** 265,270 **** --- 271,277 ---- global runtests global env global tool_root_dir + global gcc_version global libjava_libgcc_s_path if [info exists LIBJAVA] { *************** proc libjava_arguments {{mode compile}} *** 330,338 **** verbose "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)" # Set the CLASSPATH environment variable ! verbose "CLASSPATH is .:$srcdir/$subdir:$objdir:$objdir/../libgcj-3.1.jar" global env ! set env(CLASSPATH) ".:$srcdir/$subdir:$objdir:$objdir/../libgcj-3.1.jar" if {$mode == "link"} { global wrapper_file wrap_compile_flags; --- 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; diff -Nrc3pad gcc-3.1/zlib/ChangeLog gcc-3.1.1/zlib/ChangeLog *** gcc-3.1/zlib/ChangeLog Wed May 15 02:27:34 2002 --- gcc-3.1.1/zlib/ChangeLog Thu Jul 25 23:40:29 2002 *************** *** 1,3 **** --- 1,7 ---- + 2002-07-25 Release Manager + + * GCC 3.1.1 Released. + 2002-05-14 Release Manager * GCC 3.1 Released. *************** Changes in 1.0.6 (19 Jan 1998) *** 245,251 **** - 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.4 2002/05/15 02:27:34 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 --- 249,255 ---- - 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 2002/07/25 23:40:29 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