gjavah.c: Delete ACC_VISIBILITY define.

Mon Jan 18 14:30:09 2000  Joerg Brunsmann  <joerg.brunsmann@fernuni-hagen.de>

	* gjavah.c: Delete ACC_VISIBILITY define.
	* jcf.h: Add ACC_VISIBILITY define.
	* parse.y: final: rule tagged <value>.
	(java_check_regular_methods): Use ACC_VISIBILITY define for
	default package access check.
	(local_variable_declaration_statement): Use final: rule.

From-SVN: r31992

gcc/java/ChangeLog

@@ -214,6 +214,15 @@
 	* zextract.c: Likewise.
 	* zipfile.h: Likewise.
 
+Mon Jan 18 14:30:09 2000  Joerg Brunsmann  <joerg.brunsmann@fernuni-hagen.de>
+
+	* gjavah.c: Delete ACC_VISIBILITY define.
+	* jcf.h: Add ACC_VISIBILITY define.
+	* parse.y: final: rule tagged <value>.
+	(java_check_regular_methods): Use ACC_VISIBILITY define for
+	default package access check.
+	(local_variable_declaration_statement): Use final: rule.
+
 Mon Jan 17 11:58:17 2000  Joerg Brunsmann  <joerg.brunsmann@fernuni-hagen.de>
 
 	* parse.y (format_parameter:): Use final: rule instead of modifiers:.

gcc/java/gjavah.c

@@ -89,8 +89,6 @@ struct JCF *current_jcf;
    If 0 then we haven't previously examined any field.  */
 static JCF_u2 last_access;
 
-#define ACC_VISIBILITY (ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED)
-
 /* Pass this macro the flags for a class and for a method.  It will
    return true if the method should be considered `final'.  */
 #define METHOD_IS_FINAL(Class, Method) \

gcc/java/jcf.h

@@ -206,6 +206,8 @@ typedef struct JCF {
 #define ACC_INTERFACE 0x0200
 #define ACC_ABSTRACT 0x0400
 
+#define ACC_VISIBILITY (ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED)
+
 #define CONSTANT_Class 7
 #define CONSTANT_Fieldref 9
 #define CONSTANT_Methodref 10

gcc/java/parse.y

@@ -414,7 +414,7 @@ static tree package_list = NULL_TREE;
 %token   STRING_LIT_TK   CHAR_LIT_TK        INT_LIT_TK        FP_LIT_TK
 %token   TRUE_TK         FALSE_TK           BOOL_LIT_TK       NULL_TK
 
-%type    <value>	modifiers MODIFIER_TK
+%type    <value>	modifiers MODIFIER_TK final
 
 %type    <node>		super ID_TK identifier
 %type    <node>		name simple_name qualified_name
@@ -1280,7 +1280,7 @@ local_variable_declaration_statement:
 local_variable_declaration:
 	type variable_declarators
 		{ declare_local_variables (0, $1, $2); }
-|	modifiers type variable_declarators /* Added, JDK1.1 final locals */
+|	final type variable_declarators /* Added, JDK1.1 final locals */
 		{ declare_local_variables ($1, $2, $3); }
 ;
 
@@ -4896,7 +4896,7 @@ java_check_regular_methods (class_decl)
 	 one that was found elsewhere. Do not issue this warning when
 	 the match was found in java.lang.Object.  */
       if (DECL_CONTEXT (found) != object_type_node
-	  && ((aflags & 0x7) == 0)
+	  && ((aflags & ACC_VISIBILITY) == 0)
 	  && !class_in_current_package (DECL_CONTEXT (found))
 	  && DECL_NAME (found) != clinit_identifier_node
 	  && flag_not_overriding)