2006-01-24 Dirk Mueller <dmueller@suse.de>

[pf3gnuchains/gcc-fork.git] / gcc / java / java-except.h

diff --git a/gcc/java/java-except.h b/gcc/java/java-except.h
index 07b3feb..2555242 100644 (file)
--- a/gcc/java/java-except.h
+++ b/gcc/java/java-except.h
@@ -1,23 +1,24 @@
 /* Definitions for exception handling for use by the GNU compiler
    for the Java(TM) language compiler.
-   Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005
+   Free Software Foundation, Inc.
 
-This file is part of GNU CC.
+This file is part of GCC.
 
-GNU CC is free software; you can redistribute it and/or modify
+GCC is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-GNU CC is distributed in the hope that it will be useful,
+GCC is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  
+along with GCC; see the file COPYING.  If not, write to
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  
 
 Java and all Java-based marks are trademarks or registered trademarks
 of Sun Microsystems, Inc. in the United States and other countries.
@@ -34,7 +35,7 @@ struct eh_range
        and the TREE_VALUE is the LABEL_DECL of the handler. */
     tree handlers;
 
-    /* Surrunding handler, if any. */
+    /* Surrounding handler, if any. */
     struct eh_range *outer;
 
     /* The first child range.  It is is nested inside this range
@@ -47,6 +48,12 @@ struct eh_range
 
     /* The next child of outer, in address order. */
     struct eh_range *next_sibling;
+
+    /* True if this range has already been expanded. */
+    int expanded;
+
+    /* The TRY_CATCH_EXPR for this EH range.  */
+    tree stmt;
   };
 
 /* A dummy range that represents the entire method. */
@@ -54,18 +61,9 @@ extern struct eh_range whole_range;
 
 #define NULL_EH_RANGE (&whole_range)
 
-extern struct eh_range * find_handler PROTO ((int));
-
-extern void method_init_exceptions PROTO ((void));
-
-extern void emit_handlers PROTO ((void));
-
-extern void maybe_start_try PROTO ((int));
-
-extern void maybe_end_try PROTO ((int));
-
-extern void add_handler PROTO ((int, int, tree, tree));
-
-extern void handle_nested_ranges PROTO ((void));
-
-extern void expand_resume_after_catch PROTO ((void));
+extern struct eh_range * find_handler (int);
+extern void method_init_exceptions (void);
+extern void maybe_start_try (int, int);
+extern void add_handler (int, int, tree, tree);
+extern void expand_end_java_handler (struct eh_range *);
+extern bool sanity_check_exception_range (struct eh_range *);