jcf-write.c (generate_classfile): Use FIELD_SYNTHETIC.

	* jcf-write.c (generate_classfile): Use FIELD_SYNTHETIC.
	* parse-scan.y (statement_without_trailing_substatement): Added
	assert_statement.
	(assert_statement): New rule.
	* java-tree.h (struct lang_type) [assertions]: New field.
	(TYPE_USES_ASSERTIONS): New macro.
	(CLASS_USES_ASSERTIONS): Likewise.
	(FIELD_SYNTHETIC): New define.
	* lex.c (java_lval;): Added ASSERT_TK.
	* parse.y (ASSERT_TK): Added.
	(statement_without_trailing_substatement): Added assert_statement.
	(assert_statement): New rule.
	(build_assertion): New function.
	(maybe_generate_pre_expand_clinit): Create and initialize
	$assertionsDisabled.
	(lookup_package_type): Removed decl.
	* keyword.h: Rebuilt.
	* keyword.gperf (assert): New token.

From-SVN: r54516

1 files changed, 66 insertions, 75 deletions

diff --git a/gcc/java/keyword.h b/gcc/java/keyword.h
index a2bc12d..24fcef5 100644
--- a/gcc/java/keyword.h
+++ b/gcc/java/keyword.h
@@ -1,5 +1,5 @@
-/* C code produced by gperf version 2.7.2 */
-/* Command-line: gperf -L C -C -F ', 0' -p -t -j1 -i 1 -g -o -N java_keyword -k'1,4,$' keyword.gperf  */
+/* C code produced by gperf version 2.7 */
+/* Command-line: gperf -L C -C -F , 0 -p -t -j1 -i 1 -g -o -N java_keyword -k1,4,$ keyword.gperf  */
 /* Keyword definition for the GNU compiler for the Java(TM) language.
    Copyright (C) 1997, 1998 Free Software Foundation, Inc.
    Contributed by Alexandre Petit-Bianco (apbianco@cygnus.com)
@@ -35,19 +35,15 @@ __inline
 #endif
 const struct java_keyword *java_keyword	PARAMS ((const char *, unsigned int));
 
-#define TOTAL_KEYWORDS 51
+#define TOTAL_KEYWORDS 52
 #define MIN_WORD_LENGTH 2
 #define MAX_WORD_LENGTH 12
 #define MIN_HASH_VALUE 7
-#define MAX_HASH_VALUE 95
-/* maximum key range = 89, duplicates = 0 */
+#define MAX_HASH_VALUE 85
+/* maximum key range = 79, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
-#else
-#ifdef __cplusplus
-inline
-#endif
 #endif
 static unsigned int
 hash (str, len)
@@ -56,32 +52,32 @@ hash (str, len)
 {
   static const unsigned char asso_values[] =
     {
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96,  9, 17,  3,
-       1,  1, 20, 13, 15, 29, 96, 21,  1, 96,
-      35, 39,  1, 96, 15,  6,  2,  1, 41, 17,
-      96,  7, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96, 96, 96, 96, 96,
-      96, 96, 96, 96, 96, 96
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86,  1, 34,  3,
+       1,  1, 18,  7, 21, 28, 86, 14,  1, 86,
+      18, 20, 37, 86, 15,  6,  2,  5, 40, 36,
+      86, 36, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+      86, 86, 86, 86, 86, 86
     };
   register int hval = len;
 
@@ -109,74 +105,69 @@ java_keyword (str, len)
 {
   static const struct java_keyword wordlist[] =
     {
-      {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
-      {"", 0},
+      {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
       {"else", ELSE_TK},
       {"true", TRUE_TK},
       {"case", CASE_TK},
+      {"assert", ASSERT_TK},
+      {"default", DEFAULT_TK},
       {"", 0},
-      {"public", PUBLIC_TK},
-      {"try", TRY_TK},
-      {"protected", PROTECTED_TK},
+      {"abstract", ABSTRACT_TK},
       {"continue", CONTINUE_TK},
       {"extends", EXTENDS_TK},
       {"const", CONST_TK},
       {"static", STATIC_TK},
       {"this", THIS_TK},
-      {"default", DEFAULT_TK},
+      {"long", LONG_TK},
       {"class", CLASS_TK},
-      {"abstract", ABSTRACT_TK},
+      {"", 0},
       {"synchronized", SYNCHRONIZED_TK},
-      {"byte", BYTE_TK},
-      {"while", WHILE_TK},
-      {"double", DOUBLE_TK},
-      {"catch", CATCH_TK},
+      {"do", DO_TK},
+      {"null", NULL_TK},
+      {"final", FINAL_TK},
+      {"float", FLOAT_TK},
       {"super", SUPER_TK},
       {"short", SHORT_TK},
-      {"switch", SWITCH_TK},
-      {"package", PACKAGE_TK},
-      {"long", LONG_TK},
-      {"false", FALSE_TK},
       {"", 0},
+      {"false", FALSE_TK},
+      {"transient", TRANSIENT_TK},
+      {"catch", CATCH_TK},
       {"int", INT_TK},
-      {"final", FINAL_TK},
-      {"float", FLOAT_TK},
-      {"char", CHAR_TK},
+      {"throws", THROWS_TK},
+      {"switch", SWITCH_TK},
       {"for", FOR_TK},
+      {"char", CHAR_TK},
       {"", 0},
       {"interface", INTERFACE_TK},
-      {"null", NULL_TK},
-      {"do", DO_TK},
-      {"finally", FINALLY_TK},
-      {"strictfp", STRICT_TK},
-      {"", 0},
+      {"byte", BYTE_TK},
+      {"try", TRY_TK},
+      {"double", DOUBLE_TK},
+      {"while", WHILE_TK},
+      {"return", RETURN_TK},
       {"implements", IMPLEMENTS_TK},
       {"void", VOID_TK},
-      {"transient", TRANSIENT_TK},
-      {"", 0},
-      {"private", PRIVATE_TK},
+      {"public", PUBLIC_TK},
       {"if", IF_TK},
+      {"protected", PROTECTED_TK},
+      {"volatile", VOLATILE_TK},
+      {"goto", GOTO_TK},
+      {"", 0},
+      {"native", NATIVE_TK},
       {"break", BREAK_TK},
-      {"throws", THROWS_TK},
       {"", 0},
+      {"import", IMPORT_TK},
       {"new", NEW_TK},
-      {"", 0},
-      {"return", RETURN_TK},
-      {"", 0},
-      {"volatile", VOLATILE_TK},
-      {"boolean", BOOLEAN_TK},
       {"instanceof", INSTANCEOF_TK},
+      {"package", PACKAGE_TK},
+      {"boolean", BOOLEAN_TK},
       {"", 0},
+      {"finally", FINALLY_TK},
       {"throw", THROW_TK},
+      {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
       {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
-      {"", 0},
-      {"native", NATIVE_TK},
-      {"", 0}, {"", 0}, {"", 0}, {"", 0},
-      {"import", IMPORT_TK},
-      {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
-      {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
-      {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
-      {"goto", GOTO_TK}
+      {"strictfp", STRICT_TK},
+      {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
+      {"private", PRIVATE_TK}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)