Re: gcc/java/parse.y: duplicate %type

[Akim Demaille <akim at epita dot fr>]

Wihtout this patch, expect next Bison to reject GCJ's grammar.
Please, install.

| [The FSF has my papers, but I doubt it matters for such a simple
| patch.]
| 
| This patch is straightforward: it remove three duplicate %typings.
| The problem is that there appear to be *many* trailing spaces in the
| file, so I send my patch in two flavors: first the diff -w flavor:

Index: ChangeLog
from  Akim Demaille  <akim@epita.fr>

	* parse.y (interface_type_list, class_member_declaration)
	(unary_expression_not_plus_minus): Remove duplicate %type.
	Whitespace changes.

Index: parse.y
===================================================================
RCS file: /cvsroot/gcc/gcc/gcc/java/parse.y,v
retrieving revision 1.383
diff -u -u -w -r1.383 parse.y
--- parse.y 4 Jun 2002 20:32:02 -0000 1.383
+++ parse.y 10 Jun 2002 16:14:07 -0000
@@ -528,12 +528,11 @@
 %type	 <node>		type_declaration compilation_unit
 			field_declaration method_declaration extends_interfaces
                         interfaces interface_type_list
-                        class_member_declaration
                         import_declarations package_declaration 
                         type_declarations interface_body
 			interface_member_declaration constant_declaration
 			interface_member_declarations interface_type
-			abstract_method_declaration interface_type_list
+			abstract_method_declaration
 %type	 <node>		class_body_declaration class_member_declaration
 			static_initializer constructor_declaration block
 %type	 <node>		class_body_declarations constructor_header
@@ -562,7 +561,7 @@
 			post_increment_expression post_decrement_expression
 			unary_expression_not_plus_minus unary_expression
 			pre_increment_expression pre_decrement_expression
-			unary_expression_not_plus_minus cast_expression
+			cast_expression
 			multiplicative_expression additive_expression
 			shift_expression relational_expression 
 			equality_expression and_expression 

| then the native one, where Emacs has trimmed all the trailing spaces.
| It is *the same*, but for trailing spaces.

Attachment: duplicate-types.patch.gz
Description: Binary data