parse.y (catch_clause_parameter:): Still set `$$' to NULL_TREE in case of error.

Tue Nov 23 10:55:18 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* parse.y (catch_clause_parameter:): Still set `$$' to NULL_TREE
 	in case of error. Error message tuned.

This fixes a catch clause error handling reported on the java-discuss
mailing list:

  http://sourceware.cygnus.com/ml/java-discuss/1999-q4/msg00358.html

From-SVN: r30710

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 8d00853c537515a75ba4e2533ffddfde68a7fdb3..b77fcd5c201da696ef15811114402a175b56e99a 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,12 +1,12 @@
-Thu Nov  4 16:27:01 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
-
-       * parse.y (resolve_qualified_expression_name): Handle PLUS_EXPR.
-       (qualify_ambiguous_name): Likewise.
-       
 1999-11-24  Mark Mitchell  <mark@codesourcery.com>
 
        * except.c (emit_handlers): Zero catch_clauses after emitting them.
 
+Tue Nov 23 10:55:18 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+       * parse.y (catch_clause_parameter:): Still set `$$' to NULL_TREE
+       in case of error. Error message tuned.
+
 1999-11-21  Anthony Green  <green@cygnus.com>
 
        * constants.c (find_methodref_index): Unwrap method names before
@@ -49,6 +49,11 @@ Tue Nov  9 12:12:38 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
        * class.c (finish_class): Emit inlined methods if any native
        methods exist in the class.  Fixes PR gcj/85.
 
+Thu Nov  4 16:27:01 1999  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+       * parse.y (resolve_qualified_expression_name): Handle PLUS_EXPR.
+       (qualify_ambiguous_name): Likewise.
+       
 Wed Nov  3 15:20:02 MST 1999  Godmar Back <gback@cs.utah.edu>
 
        * typeck.c: (lookup_java_method):  search all inherited

diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index d1123cb54c84aeb31bb59c194b0758ce06e2e0db..cf5c8631ac6c4182ed1ef3369551e64d1938a0f6 100644 (file)
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -1732,11 +1732,14 @@ catch_clause_parameter:
                  EXPR_WFL_LINECOL ($$) = $1.location;
                }
 |      CATCH_TK error
-               {yyerror ("'(' expected"); RECOVER;}
+               {yyerror ("'(' expected"); RECOVER; $$ = NULL_TREE;}
 |      CATCH_TK OP_TK error 
-               {yyerror ("Missing term or ')' expected"); DRECOVER (2);}
+               {
+                 yyerror ("Missing term or ')' expected"); 
+                 RECOVER; $$ = NULL_TREE;
+               }
 |      CATCH_TK OP_TK error CP_TK /* That's for () */
-               {yyerror ("')' expected"); DRECOVER (1);}
+               {yyerror ("Missing term"); RECOVER; $$ = NULL_TREE;}
 ;
 
 finally: