Merged gcj-eclipse branch to trunk.

From-SVN: r120621

42 files changed, 2961 insertions, 33457 deletions

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index a8aea42..5776df2 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,246 @@
+2007-01-09  Andrew Haley  <aph@redhat.com>
+
+	* expr.c (build_java_arrayaccess): Rewrite to generate array
+	access in canonical form.
+	(expand_java_arraystore): Use build_fold_addr_expr() on address of
+	array access.
+
+2007-01-03  Andrew Haley  <aph@redhat.com>
+
+	PR java/28754
+	* expr.c (expand_java_field_op): If we're initializing a field's
+	declaring interface we should not also initialize the class
+	context in which it was referenced.
+
+2007-01-02  Tom Tromey  <tromey@redhat.com>
+
+	* java-tree.h (compiling_from_source, current_encoding,
+	JTI_FINIT_IDENTIFIER_NODE, JTI_INSTINIT_IDENTIFIER_NODE,
+	JTI_LENGTH_IDENTIFIER_NODE, JTI_SUPER_IDENTIFIER_NODE,
+	JTI_CONTINUE_IDENTIFIER_NODE, JTI_ACCESS0_IDENTIFIER_NODE,
+	JTI_WFL_OPERATOR): Removed
+	(finit_identifier_node, instinit_identifier_node,
+	length_identifier_node, super_identifier_node,
+	continue_identifier_node, access0_identifier_node, wfl_operator):
+	Removed.
+	(cyclic_inheritance_report,
+	DECL_FUNCTION_STATIC_METHOD_INVOCATION_COMPOUND,
+	DECL_FUNCTION_NAP, DECL_FUNCTION_SYNTHETIC_CTOR,
+	DECL_FIXED_CONSTRUCTOR_P): Removed.
+	(struct lang_decl_func) <smic, nap, synthetic_ctor, fixed_ctor>:
+	Removed.
+	(TYPE_FINIT_STMT_LIST, TYPE_CLINIT_STMT_LIST, TYPE_II_STMT_LIST,
+	TYPE_IMPORT_LIST, TYPE_IMPORT_DEMAND_LIST): Removed.
+	(struct lang_type) <finit_stmt_list, clinit_stmt_list, ii_block,
+	import_list, import_demand_list>: Removed.
+	(java_layout_seen_class_methods, init_jcf_parse, init_src_parse,
+	cxx_keyword_p): Removed.
+	(DECL_FINIT_P, DECL_INSTINIT_P, ID_FINIT_P, ID_INSTINIT_P,
+	TYPE_UNUSED, TYPE_UNDERFLOW, TYPE_UNEXPECTED,
+	CLASS_ACCESS0_GENERATED_P, CLASS_HAS_FINIT_P,
+	IS_A_SINGLE_IMPORT_CLASSFILE_NAME_P, IS_A_CLASSFILE_NAME,
+	IS_AN_IMPORT_ON_DEMAND_P, COMPOUND_ASSIGN_P, SWITCH_HAS_DEFAULT,
+	PRIMARY_P, MODIFY_EXPR_FROM_INITIALIZATION_P,
+	CLASS_METHOD_CHECKED_P, FOR_LOOP_P, ANONYMOUS_CLASS_P,
+	LOCAL_CLASS_P, ARG_FINAL_P, SUPPRESS_UNREACHABLE_ERROR,
+	RESOLVE_PACKAGE_NAME_P, RESOLVE_TYPE_NAME_P, IS_BREAK_STMT_P,
+	IS_CRAFTED_STRING_BUFFER_P, IS_INIT_CHECKED, CALL_USING_SUPER,
+	NESTED_FIELD_ACCESS_IDENTIFIER_P, TOPLEVEL_CLASS_DECL_P,
+	PURE_INNER_CLASS_TYPE_P, TOPLEVEL_CLASS_TYPE_P,
+	CALL_CONSTRUCTOR_P, CALL_EXPLICIT_CONSTRUCTOR_P,
+	CALL_THIS_CONSTRUCTOR_P, CALL_SUPER_CONSTRUCTOR_P,
+	FINALLY_EXPR_LABEL, FINALLY_EXPR_BLOCK, BLOCK_IS_IMPLICIT,
+	BLOCK_EMPTY_P, IS_UNCHECKED_EXCEPTION_P, java_error_count,
+	java_parse_abort_on_error, extract_field_decl): Removed.
+	(finput): Declare.
+	* lang.c: (compiling_from_source, current_encoding): Removed.
+	(java_handle_option): Ignore -fencoding.
+	* parse.h: Don't include lex.h.
+	(java_error_count, int_fits_type_p, stabilize_reference, RULE,
+	RECOVERED, DRECOVERED, RECOVER, DRECOVER, YYERROR_NOW,
+	YYNOT_TWICE, CLASS_MODIFIERS, FIELD_MODIFIERS, METHOD_MODIFIERS,
+	INTERFACE_MODIFIERS, INTERFACE_INNER_MODIFIERS,
+	INTERFACE_METHOD_MODIFIERS, INTERFACE_FIELD_MODIFIERS,
+	MODIFIER_WFL, THIS_MODIFIER_ONLY, parse_error_context,
+	ABSTRACT_CHECK, JCONSTRUCTOR_CHECK, exit_java_complete_class,
+	CLASS_OR_INTERFACE, GET_REAL_TYPE, GET_TYPE_NAME,
+	OBSOLETE_MODIFIER_WARNING, OBSOLETE_MODIFIER_WARNING2,
+	BUILD_PTR_FROM_NAME, INCOMPLETE_TYPE_P,
+	JAVA_MAYBE_GENERATE_DEBUG_INFO, JBSC_TYPE_P, JSTRING_P,
+	JNULLP_TYPE_P, JDECL_P, TYPE_INTERFACE_P, TYPE_CLASS_P,
+	IDENTIFIER_INNER_CLASS_OUTER_FIELD_ACCESS,
+	MANGLE_OUTER_LOCAL_VARIABLE_NAME,
+	MANGLE_ALIAS_INITIALIZER_PARAMETER_NAME_ID,
+	MANGLE_ALIAS_INITIALIZER_PARAMETER_NAME_STRING,
+	SKIP_THIS_AND_ARTIFICIAL_PARMS, MARK_FINAL_PARMS,
+	UNMARK_FINAL_PARMS, CRAFTED_PARAM_LIST_FIXUP,
+	AIPL_FUNCTION_CREATION, AIPL_FUNCTION_DECLARATION,
+	AIPL_FUNCTION_CTOR_INVOCATION, AIPL_FUNCTION_FINIT_INVOCATION,
+	ERROR_CANT_CONVERT_TO_BOOLEAN, ERROR_CANT_CONVERT_TO_NUMERIC,
+	ERROR_CAST_NEEDED_TO_INTEGRAL, ERROR_VARIABLE_NOT_INITIALIZED,
+	LOOP_EXPR_BODY_MAIN_BLOCK, LOOP_EXPR_BODY_UPDATE_BLOCK,
+	LOOP_EXPR_BODY_CONDITION_EXPR, LOOP_EXPR_BODY_LABELED_BODY,
+	LOOP_EXPR_BODY_BODY_EXPR, PUSH_LABELED_BLOCK, POP_LABELED_BLOCK,
+	PUSH_LOOP, POP_LOOP, PUSH_EXCEPTIONS, POP_EXCEPTIONS,
+	IN_TRY_BLOCK_P, EXCEPTIONS_P, ANONYMOUS_ARRAY_BASE_TYPE,
+	ANONYMOUS_ARRAY_DIMS_SIG, ANONYMOUS_ARRAY_INITIALIZER,
+	INVOKE_STATIC, INVOKE_NONVIRTUAL, INVOKE_SUPER, INVOKE_INTERFACE,
+	INVOKE_VIRTUAL, jdep_code, struct _jdep, JDEP_DECL, JDEP_DECL_WFL,
+	JDEP_KIND, JDEP_WFL, JDEP_MISC, JDEP_ENCLOSING, JDEP_CLASS,
+	JDEP_APPLY_PATCH, JDEP_GET_PATCH, JDEP_CHAIN, JDEP_TO_RESOLVE,
+	JDEP_RESOLVED_DECL, JDEP_RESOLVED, JDEP_RESOLVED_P, struct
+	jdeplist_s, jdeplists, CLASSD_FIRST, CLASSD_LAST, CLASSD_CHAIN,
+	JDEP_INSERT, SET_TYPE_FOR_RESOLUTION, WFL_STRIP_BRACKET,
+	STRING_STRIP_BRACKETS, PROMOTE_RECORD_IF_COMPLETE,
+	BLOCK_CHAIN_DECL, GET_CURRENT_BLOCK, EXPR_WFL_GET_LINECOL,
+	EXPR_WFL_QUALIFICATION, QUAL_WFL, QUAL_RESOLUTION, QUAL_DECL_TYPE,
+	GET_SKIP_TYPE, COMPLETE_CHECK_OP, COMPLETE_CHECK_OP_0,
+	COMPLETE_CHECK_OP_1, COMPLETE_CHECK_OP_2, BUILD_APPEND,
+	BUILD_STRING_BUFFER, BUILD_THROW, SET_WFL_OPERATOR,
+	PATCH_METHOD_RETURN_ERROR, CHECK_METHODS, CLEAR_DEPRECATED,
+	CHECK_DEPRECATED_NO_RESET, CHECK_DEPRECATED, REGISTER_IMPORT,
+	CURRENT_OSB, struct parser_ctxt, GET_CPC_LIST, CPC_INNER_P,
+	GET_CPC, GET_CPC_UN, GET_CPC_UN_MODE, GET_CPC_DECL_NODE,
+	GET_ENCLOSING_CPC, GET_NEXT_ENCLOSING_CPC,
+	GET_ENCLOSING_CPC_CONTEXT, INNER_ENCLOSING_SCOPE_CHECK, PUSH_CPC,
+	PUSH_ERROR, POP_CPC, DEBUG_CPC, CPC_INITIALIZER_LIST,
+	CPC_STATIC_INITIALIZER_LIST, CPC_INSTANCE_INITIALIZER_LIST,
+	CPC_INITIALIZER_STMT, CPC_STATIC_INITIALIZER_STMT,
+	CPC_INSTANCE_INITIALIZER_STMT, SET_CPC_INITIALIZER_STMT,
+	SET_CPC_STATIC_INITIALIZER_STMT,
+	SET_CPC_INSTANCE_INITIALIZER_STMT, JAVA_NOT_RADIX10_FLAG,
+	java_complete_class, java_check_circular_reference,
+	java_fix_constructors, java_layout_classes, java_reorder_fields,
+	java_method_add_stmt, java_get_line_col, reset_report,
+	java_init_lex, yyparse, java_parse, yyerror, java_expand_classes,
+	java_finish_classes, ctxp, ctxp_for_generation,
+	ctxp_for_generation_last): Removed.
+	* expr.c (force_evaluation_order): Don't mention NEW_CLASS_EXPR.
+	* mangle.c (utf8_cmp): New function.
+	(cxx_keywords): New global.
+	(cxx_keyword_p): New function.
+	* jvspec.c (JAVA_START_CHAR): Removed obsolete comment.
+	* java-tree.def (UNARY_PLUS_EXPR, NEW_ARRAY_EXPR,
+	NEW_ANONYMOUS_ARRAY_EXPR, NEW_CLASS_EXPR, THIS_EXPR,
+	CASE_EXPR, DEFAULT_EXPR, JAVA_CATCH_EXPR, SYNCHRONIZED_EXPR,
+	THROW_EXPR, CONDITIONAL_EXPR, INSTANCEOF_EXPR, NEW_ARRAY_INIT,
+	CLASS_LITERAL, JAVA_EXC_OBJ_EXPR): Removed.
+	* Make-lang.in (java.srcextra): Do nothing.
+	(parse.c, keyword.h, gt-java-parse.h): Removed targets.
+	(JAVA_OBJS): Don't mention deleted files.
+	(java.mostlyclean): Likewise.
+	(java.clean): Likewise.
+	(JAVA_LEX_C): Removed.
+	(buffer.o, check-init.o, parse.o): Remove unused targets.
+	(typeck.o): Updated.
+	* jcf-parse.c (read_class): Comment out unused code.
+	(java_layout_seen_class_methods): New function.
+	(parse_source_file_1, parse_source_file_2, parse_source_file_3):
+	Removed.
+	(java_parse_file): Comment out unused code.  Don't use 'ctxp'.
+	(init_jcf_parse): Removed.
+	* config-lang.in (gtfiles): Remove deleted files.
+	* decl.c (java_init_decl_processing): Don't initialize
+	finit_identifier_node, instinit_identifier_node,
+	length_identifier_node, super_identifier_node,
+	continue_identifier_node, access0_identifier_node.  Don't call
+	init_jcf_parse.
+	* class.c (cyclic_inheritance_report): New global.
+	(add_method_1): Don't use
+	DECL_FUNCTION_STATIC_METHOD_INVOCATION_COMPOUND.
+	(maybe_layout_super_class): Comment out code.
+	(safe_layout_class): New function.
+	* java-gimplify.c (java_gimplify_expr): Removed CASE_EXPR,
+	DEFAULT_EXPR, NEW_ARRAY_INIT, JAVA_CATCH_EXPR, JAVA_EXC_OBJ_EXPR,
+	UNARY_PLUS_EXPR, NEW_ARRAY_EXPR, NEW_ANONYMOUS_ARRAY_EXPR,
+	NEW_CLASS_EXPR, SYNCHRONIZED_EXPR, CONDITIONAL_EXPR,
+	INSTANCEOF_EXPR, CLASS_LITERAL, THIS_EXPR.
+	(java_gimplify_case_expr): Removed.
+	(java_gimplify_default_expr): Likewise.
+	(java_gimplify_new_array_init): Likewise.
+	* parse.y: Removed.
+	* keyword.gperf, keyword.h: Removed.
+	* chartables.h: Removed.
+	* check-init.c: Removed.
+	* buffer.c, buffer.h: Removed.
+	* convert.h: Removed.
+	* gen-table.pl: Removed.
+	* lex.c, lex.h: Removed.
+
+2007-01-02  Andrew Haley  <aph@redhat.com>
+
+	* expr.c (expand_java_arraystore): Make sure we perform a bounds
+	check at runtime before we perform a type check.
+
+2006-12-19  Andrew Haley  <aph@redhat.com>
+
+	* decl.c: Bump minor BC ABI version.
+
+2006-12-13  Gary Benson  <gbenson@redhat.com>
+
+	* jcf-depend.c (jcf_dependency_add_file): Mark filename unused.
+
+2006-12-12  Tom Tromey  <tromey@redhat.com>
+
+	* lang-specs.h: Pass -M options to jc1.
+	* jcf-depend.c (jcf_dependency_add_file): Don't emit
+	dependencies.
+
+2006-12-07  Mohan Embar  <gnustuff@thisiscool.com>
+
+	* jcf-path.c (jcf_path_compute): Use platform PATH_SEPARATOR.
+
+2006-12-06  Mohan Embar  <gnustuff@thisiscool.com>
+
+	* lang-specs.h: Pass '%U'-based options as separate arguments.
+
+2006-12-05  Tom Tromey  <tromey@redhat.com>
+
+	PR java/29495:
+	* jcf-parse.c (HANDLE_SYNTHETIC_ATTRIBUTE): Mark fields and
+	classes as well.
+	* class.c (add_field): Handle ACC_SYNTHETIC.
+	(add_method_1): Likewise.  Handle bridge and varargs.
+	(get_access_flags_from_decl): Handle synthetic, bridge, varargs,
+	annotation.
+	(set_class_decl_access_flags): Handle synthetic and annotation.
+	* java-tree.h (METHOD_BRIDGE): New macro.
+	(METHOD_VARARGS): Likewise.
+	(TYPE_SYNTHETIC): Likewise.
+	(TYPE_ANNOTATION): Likewise.
+	(lang_type): New fields 'synthetic' and 'annotation'.
+	(lang_decl_func): New fields 'varargs' and 'bridge'.
+
+2006-12-04  Andrew Haley  <aph@redhat.com>
+
+	* jcf-parse.c (rewrite_reflection_indexes): Don't do anything if
+	there's no map.
+
+2006-11-29  Gary Benson  <gbenson@redhat.com>
+
+	* expr.c (rewrite_arglist_getcaller): Reorder.
+
+2006-11-29  Andrew Haley  <aph@redhat.com>
+
+	* expr.c (rewrite_arglist_getcaller): Remove DECL_INLINE.
+	* lang.c (java_decl_ok_for_sibcall): Check for DECL_INLINE.
+
+2006-11-23  Andrew Haley  <aph@redhat.com>
+
+	* expr.c (rewrite_arglist_getcaller): New.
+	(rewrite_arglist_getclass): Fix indentation.
+	(rules): Add gnu.classpath.VMStackWalker.getCallingClass() and 
+	gnu.classpath.VMStackWalker.getCallingClassLoader().
+	* builtins.c (initialize_builtins): Remove duplicate def'n of
+	__sync_synchronize.
+	Add __builtin_return_address.
+
+2006-11-22  Andrew Haley  <aph@redhat.com>
+
+	* jcf-reader.c (get_attribute): Mark attr_type unused.
+
+	* builtins.c (compareAndSwapObject_builtin): Fix declaration.
+
 2007-01-08  Richard Guenther  <rguenther@suse.de>
 
 	* lex.c (do_java_lex): Use build_int_cst_wide_type.
@@ -18,6 +261,346 @@
 	* check-init.c (check_init): Remove handling of FIX_CEIL_EXPR,
 	FIX_FLOOR_EXPR and FIX_ROUND_EXPR.
 
+2006-11-06  Andrew Haley  <aph@redhat.com>
+
+	* java-tree.h (CONSTANT_LazyFlag): New.
+	* constants.c (build_constants_constructor): Mask CONSTANT_LazyFlag.
+	* jcf-parse.c (handle_innerclass_attribute): Write attribute to
+	reflection_data.
+	(handle_constant): Return 0 for dummy cpool entries.
+	Handle constants of kind Class.
+	Handle constants of kind NameAndType.
+	(handle_enclosingmethod_attribute): New.
+	(handle_signature_attribute): New.
+	(HANDLE_ENCLOSINGMETHOD_ATTRIBUTE): New.
+	(HANDLE_SIGNATURE_ATTRIBUTE): New.
+	(handle_constant): Use unmangle_classname()rather than calling
+	identifier_subst() directly.
+
+2006-11-02  Andrew Haley  <aph@redhat.com>
+
+	* java-tree.h (FIELD_ENUM): New.
+	(lang_decl_var.field_enum): New.
+	(lang_type.enum_class): New.
+	(CLASS_ENUM): New.
+	* class.c (set_class_decl_access_flags): Handle enum types.
+	(add_field): Handle enum fields.
+	(get_access_flags_from_decl): Likewise.
+
+	* class.c (make_class_data): Put reflection_data into rodata.
+
+2006-11-01  Andrew Haley  <aph@redhat.com>
+
+	* jcf-parse.c (field_offsets, bit_obstack): New variables.
+	(jcf_parse): Write end marker to annotation_data.
+	(java_parse_file): Create field_offsets bitmap.  Destroy it.
+	(annotation_grow, annotation_rewrite_byte) 
+	(annotation_rewrite_short, annotation_rewrite_int) 
+	(annotation_read_short, annotation_write_byte) 
+	(annotation_write_short, annotation_write_int) 
+	(handle_long_constant, handle_constant, handle_element_value) 
+	(handle_annotation, handle_annotations) 
+	(handle_annotation_attribute, rewrite_reflection_indexes) 
+	(handle_member_annotations, handle_parameter_annotations) 
+	(handle_default_annotation): New functions.
+	(HANDLE_RUNTIMEVISIBLEANNOTATIONS_ATTRIBUTE) 
+	(HANDLE_RUNTIMEINVISIBLEANNOTATIONS_ATTRIBUTE) 
+	(HANDLE_RUNTIMEVISIBLEPARAMETERANNOTATIONS_ATTRIBUTE) 
+	(HANDLE_RUNTIMEINVISIBLEPARAMETERANNOTATIONS_ATTRIBUTE) 
+	(HANDLE_ANNOTATIONDEFAULT_ATTRIBUTE): New definitions.
+	* java-tree.h (enum jv_attr_type, enum jv_attr_kind): New. 
+	(TYPE_REFLECTION_DATA): New.
+	(TYPE_REFLECTION_DATASIZE): New.
+	* jcf.h (enum cpool_tag): Convert a bunch of #define constants to
+	an enum.
+	* jcf-reader.c (get_attribute): Pass field/method index and
+	attribute type to get_attribute().
+	* constants.c (find_class_or_string_constant): Make nonstatic.
+	(cpool_for_class): Likewise.
+	(build_constants_constructor): Separate string and scalar types.
+	* class.c (make_class_data): Generate field_indexes permutation.
+	Pass it to rewrite_reflection_indexes().
+	(make_class_data): Generate constructor for reflection_data field.
+
+2006-10-20  Tom Tromey  <tromey@redhat.com>
+
+	* gcj.texi (Top): Don't mention jv-scan.
+	(Invoking gcj): Likewise.
+	(Invoking gcjh): Likewise.
+	(Invoking gjnih): Likewise.
+	(Invoking gij): Likewise.
+	(Invoking gcj-dbtool): Likewise.
+	(Invoking jv-scan): Removed.
+	* parse-scan.y: Removed.
+	* jv-scan.c: Removed.
+	* config-lang.in (stagestuff): Don't mention jv-scan.
+	* Make-lang.in (java): Removed jv-scan.
+	(JAVA_TARGET_INDEPENDENT_BIN_TOOLS): Likewise.
+	(JVSCAN_OBJS): Removed.
+	(jv-scan$(exeext)): Likewise.
+	(JAVA_MANFILES): Removed jv-scan.1.
+	(java.uninstall): Don't mention jv-scan.
+	(java.mostlyclean): Likewise.
+	(java.maintainer-clean): Likewise.
+	(.INTERMEDIATE): Likewise.
+	(java/jv-scan.o): Removed.
+	(jv-scan.pod): Likewise.
+	(java.srcextra): Don't mention parse-scan.c.
+	(java.mostlyclean): Likewise.
+	(java/parse-scan.c): Removed.
+	(java/parse-scan.o-warn): Removed.
+	(java/parse-scan.o): Removed.
+
+2006-10-20  Tom Tromey  <tromey@redhat.com>
+
+	* lang.c (java_handle_option): Don't use
+	jcf_write_base_directory.
+	* jcf.h (jcf_write_base_directory): Removed.
+	* parse.y (java_expand_classes): Don't call write_classfile.
+	* config-lang.in (gtfiles): Removed jcf-write.c.
+	* Make-lang.in (JAVA_OBJS): Removed jcf-write.o.
+	(java/jcf-write.o): Removed.
+	* jcf-parse.c (parse_class_file): Don't call write_classfile.
+	* java-tree.h (write_classfile): Removed declaration.
+	* jcf-write.c: Removed.
+
+2006-10-20  Tom Tromey  <tromey@redhat.com>
+
+	* Make-lang.in (java): Removed gjnih, gcjh.
+	(JAVA_TARGET_INDEPENDENT_BIN_TOOLS): Likewise.
+	(GCJH_OBJS): Removed.
+	(GJNIH_OBJS): Likewise.
+	(gjnih$(exeext)): Likewise.
+	(gcjh$(exeext)): Likewise.
+	(JAVA_MANFILES): Removed gcjh.1, gjnih.1.
+	(java.install-common): Don't special case gcjh.
+	(java.uninstall): Don't mention gcjh, gjnih.
+	(java.mostlyclean): Likewise.
+	(java.maintainer-clean): Likewise.
+	(.INTERMEDIATE): Likewise.
+	(gcjh.pod): Removed.
+	(gjnih.pod): Likewise.
+	(GCJH_TARGET_INSTALL_NAME): Removed.
+	(java/gjavah-jni.o): Removed.
+	(java/gjavah.o): Likewise.
+	* config-lang.in (stagestuff): Removed gjnih, gcjh.
+	* gjavah.c: Removed.
+
+2006-10-17  Tom Tromey  <tromey@redhat.com>
+
+	* jcf-dump.c (print_element_value): Expect a utf8 constant in the
+	"string" case.
+
+2006-10-17  Tom Tromey  <tromey@redhat.com>
+
+	* jvgenmain.c (main): Handle -findirect-dispatch.
+	* jvspec.c (jvgenmain_spec): Pass -findirect-dispatch to
+	jvgenmain.
+
+2006-10-06  Andrew Haley  <aph@redhat.com>
+
+	* builtins.c (compareAndSwapInt_builtin): Check that we really do
+	have a compare_and_swap builtin.
+	(compareAndSwapLong_builtin): Likewise.
+	(compareAndSwapObject_builtin): Likewise.
+
+2006-10-04  Andrew Haley  <aph@redhat.com>
+
+	* builtins.c (java_builtins): Add compareAndSwapInt,
+	compareAndSwapLong, compareAndSwapObject, putOrderedInt,
+	putOrderedLong, putOrderedObject, putIntVolatile, putLongVolatile,
+	putObjectVolatile, getObjectVolatile, getIntVolatile,
+	getLongVolatile, getLong.
+	(UNMARSHAL3): New macro.
+	(UNMARSHAL4): Likewise.
+	(UNMARSHAL5): Likewise.
+	(build_arglist_for_builtin): New function.
+	(build_addr_sum, build_check_this): New functions.
+	(putObject_builtin. compareAndSwapInt_builtin,
+	compareAndSwapLong_builtin, compareAndSwapObject_builtin,
+	putVolatile_builtin, getVolatile_builtin): New builtins.
+
+2006-06-08  Andrew Haley  <aph@redhat.com>
+ 
+	* expr.c (build_field_ref): Pass NULL_TREE as SPECIAL arg to
+	get_symbol_table_index().
+	(maybe_rewrite_invocation): Set SPECIAL if we need to access a
+	private method.
+	(build_known_method_ref): New arg: special.  Pass it to
+	get_symbol_table_index.
+	(get_symbol_table_index): Put SPECIAL in the TREE_PURPOSE field of
+	the method list.
+	(build_invokevirtual): New arg: special.  Pass it to
+	get_symbol_table_index.
+	(expand_invoke): New variable: special.
+	Pass it to maybe_rewrite_invocation().
+	Pass it to build_known_method_ref().
+	* class.c (build_symbol_entry): Add new arg: special.  Use it to
+	build the symbol table conbstructor.
+	(emit_symbol_table): Extract SPECIAL from the method list and pass
+	it to build_symbol_entry().
+	* parse.y (patch_invoke): Call maybe_rewrite_invocation() and set
+	special accordingly.
+ 
+2006-09-08  Andrew Haley  <aph@redhat.com>
+
+	* class.c (layout_class_method): Use build_java_signature, not
+	build_java_argument_signature.  Use lookup_java_method, not
+	lookup_argument_method.
+
+2006-08-16  Jakub Jelinek  <jakub@redhat.com>
+	    Bryce McKinlay  <bryce@mckinlay.net.nz>
+
+	* jvspec.c (lang_specific_driver): Add -s-bc-abi when needed.
+
+2006-07-18  Tom Tromey  <tromey@redhat.com>
+
+	* lang.opt: Added missing -W options.
+
+2006-07-12  Tom Tromey  <tromey@redhat.com>
+
+	PR java/28329:
+	* lang-specs.h: Pass '%U'-based options as separate arguments.
+	Use -faux-classpath.
+	* lang.c (java_handle_option): Handle OPT_faux_classpath.
+	* lang.opt (faux-classpath): New option.
+
+2006-07-07  Tom Tromey  <tromey@redhat.com>
+
+	* class.c (make_class_data): Set value for reflection_data field.
+	* decl.c (java_init_decl_processing): Add reflection_data field.
+
+2006-07-07  Tom Tromey  <tromey@redhat.com>
+
+	* jcf-dump.c (HANDLE_ENCLOSINGMETHOD_ATTRIBUTE): Declare locals
+	earlier.
+	(HANDLE_SIGNATURE_ATTRIBUTE): Likewise.
+
+2006-07-07  Andrew Haley  <aph@redhat.com>
+
+        * jcf-parse.c (set_source_filename): Don't check for
+	CLASS_FROM_CURRENTLY_COMPILED_P.
+        Remove // comments.
+
+2006-07-07  Andrew Haley  <aph@redhat.com>
+
+	* java-tree.h (java_read_sourcefilenames): Declare.
+	* lang.c (java_handle_option): Call java_read_sourcefilenames().
+	* lang.opt (fsource-filename): New opt.
+	* lang-specs.h: Add -fsource-filename.
+	* jcf-parse.c (num_files, filenames): New variables.
+	(reverse, cmpstringp, java_read_sourcefilenames,
+	find_sourcefile): New.
+	(set_source_filename): Call find_sourcefile to find the real name
+	of a source file.
+
+2006-06-27  Tom Tromey  <tromey@redhat.com>
+
+	* jcf-reader.c (get_attribute): Handle EnclosingMethod,
+	Signature, LocalVariableTypeTable, annotation attributes.
+	* jcf-dump.c (HANDLE_ENCLOSINGMETHOD_ATTRIBUTE): New macro.
+	(HANDLE_SIGNATURE_ATTRIBUTE): Likewise.
+	(HANDLE_START_FIELD): Mention 'descriptor', not 'signature'.
+	(HANDLE_METHOD): Likewise.
+	(HANDLE_LOCALVARIABLETYPETABLE_ATTRIBUTE): New macro.
+	(print_annotation): New function.
+	(print_element_value): Likewise.
+	(indent): Likewise.
+	(HANDLE_RUNTIMEVISIBLEANNOTATIONS_ATTRIBUTE): New macro.
+	(HANDLE_RUNTIMEINVISIBLEANNOTATIONS_ATTRIBUTE): Likewise.
+	(print_parameter_annotations): New function.
+	(HANDLE_RUNTIMEVISIBLEPARAMETERANNOTATIONS_ATTRIBUTE): New macro.
+	(HANDLE_RUNTIMEINVISIBLEPARAMETERANNOTATIONS_ATTRIBUTE):
+	Likewise.
+	(HANDLE_ANNOTATIONDEFAULT_ATTRIBUTE): Likewise.
+	(print_annotations): New function.
+
+2006-06-23  Tom Tromey  <tromey@redhat.com>
+
+	* lang-specs.h: Default -fsource and -ftarget to 1.5.  If
+	emitting class files, always use 1.5.
+	* gcj.texi (Input Options): Document -fsource.
+	(Code Generation): Document -ftarget.
+
+2006-06-21  Tom Tromey  <tromey@redhat.com>
+
+	PR java/28089:
+	* expr.c (expand_java_field_op): Initialize field's declaring
+	class.
+
+2006-06-20  Tom Tromey  <tromey@redhat.com>
+
+	* expr.c (push_value): Always flush quick stack.
+
+2006-06-19  Tom Tromey  <tromey@redhat.com>
+
+	* expr.c (push_value): Also flush quick stack if value is a
+	component_ref.
+
+2006-06-19  Tom Tromey  <tromey@redhat.com>
+
+	* expr.c (push_value): Flush quick stack if value has side
+	effects.
+
+2006-06-13  Tom Tromey  <tromey@redhat.com>
+
+	* class.c (is_compiled_class): Explicitly check for current
+	class.
+
+2006-06-09  Tom Tromey  <tromey@redhat.com>
+
+	* gjavah.c (decompile_method): Don't decompile a static field
+	accessor method.
+
+2006-06-06  Tom Tromey  <tromey@redhat.com>
+
+	* lang-specs.h <jc1>: Add .jar file to command line if
+	-fsaw-java-file.  Also, remove -ffilelist-file in this case.
+
+2006-06-05  Tom Tromey  <tromey@redhat.com>
+
+	* jcf-dump.c (print_access_flags): Handle varargs, bridge,
+	synthetic, enum, annotation.
+	* jcf.h (ACC_BRIDGE): New macro.
+	(ACC_VARARGS): Likewise.
+	(ACC_SYNTHETIC): Likewise.
+	(ACC_ENUM): Likewise.
+	(ACC_ANNOTATION): Likewise.
+
+2006-06-04  Tom Tromey  <tromey@redhat.com>
+
+	* lang.opt (-fsaw-java-file, -fsource, -ftarget): New options.
+	* jvspec.c (jvgenmain_spec): Remove -fsaw-java-file, -fsource,
+	and -ftarget.
+	(lang_specific_driver): Removed dead code.  Add -fsaw-java-file
+	when needed.  Handle classpath-setting.
+	* Make-lang.in ($(GCJ)$(exeext)): Link in jcf-path.o.
+	* lang-specs.h: Rewrote.
+
+2006-06-04  Tom Tromey  <tromey@redhat.com>
+
+	* jcf-io.c (find_class): Set source_ok to 0.
+	* jcf-parse.c (jcf_parse): Disable gnu.gcj.gcj-compiled warning.
+	(parse_class_file): Don't call java_mark_class_local.
+	(java_parse_file): Skip .java files.  Call java_mark_class_local
+	before lowering any code.
+	(parse_zip_file_entries): Don't call duplicate_class_warning
+	here.
+	(process_zip_dir): ... call it here.
+	* class.c (add_field): Don't mark field external if it is being
+	compiled into this object.
+	(make_class_data): Handle situation where class_dtable_decl is
+	created before Class is compiled.
+	(is_compiled_class): Don't assume files in zip are compiled into
+	this object.
+	(layout_class_method): Don't mark method external if it is being
+	compiled into this object.
+
+2006-06-04  Tom Tromey  <tromey@redhat.com>
+
+	* jcf-path.c (jcf_path_compute): New function.
+	* jcf.h (jcf_path_compute): Declare.
+
 2006-10-23 Rafael Avila de Espindola  <rafael.espindola@gmail.com>
 
 	* decl.c: Include langhooks.h.
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index d054053..f1c347f 100644
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -1,6 +1,7 @@
 # Top level -*- makefile -*- fragment for the GNU compiler for the Java(TM)
 # language.
-#   Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+#   2005, 2006, 2007 Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
@@ -43,18 +44,15 @@
 # Actual names to use when installing a native compiler.
 JAVA_INSTALL_NAME := $(shell echo gcj|sed '$(program_transform_name)')
 JAVA_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo gcj|sed '$(program_transform_name)')
-GCJH_TARGET_INSTALL_NAME := $(target_noncanonical)-$(shell echo gcjh|sed '$(program_transform_name)')
 
 GCJ = gcj
 
 # Define the names for selecting java in LANGUAGES.
-java: jc1$(exeext) $(GCJ)$(exeext) jvgenmain$(exeext) \
-      gcjh$(exeext) jv-scan$(exeext) jcf-dump$(exeext) \
-      gjnih$(exeext)
+java: jc1$(exeext) $(GCJ)$(exeext) jvgenmain$(exeext) jcf-dump$(exeext)
 
 # Define the name of target independent tools to be installed in $(bindir)
 # Names are subject to changes
-JAVA_TARGET_INDEPENDENT_BIN_TOOLS = gcjh gjnih jv-scan jcf-dump
+JAVA_TARGET_INDEPENDENT_BIN_TOOLS = jcf-dump
 
 # Tell GNU make to ignore these if they exist.
 .PHONY: java
@@ -67,55 +65,28 @@ jvspec.o: $(srcdir)/java/jvspec.c $(SYSTEM_H) coretypes.h $(TM_H) \
 		$(INCLUDES) $(srcdir)/java/jvspec.c $(OUTPUT_OPTION))
 
 # Create the compiler driver for $(GCJ).
-$(GCJ)$(exeext): $(GCC_OBJS) jvspec.o version.o \
+$(GCJ)$(exeext): $(GCC_OBJS) jvspec.o java/jcf-path.o version.o \
 	   prefix.o intl.o $(LIBDEPS) $(EXTRA_GCC_OBJS)
 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GCC_OBJS) jvspec.o \
-	  prefix.o intl.o version.o $(EXTRA_GCC_OBJS) $(LIBS)
+	  java/jcf-path.o prefix.o intl.o \
+	  version.o $(EXTRA_GCC_OBJS) $(LIBS)
 
 # Create a version of the $(GCJ) driver which calls the cross-compiler.
 $(GCJ)-cross$(exeext): $(GCJ)$(exeext)
 	-rm -f $(GCJ)-cross$(exeext)
 	cp $(GCJ)$(exeext) $(GCJ)-cross$(exeext)
 
-java.srcextra: java/parse.c java/parse-scan.c
-	-cp -p $^ $(srcdir)/java
-
-java/parse.c: java/parse.y
-	-$(BISON) -t --name-prefix=java_ $(BISONFLAGS) -o $@ $<
-
-java/parse-scan.c: java/parse-scan.y
-	-$(BISON) -t $(BISONFLAGS) -o $@ $< 
-
-$(srcdir)/java/keyword.h: $(srcdir)/java/keyword.gperf
-	(cd $(srcdir)/java || exit 1; \
-	gperf -L ANSI-C -C -F ', 0' -p -t -j1 -i 1 -g -o -N java_keyword -k1,4,$$ \
-		keyword.gperf > k$$$$.h || { \
-	echo "Please update gperf from ftp://ftp.gnu.org/pub/gnu/gperf/" >&2; \
-	rm -f k$$$$.h; \
-	exit 1; } ; \
-	mv -f k$$$$.h keyword.h)
-
-gt-java-parse.h : s-gtype ; @true
+java.srcextra:
 
 # Executables built by this Makefile:
-JAVA_OBJS = java/parse.o java/class.o java/decl.o java/expr.o \
+JAVA_OBJS = java/class.o java/decl.o java/expr.o \
   java/constants.o java/lang.o java/typeck.o java/except.o \
   java/verify-glue.o java/verify-impl.o \
   java/zextract.o java/jcf-io.o java/win32-host.o java/jcf-parse.o java/mangle.o \
   java/mangle_name.o java/builtins.o java/resource.o \
-  java/jcf-write.o java/buffer.o java/check-init.o java/jcf-depend.o \
+  java/jcf-depend.o \
   java/jcf-path.o java/boehm.o java/java-gimplify.o
 
-GCJH_OBJS = java/gjavah.o java/jcf-io.o java/jcf-depend.o java/jcf-path.o \
-  java/win32-host.o java/zextract.o version.o errors.o ggc-none.o \
-  intl.o
-
-GJNIH_OBJS = java/gjavah-jni.o java/jcf-io.o java/jcf-depend.o java/jcf-path.o \
-  java/win32-host.o java/zextract.o version.o errors.o \
-  ggc-none.o intl.o
-
-JVSCAN_OBJS = java/parse-scan.o java/jv-scan.o version.o intl.o
-
 JCFDUMP_OBJS = java/jcf-dump.o java/jcf-io.o java/jcf-depend.o java/jcf-path.o \
 		java/win32-host.o java/zextract.o errors.o version.o ggc-none.o intl.o
 
@@ -128,7 +99,6 @@ java-warn = $(STRICT_WARN)
 jvspec.o-warn = -Wno-error
 
 # Bison-1.75 output often yields (harmless) -Wtraditional warnings
-java/parse-scan.o-warn = -Wno-error
 java/parse.o-warn = -Wno-error
 
 jc1$(exeext): $(JAVA_OBJS) $(BACKEND) $(LIBDEPS) attribs.o
@@ -136,18 +106,6 @@ jc1$(exeext): $(JAVA_OBJS) $(BACKEND) $(LIBDEPS) attribs.o
 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ \
 		$(JAVA_OBJS) $(BACKEND) $(ZLIB) $(LIBICONV) $(LIBS) attribs.o
 
-gcjh$(exeext): $(GCJH_OBJS) $(LIBDEPS)
-	rm -f $@
-	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GCJH_OBJS) $(CPPLIBS) $(ZLIB) $(LIBS)
-
-gjnih$(exeext): $(GJNIH_OBJS) $(LIBDEPS)
-	rm -f $@
-	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(GJNIH_OBJS) $(CPPLIBS) $(ZLIB) $(LIBS)
-
-jv-scan$(exeext): $(JVSCAN_OBJS) $(LIBDEPS)
-	rm -f $@
-	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVSCAN_OBJS) $(LIBICONV) $(LIBS)
-
 jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIBDEPS)
 	rm -f $@
 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \
@@ -179,9 +137,9 @@ java.srcinfo: doc/gcj.info
 java.dvi: doc/gcj.dvi
 java.pdf: doc/gcj.pdf
 java.html: $(build_htmldir)/java/index.html
-JAVA_MANFILES = doc/gcj.1 doc/gcjh.1 doc/jv-scan.1 doc/jcf-dump.1 doc/gij.1 \
+JAVA_MANFILES = doc/gcj.1 doc/jcf-dump.1 doc/gij.1 \
                 doc/jv-convert.1 doc/grmic.1 doc/grmiregistry.1 \
-		doc/gcj-dbtool.1 doc/gjnih.1
+		doc/gcj-dbtool.1
 
 java.man: $(JAVA_MANFILES)
 
@@ -191,14 +149,10 @@ java.srcman: $(JAVA_MANFILES)
 check-java :
 
 # Install hooks:
-# jc1, gcj, jvgenmain, and gcjh are installed elsewhere as part
+# jc1, gcj, and jvgenmain are installed elsewhere as part
 # of $(COMPILERS).
 
 # Install gcj as well as the target-independent tools.
-# For a native build, we special-case gcjh and also install
-# its explicitly-prefixed variant. This allows us to write
-# portable makefiles for both cross builds (where gcjh *must*
-# be explicitly prefixed) and native builds.
 java.install-common: installdirs
 	-if [ -f $(GCJ)$(exeext) ]; then \
 	  rm -f $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \
@@ -218,13 +172,6 @@ java.install-common: installdirs
 	    rm -f $(DESTDIR)$(bindir)/$$tool_transformed_name$(exeext); \
 	    $(INSTALL_PROGRAM) $$tool$(exeext) $(DESTDIR)$(bindir)/$$tool_transformed_name$(exeext); \
 	    chmod a+x $(DESTDIR)$(bindir)/$$tool_transformed_name$(exeext); \
-	    if [ -f $(GCJ)-cross$(exeext) ]; then \
-	      true; \
-	    elif [ $$tool = gcjh ]; then \
-	      rm -f $(DESTDIR)$(bindir)/$(GCJH_TARGET_INSTALL_NAME)$(exeext); \
-	      ( cd $(DESTDIR)$(bindir) && \
-	        $(LN) $$tool_transformed_name$(exeext) $(GCJH_TARGET_INSTALL_NAME)$(exeext) ); \
-	    fi; \
           fi ; \
        done
 
@@ -233,9 +180,6 @@ java.install-man:
 java.uninstall:
 	-rm -rf $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext)
 	-rm -rf $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext)
-	-rm -rf $(DESTDIR)$(man1dir)/gcjh$(man1ext)
-	-rm -rf $(DESTDIR)$(man1dir)/gjnih$(man1ext)
-	-rm -rf $(DESTDIR)$(man1dir)/jv-scan$(man1ext)
 	-rm -rf $(DESTDIR)$(man1dir)/jcf-dump$(man1ext)
 	-rm -rf $(DESTDIR)$(man1dir)/gij$(man1ext)
 	-rm -rf $(DESTDIR)$(man1dir)/jv-convert$(man1ext)
@@ -249,18 +193,16 @@ java.install-info: $(DESTDIR)$(infodir)/gcj.info
 # We just have to delete files specific to us.
 
 java.mostlyclean:
-	-rm -f java/parse.c java/parse-scan.c
 	-rm -f java/*$(objext) $(DEMANGLER_PROG)
 	-rm -f java/*$(coverageexts)
-	-rm -f jc1$(exeext) $(GCJ)$(exeext) jvgenmain$(exeext) gcjh$(exeext) \
-          gjnih$(exeext) jv-scan$(exeext) jcf-dump$(exeext) s-java
+	-rm -f jc1$(exeext) $(GCJ)$(exeext) jvgenmain$(exeext) \
+          jcf-dump$(exeext) s-java
 java.clean:
 java.distclean:
 	-rm -f java/config.status java/Makefile
-	-rm -f java/parse.output java/y.tab.c
 java.maintainer-clean:
-	-rm -f $(docobjdir)/gcj.1 $(docobjdir)/gcjh.1 $(docobjdir)/gjnih.1
-	-rm -f $(docobjdir)/jv-scan.1 $(docobjdir)/jcf-dump.1
+	-rm -f $(docobjdir)/gcj.1
+	-rm -f $(docobjdir)/jcf-dump.1
 	-rm -f $(docobjdir)/gij.1
 	-rm -f $(docobjdir)/jv-convert.1
 	-rm -f $(docobjdir)/grmic.1
@@ -286,22 +228,14 @@ java.stagefeedback: stageprofile-start
 #
 # .o:.h dependencies.
 JAVA_TREE_H = $(TREE_H) $(HASHTAB_H) java/java-tree.h java/java-tree.def
-JAVA_LEX_C = java/lex.c java/keyword.h java/chartables.h
 
 java/jcf-dump.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(JAVA_TREE_H) \
   java/jcf-dump.c java/jcf-reader.c java/jcf.h java/javaop.h java/javaop.def \
   version.h $(GGC_H) intl.h
-java/gjavah.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(JAVA_TREE_H) \
-  java/gjavah.c java/jcf-reader.c java/jcf.h java/javaop.h version.h $(GGC_H) \
-  intl.h
 java/boehm.o: java/boehm.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
   $(TREE_H) $(JAVA_TREE_H) java/parse.h toplev.h
-java/buffer.o: java/buffer.c $(CONFIG_H) java/buffer.h $(SYSTEM_H) coretypes.h \
-  $(TM_H) toplev.h
 java/builtins.o: java/builtins.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
   $(JAVA_TREE_H) $(GGC_H) $(FLAGS_H) langhooks.h gt-java-builtins.h
-java/check-init.o: java/check-init.c $(CONFIG_H) $(JAVA_TREE_H) $(SYSTEM_H) \
-  coretypes.h $(TM_H) toplev.h
 java/class.o: java/class.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
   $(JAVA_TREE_H) $(RTL_H) java/jcf.h java/parse.h toplev.h output.h $(GGC_H) \
   $(TARGET_H) $(FUNCTION_H) gt-java-class.h $(CGRAPH_H)
@@ -323,11 +257,6 @@ java/jcf-depend.o: java/jcf-depend.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
 java/jcf-parse.o: java/jcf-parse.c $(CONFIG_H) $(JAVA_TREE_H) $(FLAGS_H) \
   input.h java/java-except.h $(SYSTEM_H) coretypes.h $(TM_H) toplev.h \
   java/parse.h $(GGC_H) debug.h $(REAL_H) gt-java-jcf-parse.h $(TM_P_H)
-java/jcf-write.o: java/jcf-write.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \
-  $(RTL_H) java/java-opcodes.h java/parse.h java/buffer.h $(SYSTEM_H) \
-  coretypes.h $(TM_H) toplev.h $(GGC_H) gt-java-jcf-write.h $(TM_P_H)
-java/jv-scan.o: java/jv-scan.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
-  version.h intl.h
 java/jvgenmain.o: java/jvgenmain.c $(CONFIG_H) $(JAVA_TREE_H) $(SYSTEM_H) \
   coretypes.h $(TM_H) intl.h
 java/lang.o: java/lang.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h input.h \
@@ -341,7 +270,7 @@ java/resource.o: java/resource.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
   $(JAVA_TREE_H) $(RTL_H) java/jcf.h java/parse.h toplev.h output.h $(GGC_H) \
   $(TARGET_H) $(FUNCTION_H) gt-java-resource.h $(EXPR_H)
 java/typeck.o: java/typeck.c $(CONFIG_H) $(JAVA_TREE_H) java/jcf.h \
-  java/convert.h toplev.h $(SYSTEM_H) coretypes.h $(TM_H) $(GGC_H) $(REAL_H)
+  toplev.h $(SYSTEM_H) coretypes.h $(TM_H) $(GGC_H) $(REAL_H)
 java/win32-host.o: java/win32-host.c $(CONFIG_H) $(SYSTEM_H) coretypes.h java/jcf.h
 java/verify-glue.o: java/verify-glue.c $(CONFIG_H) $(SYSTEM_H) $(JAVA_TREE_H) \
   coretypes.h $(TM_H) java/verify.h toplev.h
@@ -352,13 +281,6 @@ java/zextract.o: java/zextract.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
 java/java-gimplify.o: java/java-gimplify.c $(CONFIG_H) $(SYSTEM_H) \
   coretypes.h $(TM_H) $(JAVA_TREE_H) $(TREE_GIMPLE_H) toplev.h
 
-java/parse-scan.o: java/parse-scan.c $(CONFIG_H) $(SYSTEM_H) \
-  coretypes.h $(TM_H) toplev.h $(JAVA_LEX_C) java/parse.h java/lex.h input.h
-java/parse.o: java/parse.c java/jcf-reader.c $(CONFIG_H) $(SYSTEM_H) \
-  coretypes.h $(TM_H) $(FUNCTION_H) $(JAVA_TREE_H) $(JAVA_LEX_C) java/parse.h \
-  java/lex.h input.h $(GGC_H) debug.h gt-java-parse.h gtype-java.h $(TARGET_H) \
-  $(TREE_DUMP_H)
-
 # jcf-io.o needs $(ZLIBINC) added to cflags.
 java/jcf-io.o: java/jcf-io.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
   $(JAVA_TREE_H)
@@ -373,14 +295,6 @@ java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
 	  -DDEFAULT_TARGET_VERSION=\"$(version)\" \
 	  $(srcdir)/java/jcf-path.c $(OUTPUT_OPTION)
 
-# create gjnih's object
-java/gjavah-jni.o: $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(JAVA_TREE_H) \
-  java/gjavah.c java/jcf-reader.c java/jcf.h java/javaop.h version.h $(GGC_H) \
-  intl.h
-	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(ZLIBINC) \
-		-DJNI_DEFAULT=1 \
-		$(srcdir)/java/gjavah.c $(OUTPUT_OPTION)
-
 TEXI_JAVA_FILES = java/gcj.texi $(gcc_docdir)/include/fdl.texi		\
 	 $(gcc_docdir)/include/gpl.texi $(gcc_docdir)/include/gcc-common.texi   \
 	 gcc-vers.texi
@@ -403,17 +317,11 @@ $(build_htmldir)/java/index.html: $(TEXI_JAVA_FILES)
 	rm -f $(@D)/*
 	$(TEXI2HTML) -I $(gcc_docdir)/include -I $(srcdir)/java -o $(@D) $<
 
-.INTERMEDIATE: gcj.pod gcjh.pod jv-scan.pod jcf-dump.pod gij.pod \
-  jv-convert.pod grmic.pod grmiregistry.pod gcj-dbtool.pod gjnih.pod
+.INTERMEDIATE: gcj.pod jcf-dump.pod gij.pod \
+  jv-convert.pod grmic.pod grmiregistry.pod gcj-dbtool.pod
 
 gcj.pod: java/gcj.texi
 	-$(TEXI2POD) -D gcj < $< > $@
-gcjh.pod: java/gcj.texi
-	-$(TEXI2POD) -D gcjh < $< > $@
-gjnih.pod: java/gcj.texi
-	-$(TEXI2POD) -D gjnih < $< > $@
-jv-scan.pod: java/gcj.texi
-	-$(TEXI2POD) -D jv-scan < $< > $@
 jcf-dump.pod: java/gcj.texi
 	-$(TEXI2POD) -D jcf-dump < $< > $@
 gij.pod: java/gcj.texi
diff --git a/gcc/java/buffer.c b/gcc/java/buffer.c
deleted file mode 100644
index 996dac7..0000000
--- a/gcc/java/buffer.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* A "buffer" utility type.
-   Copyright (C) 1998, 2003 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-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.
-
-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 GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-
-/* Written by Per Bothner <bothner@cygnus.com>, July 1998. */
-
-#include "config.h"
-#include "system.h"
-#include "coretypes.h"
-#include "tm.h"
-#include "buffer.h"
-
-/* Grow BUFP so there is room for at least SIZE more bytes. */
-
-void
-buffer_grow (struct buffer *bufp, int size)
-{
-  if (bufp->limit - bufp->ptr >= size)
-    return;
-  if (bufp->data == 0)
-    {
-      if (size < 120)
-	size = 120;
-      bufp->data = XNEWVEC (unsigned char, size);
-      bufp->ptr = bufp->data;
-    }
-  else
-    {
-      int index = bufp->ptr - bufp->data;
-      size += 2 * (bufp->limit - bufp->data);
-      bufp->data = xrealloc (bufp->data, size);
-      bufp->ptr = bufp->data + index;
-    }
-  bufp->limit = bufp->data + size;
-}
diff --git a/gcc/java/buffer.h b/gcc/java/buffer.h
deleted file mode 100644
index c74cc28..0000000
--- a/gcc/java/buffer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* A "buffer" utility type.
-   Copyright (C) 1998, 2000, 2003 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-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.
-
-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 GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-
-/* Written by Per Bothner <bothner@cygnus.com>, July 1998. */
-
-/* A simple data structure for an expandable buffer. */
-
-struct buffer
-{
-  /* The start of the actual data buffer. */
-  unsigned char *data;
-
-  /* Where to write next in the buffer. */
-  unsigned char *ptr;
-
-  /* The end of the allocated data buffer. */
-  unsigned char *limit;
-};
-
-#define NULL_BUFFER { (void*) 0, (void*) 0, (void*) 0 }
-
-#define BUFFER_INIT(BUFP) \
-  ((BUFP)->data = NULL, (BUFP)->ptr = NULL, (BUFP)->limit = NULL)
-
-#define BUFFER_LENGTH(BUFP) ((BUFP)->ptr - (BUFP)->data)
-
-#define BUFFER_RESET(BUFP) ((BUFP)->ptr = (BUFP)->data)
-
-extern void buffer_grow (struct buffer*, int);
diff --git a/gcc/java/builtins.c b/gcc/java/builtins.c
index 7793639..9f22900 100644
--- a/gcc/java/builtins.c
+++ b/gcc/java/builtins.c
@@ -34,7 +34,12 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "flags.h"
 #include "langhooks.h"
 #include "java-tree.h"
-
+#include <stdarg.h>
+#include "convert.h"
+#include "rtl.h"
+#include "insn-codes.h"
+#include "expr.h"
+#include "optabs.h"
 
 static tree max_builtin (tree, tree);
 static tree min_builtin (tree, tree);
@@ -43,6 +48,13 @@ static tree convert_real (tree, tree);
 
 static tree java_build_function_call_expr (tree, tree);
 
+static tree putObject_builtin (tree, tree);
+static tree compareAndSwapInt_builtin (tree, tree);
+static tree compareAndSwapLong_builtin (tree, tree);
+static tree compareAndSwapObject_builtin (tree, tree);
+static tree putVolatile_builtin (tree, tree);
+static tree getVolatile_builtin (tree, tree);
+
 
 
 /* Functions of this type are used to inline a given call.  Such a
@@ -90,6 +102,25 @@ static GTY(()) struct builtin_record java_builtins[] =
   { { "java.lang.Double" }, { "longBitsToDouble" }, convert_real, 0 },
   { { "java.lang.Float" }, { "floatToRawIntBits" }, convert_real, 0 },
   { { "java.lang.Double" }, { "doubleToRawLongBits" }, convert_real, 0 },
+  { { "sun.misc.Unsafe" }, { "putInt" }, putObject_builtin, 0},
+  { { "sun.misc.Unsafe" }, { "putLong" }, putObject_builtin, 0},
+  { { "sun.misc.Unsafe" }, { "putObject" }, putObject_builtin, 0},
+  { { "sun.misc.Unsafe" }, { "compareAndSwapInt" }, 
+    compareAndSwapInt_builtin, 0},
+  { { "sun.misc.Unsafe" }, { "compareAndSwapLong" }, 
+    compareAndSwapLong_builtin, 0},
+  { { "sun.misc.Unsafe" }, { "compareAndSwapObject" }, 
+    compareAndSwapObject_builtin, 0},
+  { { "sun.misc.Unsafe" }, { "putOrderedInt" }, putVolatile_builtin, 0},
+  { { "sun.misc.Unsafe" }, { "putOrderedLong" }, putVolatile_builtin, 0},
+  { { "sun.misc.Unsafe" }, { "putOrderedObject" }, putVolatile_builtin, 0},
+  { { "sun.misc.Unsafe" }, { "putIntVolatile" }, putVolatile_builtin, 0},
+  { { "sun.misc.Unsafe" }, { "putLongVolatile" }, putVolatile_builtin, 0},
+  { { "sun.misc.Unsafe" }, { "putObjectVolatile" }, putVolatile_builtin, 0},
+  { { "sun.misc.Unsafe" }, { "getObjectVolatile" }, getVolatile_builtin, 0},
+  { { "sun.misc.Unsafe" }, { "getIntVolatile" }, getVolatile_builtin, 0},
+  { { "sun.misc.Unsafe" }, { "getLongVolatile" }, getVolatile_builtin, 0},
+  { { "sun.misc.Unsafe" }, { "getLong" }, getVolatile_builtin, 0},
   { { NULL }, { NULL }, NULL, END_BUILTINS }
 };
 
@@ -145,6 +176,265 @@ convert_real (tree method_return_type, tree method_arguments)
 
 
 
+/* Provide builtin support for atomic operations.  These are
+   documented at length in libjava/sun/misc/Unsafe.java.  */
+
+/* FIXME.  There are still a few things wrong with this logic.  In
+   particular, atomic writes of multi-word integers are not truly
+   atomic: this requires more work.
+
+   In general, double-word compare-and-swap cannot portably be
+   implemented, so we need some kind of fallback for 32-bit machines.
+
+*/
+
+
+/* Macros to unmarshal arguments from a TREE_LIST into a few
+   variables.  We also convert the offset arg from a long to an
+   integer that is the same size as a pointer.  */
+
+#define UNMARSHAL3(METHOD_ARGUMENTS)					\
+tree this_arg, obj_arg, offset_arg;					\
+do									\
+{									\
+  tree chain = METHOD_ARGUMENTS;					\
+  this_arg = TREE_VALUE (chain);					\
+  chain = TREE_CHAIN (chain);						\
+  obj_arg = TREE_VALUE (chain);						\
+  chain = TREE_CHAIN (chain);						\
+  offset_arg = fold_convert (java_type_for_size (POINTER_SIZE, 0),	\
+			     TREE_VALUE (chain));			\
+}									\
+while (0)
+
+#define UNMARSHAL4(METHOD_ARGUMENTS)					\
+tree value_type, this_arg, obj_arg, offset_arg, value_arg;		\
+do									\
+{									\
+  tree chain = METHOD_ARGUMENTS;					\
+  this_arg = TREE_VALUE (chain);					\
+  chain = TREE_CHAIN (chain);						\
+  obj_arg = TREE_VALUE (chain);						\
+  chain = TREE_CHAIN (chain);						\
+  offset_arg = fold_convert (java_type_for_size (POINTER_SIZE, 0),	\
+			     TREE_VALUE (chain));			\
+  chain = TREE_CHAIN (chain);						\
+  value_arg = TREE_VALUE (chain);					\
+  value_type = TREE_TYPE (value_arg);					\
+}									\
+while (0)
+
+#define UNMARSHAL5(METHOD_ARGUMENTS)					\
+tree value_type, this_arg, obj_arg, offset_arg, expected_arg, value_arg; \
+do									\
+{									\
+  tree chain = METHOD_ARGUMENTS;					\
+  this_arg = TREE_VALUE (chain);					\
+  chain = TREE_CHAIN (chain);						\
+  obj_arg = TREE_VALUE (chain);						\
+  chain = TREE_CHAIN (chain);						\
+  offset_arg = fold_convert (java_type_for_size (POINTER_SIZE, 0),	\
+			     TREE_VALUE (chain));			\
+  chain = TREE_CHAIN (chain);						\
+  expected_arg = TREE_VALUE (chain);					\
+  chain = TREE_CHAIN (chain);						\
+  value_arg = TREE_VALUE (chain);					\
+  value_type = TREE_TYPE (value_arg);					\
+}									\
+while (0)
+
+/* Construct an arglist from a call.  */
+
+static tree
+build_arglist_for_builtin (tree arg, ...)
+{
+  va_list ap;
+  tree nextarg;
+  tree newarglist = build_tree_list (NULL_TREE, arg);
+
+  va_start(ap, arg);
+  while ((nextarg = va_arg(ap, tree)))
+    newarglist = tree_cons (NULL_TREE, nextarg, newarglist);
+
+  return nreverse (newarglist);
+}
+
+/* Add an address to an offset, forming a sum.  */
+
+static tree
+build_addr_sum (tree type, tree addr, tree offset)
+{
+  tree ptr_type = build_pointer_type (type);
+  return  fold_build2 (PLUS_EXPR, 
+		       ptr_type, 
+		       fold_convert (ptr_type, addr), offset);
+}
+
+/* Make sure that this-arg is non-NULL.  This is a security check.  */
+
+static tree
+build_check_this (tree stmt, tree this_arg)
+{
+  return build2 (COMPOUND_EXPR, TREE_TYPE (stmt), 
+		 java_check_reference (this_arg, 1), stmt);
+}
+
+/* Now the builtins.  These correspond to the primitive functions in
+   libjava/sun/misc/natUnsafe.cc.  */
+
+static tree
+putObject_builtin (tree method_return_type ATTRIBUTE_UNUSED, 
+		   tree method_arguments)
+{
+  tree addr, stmt;
+  UNMARSHAL4 (method_arguments);
+
+  addr = build_addr_sum (value_type, obj_arg, offset_arg);
+  stmt = fold_build2 (MODIFY_EXPR, value_type,
+		      build_java_indirect_ref (value_type, addr,
+					       flag_check_references),
+		      value_arg);
+
+  return build_check_this (stmt, this_arg);
+}
+
+static tree
+compareAndSwapInt_builtin (tree method_return_type ATTRIBUTE_UNUSED,
+			   tree method_arguments)
+{
+  enum machine_mode mode = TYPE_MODE (int_type_node);
+  if (sync_compare_and_swap_cc[mode] != CODE_FOR_nothing 
+      || sync_compare_and_swap[mode] != CODE_FOR_nothing)
+    {
+      tree newarglist, addr, stmt;
+      UNMARSHAL5 (method_arguments);
+
+      addr = build_addr_sum (int_type_node, obj_arg, offset_arg);
+
+      newarglist 
+	= build_arglist_for_builtin (addr, expected_arg, value_arg, NULL_TREE);
+      stmt = (build_function_call_expr
+	      (built_in_decls[BUILT_IN_BOOL_COMPARE_AND_SWAP_4],
+	       newarglist));
+
+      return build_check_this (stmt, this_arg);
+    }
+  return NULL_TREE;
+}
+
+static tree
+compareAndSwapLong_builtin (tree method_return_type ATTRIBUTE_UNUSED,
+			    tree method_arguments)
+{
+  enum machine_mode mode = TYPE_MODE (long_type_node);
+  if (sync_compare_and_swap_cc[mode] != CODE_FOR_nothing 
+      || sync_compare_and_swap[mode] != CODE_FOR_nothing)
+    {
+      tree newarglist, addr, stmt;
+      UNMARSHAL5 (method_arguments);
+
+      addr = build_addr_sum (long_type_node, obj_arg, offset_arg);
+
+      newarglist 
+	= build_arglist_for_builtin (addr, expected_arg, value_arg, NULL_TREE);
+      stmt = (build_function_call_expr
+	      (built_in_decls[BUILT_IN_BOOL_COMPARE_AND_SWAP_8],
+	       newarglist));
+
+      return build_check_this (stmt, this_arg);
+    }
+  return NULL_TREE;
+}
+static tree
+compareAndSwapObject_builtin (tree method_return_type ATTRIBUTE_UNUSED, 
+			      tree method_arguments)
+{
+  enum machine_mode mode = TYPE_MODE (ptr_type_node);
+  if (sync_compare_and_swap_cc[mode] != CODE_FOR_nothing 
+      || sync_compare_and_swap[mode] != CODE_FOR_nothing)
+  {
+    tree newarglist, addr, stmt;
+    int builtin;
+
+    UNMARSHAL5 (method_arguments);
+    builtin = (POINTER_SIZE == 32 
+	       ? BUILT_IN_BOOL_COMPARE_AND_SWAP_4 
+	       : BUILT_IN_BOOL_COMPARE_AND_SWAP_8);
+
+    addr = build_addr_sum (value_type, obj_arg, offset_arg);
+
+    newarglist 
+      = build_arglist_for_builtin (addr, expected_arg, value_arg, NULL_TREE);
+    stmt = (build_function_call_expr
+	    (built_in_decls[builtin],
+	     newarglist));
+
+    return build_check_this (stmt, this_arg);
+  }
+  return NULL_TREE;
+}
+
+static tree
+putVolatile_builtin (tree method_return_type ATTRIBUTE_UNUSED, 
+		     tree method_arguments)
+{
+  tree newarglist, addr, stmt, modify_stmt;
+  UNMARSHAL4 (method_arguments);
+  
+  addr = build_addr_sum (value_type, obj_arg, offset_arg);
+  addr 
+    = fold_convert (build_pointer_type (build_type_variant (value_type, 0, 1)),
+		    addr);
+  
+  newarglist = NULL_TREE;
+  stmt = (build_function_call_expr
+	  (built_in_decls[BUILT_IN_SYNCHRONIZE],
+	   newarglist));
+  modify_stmt = fold_build2 (MODIFY_EXPR, value_type,
+			     build_java_indirect_ref (value_type, addr,
+						      flag_check_references),
+			     value_arg);
+  stmt = build2 (COMPOUND_EXPR, TREE_TYPE (modify_stmt), 
+		 stmt, modify_stmt);
+
+  return build_check_this (stmt, this_arg);
+}
+
+static tree
+getVolatile_builtin (tree method_return_type ATTRIBUTE_UNUSED, 
+		     tree method_arguments)
+{
+  tree newarglist, addr, stmt, modify_stmt, tmp;
+  UNMARSHAL3 (method_arguments);
+  
+  addr = build_addr_sum (method_return_type, obj_arg, offset_arg);
+  addr 
+    = fold_convert (build_pointer_type (build_type_variant 
+					(method_return_type, 0, 1)), addr);
+  
+  newarglist = NULL_TREE;
+  stmt = (build_function_call_expr
+	  (built_in_decls[BUILT_IN_SYNCHRONIZE],
+	   newarglist));
+  
+  tmp = build_decl (VAR_DECL, NULL, method_return_type);
+  DECL_IGNORED_P (tmp) = 1;
+  DECL_ARTIFICIAL (tmp) = 1;
+  pushdecl (tmp);
+
+  modify_stmt = fold_build2 (MODIFY_EXPR, method_return_type,
+			     tmp,
+			     build_java_indirect_ref (method_return_type, addr,
+						      flag_check_references));
+
+  stmt = build2 (COMPOUND_EXPR, void_type_node, modify_stmt, stmt);
+  stmt = build2 (COMPOUND_EXPR, method_return_type, stmt, tmp);
+  
+  return stmt;
+}
+  
+
+
 #define BUILTIN_NOTHROW 1
 #define BUILTIN_CONST 2
 /* Define a single builtin.  */
@@ -258,10 +548,27 @@ initialize_builtins (void)
 		  boolean_ftype_boolean_boolean,
 		  "__builtin_expect",
 		  BUILTIN_CONST | BUILTIN_NOTHROW);
-		  
+  define_builtin (BUILT_IN_BOOL_COMPARE_AND_SWAP_4, 
+		  "__sync_bool_compare_and_swap_4",
+		  build_function_type_list (boolean_type_node,
+					    int_type_node, 
+					    build_pointer_type (int_type_node),
+					    int_type_node, NULL_TREE), 
+		  "__sync_bool_compare_and_swap_4", 0);
+  define_builtin (BUILT_IN_BOOL_COMPARE_AND_SWAP_8, 
+		  "__sync_bool_compare_and_swap_8",
+		  build_function_type_list (boolean_type_node,
+					    long_type_node, 
+					    build_pointer_type (long_type_node),
+					    int_type_node, NULL_TREE), 
+		  "__sync_bool_compare_and_swap_8", 0);
   define_builtin (BUILT_IN_SYNCHRONIZE, "__sync_synchronize",
 		  build_function_type (void_type_node, void_list_node),
 		  "__sync_synchronize", BUILTIN_NOTHROW);
+  
+  define_builtin (BUILT_IN_RETURN_ADDRESS, "__builtin_return_address",
+		  build_function_type_list (ptr_type_node, int_type_node, NULL_TREE),
+		  "__builtin_return_address", BUILTIN_NOTHROW);
 
   build_common_builtin_nodes ();
 }
diff --git a/gcc/java/chartables.h b/gcc/java/chartables.h
deleted file mode 100644
index 7cb5f86..0000000
--- a/gcc/java/chartables.h
+++ /dev/null
@@ -1,3219 +0,0 @@
-/* This file is automatically generated.  DO NOT EDIT!
-   Instead, edit gen-table.pl and re-run.  */
-
-#ifndef GCC_CHARTABLES_H
-#define GCC_CHARTABLES_H
-
-#define LETTER_START 1
-#define LETTER_PART  2
-#define LETTER_SPACE 4
-
-#define LETTER_MASK  7
-
-static const char page0[256] = {
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 
-  (LETTER_SPACE), 0, 0, (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_SPACE), (LETTER_SPACE), (LETTER_SPACE), 
-  (LETTER_SPACE), (LETTER_SPACE), 0, 0, 0, (LETTER_START | LETTER_PART), 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, (LETTER_START | LETTER_PART), 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART)
-};
-
-static const char page2[256] = {
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0
-};
-
-static const char page3[256] = {
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static const char page4[256] = {
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0
-};
-
-static const char page5[256] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  0, (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, (LETTER_PART), 0, 
-  (LETTER_PART), (LETTER_PART), 0, (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static const char page6[256] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 0, (LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), 0, 0, (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, 0, (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0
-};
-
-static const char page7[256] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static const char page9[256] = {
-  0, (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_PART), 0, (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, 0, (LETTER_PART), (LETTER_PART), 0, 0, (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_PART), 0, 
-  0, 0, 0, (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0
-};
-
-static const char page10[256] = {
-  0, 0, (LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 
-  (LETTER_PART), 0, (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, (LETTER_PART), (LETTER_PART), 0, 
-  0, (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  0, (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 0, 0, 0, 
-  0, 0, (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static const char page11[256] = {
-  0, (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 0, (LETTER_PART), 
-  (LETTER_PART), 0, 0, (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 0, 
-  0, 0, 0, 0, 0, (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, (LETTER_PART), (LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  0, 0, 0, (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0
-};
-
-static const char page12[256] = {
-  0, (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  0, (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_PART), 
-  (LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), 0, (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, (LETTER_PART), (LETTER_PART), 0, 0, 0, 
-  0, 0, 0, 0, (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0
-};
-
-static const char page13[256] = {
-  0, 0, (LETTER_PART), (LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, (LETTER_PART), (LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, (LETTER_PART), 0, 0, 0, 0, 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, (LETTER_PART), 0, (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static const char page14[256] = {
-  0, (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), (LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  0, (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 0, 0, 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), (LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  0, (LETTER_PART), (LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 0, 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, 0, (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static const char page15[256] = {
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 0, 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_PART), 0, (LETTER_PART), 0, 
-  (LETTER_PART), 0, 0, 0, 0, (LETTER_PART), (LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  0, (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, (LETTER_PART), (LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static const char page16[256] = {
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  0, 0, 0, (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 
-  0, 0, 0, 0, (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static const char page17[256] = {
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  0
-};
-
-static const char page18[256] = {
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART)
-};
-
-static const char page19[256] = {
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static const char page20[256] = {
-  0, (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART)
-};
-
-static const char page22[256] = {
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_SPACE), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0
-};
-
-static const char page23[256] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 0, 0, 0, 
-  0, (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0
-};
-
-static const char page24[256] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 
-  0, (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  0, 0, 0, (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0
-};
-
-static const char page30[256] = {
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  0
-};
-
-static const char page31[256] = {
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0
-};
-
-static const char page32[256] = {
-  (LETTER_SPACE), (LETTER_SPACE), (LETTER_SPACE), (LETTER_SPACE), 
-  (LETTER_SPACE), (LETTER_SPACE), (LETTER_SPACE), 0, (LETTER_SPACE), 
-  (LETTER_SPACE), (LETTER_SPACE), (LETTER_SPACE), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_SPACE), (LETTER_SPACE), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 
-  (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static const char page33[256] = {
-  0, 0, (LETTER_START | LETTER_PART), 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0
-};
-
-static const char page48[256] = {
-  (LETTER_SPACE), 0, 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, (LETTER_PART), (LETTER_PART), 0, 
-  0, (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0
-};
-
-static const char page49[256] = {
-  0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0
-};
-
-static const char page52[256] = {
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static const char page77[256] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART)
-};
-
-static const char page78[256] = {
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static const char page159[256] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static const char page164[256] = {
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART)
-};
-
-static const char page172[256] = {
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static const char page215[256] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static const char page250[256] = {
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0
-};
-
-static const char page251[256] = {
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_PART), (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART)
-};
-
-static const char page253[256] = {
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0
-};
-
-static const char page254[256] = {
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  0, (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, (LETTER_PART)
-};
-
-static const char page255[256] = {
-  0, 0, 0, 0, (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), (LETTER_PART), 
-  0, 0, 0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, (LETTER_START | LETTER_PART), 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 0, 0, 
-  (LETTER_START | LETTER_PART), (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, (LETTER_START | LETTER_PART), 
-  (LETTER_START | LETTER_PART), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
-static const char *const type_table[256] = {
-  page0,
-  (char *) (LETTER_START | LETTER_PART),
-  page2,
-  page3,
-  page4,
-  page5,
-  page6,
-  page7,
-  (char *) 0,
-  page9,
-  page10,
-  page11,
-  page12,
-  page13,
-  page14,
-  page15,
-  page16,
-  page17,
-  page18,
-  page19,
-  page20,
-  (char *) (LETTER_START | LETTER_PART),
-  page22,
-  page23,
-  page24,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  page30,
-  page31,
-  page32,
-  page33,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  page48,
-  page49,
-  (char *) 0,
-  (char *) 0,
-  page52,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  page77,
-  page78,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  page159,
-  (char *) (LETTER_START | LETTER_PART),
-  (char *) (LETTER_START | LETTER_PART),
-  (char *) (LETTER_START | LETTER_PART),
-  (char *) (LETTER_START | LETTER_PART),
-  page164,
-  (char *) (LETTER_START | LETTER_PART),
-  (char *) (LETTER_START | LETTER_PART),
-  (char *) (LETTER_START | LETTER_PART),
-  (char *) (LETTER_START | LETTER_PART),
-  (char *) (LETTER_START | LETTER_PART),
-  (char *) (LETTER_START | LETTER_PART),
-  (char *) (LETTER_START | LETTER_PART),
-  page172,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  page215,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) 0,
-  (char *) (LETTER_START | LETTER_PART),
-  page250,
-  page251,
-  (char *) (LETTER_START | LETTER_PART),
-  page253,
-  page254,
-  page255
-};
-
-#endif /* ! GCC_CHARTABLES_H */
diff --git a/gcc/java/check-init.c b/gcc/java/check-init.c
deleted file mode 100644
index 4aca992..0000000
--- a/gcc/java/check-init.c
+++ /dev/null
@@ -1,1032 +0,0 @@
-/* Code to test for "definitive [un]assignment".
-   Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2006 Free Software Foundation,
-   Inc.
-
-This file is part of GCC.
-
-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.
-
-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 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.
-The Free Software Foundation is independent of Sun Microsystems, Inc.  */
-
-/* Written by Per Bothner <bothner@cygnus.com>, January 1999. */
-
-#include "config.h"
-#include "system.h"
-#include "coretypes.h"
-#include "tm.h"
-#include "tree.h"
-#include "flags.h" /* Needed for optimize. */
-#include "java-tree.h"
-#include "toplev.h" /* Needed for fatal. */
-
-/* The basic idea is that we assign each local variable declaration
-   and each blank final field an index, and then we pass around
-   bitstrings, where the (2*i)'th bit is set if decl whose DECL_BIT_INDEX
-   is i is definitely assigned, and the (2*i=1)'th bit is set if 
-   decl whose DECL_BIT_INDEX is i is definitely unassigned */
-
-/* One segment of a bitstring. */
-typedef unsigned int word;
-
-/* Pointer to a bitstring. */
-typedef word *words;
-
-/* Number of locals variables currently active. */
-static int num_current_locals = 0;
-
-/* The value of num_current_locals when we entered the closest
-   enclosing LOOP_EXPR. */
-static int loop_current_locals;
-
-/* The index of the first local variable in the current block.
-
-   The variables whose DECL_BIT_INDEX are in the range from
-   start_current_locals (inclusive) up to num_current_locals (exclusive)
-   are declared in the "current" block.  If there is a loop or branch
-   form, we set start_current_locals to num_current_locals to indicate
-   there is no current block.
-
-   The point is that if a variable in the current block is set,
-   there are no other control paths that we have to worry about.
-   Hence, we can remove it from the set of variables we are
-   checking, making its bit index available for some other variable.
-   For simplicity, we only do that if the variable's bit index
-   is (num_current_locals-1);  freeing up its bit index is then
-   just a simple matter of decrementing num_current_locals.
-   The reason this is worth doing is that it is simple, and
-   allows us to use short (usually one-word) bit-strings,
-   even for methods with thousands of local variables, as
-   long as most of them are initialized immediately after or in
-   their declaration. */
-static int start_current_locals = 0;
-
-static int num_current_words;
-
-#define COPYN(DST, SRC, NWORDS) memcpy (DST, SRC, NWORDS * sizeof(word))
-#define COPY(DST, SRC) COPYN (DST, SRC, num_current_words)
-
-#define SET_ALL(DST) memset (DST, ~0, num_current_words * sizeof(word))
-#define CLEAR_ALL(DST) memset (DST, 0, num_current_words * sizeof(word))
-
-#define INTERSECTN(DST, SRC1, SRC2, N) \
-  do { int n = N; \
-  while (--n >= 0) DST[n] = SRC1[n] & SRC2[n]; \
-  } while (0)
-
-#define UNION(DST, SRC1, SRC2) \
-  UNIONN (DST, SRC1, SRC2, num_current_words)
-
-#define UNIONN(DST, SRC1, SRC2, N) \
-  do { int n = N; \
-  while (--n >= 0) DST[n] = SRC1[n] | SRC2[n]; \
-  } while (0)
-
-#define INTERSECT(DST, SRC1, SRC2) \
-  INTERSECTN (DST, SRC1, SRC2, num_current_words)
-
-#define WORD_SIZE  ((unsigned int)(sizeof(word) * BITS_PER_UNIT))
-
-static void check_bool_init (tree, words, words, words);
-static void check_init (tree, words);
-static void check_cond_init (tree, tree, tree, words, words, words);
-static void check_bool2_init (enum tree_code, tree, tree, words, words, words);
-struct alternatives;
-static void done_alternative (words, struct alternatives *);
-static tree get_variable_decl (tree);
-static void final_assign_error (tree);
-static void check_final_reassigned (tree, words);
-
-#define ALLOC_WORDS(NUM) (xmalloc ((NUM) * sizeof (word)))
-#define FREE_WORDS(PTR) (free (PTR))
-
-/* DECLARE_BUFFERS is used to allocate NUMBUFFER bit sets, each of
-   which is an array of length num_current_words number of words.
-   Declares a new local variable BUFFER to hold the result (or rather
-   a pointer to the first of the bit sets).  In almost all cases
-   num_current_words will be 1 or at most 2, so we try to stack
-   allocate the arrays in that case, using a stack array
-   named BUFFER##_short.  Each DECLARE_BUFFERS must be matched by
-   a corresponding RELEASE_BUFFERS to avoid memory leaks.  */
-
-#define DECLARE_BUFFERS(BUFFER, NUMBUFFERS) \
-  word BUFFER##_short[2 * NUMBUFFERS]; \
-  words BUFFER = ALLOC_BUFFER(BUFFER##_short, NUMBUFFERS * num_current_words)
-
-#define RELEASE_BUFFERS(BUFFER) \
-  FREE_BUFFER(BUFFER, BUFFER##_short)
-
-#define ALLOC_BUFFER(SHORTBUFFER, NUMWORDS) \
-  ((NUMWORDS) * sizeof(word) <= sizeof(SHORTBUFFER) ? SHORTBUFFER \
-   : ALLOC_WORDS(NUMWORDS))
-
-#define FREE_BUFFER(BUFFER, SHORTBUFFER) \
-  if (BUFFER != SHORTBUFFER) FREE_WORDS(BUFFER)
-
-#define SET_P(WORDS, BIT) \
-  (WORDS[(BIT) / WORD_SIZE] & (1 << ((BIT) % WORD_SIZE)))
-
-#define CLEAR_BIT(WORDS, BIT) \
-  (WORDS[(BIT) / WORD_SIZE] &= ~ (1 << ((BIT) % WORD_SIZE)))
-
-#define SET_BIT(WORDS, BIT) \
-  (WORDS[(BIT) / WORD_SIZE] |= (1 << ((BIT) % WORD_SIZE)))
-
-#define WORDS_NEEDED(BITS) (((BITS)+(WORD_SIZE-1))/(WORD_SIZE))
-
-#define ASSIGNED_P(WORDS, BIT)  SET_P(WORDS, 2 * (BIT))
-#define UNASSIGNED_P(WORDS, BIT)  SET_P(WORDS, 2 * (BIT) + 1)
-
-#define SET_ASSIGNED(WORDS, INDEX) SET_BIT (WORDS, 2 * (INDEX))
-#define SET_UNASSIGNED(WORDS, INDEX) SET_BIT (WORDS, 2 * (INDEX) + 1)
-
-#define CLEAR_ASSIGNED(WORDS, INDEX) CLEAR_BIT (WORDS, 2 * (INDEX))
-#define CLEAR_UNASSIGNED(WORDS, INDEX) CLEAR_BIT (WORDS, 2 * (INDEX) + 1)
-
-/* Get the "interesting" declaration from a MODIFY_EXPR or COMPONENT_REF.
-   Return the declaration or NULL_TREE if no interesting declaration.  */
-
-static tree
-get_variable_decl (tree exp)
-{
-  /* A static field can be wrapped in a COMPOUND_EXPR where the first
-     argument initializes the class.  */
-  if (TREE_CODE (exp) == COMPOUND_EXPR)
-    exp = extract_field_decl (exp);
-
-  if (TREE_CODE (exp) == VAR_DECL)
-    {
-      if (! TREE_STATIC (exp) ||  FIELD_FINAL (exp))
-	return exp;
-    }
-  /* We only care about final parameters. */
-  else if (TREE_CODE (exp) == PARM_DECL)
-    {
-      if (DECL_FINAL (exp))
-	return exp;
-    }
-  /* See if exp is this.field. */
-  else if (TREE_CODE (exp) == COMPONENT_REF)
-    {
-      tree op0 = TREE_OPERAND (exp, 0);
-      tree op1 = TREE_OPERAND (exp, 1);
-      tree mdecl = current_function_decl;
-      if (TREE_CODE (op0) == INDIRECT_REF
-	  && TREE_CODE (op1) == FIELD_DECL
-	  && ! METHOD_STATIC (mdecl)
-	  && FIELD_FINAL (op1))
-	{
-	  op0 = TREE_OPERAND (op0, 0);
-	  if (op0 == BLOCK_EXPR_DECLS (DECL_FUNCTION_BODY (mdecl)))
-	    return op1;
-	}
-    }
-  else if (TREE_CODE (exp) == INDIRECT_REF)
-    {
-      /* For indirect dispatch, look for an expression of the form 
-      (indirect_ref (+ (array_ref otable <N>) this)).  
-      FIXME: it would probably be better to generate a JAVA_FIELD_REF
-      expression that gets converted to OTABLE access at
-      gimplification time.  */
-      exp = TREE_OPERAND (exp, 0);
-      if (TREE_CODE (exp) == PLUS_EXPR)
-	{
-	  tree op0 = TREE_OPERAND (exp, 0);
-	  STRIP_NOPS (op0);
-	  if (TREE_CODE (op0) == ARRAY_REF)
-	    {
-	      tree table = TREE_OPERAND (op0, 0);
-	      if (TREE_CODE (table) == VAR_DECL
-		  && DECL_LANG_SPECIFIC (table)
-		  && DECL_OWNER (table) 
-		  && TYPE_OTABLE_DECL (DECL_OWNER (table)) == table)
-		{
-		  HOST_WIDE_INT index 
-		    = TREE_INT_CST_LOW (TREE_OPERAND (op0, 1));
-		  tree otable_methods 
-		    = TYPE_OTABLE_METHODS (DECL_OWNER (table));
-		  tree element;
-		  for (element = otable_methods; 
-		       element; 
-		       element = TREE_CHAIN (element))
-		    {
-		      if (index == 1)
-			{
-			  tree purpose = TREE_PURPOSE (element);
-			  if (TREE_CODE (purpose) == FIELD_DECL)
-			    return purpose;
-			  else
-			    return NULL_TREE;
-			}
-		      --index;
-		    }
-		}
-	    }
-	}
-    }
-
-  return NULL_TREE;
-}
-
-static void
-final_assign_error (tree name)
-{
-  error ("Can't reassign a value to the final variable %qs",
-	 IDENTIFIER_POINTER (name));
-}
-
-static void
-check_final_reassigned (tree decl, words before)
-{
-  int index = DECL_BIT_INDEX (decl);
-  /* A final local already assigned or a final parameter
-     assigned must be reported as errors */
-  if (DECL_FINAL (decl) && index != -2
-      && (index < loop_current_locals /* I.e. -1, or outside current loop. */
-          || (DECL_LOCAL_FINAL_IUD (decl) ? ASSIGNED_P (before, index)
-              : ! UNASSIGNED_P (before, index))))
-    {
-      final_assign_error (DECL_NAME (decl));
-    }
-}
-
-/* Check a conditional form (TEST_EXP ? THEN_EXP : ELSE_EXP) for
-   definite [un]assignment.
-   BEFORE, WHEN_FALSE, and WHEN_TRUE are as in check_bool_init. */
-
-static void
-check_cond_init (tree test_exp, tree then_exp, tree else_exp,
-		 words before, words when_false, words when_true)
-{
-  int save_start_current_locals = start_current_locals;
-  DECLARE_BUFFERS(test_false, 6);
-  words test_true = test_false + num_current_words;
-  words then_false = test_true + num_current_words;
-  words then_true = then_false + num_current_words;
-  words else_false = then_true + num_current_words;
-  words else_true = else_false + num_current_words;
-  start_current_locals = num_current_locals;
-
-  check_bool_init (test_exp, before, test_false, test_true);
-  check_bool_init (then_exp, test_true, then_false, then_true);
-  check_bool_init (else_exp, test_false, else_false, else_true);
-  INTERSECT (when_false, then_false, else_false);
-  INTERSECT (when_true, then_true, else_true);
-  RELEASE_BUFFERS(test_false);
-  start_current_locals = save_start_current_locals;
-}
-
-/* Check a boolean binary form CODE (EXP0, EXP1),
-   where CODE is one of EQ_EXPR, BIT_AND_EXPR, or BIT_IOR_EXPR.
-   BEFORE, WHEN_FALSE, and WHEN_TRUE are as in check_bool_init. */
-
-static void
-check_bool2_init (enum tree_code code, tree exp0, tree exp1,
-		  words before, words when_false, words when_true)
-{
-  word buf[2*4];
-  words tmp = num_current_words <= 2 ? buf
-    : ALLOC_WORDS (4 * num_current_words);
-  words when_false_0 = tmp;
-  words when_false_1 = tmp+num_current_words;
-  words when_true_0 = tmp+2*num_current_words;
-  words when_true_1 = tmp+3*num_current_words;
-  check_bool_init (exp0, before, when_false_0, when_true_0);
-  INTERSECT (before, when_false_0, when_true_0);
-  check_bool_init (exp1, before, when_false_1, when_true_1);
-
-  INTERSECT (before, when_false_1, when_true_1);
-
-  if (code == EQ_EXPR)
-    {
-      /* Now set:
-       * when_true = (when_false_1 INTERSECTION when_true_1)
-       *   UNION (when_true_0 INTERSECTION when_false_1)
-       *   UNION (when_false_0 INTERSECTION when_true_1);
-       * using when_false and before as temporary working areas.  */
-      INTERSECT (when_true, when_true_0, when_false_1);
-      INTERSECT (when_false, when_true_0, when_false_1);
-      UNION (when_true, when_true, when_false);
-      UNION (when_true, when_true, before);
-
-      /* Now set:
-       * when_false = (when_false_1 INTERSECTION when_true_1)
-       *   UNION (when_true_0 INTERSECTION when_true_1)
-       *   UNION (when_false_0 INTERSECTION when_false_1);
-       * using before as a temporary working area.  */
-      INTERSECT (when_false, when_true_0, when_true_1);
-      UNION (when_false, when_false, before);
-      INTERSECT (before, when_false_0, when_false_1);
-      UNION (when_false, when_false, before);
-    }
-  else if (code == BIT_AND_EXPR || code == TRUTH_AND_EXPR)
-    {
-      UNION (when_true, when_true_0, when_true_1);
-      INTERSECT (when_false, when_false_0, when_false_1);
-      UNION (when_false, when_false, before);
-    }
-  else /* if (code == BIT_IOR_EXPR || code == TRUTH_OR_EXPR) */
-    {
-      UNION (when_false, when_false_0, when_false_1);
-      INTERSECT (when_true, when_true_0, when_true_1);
-      UNION (when_true, when_true, before);
-    }
-
-  if (tmp != buf)
-    FREE_WORDS (tmp);
-}
-
-/* Check a boolean expression EXP for definite [un]assignment.
-   BEFORE is the set of variables definitely [un]assigned before the
-   conditional.  (This bitstring may be modified arbitrarily in this function.)
-   On output, WHEN_FALSE is the set of variables [un]definitely assigned after
-   the conditional when the conditional is false.
-   On output, WHEN_TRUE is the set of variables definitely [un]assigned after
-   the conditional when the conditional is true.
-   (WHEN_FALSE and WHEN_TRUE are overwritten with initial values ignored.)
-   (None of BEFORE, WHEN_FALSE, or WHEN_TRUE can overlap, as they may
-   be used as temporary working areas. */
-
-static void
-check_bool_init (tree exp, words before, words when_false, words when_true)
-{
-  switch (TREE_CODE (exp))
-    {
-    case COND_EXPR:
-      check_cond_init (TREE_OPERAND (exp, 0), TREE_OPERAND (exp, 1),
-		       TREE_OPERAND (exp, 2),
-		       before, when_false, when_true);
-      return;
-
-    case TRUTH_ANDIF_EXPR:
-      check_cond_init (TREE_OPERAND (exp, 0),
-		       TREE_OPERAND (exp, 1), boolean_false_node,
-		       before, when_false, when_true);
-      return;
-    case TRUTH_ORIF_EXPR:
-      check_cond_init (TREE_OPERAND (exp, 0),
-		       boolean_true_node, TREE_OPERAND (exp, 1),
-		       before, when_false, when_true);
-      return;
-    case TRUTH_NOT_EXPR:
-      check_bool_init (TREE_OPERAND (exp, 0), before, when_true, when_false);
-      return;
-
-    case BIT_AND_EXPR:
-    case BIT_IOR_EXPR:
-    case TRUTH_AND_EXPR:
-    case TRUTH_OR_EXPR:
-    case EQ_EXPR:
-      check_bool2_init (TREE_CODE (exp),
-			TREE_OPERAND (exp, 0), TREE_OPERAND (exp, 1),
-			before, when_false, when_true);
-      return;
-
-    case TRUTH_XOR_EXPR:
-    case BIT_XOR_EXPR:
-    case NE_EXPR:
-      /* Just like EQ_EXPR, but switch when_true and when_false. */
-      check_bool2_init (EQ_EXPR, TREE_OPERAND (exp, 0), TREE_OPERAND (exp, 1),
-			before, when_true, when_false);
-
-      return;
-
-    case INTEGER_CST:
-      if (integer_zerop (exp))
-	{
-	  SET_ALL (when_true);
-	  COPY (when_false, before);
-	}
-      else
-	{
-	  SET_ALL (when_false);
-	  COPY (when_true, before);
-	}
-      break;
-
-    default:
-      check_init (exp, before);
-      COPY (when_false, before);
-      COPY (when_true, before);
-    }
-}
-
-/* Used to keep track of control flow branches. */
-
-struct alternatives
-{
-  struct alternatives *outer;
-
-  /* The value of num_current_locals at the start of this compound. */
-  int num_locals;
-
-  /* The value of the "before" set at the start of the control structure.
-   Used for SWITCH_EXPR but not set for LABELED_BLOCK_EXPR. */
-  words saved;
-
-  int save_start_current_locals;
-
-  /* If num_current_words==1, combined==&one_word, for efficiency. */
-  word one_word;
-
-  /* The intersection of the "after" sets from previous branches. */
-  words combined;
-
-  tree block;
-};
-
-struct alternatives * alternatives = NULL;
-
-/* Begin handling a control flow branch.
-   BEFORE is the state of [un]assigned variables on entry.
-   CURRENT is a struct alt to manage the branch alternatives. */
-
-#define BEGIN_ALTERNATIVES(before, current) \
-{ \
-  current.saved = NULL; \
-  current.num_locals = num_current_locals; \
-  current.combined = num_current_words <= 1 ? &current.one_word \
-    : ALLOC_WORDS (num_current_words); \
-  SET_ALL (current.combined); \
-  current.outer = alternatives; \
-  alternatives = &current; \
-  current.save_start_current_locals = start_current_locals; \
-  start_current_locals = num_current_locals; \
-}
-
-/* We have finished with one branch of branching control flow.
-   Store the [un]assigned state, merging (intersecting) it with the state
-   of previous alternative branches. */
-
-static void
-done_alternative (words after, struct alternatives *current)
-{
-  INTERSECTN (current->combined, current->combined, after,
-	      WORDS_NEEDED (2 * current->num_locals));
-}
-
-/* Used when we done with a control flow branch and are all merged again.
- * AFTER is the merged state of [un]assigned variables,
-   CURRENT is a struct alt that was passed to BEGIN_ALTERNATIVES. */
-
-#define END_ALTERNATIVES(after, current) \
-{ \
-  alternatives = current.outer; \
-  COPY (after, current.combined); \
-  if (current.combined != &current.one_word) \
-    FREE_WORDS (current.combined); \
-  start_current_locals = current.save_start_current_locals; \
-}
-
-/* Check for (un)initialized local variables in EXP.  */
-
-static void
-check_init (tree exp, words before)
-{
-  tree tmp;
-  location_t save_location = input_location;
- again:
-  if (EXPR_HAS_LOCATION (exp))
-    input_location = EXPR_LOCATION (exp);
-  switch (TREE_CODE (exp))
-    {
-    case VAR_DECL:
-    case PARM_DECL:
-      if (! FIELD_STATIC (exp) && DECL_NAME (exp) != NULL_TREE
-	  && DECL_NAME (exp) != this_identifier_node)
-	{
-	  int index = DECL_BIT_INDEX (exp);
-	  /* We don't want to report and mark as non initialized class
-	     initialization flags. */
-	  if (! LOCAL_CLASS_INITIALIZATION_FLAG_P (exp)
-	      && index >= 0 && ! ASSIGNED_P (before, index))
-	    {
-	      error ("variable %qD may not have been initialized", exp);
-	      DECL_BIT_INDEX (exp) = -2;
-	    }
-	}
-      break;
-
-    case COMPONENT_REF:
-      check_init (TREE_OPERAND (exp, 0), before);
-      if ((tmp = get_variable_decl (exp)) != NULL_TREE)
-	{
-	  int index = DECL_BIT_INDEX (tmp);
-	  if (index >= 0 && ! ASSIGNED_P (before, index))
-	    {
-	      error ("variable %qD may not have been initialized", tmp);
-	      /* Suppress further errors. */
-	      DECL_BIT_INDEX (tmp) = -2;
-	    }
-	}
-      break;
-      
-    case MODIFY_EXPR:
-      tmp = TREE_OPERAND (exp, 0);
-      /* We're interested in variable declaration and parameter
-         declaration when they're declared with the `final' modifier. */
-      if ((tmp = get_variable_decl (tmp)) != NULL_TREE)
-	{
-	  int index;
-	  check_init (TREE_OPERAND (exp, 1), before);
-	  check_final_reassigned (tmp, before);
-	  index = DECL_BIT_INDEX (tmp);
-	  if (index >= 0)
-	    {
-	      SET_ASSIGNED (before, index);
-	      CLEAR_UNASSIGNED (before, index);
-	    }
-	  /* Minor optimization.  See comment for start_current_locals.
-	     If we're optimizing for class initialization, we keep
-	     this information to check whether the variable is
-	     definitely assigned when once we checked the whole
-	     function. */
-	  if (! STATIC_CLASS_INIT_OPT_P () /* FIXME */
-	      && ! DECL_FINAL (tmp)
-	      && index >= start_current_locals
-	      && index == num_current_locals - 1)
-	    {
-	      num_current_locals--;
-	      DECL_BIT_INDEX (tmp) = -1;
-	    }
-	 break;
-       }
-      else if (TREE_CODE (tmp = TREE_OPERAND (exp, 0)) == COMPONENT_REF)
-	{
-	  tree decl;
-	  check_init (tmp, before);
-	  check_init (TREE_OPERAND (exp, 1), before);
-	  decl = TREE_OPERAND (tmp, 1);
-	  if (DECL_FINAL (decl))
-	    final_assign_error (DECL_NAME (decl));
-	  break;
-	}
-      else if (TREE_CODE (tmp) == COMPONENT_REF && IS_ARRAY_LENGTH_ACCESS (tmp))
-	{
-	  /* We can't emit a more specific message here, because when
-	     compiling to bytecodes we don't get here. */
-	  final_assign_error (length_identifier_node);
-	}
-     else
-       goto binop;
-    case BLOCK:
-      if (BLOCK_EXPR_BODY (exp))
-	{
-	  tree decl = BLOCK_EXPR_DECLS (exp);
-	  int words_needed;
-	  word* tmp;
-	  int i;
-	  int save_start_current_locals = start_current_locals;
-	  int save_num_current_words = num_current_words;
-	  start_current_locals = num_current_locals;
-	  for (;  decl != NULL_TREE;  decl = TREE_CHAIN (decl))
-	    {
-	      DECL_BIT_INDEX (decl) = num_current_locals++;
-	    }
-	  words_needed = WORDS_NEEDED (2 * num_current_locals);
-	  if (words_needed > num_current_words)
-	    {
-	      tmp = ALLOC_WORDS (words_needed);
-	      COPY (tmp, before);
-	      num_current_words = words_needed;
-	    }
-	  else
-	    tmp = before;
-	  for (i = start_current_locals;  i < num_current_locals;  i++)
-	    {
-	      CLEAR_ASSIGNED (tmp, i);
-	      SET_UNASSIGNED (tmp, i);
-	    }
-	  check_init (BLOCK_EXPR_BODY (exp), tmp);
-
-	  /* Re-set DECL_BIT_INDEX since it is also DECL_POINTER_ALIAS_SET. */
-	  for (decl = BLOCK_EXPR_DECLS (exp);
-	       decl != NULL_TREE;  decl = TREE_CHAIN (decl))
-	    {
-	      if (LOCAL_CLASS_INITIALIZATION_FLAG_P (decl))
-		{
-		  int index = DECL_BIT_INDEX (decl);
-		  tree fndecl = DECL_CONTEXT (decl);
-		  if (fndecl && METHOD_STATIC (fndecl)
-		      && (DECL_INITIAL (decl) == boolean_true_node
-			  || (index >= 0 && ASSIGNED_P (tmp, index))))
-		    *(htab_find_slot 
-		      (DECL_FUNCTION_INITIALIZED_CLASS_TABLE (fndecl),
-		       DECL_FUNCTION_INIT_TEST_CLASS (decl), INSERT)) =
-		      DECL_FUNCTION_INIT_TEST_CLASS (decl);
-		}
-	      DECL_BIT_INDEX (decl) = -1;
-	    }
-
-	  num_current_locals = start_current_locals;
-	  start_current_locals = save_start_current_locals;
-	  if (tmp != before)
-	    {
-	      num_current_words = save_num_current_words;
-	      COPY (before, tmp);
-	      FREE_WORDS (tmp);
-	    }
-	}
-      break;
-    case LOOP_EXPR:
-      {
-	/* The JLS 2nd edition discusses a complication determining
-	   definite unassignment of loop statements.  They define a
-	   "hypothetical" analysis model.  We do something much
-	   simpler: We just disallow assignments inside loops to final
-	   variables declared outside the loop.  This means we may
-	   disallow some contrived assignments that the JLS, but I
-	   can't see how anything except a very contrived testcase (a
-	   do-while whose condition is false?) would care. */
-
-	struct alternatives alt;
-	int save_loop_current_locals = loop_current_locals;
-	int save_start_current_locals = start_current_locals;
-	loop_current_locals = num_current_locals;
-	start_current_locals = num_current_locals;
-	BEGIN_ALTERNATIVES (before, alt);
-	alt.block = exp;
-	check_init (TREE_OPERAND (exp, 0), before);
-	END_ALTERNATIVES (before, alt);
-	loop_current_locals = save_loop_current_locals;
-	start_current_locals = save_start_current_locals;
-	break;
-      }
-    case EXIT_EXPR:
-      {
-	struct alternatives *alt = alternatives;
-	DECLARE_BUFFERS(when_true, 2);
-	words when_false = when_true + num_current_words;
-#ifdef ENABLE_JC1_CHECKING
-	gcc_assert (TREE_CODE (alt->block) == LOOP_EXPR);
-#endif
-	check_bool_init (TREE_OPERAND (exp, 0), before, when_false, when_true);
-	done_alternative (when_true, alt);
-	COPY (before, when_false);
-	RELEASE_BUFFERS(when_true);
-	break;
-      }
-    case LABELED_BLOCK_EXPR:
-      {
-	struct alternatives alt;
-	BEGIN_ALTERNATIVES (before, alt);
-	alt.block = exp;
-	if (LABELED_BLOCK_BODY (exp))
-	  check_init (LABELED_BLOCK_BODY (exp), before);
-	done_alternative (before, &alt);
-	END_ALTERNATIVES (before, alt);
-	break;
-      }
-    case EXIT_BLOCK_EXPR:
-      {
-	tree block = TREE_OPERAND (exp, 0);
-	struct alternatives *alt = alternatives;
-	while (alt->block != block)
-	  alt = alt->outer;
-	done_alternative (before, alt);
-	SET_ALL (before);
-	break;
-      }
-    case SWITCH_EXPR:
-      {
-	struct alternatives alt;
-	word buf[2];
-	check_init (TREE_OPERAND (exp, 0), before);
-	BEGIN_ALTERNATIVES (before, alt);
-	alt.saved = ALLOC_BUFFER(buf, num_current_words);
-	COPY (alt.saved, before);
-	alt.block = exp;
-	check_init (TREE_OPERAND (exp, 1), before);
-	done_alternative (before, &alt);
-	if (! SWITCH_HAS_DEFAULT (exp))
-	  done_alternative (alt.saved, &alt);
-	FREE_BUFFER(alt.saved, buf);
-	END_ALTERNATIVES (before, alt);
-	break;
-      }
-    case CASE_EXPR:
-    case DEFAULT_EXPR:
-      {
-	int i;
-	struct alternatives *alt = alternatives;
-	while (TREE_CODE (alt->block) != SWITCH_EXPR)
-	  alt = alt->outer;
-	COPYN (before, alt->saved, WORDS_NEEDED (2 * alt->num_locals));
-	for (i = alt->num_locals;  i < num_current_locals;  i++)
-	  CLEAR_ASSIGNED (before, i);
-	break;
-      }
-
-    case TRY_EXPR:
-      {
-	tree try_clause = TREE_OPERAND (exp, 0);
-	tree clause = TREE_OPERAND (exp, 1);
-	word buf[2*2];
-	words tmp = (num_current_words <= 2 ? buf
-		    : ALLOC_WORDS (2 * num_current_words));
-	words save = tmp + num_current_words;
-	struct alternatives alt;
-	BEGIN_ALTERNATIVES (before, alt);
-	COPY (save, before);
-	COPY (tmp, save);
-	check_init (try_clause, tmp);
-	done_alternative (tmp, &alt);
-	for ( ; clause != NULL_TREE;  clause = TREE_CHAIN (clause))
-	  {
-	    tree catch_clause = TREE_OPERAND (clause, 0);
-	    COPY (tmp, save);
-	    check_init (catch_clause, tmp);
-	    done_alternative (tmp, &alt);
-	  }
-	if (tmp != buf)
-	  {
-	    FREE_WORDS (tmp);
-	  }
-	END_ALTERNATIVES (before, alt);
-      }
-    break;
-
-    case TRY_FINALLY_EXPR:
-      {
-	DECLARE_BUFFERS(tmp, 1);
-	COPY (tmp, before);
-	check_init (TREE_OPERAND (exp, 0), before);
-	check_init (TREE_OPERAND (exp, 1), tmp);
-	UNION (before, before, tmp);
-	RELEASE_BUFFERS(tmp);
-      }
-      break;
-
-    case RETURN_EXPR:
-    case THROW_EXPR:
-      if (TREE_OPERAND (exp, 0))
-	check_init (TREE_OPERAND (exp, 0), before);
-      goto never_continues;
-
-    case ERROR_MARK:
-    never_continues:
-      SET_ALL (before);
-      break;
-      
-    case COND_EXPR:
-    case TRUTH_ANDIF_EXPR:
-    case TRUTH_ORIF_EXPR:
-      {
-	DECLARE_BUFFERS(when_true, 2);
-	words when_false = when_true + num_current_words;
-	check_bool_init (exp, before, when_false, when_true);
-	INTERSECT (before, when_false, when_true);
-	RELEASE_BUFFERS(when_true);
-      }
-      break;
-
-    case NOP_EXPR:
-      if (IS_EMPTY_STMT (exp))
-	break;
-      /* ... else fall through ... */
-    case UNARY_PLUS_EXPR:
-    case NEGATE_EXPR:
-    case TRUTH_AND_EXPR:
-    case TRUTH_OR_EXPR:
-    case TRUTH_XOR_EXPR:
-    case TRUTH_NOT_EXPR:
-    case BIT_NOT_EXPR:
-    case CONVERT_EXPR:
-    case VIEW_CONVERT_EXPR:
-    case BIT_FIELD_REF:
-    case FLOAT_EXPR:
-    case FIX_TRUNC_EXPR:
-    case INDIRECT_REF:
-    case ADDR_EXPR:
-    case NON_LVALUE_EXPR:
-    case INSTANCEOF_EXPR:
-    case ABS_EXPR:
-      /* Avoid needless recursion. */
-      exp = TREE_OPERAND (exp, 0);
-      goto again;
-
-    case PREDECREMENT_EXPR:
-    case PREINCREMENT_EXPR:
-    case POSTDECREMENT_EXPR:
-    case POSTINCREMENT_EXPR:
-      tmp = get_variable_decl (TREE_OPERAND (exp, 0));
-      if (tmp != NULL_TREE && DECL_FINAL (tmp))
-	final_assign_error (DECL_NAME (tmp));
-      else if (TREE_CODE (tmp = TREE_OPERAND (exp, 0)) == COMPONENT_REF)
-        {
-          /* Take care of array length accesses too.  */
-          tree decl = TREE_OPERAND (tmp, 1);
-          if (DECL_FINAL (decl))
-            final_assign_error (DECL_NAME (decl));
-        }
-
-      /* Avoid needless recursion.  */
-      exp = TREE_OPERAND (exp, 0);
-      goto again;
-
-    case SAVE_EXPR:
-      if (IS_INIT_CHECKED (exp))
-	break;
-      IS_INIT_CHECKED (exp) = 1;
-      exp = TREE_OPERAND (exp, 0);
-      goto again;
-
-    case COMPOUND_EXPR:
-    case PLUS_EXPR:
-    case MINUS_EXPR:
-    case MULT_EXPR:
-    case TRUNC_DIV_EXPR:
-    case TRUNC_MOD_EXPR:
-    case RDIV_EXPR:
-    case LSHIFT_EXPR:
-    case RSHIFT_EXPR:
-    case URSHIFT_EXPR:
-    case BIT_AND_EXPR:
-    case BIT_XOR_EXPR:
-    case BIT_IOR_EXPR:
-    case EQ_EXPR: 
-    case NE_EXPR:
-    case GT_EXPR:
-    case GE_EXPR:
-    case LT_EXPR:
-    case LE_EXPR:
-    case MAX_EXPR:
-    case MIN_EXPR:
-    case ARRAY_REF:
-    case LROTATE_EXPR:
-    case RROTATE_EXPR:
-    case CEIL_DIV_EXPR:
-    case FLOOR_DIV_EXPR:
-    case ROUND_DIV_EXPR:
-    case CEIL_MOD_EXPR:
-    case FLOOR_MOD_EXPR:
-    case ROUND_MOD_EXPR:
-    case EXACT_DIV_EXPR:
-    case UNLT_EXPR:
-    case UNLE_EXPR:
-    case UNGT_EXPR:
-    case UNGE_EXPR:
-    case UNEQ_EXPR:
-    case LTGT_EXPR:
-    binop:
-      check_init (TREE_OPERAND (exp, 0), before);
-      /* Avoid needless recursion, especially for COMPOUND_EXPR. */
-      exp = TREE_OPERAND (exp, 1);
-      goto again;
-
-    case RESULT_DECL:
-    case FUNCTION_DECL:
-    case INTEGER_CST:
-    case REAL_CST:
-    case STRING_CST:
-    case DECL_EXPR:
-    case JAVA_EXC_OBJ_EXPR:
-      break;
-
-    case NEW_CLASS_EXPR:
-    case CALL_EXPR:
-      {
-	tree func = TREE_OPERAND (exp, 0);
-	tree x = TREE_OPERAND (exp, 1);
-	if (TREE_CODE (func) == ADDR_EXPR)
-	  func = TREE_OPERAND (func, 0);
-	check_init (func, before);
-
-	for ( ;  x != NULL_TREE;  x = TREE_CHAIN (x))
-	  check_init (TREE_VALUE (x), before);
-	if (func == throw_node)
-	  goto never_continues;
-      }
-      break;
-
-    case NEW_ARRAY_INIT:
-      {
-	tree value;
-	unsigned HOST_WIDE_INT idx;
-	FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (TREE_OPERAND (exp, 0)),
-				    idx, value)
-	  check_init (value, before);
-      }
-      break;
-
-    case EXPR_WITH_FILE_LOCATION:
-      {
-	location_t saved_location = input_location;
-	tree body = EXPR_WFL_NODE (exp);
-	if (IS_EMPTY_STMT (body))
-	  break;
-#ifdef USE_MAPPED_LOCATION
-	input_location = EXPR_LOCATION (exp);
-#else
-	input_filename = EXPR_WFL_FILENAME (exp);
-	input_line = EXPR_WFL_LINENO (exp);
-#endif
-	check_init (body, before);
-	input_location = saved_location;
-      }
-      break;
-      
-    default:
-      internal_error
-	("internal error in check-init: tree code not implemented: %s",
-	 tree_code_name [(int) TREE_CODE (exp)]);
-    }
-  input_location = save_location;
-}
-
-void
-check_for_initialization (tree body, tree mdecl)
-{
-  tree decl;
-  word buf[2];
-  words before = buf;
-  tree owner = DECL_CONTEXT (mdecl);
-  int is_static_method = METHOD_STATIC (mdecl);
-  /* We don't need to check final fields of <init> it it calls this(). */
-  int is_finit_method = DECL_FINIT_P (mdecl) || DECL_INSTINIT_P (mdecl);
-  int is_init_method
-    = (is_finit_method || DECL_CLINIT_P (mdecl)
-       || (DECL_INIT_P (mdecl) && ! DECL_INIT_CALLS_THIS (mdecl)));
-
-  start_current_locals = num_current_locals = 0;
-  num_current_words = 2;
-
-  if (is_init_method)
-    {
-      int words_needed, i;
-      for (decl = TYPE_FIELDS (owner);
-	   decl != NULL_TREE;  decl = TREE_CHAIN (decl))
-	{
-	  if (DECL_FINAL (decl) && FIELD_STATIC (decl) == is_static_method)
-	    {
-	      if (DECL_FIELD_FINAL_IUD (decl))
-		DECL_BIT_INDEX (decl) = -1;
-	      else
-		DECL_BIT_INDEX (decl) = num_current_locals++;
-	    }
-	}
-      words_needed = WORDS_NEEDED (2 * num_current_locals);
-      if (words_needed > 2)
-	{
-	  num_current_words = words_needed;
-	  before = ALLOC_WORDS(words_needed);
-	}
-      i = 0;
-      for (decl = TYPE_FIELDS (owner);
-	   decl != NULL_TREE;  decl = TREE_CHAIN (decl))
-	{
-	  if (FIELD_FINAL (decl) && FIELD_STATIC (decl) == is_static_method)
-	    {
-	      if (! DECL_FIELD_FINAL_IUD (decl))
-		{
-		  CLEAR_ASSIGNED (before, i);
-		  SET_UNASSIGNED (before, i);
-		  i++;
-		}
-	    }
-	}
-
-    }
-
-  check_init (body, before);
-
-  if (is_init_method)
-    {
-      for (decl = TYPE_FIELDS (owner);
-	   decl != NULL_TREE;  decl = TREE_CHAIN (decl))
-	{
-	  if (FIELD_FINAL (decl) && FIELD_STATIC (decl) == is_static_method)
-	    {
-	      int index = DECL_BIT_INDEX (decl);
-	      if (index >= 0 && ! ASSIGNED_P (before, index))
-		{
-		  if (! is_finit_method)
-		    error ("%Jfinal field %qD may not have been initialized",
-                           decl, decl);
-		}
-	      else if (is_finit_method)
-		DECL_FIELD_FINAL_IUD (decl) = 1;
-
-	      /* Re-set to initial state, since we later may use the
-		 same bit for DECL_POINTER_ALIAS_SET. */
-	      DECL_BIT_INDEX (decl) = -1;
-	    }
-	}
-    }
-
-  start_current_locals = num_current_locals = 0;
-}
diff --git a/gcc/java/class.c b/gcc/java/class.c
index b1faafc..e9d8174 100644
--- a/gcc/java/class.c
+++ b/gcc/java/class.c
@@ -1,6 +1,6 @@
 /* Functions related to building classes and their related objects.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -46,6 +46,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "cgraph.h"
 #include "tree-iterator.h"
 #include "cgraph.h"
+#include "vecprim.h"
 
 /* DOS brain-damage */
 #ifndef O_BINARY
@@ -68,6 +69,8 @@ static void register_class (void);
 
 struct obstack temporary_obstack;
 
+static const char *cyclic_inheritance_report;
+
 /* The compiler generates different code depending on whether or not
    it can assume certain classes have been compiled down to native
    code or not.  The compiler options -fassume-compiled= and
@@ -497,6 +500,9 @@ set_class_decl_access_flags (int access_flags, tree class_decl)
   if (access_flags & ACC_PRIVATE)   CLASS_PRIVATE (class_decl) = 1;
   if (access_flags & ACC_PROTECTED) CLASS_PROTECTED (class_decl) = 1;
   if (access_flags & ACC_STRICT)    CLASS_STRICTFP (class_decl) = 1;
+  if (access_flags & ACC_ENUM)      CLASS_ENUM (class_decl) = 1;
+  if (access_flags & ACC_SYNTHETIC) CLASS_SYNTHETIC (class_decl) = 1;
+  if (access_flags & ACC_ANNOTATION) CLASS_ANNOTATION (class_decl) = 1;
 }
 
 /* Return length of inheritance chain of CLAS, where java.lang.Object is 0,
@@ -719,9 +725,6 @@ add_method_1 (tree this_class, int access_flags, tree name, tree function_type)
     DECL_FUNCTION_INITIALIZED_CLASS_TABLE (fndecl) =
       htab_create_ggc (50, htab_hash_pointer, htab_eq_pointer, NULL);
 
-  /* Initialize the static method invocation compound list */
-  DECL_FUNCTION_STATIC_METHOD_INVOCATION_COMPOUND (fndecl) = NULL_TREE;
-
   TREE_CHAIN (fndecl) = TYPE_METHODS (this_class);
   TYPE_METHODS (this_class) = fndecl;
 
@@ -748,6 +751,9 @@ add_method_1 (tree this_class, int access_flags, tree name, tree function_type)
   if (access_flags & ACC_SYNCHRONIZED) METHOD_SYNCHRONIZED (fndecl) = 1;
   if (access_flags & ACC_ABSTRACT) METHOD_ABSTRACT (fndecl) = 1;
   if (access_flags & ACC_STRICT) METHOD_STRICTFP (fndecl) = 1;
+  if (access_flags & ACC_SYNTHETIC) DECL_ARTIFICIAL (fndecl) = 1;
+  if (access_flags & ACC_BRIDGE) METHOD_BRIDGE (fndecl) = 1;
+  if (access_flags & ACC_VARARGS) METHOD_VARARGS (fndecl) = 1;
   return fndecl;
 }
 
@@ -780,6 +786,7 @@ add_field (tree class, tree name, tree field_type, int flags)
   TREE_CHAIN (field) = TYPE_FIELDS (class);
   TYPE_FIELDS (class) = field;
   DECL_CONTEXT (field) = class;
+  MAYBE_CREATE_VAR_LANG_DECL_SPECIFIC (field);
 
   if (flags & ACC_PUBLIC) FIELD_PUBLIC (field) = 1;
   if (flags & ACC_PROTECTED) FIELD_PROTECTED (field) = 1;
@@ -791,15 +798,17 @@ add_field (tree class, tree name, tree field_type, int flags)
       TREE_THIS_VOLATILE (field) = 1;
     }
   if (flags & ACC_TRANSIENT) FIELD_TRANSIENT (field) = 1;
+  if (flags & ACC_ENUM) FIELD_ENUM (field) = 1;
+  if (flags & ACC_SYNTHETIC) FIELD_SYNTHETIC (field) = 1;
   if (is_static)
     {
       FIELD_STATIC (field) = 1;
       /* Always make field externally visible.  This is required so
 	 that native methods can always access the field.  */
       TREE_PUBLIC (field) = 1;
-      /* Considered external until we know what classes are being
-	 compiled into this object file.  */
-      DECL_EXTERNAL (field) = 1;
+      /* Considered external unless we are compiling it into this
+	 object file.  */
+      DECL_EXTERNAL (field) = (is_compiled_class (class) != 2);
     }
 
   return field;
@@ -1219,6 +1228,10 @@ get_access_flags_from_decl (tree decl)
 	access_flags |= ACC_VOLATILE;
       if (FIELD_TRANSIENT (decl))
 	access_flags |= ACC_TRANSIENT;
+      if (FIELD_ENUM (decl))
+	access_flags |= ACC_ENUM;
+      if (FIELD_SYNTHETIC (decl))
+	access_flags |= ACC_SYNTHETIC;
       return access_flags;
     }
   if (TREE_CODE (decl) == TYPE_DECL)
@@ -1241,6 +1254,12 @@ get_access_flags_from_decl (tree decl)
 	access_flags |= ACC_PROTECTED;
       if (CLASS_STRICTFP (decl))
 	access_flags |= ACC_STRICT;
+      if (CLASS_ENUM (decl))
+	access_flags |= ACC_ENUM;
+      if (CLASS_SYNTHETIC (decl))
+	access_flags |= ACC_SYNTHETIC;
+      if (CLASS_ANNOTATION (decl))
+	access_flags |= ACC_ANNOTATION;
       return access_flags;
     }
   if (TREE_CODE (decl) == FUNCTION_DECL)
@@ -1265,6 +1284,12 @@ get_access_flags_from_decl (tree decl)
 	access_flags |= ACC_STRICT;
       if (METHOD_INVISIBLE (decl))
 	access_flags |= ACC_INVISIBLE;
+      if (DECL_ARTIFICIAL (decl))
+	access_flags |= ACC_SYNTHETIC;
+      if (METHOD_BRIDGE (decl))
+	access_flags |= ACC_BRIDGE;
+      if (METHOD_VARARGS (decl))
+	access_flags |= ACC_VARARGS;
       return access_flags;
     }
   gcc_unreachable ();
@@ -1646,6 +1671,8 @@ make_class_data (tree type)
       to where objects actually point at, following new g++ ABI. */
   tree dtable_start_offset = build_int_cst (NULL_TREE,
 					    2 * POINTER_SIZE / BITS_PER_UNIT);
+  VEC(int, heap) *field_indexes;
+  tree first_real_field;
 
   this_class_addr = build_static_class_ref (type);
   decl = TREE_OPERAND (this_class_addr, 0);
@@ -1655,15 +1682,28 @@ make_class_data (tree type)
     {
       tree dtable = get_dispatch_table (type, this_class_addr);
       uses_jv_markobj = uses_jv_markobj_p (dtable);
-      dtable_decl = build_dtable_decl (type);
-      DECL_INITIAL (dtable_decl) = dtable;
-      TREE_STATIC (dtable_decl) = 1;
-      DECL_ARTIFICIAL (dtable_decl) = 1;
-      DECL_IGNORED_P (dtable_decl) = 1;
+      if (type == class_type_node && class_dtable_decl != NULL_TREE)
+	{
+	  /* We've already created some other class, and consequently
+	     we made class_dtable_decl.  Now we just want to fill it
+	     in.  */
+	  dtable_decl = class_dtable_decl;
+	}
+      else
+	{
+	  dtable_decl = build_dtable_decl (type);
+	  TREE_STATIC (dtable_decl) = 1;
+	  DECL_ARTIFICIAL (dtable_decl) = 1;
+	  DECL_IGNORED_P (dtable_decl) = 1;
+	}
+
       TREE_PUBLIC (dtable_decl) = 1;
+      DECL_INITIAL (dtable_decl) = dtable;
       if (! flag_indirect_classes)
 	rest_of_decl_compilation (dtable_decl, 1, 0);
-      if (type == class_type_node)
+      /* Maybe we're compiling Class as the first class.  If so, set
+	 class_dtable_decl to the decl we just made.  */
+      if (type == class_type_node && class_dtable_decl == NULL_TREE)
 	class_dtable_decl = dtable_decl;
     }
 
@@ -1673,7 +1713,54 @@ make_class_data (tree type)
     field = TREE_CHAIN (field);  /* Skip dummy fields.  */
   if (field && DECL_NAME (field) == NULL_TREE)
     field = TREE_CHAIN (field);  /* Skip dummy field for inherited data. */
-  for ( ;  field != NULL_TREE;  field = TREE_CHAIN (field))
+  first_real_field = field;
+
+  /* First count static and instance fields.  */
+  for ( ; field != NULL_TREE; field = TREE_CHAIN (field))
+    {
+      if (! DECL_ARTIFICIAL (field))
+	{
+	  if (FIELD_STATIC (field))
+	    static_field_count++;
+	  else if (uses_jv_markobj || !flag_reduced_reflection)
+	    instance_field_count++;
+	}
+    }
+  field_count = static_field_count + instance_field_count;
+  field_indexes = VEC_alloc (int, heap, field_count);
+  
+  /* gcj sorts fields so that static fields come first, followed by
+     instance fields.  Unfortunately, by the time this takes place we
+     have already generated the reflection_data for this class, and
+     that data contians indexes into the fields.  So, we generate a
+     permutation that maps each original field index to its final
+     position.  Then we pass this permutation to
+     rewrite_reflection_indexes(), which fixes up the reflection
+     data.  */
+  {
+    int i;
+    int static_count = 0;
+    int instance_count = static_field_count;
+    int field_index;
+
+    for (i = 0, field = first_real_field; 
+	 field != NULL_TREE; 
+	 field = TREE_CHAIN (field), i++)
+    {
+      if (! DECL_ARTIFICIAL (field))
+	{
+	  field_index = 0;
+	  if (FIELD_STATIC (field))
+	    field_index = static_count++;
+	  else if (uses_jv_markobj || !flag_reduced_reflection)
+	    field_index = instance_count++;
+	  VEC_quick_push (int, field_indexes, field_index);
+	}
+    }
+  }
+
+  for (field = first_real_field; field != NULL_TREE; 
+       field = TREE_CHAIN (field))
     {
       if (! DECL_ARTIFICIAL (field))
 	{
@@ -1683,7 +1770,6 @@ make_class_data (tree type)
                  as it is used in the creation of the field itself. */
               tree init = make_field_value (field);
 	      tree initial = DECL_INITIAL (field);
-	      static_field_count++;
 	      static_fields = tree_cons (NULL_TREE, init, static_fields);
 	      /* If the initial value is a string constant,
 		 prevent output_constant from trying to assemble the value. */
@@ -1696,12 +1782,11 @@ make_class_data (tree type)
 	  else if (uses_jv_markobj || !flag_reduced_reflection)
 	    {
               tree init = make_field_value (field);
-	      instance_field_count++;
 	      instance_fields = tree_cons (NULL_TREE, init, instance_fields);
 	    }
 	}
     }
-  field_count = static_field_count + instance_field_count;
+
   if (field_count > 0)
     {
       static_fields = nreverse (static_fields);
@@ -1781,8 +1866,10 @@ make_class_data (tree type)
       DECL_ARTIFICIAL (class_dtable_decl) = 1;
       DECL_IGNORED_P (class_dtable_decl) = 1;
       if (is_compiled_class (class_type_node) != 2)
-	DECL_EXTERNAL (class_dtable_decl) = 1;
-      rest_of_decl_compilation (class_dtable_decl, 1, 0);
+	{
+	  DECL_EXTERNAL (class_dtable_decl) = 1;
+	  rest_of_decl_compilation (class_dtable_decl, 1, 0);
+	}
     }
 
   super = CLASSTYPE_SUPER (type);
@@ -2001,6 +2088,48 @@ make_class_data (tree type)
   PUSH_FIELD_VALUE (cons, "aux_info", null_pointer_node);
   PUSH_FIELD_VALUE (cons, "engine", null_pointer_node);
 
+  if (TYPE_REFLECTION_DATA (current_class))
+    {
+      int i;
+      int count = TYPE_REFLECTION_DATASIZE (current_class);
+      VEC (constructor_elt, gc) *v
+	= VEC_alloc (constructor_elt, gc, count);
+      unsigned char *data = TYPE_REFLECTION_DATA (current_class);
+      tree max_index = build_int_cst (sizetype, count);
+      tree index = build_index_type (max_index);
+      tree type = build_array_type (unsigned_byte_type_node, index);
+      char buf[64];
+      tree array;
+      static int reflection_data_count;
+
+      sprintf (buf, "_reflection_data_%d", reflection_data_count++);
+      array = build_decl (VAR_DECL, get_identifier (buf), type);
+
+      rewrite_reflection_indexes (field_indexes);
+
+      for (i = 0; i < count; i++)
+	{
+	  constructor_elt *elt = VEC_quick_push (constructor_elt, v, NULL);
+ 	  elt->index = build_int_cst (sizetype, i);
+	  elt->value = build_int_cstu (byte_type_node, data[i]);
+	}
+
+      DECL_INITIAL (array) = build_constructor (type, v);
+      TREE_STATIC (array) = 1;
+      DECL_ARTIFICIAL (array) = 1;
+      DECL_IGNORED_P (array) = 1;
+      TREE_READONLY (array) = 1;
+      TREE_CONSTANT (DECL_INITIAL (array)) = 1;
+      rest_of_decl_compilation (array, 1, 0);
+      
+      PUSH_FIELD_VALUE (cons, "reflection_data", build_address_of (array));
+
+      free (data);
+      TYPE_REFLECTION_DATA (current_class) = NULL;
+    }
+  else
+    PUSH_FIELD_VALUE (cons, "reflection_data", null_pointer_node);
+
   FINISH_RECORD_CONSTRUCTOR (cons);
 
   DECL_INITIAL (decl) = cons;
@@ -2066,11 +2195,13 @@ is_compiled_class (tree class)
     return 1;
   if (TYPE_ARRAY_P (class))
     return 0;
+  /* We have to check this explicitly to avoid trying to load a class
+     that we're currently parsing.  */
   if (class == current_class)
     return 2;
 
   seen_in_zip = (TYPE_JCF (class) && JCF_SEEN_IN_ZIP (TYPE_JCF (class)));
-  if (CLASS_FROM_CURRENTLY_COMPILED_P (class) || seen_in_zip)
+  if (CLASS_FROM_CURRENTLY_COMPILED_P (class))
     {
       /* The class was seen in the current ZIP file and will be
 	 available as a compiled class in the future but may not have
@@ -2182,7 +2313,7 @@ push_super_field (tree this_class, tree super_class)
 /* Handle the different manners we may have to lay out a super class.  */
 
 static tree
-maybe_layout_super_class (tree super_class, tree this_class)
+maybe_layout_super_class (tree super_class, tree this_class ATTRIBUTE_UNUSED)
 {
   if (!super_class)
     return NULL_TREE;
@@ -2201,6 +2332,7 @@ maybe_layout_super_class (tree super_class, tree this_class)
 	super_class = TREE_TYPE (super_class);
       else
 	{
+#if 0
 	  /* do_resolve_class expects an EXPR_WITH_FILE_LOCATION, so
 	     we give it one.  */
 	  tree this_wrap = NULL_TREE;
@@ -2226,6 +2358,8 @@ maybe_layout_super_class (tree super_class, tree this_class)
 	  if (!super_class)
 	    return NULL_TREE;	/* FIXME, NULL_TREE not checked by caller. */
 	  super_class = TREE_TYPE (super_class);
+#endif
+	  gcc_unreachable ();
 	}
     }
   if (!TYPE_SIZE (super_class))
@@ -2234,6 +2368,22 @@ maybe_layout_super_class (tree super_class, tree this_class)
   return super_class;
 }
 
+/* safe_layout_class just makes sure that we can load a class without
+   disrupting the current_class, input_file, input_line, etc, information
+   about the class processed currently.  */
+
+void
+safe_layout_class (tree class)
+{
+  tree save_current_class = current_class;
+  location_t save_location = input_location;
+
+  layout_class (class);
+
+  current_class = save_current_class;
+  input_location = save_location;
+}
+
 void
 layout_class (tree this_class)
 {
@@ -2450,9 +2600,10 @@ layout_class_method (tree this_class, tree super_class,
   tree method_name = DECL_NAME (method_decl);
 
   TREE_PUBLIC (method_decl) = 1;
-  /* Considered external until we know what classes are being
-     compiled into this object file.  */
-  DECL_EXTERNAL (method_decl) = 1;
+  /* Considered external unless it is being compiled into this object
+     file.  */
+  DECL_EXTERNAL (method_decl) = ((is_compiled_class (this_class) != 2)
+				 || METHOD_NATIVE (method_decl));
 
   if (ID_INIT_P (method_name))
     {
@@ -2464,14 +2615,14 @@ layout_class_method (tree this_class, tree super_class,
 	    p = ptr;
 	}
       DECL_CONSTRUCTOR_P (method_decl) = 1;
-      build_java_argument_signature (TREE_TYPE (method_decl));
+      build_java_signature (TREE_TYPE (method_decl));
     }
   else if (! METHOD_STATIC (method_decl))
     {
       tree method_sig =
-	build_java_argument_signature (TREE_TYPE (method_decl));
+	build_java_signature (TREE_TYPE (method_decl));
       bool method_override = false;
-      tree super_method = lookup_argument_method (super_class, method_name,
+      tree super_method = lookup_java_method (super_class, method_name,
 						  method_sig);
       if (super_method != NULL_TREE
 	  && ! METHOD_DUMMY (super_method))
diff --git a/gcc/java/config-lang.in b/gcc/java/config-lang.in
index d046c66..17ecbc9 100644
--- a/gcc/java/config-lang.in
+++ b/gcc/java/config-lang.in
@@ -1,6 +1,6 @@
 # Top level configure fragment for the GNU compiler for the Java(TM)
 # language.
-#  Copyright (C) 1994, 1995, 2000, 2001, 2003 Free Software Foundation, Inc.
+#  Copyright (C) 1994, 1995, 2000, 2001, 2003, 2007 Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
@@ -34,9 +34,9 @@ language="java"
 
 compilers="jc1\$(exeext) jvgenmain\$(exeext)"
 
-stagestuff="jc1\$(exeext) gcj\$(exeext) jvgenmain\$(exeext) gcjh\$(exeext) gjnih\$(exeext) jv-scan\$(exeext) jcf-dump\$(exeext)"
+stagestuff="jc1\$(exeext) gcj\$(exeext) jvgenmain\$(exeext) jcf-dump\$(exeext)"
 
-gtfiles="\$(srcdir)/java/java-tree.h \$(srcdir)/java/jcf.h \$(srcdir)/java/lex.h \$(srcdir)/java/parse.h \$(srcdir)/java/builtins.c \$(srcdir)/java/class.c \$(srcdir)/java/constants.c \$(srcdir)/java/decl.c \$(srcdir)/java/expr.c \$(srcdir)/java/jcf-parse.c \$(srcdir)/java/jcf-write.c \$(srcdir)/java/lang.c \$(srcdir)/java/mangle.c \$(srcdir)/java/parse.y \$(srcdir)/java/resource.c"
+gtfiles="\$(srcdir)/java/java-tree.h \$(srcdir)/java/jcf.h \$(srcdir)/java/parse.h \$(srcdir)/java/builtins.c \$(srcdir)/java/class.c \$(srcdir)/java/constants.c \$(srcdir)/java/decl.c \$(srcdir)/java/expr.c \$(srcdir)/java/jcf-parse.c \$(srcdir)/java/lang.c \$(srcdir)/java/mangle.c \$(srcdir)/java/resource.c"
 
 target_libs=${libgcj_saved}
 lang_dirs="zlib fastjar"
diff --git a/gcc/java/constants.c b/gcc/java/constants.c
index 2f4c053..70e5321 100644
--- a/gcc/java/constants.c
+++ b/gcc/java/constants.c
@@ -34,11 +34,9 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 
 static void set_constant_entry (CPool *, int, int, jword);
 static int find_tree_constant (CPool *, int, tree);
-static int find_class_or_string_constant (CPool *, int, tree);
 static int find_name_and_type_constant (CPool *, tree, tree);
 static tree get_tag_node (int);
 static tree build_constant_data_ref (void);
-static CPool *cpool_for_class (tree);
 
 /* Set the INDEX'th constant in CPOOL to have the given TAG and VALUE. */
 
@@ -134,7 +132,7 @@ find_utf8_constant (CPool *cpool, tree name)
   return find_tree_constant (cpool, CONSTANT_Utf8, name);
 }
 
-static int
+int
 find_class_or_string_constant (CPool *cpool, int tag, tree name)
 {
   jword j = find_utf8_constant (cpool, name);
@@ -322,6 +320,9 @@ get_tag_node (int tag)
 {
   /* A Cache for build_int_cst (CONSTANT_XXX, 0). */
 
+  if (tag >= 13)
+    return build_int_cst (NULL_TREE, tag);
+
   if (tag_nodes[tag] == NULL_TREE)
     tag_nodes[tag] = build_int_cst (NULL_TREE, tag);
   return tag_nodes[tag];
@@ -329,7 +330,7 @@ get_tag_node (int tag)
 
 /* Given a class, return its constant pool, creating one if necessary.  */
 
-static CPool *
+CPool *
 cpool_for_class (tree class)
 {
   CPool *cpool = TYPE_CPOOL (class);
@@ -495,11 +496,20 @@ build_constants_constructor (void)
   tree tags_list = NULL_TREE;
   tree data_list = NULL_TREE;
   int i;
+
   for (i = outgoing_cpool->count;  --i > 0; )
-    switch (outgoing_cpool->tags[i])
+    switch (outgoing_cpool->tags[i] & ~CONSTANT_LazyFlag)
       {
+      case CONSTANT_None:  /* The second half of a Double or Long on a
+			      32-bit target.  */
       case CONSTANT_Fieldref:
       case CONSTANT_NameAndType:
+      case CONSTANT_Float:
+      case CONSTANT_Integer:
+      case CONSTANT_Double:
+      case CONSTANT_Long:
+      case CONSTANT_Methodref:
+      case CONSTANT_InterfaceMethodref:
 	{
 	  unsigned HOST_WIDE_INT temp = outgoing_cpool->data[i].w;
 
@@ -512,8 +522,7 @@ build_constants_constructor (void)
 	    temp <<= BITS_PER_WORD - 32;
 
 	  tags_list
-	    = tree_cons (NULL_TREE, 
-			 build_int_cst (NULL_TREE, outgoing_cpool->tags[i]),
+	    = tree_cons (NULL_TREE, get_tag_node (outgoing_cpool->tags[i]),
 			 tags_list);
 	  data_list
 	    = tree_cons (NULL_TREE, 
@@ -522,7 +531,11 @@ build_constants_constructor (void)
 			 data_list);
 	}
 	break;
-      default:
+
+      case CONSTANT_Class:
+      case CONSTANT_String:
+      case CONSTANT_Unicode:
+      case CONSTANT_Utf8:
 	tags_list
 	  = tree_cons (NULL_TREE, get_tag_node (outgoing_cpool->tags[i]),
 		       tags_list);
@@ -530,6 +543,9 @@ build_constants_constructor (void)
 	  = tree_cons (NULL_TREE, build_utf8_ref (outgoing_cpool->data[i].t),
 		       data_list);
 	break;
+
+      default:
+	gcc_assert (false);
       }
   if (outgoing_cpool->count > 0)
     {
diff --git a/gcc/java/convert.h b/gcc/java/convert.h
deleted file mode 100644
index f08c413..0000000
--- a/gcc/java/convert.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Definition of conversion functions.
-   Copyright (C) 1993, 1998, 2000, 2003 Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-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.
-
-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 GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-
-/* Written by Jeffrey Hsu <hsu@cygnus.com> */
-
-extern tree convert_to_integer (tree type, tree expr);
-extern tree convert_to_real (tree type, tree expr);
-extern tree convert_to_pointer (tree type, tree expr);
diff --git a/gcc/java/decl.c b/gcc/java/decl.c
index 912f854..3460609 100644
--- a/gcc/java/decl.c
+++ b/gcc/java/decl.c
@@ -1,7 +1,7 @@
 /* Process declarations and variables for the GNU compiler for the
    Java(TM) language.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -75,9 +75,9 @@ static void parse_version (void);
 					  loader.  */
 
 /* If an ABI change is made within a GCC release series, rendering current
-   binaries incompatible with the old runtimes, this number can be set to
+   binaries incompatible with the old runtimes, this number must be set to
    enforce the compatibility rules. */
-#define MINOR_BINARYCOMPAT_ABI_VERSION 0
+#define MINOR_BINARYCOMPAT_ABI_VERSION 1
 
 /* The runtime may recognize a variety of BC ABIs (objects generated by 
    different version of gcj), but will probably always require strict 
@@ -755,15 +755,9 @@ java_init_decl_processing (void)
   TYPE_identifier_node = get_identifier ("TYPE");
   init_identifier_node = get_identifier ("<init>");
   clinit_identifier_node = get_identifier ("<clinit>");
-  finit_identifier_node = get_identifier ("finit$");
-  instinit_identifier_node = get_identifier ("instinit$");
   void_signature_node = get_identifier ("()V");
-  length_identifier_node = get_identifier ("length");
   finalize_identifier_node = get_identifier ("finalize");
   this_identifier_node = get_identifier ("this");
-  super_identifier_node = get_identifier ("super");
-  continue_identifier_node = get_identifier ("continue");
-  access0_identifier_node = get_identifier ("access$0");
   classdollar_identifier_node = get_identifier ("class$");
 
   java_lang_cloneable_identifier_node = get_identifier ("java.lang.Cloneable");
@@ -854,6 +848,7 @@ java_init_decl_processing (void)
   PUSH_FIELD (class_type_node, field, "chain", ptr_type_node);
   PUSH_FIELD (class_type_node, field, "aux_info", ptr_type_node);
   PUSH_FIELD (class_type_node, field, "engine", ptr_type_node);
+  PUSH_FIELD (class_type_node, field, "reflection_data", ptr_type_node);
   for (t = TYPE_FIELDS (class_type_node);  t != NULL_TREE;  t = TREE_CHAIN (t))
     FIELD_PRIVATE (t) = 1;
   push_super_field (class_type_node, object_type_node);
@@ -1109,8 +1104,6 @@ java_init_decl_processing (void)
 
   lang_eh_runtime_type = do_nothing;
 
-  init_jcf_parse ();
-    
   initialize_builtins ();
   soft_fmod_node = built_in_decls[BUILT_IN_FMOD];
 #if 0
diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 3cb3db7..b9d68b0 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -1,6 +1,6 @@
 /* Process expressions for the GNU compiler for the Java(TM) language.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -885,6 +885,7 @@ build_java_arrayaccess (tree array, tree type, tree index)
   tree data_field;
   tree ref;
   tree array_type = TREE_TYPE (TREE_TYPE (array));
+  tree size_exp = fold_convert (sizetype, size_in_bytes (type));
 
   if (!is_array_type_p (TREE_TYPE (array)))
     {
@@ -919,16 +920,34 @@ build_java_arrayaccess (tree array, tree type, tree index)
      to have the bounds check evaluated first. */
   if (throw != NULL_TREE)
     index = build2 (COMPOUND_EXPR, int_type_node, throw, index);
- 
+
   data_field = lookup_field (&array_type, get_identifier ("data"));
 
   ref = build3 (COMPONENT_REF, TREE_TYPE (data_field),    
 		build_java_indirect_ref (array_type, array, 
 					 flag_check_references),
 		data_field, NULL_TREE);
-  
-  node = build4 (ARRAY_REF, type, ref, index, NULL_TREE, NULL_TREE);
-  return node;
+
+  /* Take the address of the data field and convert it to a pointer to
+     the element type.  */
+  node = build1 (NOP_EXPR, build_pointer_type (type), build_address_of (ref));
+
+  /* Multiply the index by the size of an element to obtain a byte
+     offset.  Convert the result to a pointer to the element type.  */
+  index = fold_convert (TREE_TYPE (node),
+			build2 (MULT_EXPR, sizetype, 
+				fold_convert (sizetype, index), 
+				size_exp));
+
+  /* Sum the byte offset and the address of the data field.  */
+  node = fold_build2 (PLUS_EXPR, TREE_TYPE (node), node, index);
+
+  /* Finally, return
+
+    *((&array->data) + index*size_exp)
+
+  */
+  return build1 (INDIRECT_REF, TREE_TYPE (TREE_TYPE (node)), node);
 }
 
 /* Generate code to throw an ArrayStoreException if OBJECT is not assignable
@@ -1127,7 +1146,7 @@ expand_java_arraystore (tree rhs_type_node)
 				 && TYPE_PRECISION (rhs_type_node) <= 32) ? 
 				 int_type_node : rhs_type_node);
   tree index = pop_value (int_type_node);
-  tree array_type, array;
+  tree array_type, array, temp, access;
 
   /* If we're processing an `aaload' we might as well just pick
      `Object'.  */
@@ -1149,14 +1168,31 @@ expand_java_arraystore (tree rhs_type_node)
   index = save_expr (index);
   array = save_expr (array);
 
+  /* We want to perform the bounds check (done by
+     build_java_arrayaccess) before the type check (done by
+     build_java_arraystore_check).  So, we call build_java_arrayaccess
+     -- which returns an ARRAY_REF lvalue -- and we then generate code
+     to stash the address of that lvalue in a temp.  Then we call
+     build_java_arraystore_check, and finally we generate a
+     MODIFY_EXPR to set the array element.  */
+
+  access = build_java_arrayaccess (array, rhs_type_node, index);
+  temp = build_decl (VAR_DECL, NULL_TREE, 
+		     build_pointer_type (TREE_TYPE (access)));
+  java_add_local_var (temp);
+  java_add_stmt (build2 (MODIFY_EXPR, TREE_TYPE (temp),
+			 temp, 
+			 build_fold_addr_expr (access)));
+
   if (TREE_CODE (rhs_type_node) == POINTER_TYPE)
     {
       tree check = build_java_arraystore_check (array, rhs_node);
       java_add_stmt (check);
     }
   
-  array = build_java_arrayaccess (array, rhs_type_node, index);
-  java_add_stmt (build2 (MODIFY_EXPR, TREE_TYPE (array), array, rhs_node));  
+  java_add_stmt (build2 (MODIFY_EXPR, TREE_TYPE (access), 
+			 build1 (INDIRECT_REF, TREE_TYPE (access), temp),
+			 rhs_node));  
 }
 
 /* Expand the evaluation of ARRAY[INDEX]. build_java_check_indexed_type makes 
@@ -2048,13 +2084,32 @@ typedef struct
   tree (*rewrite_arglist) (tree arglist);
 } rewrite_rule;
 
+/* Add __builtin_return_address(0) to the end of an arglist.  */
+
+
+static tree 
+rewrite_arglist_getcaller (tree arglist)
+{
+  tree retaddr 
+    = (build_function_call_expr 
+       (built_in_decls[BUILT_IN_RETURN_ADDRESS],
+	build_tree_list (NULL_TREE, integer_zero_node)));
+  
+  DECL_INLINE (current_function_decl) = 0;
+
+  return chainon (arglist, 
+		  tree_cons (NULL_TREE, retaddr, 
+			     NULL_TREE));
+}
+
 /* Add this.class to the end of an arglist.  */
 
 static tree 
 rewrite_arglist_getclass (tree arglist)
 {
   return chainon (arglist, 
-		  tree_cons (NULL_TREE, build_class_ref (output_class), NULL_TREE));
+		  tree_cons (NULL_TREE, build_class_ref (output_class),
+			     NULL_TREE));
 }
 
 static rewrite_rule rules[] =
@@ -2064,6 +2119,14 @@ static rewrite_rule rules[] =
    {"java.lang.Class", "forName", "(Ljava/lang/String;)Ljava/lang/Class;",
     "(Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Class;",
     ACC_FINAL|ACC_PRIVATE|ACC_STATIC, rewrite_arglist_getclass},
+   {"gnu.classpath.VMStackWalker", "getCallingClass", "()Ljava/lang/Class;",
+    "(Lgnu/gcj/RawData;)Ljava/lang/Class;",
+    ACC_FINAL|ACC_PRIVATE|ACC_STATIC, rewrite_arglist_getcaller},
+   {"gnu.classpath.VMStackWalker", "getCallingClassLoader", 
+    "()Ljava/lang/ClassLoader;",
+    "(Lgnu/gcj/RawData;)Ljava/lang/ClassLoader;",
+    ACC_FINAL|ACC_PRIVATE|ACC_STATIC, rewrite_arglist_getcaller},
+
    {NULL, NULL, NULL, NULL, 0, NULL}};
 
 /* Scan the rules list for replacements for *METHOD_P and replace the
@@ -2848,7 +2911,8 @@ expand_java_field_op (int is_static, int is_putting, int field_ref_index)
       tree context = DECL_CONTEXT (field_ref);
       if (context != self_type && CLASS_INTERFACE (TYPE_NAME (context)))
 	field_ref = build_class_init (context, field_ref);
-      field_ref = build_class_init (self_type, field_ref);
+      else
+	field_ref = build_class_init (self_type, field_ref);
     }
   if (is_putting)
     {
@@ -3645,7 +3709,6 @@ force_evaluation_order (tree node)
   if (flag_syntax_only)
     return node;
   if (TREE_CODE (node) == CALL_EXPR
-      || TREE_CODE (node) == NEW_CLASS_EXPR
       || (TREE_CODE (node) == COMPOUND_EXPR
 	  && TREE_CODE (TREE_OPERAND (node, 0)) == CALL_EXPR
 	  && TREE_CODE (TREE_OPERAND (node, 1)) == SAVE_EXPR)) 
diff --git a/gcc/java/gcj.texi b/gcc/java/gcj.texi
index 01c02dc..0796867 100644
--- a/gcc/java/gcj.texi
+++ b/gcc/java/gcj.texi
@@ -68,8 +68,6 @@ man page gfdl(7).
                             Generate header files from Java class files
 * gjnih: (gcj)Invoking gjnih.
                             Generate JNI header files from Java class files
-* jv-scan: (gcj)Invoking jv-scan.
-                            Print information about Java source files
 * jcf-dump: (gcj)Invoking jcf-dump.
                             Print information about Java class files
 * gij: (gcj)Invoking gij.   GNU interpreter for Java bytecode
@@ -121,7 +119,6 @@ files and object files, and it can read both Java source code and
 * Compatibility::	Compatibility between gcj and other tools for Java
 * Invoking gcjh::       Generate header files from class files
 * Invoking gjnih::      Generate JNI header files from class files
-* Invoking jv-scan::    Print information about source files
 * Invoking jcf-dump::   Print information about class files
 * Invoking gij::	Interpreting Java bytecodes
 * Invoking gcj-dbtool:: Tool for manipulating class file databases.
@@ -156,7 +153,7 @@ gcj [@option{-I}@var{dir}@dots{}] [@option{-d} @var{dir}@dots{}]
     @var{sourcefile}@dots{}
 @c man end
 @c man begin SEEALSO gcj
-gcc(1), gcjh(1), gjnih(1), gij(1), jv-scan(1), jcf-dump(1), gfdl(7),
+gcc(1), gcjh(1), gjnih(1), gij(1), jcf-dump(1), gfdl(7),
 and the Info entries for @file{gcj} and @file{gcc}.
 @c man end
 @end ignore
@@ -305,6 +302,10 @@ behavior in this particular case.)
 This forces the compiler to always check for the special zero length
 attribute @code{gnu.gcj.gcj-compiled} in @code{java.lang.Object} and
 issue an error if it isn't found.
+
+@item -fsource=@var{VERSION}
+This option is used to choose the source version accepted by
+@command{gcj}.  The default is @samp{1.5}.
 @end table
 
 @node Encodings
@@ -457,6 +458,11 @@ instance, it could be used in a call to @code{ResourceBundle.getBundle}.
 The actual file name to be compiled this way must be specified
 separately.
 
+@item -ftarget=@var{VERSION}
+This can be used with @option{-C} to choose the version of bytecode
+emitted by @command{gcj}.  The default is @samp{1.5}.  When not
+generating bytecode, this option has no effect.
+
 @item -d @var{directory}
 When used with @code{-C}, this causes all generated @file{.class} files
 to be put in the appropriate subdirectory of @var{directory}.  By
@@ -751,7 +757,7 @@ gcjh [@option{-stubs}] [@option{-jni}]
     @var{classname}@dots{}
 @c man end
 @c man begin SEEALSO gcjh
-gcc(1), gcj(1), gij(1), jv-scan(1), jcf-dump(1), gfdl(7),
+gcc(1), gcj(1), gij(1), jcf-dump(1), gfdl(7),
 and the Info entries for @file{gcj} and @file{gcc}.
 @c man end
 @end ignore
@@ -865,7 +871,7 @@ gjnih [@option{-stubs}] [@option{-jni}]
     @var{classname}@dots{}
 @c man end
 @c man begin SEEALSO gjnih
-gcc(1), gcj(1), gcjh(1), gij(1), jv-scan(1), jcf-dump(1), gfdl(7),
+gcc(1), gcj(1), gcjh(1), gij(1), jcf-dump(1), gfdl(7),
 and the Info entries for @file{gcj} and @file{gcc}.
 @c man end
 @end ignore
@@ -952,69 +958,6 @@ All remaining options are considered to be names of classes.
 
 @c man end
 
-@node Invoking jv-scan
-@chapter Invoking jv-scan
-
-@c man title jv-scan print information about Java source file
-
-@c man begin DESCRIPTION jv-scan
-
-The @code{jv-scan} program can be used to print information about a Java
-source file (@file{.java} file).
-
-@c man end
-
-@ignore
-@c man begin SYNOPSIS jv-scan
-jv-scan [@option{--no-assert}] [@option{--complexity}] 
-    [@option{--encoding}=@var{name}] [@option{--print-main}] 
-    [@option{--list-class}] [@option{--list-filename}]
-    [@option{--version}] [@option{--help}]
-    [@option{-o} @var{file}] @var{inputfile}@dots{}
-@c man end
-@c man begin SEEALSO jv-scan
-gcc(1), gcj(1), gcjh(1), gij(1), jcf-dump(1), gfdl(7),
-and the Info entries for @file{gcj} and @file{gcc}.
-@c man end
-@end ignore
-
-@c man begin OPTIONS jv-scan
-
-@table @gcctabopt
-@item --no-assert
-Don't recognize the @code{assert} keyword, for backwards compatibility
-with older versions of the language specification.
-
-@item --complexity
-This prints a complexity measure, related to cyclomatic complexity, for
-each input file.
-
-@item --encoding=@var{name}
-This works like the corresponding @command{gcj} option.
-
-@item --print-main
-This prints the name of the class in this file containing a @code{main}
-method.
-
-@item --list-class
-This lists the names of all classes defined in the input files.
-
-@item --list-filename
-If @code{--list-class} is given, this option causes @code{jv-scan} to
-also print the name of the file in which each class was found.
-
-@item -o @var{file}
-Print output to the named file.
-
-@item --help
-Print help, then exit.
-
-@item --version
-Print version number, then exit.
-@end table
-
-@c man end
-
 @node Invoking jcf-dump
 @chapter Invoking jcf-dump
 
@@ -1092,7 +1035,7 @@ gij [@option{-jar}] [@option{OPTION}] @dots{} @var{CLASS} [@var{ARGS}@dots{}]
   [@option{--showversion}] [@option{--version}] [@option{--help}][@option{-?}]
 @c man end
 @c man begin SEEALSO gij
-gcc(1), gcj(1), gcjh(1), jv-scan(1), jcf-dump(1), gfdl(7),
+gcc(1), gcj(1), gcjh(1), jcf-dump(1), gfdl(7),
 and the Info entries for @file{gcj} and @file{gcc}.
 @c man end
 @end ignore
@@ -1219,7 +1162,7 @@ gcj-dbtool [@option{-0}] [@option{-}] [@option{-n}] [@option{-a}] [@option{-f}]
 
 @c man end
 @c man begin SEEALSO gij
-gcc(1), gcj(1), gcjh(1), jv-scan(1), jcf-dump(1), gfdl(7),
+gcc(1), gcj(1), gcjh(1), jcf-dump(1), gfdl(7),
 and the Info entries for @file{gcj} and @file{gcc}.
 @c man end
 @end ignore
diff --git a/gcc/java/gen-table.pl b/gcc/java/gen-table.pl
deleted file mode 100644
index a2f2213..0000000
--- a/gcc/java/gen-table.pl
+++ /dev/null
@@ -1,273 +0,0 @@
-#! /usr/bin/perl
-
-#    Copyright (C) 2000, 2001, 2003 Free Software Foundation
-
-#    This program 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.
-
-#    This program 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 this program; if not, write to the Free Software
-#    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-#    02110-1301, USA.
-
-# gen-table.pl - Generate tables for gcj from Unicode data.
-# Usage: perl gen-table.pl DATA-FILE
-#
-# You can find the Unicode data file here:
-#   ftp://www.unicode.org/Public/3.0-Update1/UnicodeData-3.0.1.txt
-# Please update this URL when this program is used with a more
-# recent version of the table.  Note that this table cannot be
-# distributed with gcc.
-# This program should not be re-run indiscriminately.  Care must be
-# taken that what it generates is in sync with the Java specification.
-
-# Names of fields in Unicode data table.
-$CODE = 0;
-$NAME = 1;
-$CATEGORY = 2;
-$COMBINING_CLASSES = 3;
-$BIDI_CATEGORY = 4;
-$DECOMPOSITION = 5;
-$DECIMAL_VALUE = 6;
-$DIGIT_VALUE = 7;
-$NUMERIC_VALUE = 8;
-$MIRRORED = 9;
-$OLD_NAME = 10;
-$COMMENT = 11;
-$UPPER = 12;
-$LOWER = 13;
-$TITLE = 14;
-
-# Start of special-cased gaps in Unicode data table.
-%gaps = (
-	 0x4e00 => "CJK",
-	 0xac00 => "Hangul",
-	 0xd800 => "Unassigned High Surrogate",
-	 0xdb80 => "Private Use High Surrogate",
-	 0xdc00 => "Low Surrogate",
-	 0xe000 => "Private Use"
-	 );
-
-# This lists control characters which are also considered whitespace.
-# This is a somewhat odd list, taken from the JCL definition of
-# Character.isIdentifierIgnorable.
-%whitespace_controls =
-    (
-     0x0009 => 1,
-     0x000a => 1,
-     0x000b => 1,
-     0x000c => 1,
-     0x000d => 1,
-     0x001c => 1,
-     0x001d => 1,
-     0x001e => 1,
-     0x001f => 1
-     );
-
-open (INPUT, "< $ARGV[0]") || exit 1;
-
-$last_code = -1;
-while (<INPUT>)
-{
-    chop;
-    @fields = split (';', $_, 30);
-    if ($#fields != 14)
-    {
-	print STDERR "Entry for $fields[$CODE] has wrong number of fields\n";
-    }
-
-    $code = hex ($fields[$CODE]);
-    last if $code > 0xffff;
-    if ($code > $last_code + 1)
-    {
-	# Found a gap.
-	if (defined $gaps{$code})
-	{
-	    # Fill the gap with the last character read.
-	    @gfields = @fields;
-	}
-	else
-	{
-	    # The gap represents undefined characters.  Only the type
-	    # matters.
-	    @gfields = ('', '', 'Cn', '0', '', '', '', '', '', '', '',
-			'', '', '', '');
-	}
-	for (++$last_code; $last_code < $code; ++$last_code)
-	{
-	    $gfields{$CODE} = sprintf ("%04x", $last_code);
-	    &process_one ($last_code, @gfields);
-	}
-    }
-    &process_one ($code, @fields);
-    $last_code = $code;
-}
-
-close (INPUT);
-
-@gfields = ('', '', 'Cn', '0', '', '', '', '', '', '', '',
-	    '', '', '', '');
-for (++$last_code; $last_code < 0x10000; ++$last_code)
-{
-    $gfields{$CODE} = sprintf ("%04x", $last_code);
-    &process_one ($last_code, @gfields);
-}
---$last_code;			# Want last to be 0xFFFF.
-
-&print_tables ($last_code);
-
-exit 0;
-
-# Process a single character.
-sub process_one
-{
-    my ($code, @fields) = @_;
-
-    my @value = ();
-    my $type = $fields[$CATEGORY];
-
-    # See if the character is a valid identifier start.
-    if ($type =~ /L./		# Letter
-	|| $type eq 'Pc'	# Connecting punctuation
-	|| $type eq 'Sc')	# Currency symbol
-    {
-	push (@value, 'LETTER_START');
-    }
-
-    # See if the character is a valid identifier member.
-    if ($type =~ /L./		# Letter
-	|| $type eq 'Pc'	# Connecting punctuation
-	|| $type eq 'Sc'	# Currency symbol
-	|| $type =~ /N[dl]/	# Number: decimal or letter
-	|| $type =~ /M[nc]/	# Mark: non-spacing or combining
-	|| ($type eq 'Cc'	# Certain controls
-	    && ! defined $whitespace_controls{$code})
-	|| ($code >= 0x200c	# Join controls
-	    && $code <= 0x200f)
-	|| ($code >= 0x202a	# Bidi controls -- note that there
-				# is a typo in the JCL where these are
-				# concerned.
-	    && $code <= 0x202e)
-	|| ($code >= 0x206a	# Format controls
-	    && $code <= 0x206f)
-	|| $code == 0xfeff)	# ZWNBSP
-    {
-	push (@value, 'LETTER_PART');
-    }
-
-    if (($type =~ /Z./
-	 # Java treats some values specially as non-spaces.
-	 && $code != 0x00a0
-	 && $code != 0x2007
-	 && $code != 0x202f)
-	# And for our purposes there are some that should be specially
-	# treated as spaces.
-	|| $code == 0x000b
-	|| ($code >= 0x001c && $code <= 0x001f))
-    {
-	push (@value, 'LETTER_SPACE');
-    }
-
-    if (! @value)
-    {
-	$value = '0';
-    }
-    else
-    {
-	$value = '(' . join (' | ', @value) . ')';
-    }
-
-    $map[$code] = $value;
-}
-
-sub print_tables
-{
-    my ($last) = @_;
-
-    local ($bytes_out) = 0;
-
-    open (OUT, "> chartables.h");
-
-    print OUT "/* This file is automatically generated.  DO NOT EDIT!\n";
-    print OUT "   Instead, edit gen-table.pl and re-run.  */\n\n";
-
-    print OUT "#ifndef GCC_CHARTABLES_H\n";
-    print OUT "#define GCC_CHARTABLES_H\n\n";
-
-    print OUT "#define LETTER_START 1\n";
-    print OUT "#define LETTER_PART  2\n";
-    print OUT "#define LETTER_SPACE 4\n\n";
-    print OUT "#define LETTER_MASK  7\n\n";
-
-    for ($count = 0; $count <= $last; $count += 256)
-    {
-	$row[$count / 256] = &print_row ($count, '(char *) ', 'const char', 1,
-					 'page');
-    }
-
-    print OUT "static const char *const type_table[256] = {\n";
-    for ($count = 0; $count <= $last; $count += 256)
-    {
-	print OUT ",\n" if $count > 0;
-	print OUT "  ", $row[$count / 256];
-	$bytes_out += 4;
-    }
-    print OUT "\n};\n\n";
-
-    print OUT "#endif /* ! GCC_CHARTABLES_H */\n";
-
-    close (OUT);
-
-    printf "Generated %d bytes\n", $bytes_out;
-}
-
-# Print a single "row" of a two-level table.
-sub print_row
-{
-    my ($start, $def_pfx, $typname, $typsize, $name) = @_;
-
-    my ($i);
-    my (@values);
-    my ($flag) = 1;
-    my ($off);
-    for ($off = 0; $off < 256; ++$off)
-    {
-	$values[$off] = $map[$off + $start];
-	if ($values[$off] ne $values[0])
-	{
-	    $flag = 0;
-	}
-    }
-    if ($flag)
-    {
-	return $def_pfx . $values[0];
-    }
-
-    printf OUT "static %s %s%d[256] = {\n  ", $typname, $name, $start / 256;
-    my ($column) = 2;
-    for ($i = $start; $i < $start + 256; ++$i)
-    {
-	print OUT ", "
-	    if $i > $start;
-	my ($text) = $values[$i - $start];
-	if (length ($text) + $column + 2 > 78)
-	{
-	    print OUT "\n  ";
-	    $column = 2;
-	}
-	print OUT $text;
-	$column += length ($text) + 2;
-    }
-    print OUT "\n};\n\n";
-
-    $bytes_out += 256 * $typsize;
-
-    return sprintf "%s%d", $name, $start / 256;
-}
diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c
deleted file mode 100644
index c79a0a9..0000000
--- a/gcc/java/gjavah.c
+++ /dev/null
@@ -1,2673 +0,0 @@
-/* Program to write C++-suitable header files from a Java(TM) .class
-   file.  This is similar to SUN's javah.
-
-Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-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.
-
-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 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.
-The Free Software Foundation is independent of Sun Microsystems, Inc.  */
-
-/* Written by Per Bothner <bothner@cygnus.com>, February 1996. */
-
-#include "config.h"
-#include "system.h"
-#include "coretypes.h"
-#include "tm.h"
-#include <math.h>
-
-#include "jcf.h"
-#include "tree.h"
-#include "version.h"
-#include "javaop.h"
-#include "java-tree.h"
-#include "java-opcodes.h"
-#include "ggc.h"
-#include "hashtab.h"
-#include "intl.h"
-
-#include <getopt.h>
-
-
-
-/* The output file.  */
-FILE *out = NULL;
-
-/* Nonzero on failure.  */
-static int found_error = 0;
-
-#ifdef JNI_DEFAULT
-#define TOOLNAME "gjnih"
-
-/* Nonzero if we're generating JNI output.  */
-int flag_jni = 1;
-#else
-#define TOOLNAME "gcjh"
-
-int flag_jni = 0;
-#endif
-
-/* When nonzero, warn when source file is newer than matching class
-   file.  */
-int flag_newer = 1;
-
-/* Directory to place resulting files in. Set by -d option. */
-static const char *output_directory = "";
-
-/* Directory to place temporary file.  Set by -td option.  Currently unused. */
-static const char *temp_directory = "/tmp";
-
-/* Number of friend functions we have to declare.  */
-static int friend_count;
-
-/* A class can optionally have a `friend' function declared.  If
-   non-NULL, this is that function.  */
-static char **friend_specs = NULL;
-
-/* Number of lines we are prepending before the class.  */
-static int prepend_count;
-
-/* We can prepend extra lines before the class's start. */
-static char **prepend_specs = NULL;
-
-/* Number of lines we are appending at the end of the class.  */
-static int add_count;
-
-/* We can append extra lines just before the class's end. */
-static char **add_specs = NULL;
-
-/* Number of lines we are appending after the class.  */
-static int append_count;
-
-/* We can append extra lines after the class's end. */
-static char **append_specs = NULL;
-
-int verbose = 0;
-
-int stubs = 0;
-
-struct JCF *current_jcf;
-
-/* This holds access information for the last field we examined.  They
-   let us generate "private:", "public:", and "protected:" properly.
-   If 0 then we haven't previously examined any field.  */
-static JCF_u2 last_access;
-
-/* 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) \
-   (((Class) & ACC_FINAL) || ((Method) & (ACC_FINAL | ACC_PRIVATE)))
-
-/* Pass this macro the flags for a method.  It will return true if the
-   method is native.  */
-#define METHOD_IS_NATIVE(Method) \
-   ((Method) & ACC_NATIVE)
-
-#define METHOD_IS_PRIVATE(Class, Method) \
-  (((Method) & ACC_PRIVATE) != 0)
-
-/* We keep a linked list of all method names we have seen.  This lets
-   us determine if a method name and a field name are in conflict.  */
-struct method_name
-{
-  unsigned char *name;
-  int length;
-  unsigned char *signature;
-  int sig_length;
-  int is_native;
-  struct method_name *next;
-};
-
-/* List of method names we've seen.  */
-static struct method_name *method_name_list;
-
-static void print_field_info (FILE*, JCF*, int, int, JCF_u2);
-static void print_mangled_classname (FILE*, JCF*, const char*, int);
-static int  print_cxx_classname (FILE*, const char*, JCF*, int, int);
-static void print_method_info (FILE*, JCF*, int, int, JCF_u2);
-static void print_c_decl (FILE*, JCF*, int, int, int, const char *, int);
-static void print_stub_or_jni (FILE*, JCF*, int, int, int, const char *, int);
-static void print_full_cxx_name (FILE*, JCF*, int, int, int, const char *, int);
-static void decompile_method (FILE*, JCF*, int) ATTRIBUTE_UNUSED;
-static void add_class_decl (FILE*, JCF*, JCF_u2);
-
-static void print_name (FILE *, JCF *, int);
-static void print_base_classname (FILE *, JCF *, int);
-static int utf8_cmp (const unsigned char *, int, const char *);
-static char *cxx_keyword_subst (const unsigned char *, int);
-static void generate_access (FILE *, JCF_u2);
-static int name_is_method_p (const unsigned char *, int);
-static char *get_field_name (JCF *, int, JCF_u2);
-static void print_field_name (FILE *, JCF *, int, JCF_u2);
-static const unsigned char *super_class_name (JCF *, int *);
-static void print_include (FILE *, const unsigned char *, int);
-static int gcjh_streq (const void *p1, const void *p2);
-static int throwable_p (const unsigned char *signature);
-static const unsigned char *
-  decode_signature_piece (FILE *, const unsigned char *,
-			  const unsigned char *, int *);
-static void print_class_decls (FILE *, JCF *, int);
-static void error (const char *gmsgid, ...) ATTRIBUTE_PRINTF_1;
-static void usage (void) ATTRIBUTE_NORETURN;
-static void help (void) ATTRIBUTE_NORETURN;
-static void version (void) ATTRIBUTE_NORETURN;
-static int overloaded_jni_method_exists_p (const unsigned char *, int,
-					   const char *, int);
-static void jni_print_char (FILE *, int);
-static void jni_print_float (FILE *, jfloat);
-static void jni_print_double (FILE *, jdouble);
-static void decompile_return_statement (FILE *, JCF *, int, int, int);
-
-static void handle_inner_classes (int);
-
-JCF_u2 current_field_name;
-JCF_u2 current_field_value;
-JCF_u2 current_field_signature;
-JCF_u2 current_field_flags;
-
-#define HANDLE_START_FIELD(ACCESS_FLAGS, NAME, SIGNATURE, ATTRIBUTE_COUNT) \
-( current_field_name = (NAME), current_field_signature = (SIGNATURE), \
-  current_field_flags = (ACCESS_FLAGS), current_field_value = 0)
-
-/* We pass over fields twice.  The first time we just note the types
-   of the fields and then the start of the methods.  Then we go back
-   and parse the fields for real.  This is ugly.  */
-static int field_pass;
-/* Likewise we pass over methods twice.  The first time we generate
-   class decl information; the second time we generate actual method
-   decls.  */
-static int method_pass;
-
-#define HANDLE_END_FIELD()						      \
-  if (field_pass)							      \
-    {									      \
-      if (out && ! stubs)						      \
-	print_field_info (out, jcf, current_field_name,			      \
-			  current_field_signature,			      \
- 			  current_field_flags);				      \
-    }									      \
-  else if (! stubs && ! flag_jni)					      \
-    add_class_decl (out, jcf, current_field_signature);
-
-#define HANDLE_CONSTANTVALUE(VALUEINDEX) current_field_value = (VALUEINDEX)
-
-static int method_declared = 0;
-static int method_access = 0;
-static int method_printed = 0;
-static int method_synthetic = 0;
-static int method_signature = 0;
-
-/* Set to 1 while the very first data member of a class is being handled.  */
-static int is_first_data_member = 0;
-
-#define HANDLE_METHOD(ACCESS_FLAGS, NAME, SIGNATURE, ATTRIBUTE_COUNT)	\
-  {									\
-    method_synthetic = 0;						\
-    method_printed = 0;							\
-    decompiled = 0;							\
-    method_signature = SIGNATURE;					\
-    if (ATTRIBUTE_COUNT)						\
-      method_synthetic = peek_attribute (jcf, ATTRIBUTE_COUNT,		\
-				  (const char *)"Synthetic", 9);	\
-    /* If a synthetic methods have been declared, its attribute aren't	\
-       worth reading (and triggering side-effects). We skip them an	\
-       set ATTRIBUTE_COUNT to zero so that they'll be skipped in	\
-       jcf_parse_one_method.  */					\
-    if (method_synthetic)						\
-      {									\
-	skip_attribute (jcf, ATTRIBUTE_COUNT);				\
-	ATTRIBUTE_COUNT = 0;						\
-      } 								\
-    if (method_pass && !method_synthetic)				\
-      {									\
-	if (out)							\
-	  print_method_info (out, jcf, NAME, SIGNATURE,			\
-			     ACCESS_FLAGS);				\
-      }									\
-    else if (!method_synthetic)						\
-      {									\
-	print_method_info (NULL, jcf, NAME, SIGNATURE,			\
-			   ACCESS_FLAGS);				\
-	if (! stubs && ! flag_jni)					\
-	  add_class_decl (out, jcf, SIGNATURE);				\
-      }									\
-  }
-
-/* Only include byte-code decompilation optimizations for ELF targets
-   since the generated headers are only known to work with ELF weak
-   symbol semantics. Specifically, these optimizations are known to
-   not work on PE-COFF and possibly others.  */
-#ifdef OBJECT_FORMAT_ELF
-#define HANDLE_CODE_ATTRIBUTE(MAX_STACK, MAX_LOCALS, CODE_LENGTH)	\
-  if (out && method_declared) decompile_method (out, jcf, CODE_LENGTH);
-#endif
-
-static int decompiled = 0;
-#define HANDLE_END_METHOD()				\
-  if (out && method_printed && !method_synthetic) 	\
-    fputs (decompiled || stubs ? "\n" : ";\n", out);
-
-#define HANDLE_INNERCLASSES_ATTRIBUTE(COUNT) handle_inner_classes (COUNT)
-
-/* We're going to need {peek,skip}_attribute, enable their definition.   */
-#define NEED_PEEK_ATTRIBUTE
-#define NEED_SKIP_ATTRIBUTE
-
-#include "jcf-reader.c"
-
-/* Print an error message and set found_error.
-   Not really gcc-internal-format message, but as error elsewhere
-   uses it, assume all users will use intersection between
-   c-format and gcc-internal-format.  */
-static void
-error (const char *gmsgid, ...)
-{
-  va_list ap;
-
-  va_start (ap, gmsgid);
-
-  fprintf (stderr, TOOLNAME ": ");
-  vfprintf (stderr, _(gmsgid), ap);
-  va_end (ap);
-  fprintf (stderr, "\n");
-  found_error = 1;
-}
-
-/* Print a single-precision float, suitable for parsing by g++.  */
-static void
-jni_print_float (FILE *stream, jfloat f)
-{
-  /* It'd be nice to use __builtin_nan/__builtin_inf here but they don't
-     work in data initializers.  FIXME.  */
-  if (JFLOAT_FINITE (f))
-    {
-      if (flag_jni)
-        {
-          fputs (" ", out);
-          if (f.negative)
-            putc ('-', stream);
-          if (f.exponent)
-            fprintf (stream, "0x1.%.6xp%+df",
-                     ((unsigned int)f.mantissa) << 1,
-                     f.exponent - JFLOAT_EXP_BIAS);
-          else
-            /* Exponent of 0x01 is -125; exponent of 0x00 is *also* -125,
-               because the implicit leading 1 bit is no longer present.  */
-            fprintf (stream, "0x0.%.6xp%+df",
-                     ((unsigned int)f.mantissa) << 1,
-                     f.exponent + 1 - JFLOAT_EXP_BIAS);
-        }
-    }
-  if (! flag_jni)
-    fputs (";\n", stream);
-}
-
-/* Print a double-precision float, suitable for parsing by g++.  */
-static void
-jni_print_double (FILE *stream, jdouble f)
-{
-  /* It'd be nice to use __builtin_nan/__builtin_inf here but they don't
-     work in data initializers.  FIXME.  */
-  if (JDOUBLE_FINITE (f))
-    {
-      if (flag_jni)
-        {
-          fputs (" ", out);
-          if (f.negative)
-            putc ('-', stream);
-          if (f.exponent)
-            fprintf (stream, "0x1.%.5x%.8xp%+d",
-                     f.mantissa0, f.mantissa1,
-                     f.exponent - JDOUBLE_EXP_BIAS);
-          else
-            /* Exponent of 0x001 is -1022; exponent of 0x000 is *also* -1022,
-               because the implicit leading 1 bit is no longer present.  */
-            fprintf (stream, "0x0.%.5x%.8xp%+d",
-                     f.mantissa0, f.mantissa1,
-                     f.exponent + 1 - JDOUBLE_EXP_BIAS);
-        }
-    }
-  fputs (flag_jni ? "\n" : ";\n", stream);
-}
-
-/* Print a character, appropriately mangled for JNI.  */
-
-static void
-jni_print_char (FILE *stream, int ch)
-{
-  if (! flag_jni)
-    jcf_print_char (stream, ch);
-  else if (ch == '(' || ch == ')')
-    {
-      /* Ignore.  */
-    }
-  else if (ch == '_')
-    fputs ("_1", stream);
-  else if (ch == ';')
-    fputs ("_2", stream);
-  else if (ch == '[')
-    fputs ("_3", stream);
-  else if (ch == '/')
-    fputs ("_", stream);
-  else if (ISALNUM (ch))
-    fputc (ch, stream);
-  else
-    {
-      /* "Unicode" character.  */
-      fprintf (stream, "_0%04x", ch);
-    }
-}
-
-/* Print a name from the class data.  If the index does not point to a
-   string, an error results.  */
-
-static void
-print_name (FILE* stream, JCF* jcf, int name_index)
-{
-  if (JPOOL_TAG (jcf, name_index) != CONSTANT_Utf8)
-    {
-      fprintf (stream, "<not a UTF8 constant>");
-      found_error = 1;
-    }
-  else if (! flag_jni)
-    jcf_print_utf8 (stream, JPOOL_UTF_DATA (jcf, name_index),
-		    JPOOL_UTF_LENGTH (jcf, name_index));
-  else
-    {
-      /* For JNI we must correctly quote each character.  */
-      const unsigned char *str = JPOOL_UTF_DATA (jcf, name_index);
-      int length = JPOOL_UTF_LENGTH (jcf, name_index);
-      const unsigned char *limit = str + length;
-      while (str < limit)
-	{
-	  int ch = UTF8_GET (str, limit);
-	  if (ch < 0)
-	    {
-	      fprintf (stream, "\\<invalid>");
-	      return;
-	    }
-	  jni_print_char (stream, ch);
-	}
-    }
-}
-
-/* Print base name of class.  The base name is everything after the
-   final separator.  */
-
-static void
-print_base_classname (FILE *stream, JCF *jcf, int index)
-{
-  int name_index = JPOOL_USHORT1 (jcf, index);
-  int len;
-  const unsigned char *s, *p, *limit;
-
-  s = JPOOL_UTF_DATA (jcf, name_index);
-  len = JPOOL_UTF_LENGTH (jcf, name_index);
-  limit = s + len;
-  p = s;
-  while (s < limit)
-    {
-      int c = UTF8_GET (s, limit);
-      if (c == '/')
-	p = s;
-    }
-
-  while (p < limit)
-    {
-      int ch = UTF8_GET (p, limit);
-      if (ch == '/')
-	fputs ("::", stream);
-      else
-	jcf_print_char (stream, ch);
-    }
-}
-
-/* Return 0 if NAME is equal to STR, -1 if STR is "less" than NAME,
-   and 1 if STR is "greater" than NAME.  */
-
-static int
-utf8_cmp (const unsigned char *str, int length, const char *name)
-{
-  const unsigned char *limit = str + length;
-  int i;
-
-  for (i = 0; name[i]; ++i)
-    {
-      int ch = UTF8_GET (str, limit);
-      if (ch != name[i])
-	return ch - name[i];
-    }
-
-  return str == limit ? 0 : 1;
-}
-
-/* This is a sorted list of all C++ keywords.  */
-
-static const char *const cxx_keywords[] =
-{
-  "_Complex",
-  "__alignof",
-  "__alignof__",
-  "__asm",
-  "__asm__",
-  "__attribute",
-  "__attribute__",
-  "__builtin_va_arg",
-  "__complex",
-  "__complex__",
-  "__const",
-  "__const__",
-  "__extension__",
-  "__imag",
-  "__imag__",
-  "__inline",
-  "__inline__",
-  "__label__",
-  "__null",
-  "__real",
-  "__real__",
-  "__restrict",
-  "__restrict__",
-  "__signed",
-  "__signed__",
-  "__typeof",
-  "__typeof__",
-  "__volatile",
-  "__volatile__",
-  "and",
-  "and_eq",
-  "asm",
-  "auto",
-  "bitand",
-  "bitor",
-  "bool",
-  "break",
-  "case",
-  "catch",
-  "char",
-  "class",
-  "compl",
-  "const",
-  "const_cast",
-  "continue",
-  "default",
-  "delete",
-  "do",
-  "double",
-  "dynamic_cast",
-  "else",
-  "enum",
-  "explicit",
-  "export",
-  "extern",
-  "false",
-  "float",
-  "for",
-  "friend",
-  "goto",
-  "if",
-  "inline",
-  "int",
-  "long",
-  "mutable",
-  "namespace",
-  "new",
-  "not",
-  "not_eq",
-  "operator",
-  "or",
-  "or_eq",
-  "private",
-  "protected",
-  "public",
-  "register",
-  "reinterpret_cast",
-  "return",
-  "short",
-  "signed",
-  "sizeof",
-  "static",
-  "static_cast",
-  "struct",
-  "switch",
-  "template",
-  "this",      
-  "throw",
-  "true",
-  "try",
-  "typedef",
-  "typeid",
-  "typename",
-  "typeof",
-  "union",
-  "unsigned",
-  "using",
-  "virtual",
-  "void",
-  "volatile",
-  "wchar_t",
-  "while",
-  "xor",
-  "xor_eq"
-};
-
-
-/* If NAME is the name of a C++ keyword, then return an override name.
-   This is a name that can be used in place of the keyword.
-   Otherwise, return NULL.  The return value is malloc()d.  */
-
-static char *
-cxx_keyword_subst (const unsigned char *str, int length)
-{
-  int last = ARRAY_SIZE (cxx_keywords);
-  int first = 0;
-  int mid = (last + first) / 2;
-  int old = -1;
-
-  for (mid = (last + first) / 2;
-       mid != old;
-       old = mid, mid = (last + first) / 2)
-    {
-      int kwl = strlen (cxx_keywords[mid]);
-      int min_length = kwl > length ? length : kwl;
-      int r = utf8_cmp (str, min_length, cxx_keywords[mid]);
-
-      if (r == 0)
-	{
-	  int i;
-
-	  /* Skip all trailing `$'.  */
-	  for (i = min_length; i < length && str[i] == '$'; ++i)
-	    ;
-	  /* We've only found a match if all the remaining characters
-	     are `$'.  */
-	  if (i == length)
-	    {
-	      char *dup = XNEWVEC (char, 2 + length - min_length + kwl);
-	      strcpy (dup, cxx_keywords[mid]);
-	      for (i = kwl; i < length + 1; ++i)
-		dup[i] = '$';
-	      dup[i] = '\0';
-	      return dup;
-	    }
-	  r = 1;
-	}
-	
-      if (r < 0)
-	last = mid;
-      else
-	first = mid;
-    }
-  return NULL;
-}
-
-/* Generate an access control keyword based on FLAGS.  */
-
-static void
-generate_access (FILE *stream, JCF_u2 flags)
-{
-  if ((flags & ACC_VISIBILITY) == last_access)
-    return;
-  last_access = (flags & ACC_VISIBILITY);
-
-  switch (last_access)
-    {
-    case 0:
-      fputs ("public: // actually package-private\n", stream);
-      break;
-    case ACC_PUBLIC:
-      fputs ("public:\n", stream);
-      break;
-    case ACC_PRIVATE:
-      fputs ("private:\n", stream);
-      break;
-    case ACC_PROTECTED:
-      fputs ("public:  // actually protected\n", stream);
-      break;
-    default:
-      found_error = 1;
-      fprintf (stream, "#error unrecognized visibility %d\n",
-	       (flags & ACC_VISIBILITY));
-      break;
-    }
-}
-
-/* See if NAME is already the name of a method.  */
-static int
-name_is_method_p (const unsigned char *name, int length)
-{
-  struct method_name *p;
-
-  for (p = method_name_list; p != NULL; p = p->next)
-    {
-      if (p->length == length && ! memcmp (p->name, name, length))
-	return 1;
-    }
-  return 0;
-}
-
-/* Free the method name list.  */
-static void
-free_method_name_list (void)
-{
-  struct method_name *p = method_name_list;
-  while (p != NULL)
-    {
-      struct method_name *next = p->next;
-      free (p->name);
-      free (p->signature);
-      free (p);
-      p = next;
-    }
-  method_name_list = NULL;
-}
-
-/* If there is already a native method named NAME, whose signature is not
-   SIGNATURE, then return true.  Otherwise return false.  */
-static int
-overloaded_jni_method_exists_p (const unsigned char *name, int length,
-				const char *signature, int sig_length)
-{
-  struct method_name *p;
-
-  for (p = method_name_list; p != NULL; p = p->next)
-    {
-      if (p->is_native
-          && p->length == length
-	  && ! memcmp (p->name, name, length)
-	  && (p->sig_length != sig_length
-	      || memcmp (p->signature, signature, sig_length)))
-	return 1;
-    }
-  return 0;
-}
-
-/* Get name of a field.  This handles renamings due to C++ clash.  */
-static char *
-get_field_name (JCF *jcf, int name_index, JCF_u2 flags)
-{
-  unsigned char *name = JPOOL_UTF_DATA (jcf, name_index);
-  int length = JPOOL_UTF_LENGTH (jcf, name_index);
-  char *override;
-
-  if (name_is_method_p (name, length))
-    {
-      /* This field name matches a method.  So override the name with
-	 a dummy name.  This is yucky, but it isn't clear what else to
-	 do.  FIXME: if the field is static, then we'll be in real
-	 trouble.  */
-      if ((flags & ACC_STATIC))
-	{
-	  error ("static field has same name as method");
-	  return NULL;
-	}
-
-      override = XNEWVEC (char, length + 3);
-      memcpy (override, name, length);
-      strcpy (override + length, "__");
-    }
-  else if (flag_jni)
-    override = NULL;
-  else
-    override = cxx_keyword_subst (name, length);
-
-  return override;
-}
-
-/* Print a field name.  Convenience function for use with
-   get_field_name.  */
-static void
-print_field_name (FILE *stream, JCF *jcf, int name_index, JCF_u2 flags)
-{
-  char *override = get_field_name (jcf, name_index, flags);
-
-  if (override)
-    {
-      fputs (override, stream);
-      free (override);
-    }
-  else
-    jcf_print_utf8 (stream, JPOOL_UTF_DATA (jcf, name_index),
-		    JPOOL_UTF_LENGTH (jcf, name_index));
-}
-
-static void
-print_field_info (FILE *stream, JCF* jcf, int name_index, int sig_index,
-		  JCF_u2 flags)
-{
-  char *override = NULL;
-
-  if (! flag_jni)
-    generate_access (stream, flags);
-  if (JPOOL_TAG (jcf, name_index) != CONSTANT_Utf8)
-    {
-      fprintf (stream, "<not a UTF8 constant>");
-      found_error = 1;
-      return;
-    }
-
-  if (flag_jni)
-    {
-      /* For JNI we only want to print real constants.  */
-      int val;
-      if (! (flags & ACC_STATIC)
-	  || ! (flags & ACC_FINAL)
-	  || current_field_value <= 0)
-	return;
-      val = JPOOL_TAG (jcf, current_field_value);
-      if (val != CONSTANT_Integer && val != CONSTANT_Long
-	  && val != CONSTANT_Float && val != CONSTANT_Double)
-	return;
-    }
-  else
-    {
-      /* Initial indentation.  */
-      fputs ("  ", stream);
-    }
-
-  if ((flags & ACC_STATIC))
-    {
-      if (flag_jni)
-	{
-	  print_cxx_classname (stream, "#undef ", jcf, jcf->this_class, 1);
-	  fputs ("_", stream);
-	  print_field_name (stream, jcf, name_index, 0);
-	  fputs ("\n", stream);
-	  print_cxx_classname (stream, "#define ", jcf, jcf->this_class, 1);
-	  fputs ("_", stream);
-	}
-      else
-	fputs ("static ", stream);
-
-      if ((flags & ACC_FINAL) && current_field_value > 0)
-	{
-	  char buffer[25];
-	  int done = 1;
-
-	  switch (JPOOL_TAG (jcf, current_field_value))
-	    {
-	    case CONSTANT_Integer:
-	      {
-		jint num;
-		int most_negative = 0;
-		if (! flag_jni)
-		  fputs ("const jint ", stream);
-		print_field_name (stream, jcf, name_index, 0);
-		fputs (flag_jni ? " " : " = ", stream);
-		num = JPOOL_INT (jcf, current_field_value);
-		/* We single out the most negative number to print
-		   specially.  This avoids later warnings from g++.  */
-		if (num == (jint) 0x80000000)
-		  {
-		    most_negative = 1;
-		    ++num;
-		  }
-		format_int (buffer, (jlong) num, 10);
-		fprintf (stream, "%sL%s%s\n", buffer,
-			 most_negative ? " - 1" : "",
-			 flag_jni ? "" : ";");
-	      }
-	      break;
-	    case CONSTANT_Long:
-	      {
-		jlong num;
-		int most_negative = 0;
-		if (! flag_jni)
-		  fputs ("const jlong ", stream);
-		print_field_name (stream, jcf, name_index, 0);
-		fputs (flag_jni ? " " : " = ", stream);
-		num = JPOOL_LONG (jcf, current_field_value);
-		/* We single out the most negative number to print
-                   specially..  This avoids later warnings from g++.  */
-		if (num == (jlong) 0x8000000000000000LL)
-		  {
-		    most_negative = 1;
-		    ++num;
-		  }
-		format_int (buffer, num, 10);
-		fprintf (stream, "%sLL%s%s\n", buffer,
-			 most_negative ? " - 1" :"",
-			 flag_jni ? "" : ";");
-	      }
-	      break;
-	    case CONSTANT_Float:
-	      {
-		jfloat fnum = JPOOL_FLOAT (jcf, current_field_value);
-		if (! flag_jni)
-		  fputs ("const jfloat ", stream);
-		print_field_name (stream, jcf, name_index, 0);
-		jni_print_float (stream, fnum);
-	      }
-	      break;
-	    case CONSTANT_Double:
-	      {
-		jdouble dnum = JPOOL_DOUBLE (jcf, current_field_value);
-		if (! flag_jni)
-		  fputs ("const jdouble ", stream);
-		print_field_name (stream, jcf, name_index, 0);
-		jni_print_double (stream, dnum);
-	      }
-	      break;
-	    default:
- 	      /* We can't print this as a constant, but we can still
- 		 print something sensible.  */
- 	      done = 0;
- 	      break;
-	    }
-
-	  if (done)
-	    return;
-	}
-    }
-
-  /* assert (! flag_jni);  */
-  override = get_field_name (jcf, name_index, flags);
-  print_c_decl (stream, jcf, name_index, sig_index, 0, override, flags);
-  fputs (";\n", stream);
-
-  if (override)
-    free (override);
-}
-
-
-static void
-print_method_info (FILE *stream, JCF* jcf, int name_index, int sig_index,
-		   JCF_u2 flags)
-{
-  const unsigned char *str;
-  int length, is_init = 0;
-  char *override = NULL;
-
-  method_declared = 0;
-  method_access = flags;
-  if (stream && JPOOL_TAG (jcf, name_index) != CONSTANT_Utf8)
-    fprintf (stream, "<not a UTF8 constant>");
-  str = JPOOL_UTF_DATA (jcf, name_index);
-  length = JPOOL_UTF_LENGTH (jcf, name_index);
-
-  if (str[0] == '<')
-    {
-      /* Ignore the internally generated method <clinit>. However,
-         treat <init> as a constructor.  */
-      if (! utf8_cmp (str, length, "<init>"))
-	is_init = 1;
-      else if (! METHOD_IS_FINAL (jcf->access_flags, flags)
-	       && ! (flags & ACC_STATIC))
-	{
-	  /* FIXME: i18n bug here.  Order of prints should not be
-	     fixed.  */
-	  fprintf (stderr, _("ignored method '"));
-	  jcf_print_utf8 (stderr, str, length);
-	  fprintf (stderr, _("' marked virtual\n"));
-	  found_error = 1;
-	  return;
-	}
-      else
-	return;
-    }
-
-  /* During the first method pass, build a list of method names. This will
-  be used to determine if field names conflict with method names. */
-  if (! stream)
-    {
-      struct method_name *nn;
-
-      nn = XNEW (struct method_name);
-      nn->name = XNEWVEC (unsigned char, length);
-      memcpy (nn->name, str, length);
-      nn->length = length;
-      nn->next = method_name_list;
-      nn->sig_length = JPOOL_UTF_LENGTH (jcf, sig_index);
-      nn->signature = XNEWVEC (unsigned char, nn->sig_length);
-      nn->is_native = METHOD_IS_NATIVE (flags);
-      memcpy (nn->signature, JPOOL_UTF_DATA (jcf, sig_index),
-	      nn->sig_length);
-      method_name_list = nn;
-      
-      /* The rest of this function doesn't matter. */
-      return;
-    }
-
-  /* We don't worry about overrides in JNI mode.  */
-  if (! flag_jni)
-    {
-      /* We can't generate a method whose name is a C++ reserved word.
-	 We can't just ignore the function, because that will cause
-	 incorrect code to be generated if the function is virtual
-	 (not only for calls to this function for for other functions
-	 after it in the vtbl).  So we give it a dummy name instead.  */
-      override = cxx_keyword_subst (str, length);
-    }
-
-  if (! stubs && ! flag_jni)
-    {
-      method_printed = 1;
-
-      generate_access (stream, flags);
-      
-      fputs ("  ", out);
-      if ((flags & ACC_STATIC))
-	fputs ("static ", out);
-      else if (! METHOD_IS_PRIVATE (jcf->access_flags, flags))
-	{
-	  /* Don't print `virtual' if we have a constructor.  */
-	  if (! is_init)
-	    fputs ("virtual ", out);
-	}
-      print_c_decl (out, jcf, name_index, sig_index, is_init, override, flags);
-      
-      if ((flags & ACC_ABSTRACT))
-	fputs (" = 0", out);
-      else
-	method_declared = 1;
-    }
-  else
-    {
-      if (METHOD_IS_NATIVE (flags)) 
-	{
-	  method_printed = 1;
-	  print_stub_or_jni (out, jcf, name_index, sig_index,
-			     is_init, override, flags);
-	}
-    }
-
-  if (override)
-    free (override);
-}
-
-/* A helper for the decompiler which prints a `return' statement where
-   the type is a reference type.  If METHODTYPE and OBJECTTYPE are not
-   identical, we emit a cast.  We do this because the C++ compiler
-   doesn't know that a reference can be cast to the type of an
-   interface it implements.  METHODTYPE is the index of the method's
-   signature.  NAMEINDEX is the index of the field name; -1 for
-   `this'.  OBJECTTYPE is the index of the object's type.  */
-static void
-decompile_return_statement (FILE *out, JCF *jcf, int methodtype,
-			    int nameindex, int objecttype)
-{
-  int cast = 0;
-  int obj_name_len, method_name_len;
-  const unsigned char *obj_data, *method_data;
-
-  obj_name_len = JPOOL_UTF_LENGTH (jcf, objecttype);
-  obj_data = JPOOL_UTF_DATA (jcf, objecttype);
-
-  method_name_len = JPOOL_UTF_LENGTH (jcf, methodtype);
-  method_data = JPOOL_UTF_DATA (jcf, methodtype);
-
-  /* Skip forward to return type part of method.  */
-  while (*method_data != ')')
-    {
-      ++method_data;
-      --method_name_len;
-    }
-  /* Skip past `)'.  */
-  ++method_data;
-  --method_name_len;
-
-  /* If we see an `L', skip it and the trailing `;'.  */
-  if (method_data[0] == 'L' && method_data[method_name_len - 1] == ';')
-    {
-      ++method_data;
-      method_name_len -= 2;
-    }
-  if (obj_data[0] == 'L' && obj_data[obj_name_len - 1] == ';')
-    {
-      ++obj_data;
-      obj_name_len -= 2;
-    }
-
-  /* FIXME: if METHODTYPE is a superclass of OBJECTTYPE then we don't
-     need a cast.  Right now there is no way to determine if this is
-     the case.  */
-  if (method_name_len != obj_name_len)
-    cast = 1;
-  else
-    {
-      int i;
-      for (i = 0; i < method_name_len; ++i)
-	{
-	  if (method_data[i] != obj_data[i])
-	    {
-	      cast = 1;
-	      break;
-	    }
-	}
-    }
-
-  fputs (" { return ", out);
-
-  if (cast)
-    {
-      int array_depth = 0;
-      const unsigned char *limit;
-
-      fputs ("reinterpret_cast<", out);
-
-      while (*method_data == '[')
-	{
-	  ++method_data;
-	  ++array_depth;
-	  --method_name_len;
-	  fputs ("JArray<", out);
-	}
-
-      /* Leading space to avoid C++ digraphs.  */
-      fputs (" ::", out);
-
-      /* If we see an `L', skip it and the trailing `;'.  Only do this
-	 if we've seen an array specification.  If we don't have an
-	 array then the `L' was stripped earlier.  */
-      if (array_depth && method_data[0] == 'L'
-	  && method_data[method_name_len - 1] == ';')
-	{
-	  ++method_data;
-	  method_name_len -= 2;
-	}
-
-      limit = method_data + method_name_len;
-      while (method_data < limit)
-	{
-	  int ch = UTF8_GET (method_data, limit);
-	  if (ch == '/')
-	    fputs ("::", out);
-	  else
-	    jcf_print_char (out, ch);
-	}
-      fputs (" *", out);
-
-      /* Close each array.  */
-      while (array_depth > 0)
-	{
-	  fputs ("> *", out);
-	  --array_depth;
-	}
-
-      /* Close the cast.  */
-      fputs ("> (", out);
-    }
-
-  if (nameindex == -1)
-    fputs ("this", out);
-  else
-    print_field_name (out, jcf, nameindex, 0);
-
-  if (cast)
-    fputs (")", out);
-
-  fputs ("; }", out);
-}
-
-
-/* Try to decompile a method body.  Right now we just try to handle a
-   simple case that we can do.  Expand as desired.  */
-static void
-decompile_method (FILE *out, JCF *jcf, int code_len)
-{
-  const unsigned char *codes = jcf->read_ptr;
-  int index;
-  uint16 name_and_type, name;
-
-  /* If the method is synchronized, don't touch it.  */
-  if ((method_access & ACC_SYNCHRONIZED))
-    return;
-
-  if (code_len == 5
-      && codes[0] == OPCODE_aload_0
-      && codes[1] == OPCODE_getfield
-      && (codes[4] == OPCODE_areturn
-	  || codes[4] == OPCODE_dreturn
-	  || codes[4] == OPCODE_freturn
-	  || codes[4] == OPCODE_ireturn
-	  || codes[4] == OPCODE_lreturn))
-    {
-      /* Found code like `return FIELD'.  */
-      index = (codes[2] << 8) | codes[3];
-      /* FIXME: ensure that tag is CONSTANT_Fieldref.  */
-      name_and_type = JPOOL_USHORT2 (jcf, index);
-      /* FIXME: ensure that tag is CONSTANT_NameAndType.  */
-      name = JPOOL_USHORT1 (jcf, name_and_type);
-      if (codes[4] == OPCODE_areturn)
-	decompile_return_statement (out, jcf, method_signature,
-				    name, JPOOL_USHORT2 (jcf, name_and_type));
-      else
-	{
-	  fputs (" { return ", out);
-	  /* FIXME: flags.  */
-	  print_field_name (out, jcf, name, 0);
-	  fputs ("; }", out);
-	}
-      decompiled = 1;
-    }
-  else if (code_len == 2
-	   && codes[0] == OPCODE_aload_0
-	   && codes[1] == OPCODE_areturn
-	   /* We're going to generate `return this'.  This only makes
-	      sense for non-static methods.  */
-	   && ! (method_access & ACC_STATIC))
-    {
-      decompile_return_statement (out, jcf, method_signature, -1,
-				  JPOOL_USHORT1 (jcf, jcf->this_class));
-      decompiled = 1;
-    }
-  else if (code_len == 1 && codes[0] == OPCODE_return)
-    {
-      /* Found plain `return'.  */
-      fputs (" { }", out);
-      decompiled = 1;
-    }
-  else if (code_len == 2
-	   && codes[0] == OPCODE_aconst_null
-	   && codes[1] == OPCODE_areturn)
-    {
-      /* Found `return null'.  We don't want to depend on NULL being
-	 defined.  */
-      fputs (" { return 0; }", out);
-      decompiled = 1;
-    }
-}
-
-/* Like strcmp, but invert the return result for the hash table.  This
-   should probably be in hashtab.c to complement the existing string
-   hash function.  */
-static int
-gcjh_streq (const void *p1, const void *p2)
-{
-  return ! strcmp ((char *) p1, (char *) p2);
-}
-
-/* Return 1 if the initial part of CLNAME names a subclass of throwable, 
-   or 0 if not.  CLNAME may be extracted from a signature, and can be 
-   terminated with either `;' or NULL.  */
-static int
-throwable_p (const unsigned char *clname)
-{
-  int length;
-  unsigned char *current;
-  int i;
-  int result = 0;
-
-  /* We keep two hash tables of class names.  In one we list all the
-     classes which are subclasses of Throwable.  In the other we will
-     all other classes.  We keep two tables to make the code a bit
-     simpler; we don't have to have a structure mapping class name to
-     a `throwable?' bit.  */
-  static htab_t throw_hash;
-  static htab_t non_throw_hash;
-  static int init_done = 0;
-
-  if (! init_done)
-    {
-      void **slot;
-      unsigned char *str;
-
-      /* Self-initializing.  The cost of this really doesn't matter.
-	 We also don't care about freeing these, either.  */
-      throw_hash = htab_create (10, htab_hash_string, gcjh_streq,
-				(htab_del) free);
-      non_throw_hash = htab_create (10, htab_hash_string, gcjh_streq,
-				    (htab_del) free);
-
-      /* Make sure the root classes show up in the tables.  */
-      str = (unsigned char *) xstrdup ("java.lang.Throwable");
-      slot = htab_find_slot (throw_hash, str, INSERT);
-      *slot = str;
-
-      str = (unsigned char *) xstrdup ("java.lang.Object");
-      slot = htab_find_slot (non_throw_hash, str, INSERT);
-      *slot = str;
-
-      init_done = 1;
-    }
-
-  for (length = 0; clname[length] != ';' && clname[length] != '\0'; ++length)
-    ;
-  current = XNEWVEC (unsigned char, length + 1);
-  for (i = 0; i < length; ++i)
-    current[i] = clname[i] == '/' ? '.' : clname[i];
-  current[length] = '\0';
-
-  /* We don't compute the hash slot here because the table might be
-     modified by the recursion.  In that case the slot could be
-     invalidated.  */
-  if (htab_find (throw_hash, current))
-    result = 1;
-  else if (htab_find (non_throw_hash, current))
-    result = 0;
-  else
-    {
-      JCF jcf;
-      void **slot;
-      unsigned char *super, *tmp;
-      int super_length = -1;
-      const char *classfile_name = find_class ((char *) current, strlen ((const char *) current),
-					       &jcf, 0);
-
-      if (! classfile_name)
-	{
-	  error ("couldn't find class %s", current);
-	  return 0;
-	}
-      if (jcf_parse_preamble (&jcf) != 0
-	  || jcf_parse_constant_pool (&jcf) != 0
-	  || verify_constant_pool (&jcf) > 0)
-	{
-	  error ("parse error while reading %s", classfile_name);
-	  return 0;
-	}
-      jcf_parse_class (&jcf);
-
-      tmp = (unsigned char *) super_class_name (&jcf, &super_length);
-      super = XNEWVEC (unsigned char, super_length + 1);
-      memcpy (super, tmp, super_length);      
-      super[super_length] = '\0';
-
-      result = throwable_p (super);
-      slot = htab_find_slot (result ? throw_hash : non_throw_hash,
-			     current, INSERT);
-      *slot = current;
-      current = NULL;
-
-      JCF_FINISH (&jcf);
-    }
-
-  return result;
-}
-
-/* Print one piece of a signature.  Returns pointer to next parseable
-   character on success, NULL on error.  */
-static const unsigned char *
-decode_signature_piece (FILE *stream, const unsigned char *signature,
-			const unsigned char *limit, int *need_space)
-{
-  const char *ctype;
-  int array_depth = 0;
-
-  switch (signature[0])
-    {
-    case '[':
-      /* More spaghetti.  */
-
-    array_loop:
-      for (signature++; (signature < limit
-			 && ISDIGIT (*signature)); signature++)
-	;
-      switch (*signature)
-	{
-	case 'B':
-	  ctype = "jbyteArray";
-	  break;
-	case 'C':
-	  ctype = "jcharArray";
-	  break;
-	case 'D':
-	  ctype = "jdoubleArray";
-	  break;
-	case 'F':
-	  ctype = "jfloatArray";
-	  break;
-	case 'I':
-	  ctype = "jintArray";
-	  break;
-	case 'S':
-	  ctype = "jshortArray";
-	  break;
-	case 'J':
-	  ctype = "jlongArray";
-	  break;
-	case 'Z':
-	  ctype = "jbooleanArray";
-	  break;
-	case '[':
-	  /* We have a nested array.  */
-	  ++array_depth;
-	  if (! flag_jni)
-	    fputs ("JArray<", stream);
-	  goto array_loop;
-
-	case 'L':
-	  /* We have to generate a reference to JArray here, so that
-	     our output matches what the compiler does.  */
-	  ++signature;
-	  /* Space between `<' and `:' to avoid C++ digraphs.  */
-	  if (! flag_jni)
-	    fputs ("JArray< ::", stream);
-	  while (signature < limit && *signature != ';')
-	    {
-	      int ch = UTF8_GET (signature, limit);
-	      if (! flag_jni)
-		{
-		  if (ch == '/')
-		    fputs ("::", stream);
-		  else
-		    jcf_print_char (stream, ch);
-		}
-	    }
-	  if (! flag_jni)
-	    fputs (" *> *", stream);
-	  *need_space = 0;
-	  ctype = NULL;
-	  break;
-	default:
-	  /* Unparseable signature.  */
-	  return NULL;
-	}
-
-      /* If the previous iterations left us with something to print,
-	 print it.  For JNI, we always print `jobjectArray' in the
-	 nested cases.  */
-      if (flag_jni && (ctype == NULL || array_depth > 0))
-	{
-	  ctype = "jobjectArray";
-	  *need_space = 1;
-	}
-      /* The `printit' case will advance SIGNATURE for us.  If we
-	 don't go there, we must advance past the `;' ourselves.  */
-      if (ctype != NULL)
-	goto printit;
-      ++signature;
-      break;
-
-    case '(':
-    case ')':
-      /* This shouldn't happen.  */
-      return NULL;
-
-    case 'B': ctype = "jbyte";  goto printit;
-    case 'C': ctype = "jchar";  goto printit;
-    case 'D': ctype = "jdouble";  goto printit;
-    case 'F': ctype = "jfloat";  goto printit;
-    case 'I': ctype = "jint";  goto printit;
-    case 'J': ctype = "jlong";  goto printit;
-    case 'S': ctype = "jshort";  goto printit;
-    case 'Z': ctype = "jboolean";  goto printit;
-    case 'V': ctype = "void";  goto printit;
-    case 'L':
-      if (flag_jni)
-	{
-	  /* We know about certain types and special-case their names.  */
-	  if (! strncmp ((const char *) signature, "Ljava/lang/String;",
-			 sizeof ("Ljava/lang/String;") -1))
-	    ctype = "jstring";
-	  else if (! strncmp ((const char *) signature, "Ljava/lang/Class;",
-			      sizeof ("Ljava/lang/Class;") - 1))
-	    ctype = "jclass";
-	  /* Skip leading 'L' for throwable_p call.  */
-	  else if (throwable_p (signature + 1))
-	    ctype = "jthrowable";
-	  else
-	    ctype = "jobject";
-
-	  while (*signature && *signature != ';')
-	    ++signature;
-
-	  goto printit;
-	}
-      /* Print a leading "::" so we look in the right namespace.  */
-      fputs ("::", stream);
-      ++signature;
-      while (*signature && *signature != ';')
-	{
-	  int ch = UTF8_GET (signature, limit);
-	  if (ch == '/')
-	    fputs ("::", stream);
-	  else
-	    jcf_print_char (stream, ch);
-	}
-      fputs (" *", stream);
-      if (*signature == ';')
-	signature++;
-      *need_space = 0;
-      break;
-    default:
-      *need_space = 1;
-      jni_print_char (stream, *signature++);
-      break;
-    printit:
-      signature++;
-      *need_space = 1;
-      fputs (ctype, stream);
-      break;
-    }
-
-  if (! flag_jni)
-    {
-      while (array_depth-- > 0)
-	fputs ("> *", stream);
-    }
-
-  return signature;
-}
-
-static void
-print_c_decl (FILE* stream, JCF* jcf, int name_index, int signature_index,
-	      int is_init, const char *name_override, int flags)
-{
-  if (JPOOL_TAG (jcf, signature_index) != CONSTANT_Utf8)
-    {
-      fprintf (stream, "<not a UTF8 constant>");
-      found_error = 1;
-    }
-  else
-    {
-      int length = JPOOL_UTF_LENGTH (jcf, signature_index);
-      const unsigned char *str0 = JPOOL_UTF_DATA (jcf, signature_index);
-      const unsigned char *str = str0;
-      const unsigned char *limit = str + length;
-      int need_space = 0;
-      int is_method = str[0] == '(';
-      const unsigned char *next;
-
-      /* If printing a method, skip to the return signature and print
-	 that first.  However, there is no return value if this is a
-	 constructor.  */
-      if (is_method && ! is_init)
-	{
-	  while (str < limit)
-	    {
-	      int ch = *str++;
-	      if (ch == ')')
-		break;
-	    }
-	}
-
-      /* If printing a field or an ordinary method, then print the
-	 "return value" now.  */
-      if (! is_method || ! is_init)
-	{
-	  next = decode_signature_piece (stream, str, limit, &need_space);
-	  if (! next)
-	    {
-	      error ("unparseable signature: '%s'", str0);
-	      return;
-	    }
-	}
-
-      /* Force the alignment of the first data member.  This is
-	 because the "new" C++ ABI changed the alignment of non-POD
-	 classes.  gcj, however, still uses the "old" alignment.  */
-      if (is_first_data_member && ! (flags & ACC_STATIC) && ! is_method)
-	{
-	  is_first_data_member = 0;
-	  print_cxx_classname (out, " __attribute__((aligned(__alignof__( ",
-			       jcf, jcf->super_class, 1);
-	  fputs (" )))) ", stream);
-	}
-
-      /* Now print the name of the thing.  */
-      if (need_space)
-	fputs (" ", stream);
-      print_full_cxx_name (stream, jcf, name_index, 
-			   signature_index, is_init, name_override,
-			   flags);
-    }
-}
-
-/* Print the unqualified method name followed by the signature. */
-static void
-print_full_cxx_name (FILE* stream, JCF* jcf, int name_index,
-		     int signature_index, int is_init,
-		     const char *name_override, int flags)
-{
-  int length = JPOOL_UTF_LENGTH (jcf, signature_index);
-  const unsigned char *str0 = JPOOL_UTF_DATA (jcf, signature_index);
-  const unsigned char *str = str0;
-  const unsigned char *limit = str + length;
-  int need_space = 0;
-  int is_method = str[0] == '(';
-  const unsigned char *next;
-
-  if (name_override)
-    fputs (name_override, stream);
-  else if (name_index)
-    {
-      /* Declare constructors specially.  */
-      if (is_init)
-	print_base_classname (stream, jcf, jcf->this_class);
-      else
-	print_name (stream, jcf, name_index);
-    }
-
-  if (flag_jni)
-    {
-      unsigned char *signature = JPOOL_UTF_DATA (jcf, signature_index);
-      int sig_len = JPOOL_UTF_LENGTH (jcf, signature_index);
-      if (overloaded_jni_method_exists_p (JPOOL_UTF_DATA (jcf, name_index),
-					  JPOOL_UTF_LENGTH (jcf, name_index),
-					  (const char *) signature, sig_len))
-	{
-	  /* If this method is overloaded by another native method,
-	     then include the argument information in the mangled
-	     name.  */
-	  unsigned char *limit = signature + sig_len;
-	  fputs ("__", stream);
-	  while (signature < limit)
-	    {
-	      int ch = UTF8_GET (signature, limit);
-	      jni_print_char (stream, ch);
-	      if (ch == ')')
-		{
-		  /* Done.  */
-		  break;
-		}
-	    }
-	}
-    }
-
-  if (is_method)
-    {
-      /* Have a method or a constructor.  Print signature pieces
-	 until done.  */
-      fputs (" (", stream);
-
-      str = str0 + 1;
-
-      /* In JNI mode, add extra arguments.  */
-      if (flag_jni)
-	{
-	  /* FIXME: it would be nice to know if we are printing a decl
-	     or a definition, and only print `env' for the latter.  */
-	  fputs ("JNIEnv *env", stream);
-
-	  fputs ((flags & ACC_STATIC) ? ", jclass" : ", jobject", stream);
-
-	  if (*str != ')')
-	    fputs (", ", stream);
-	}
-
-      while (str < limit && *str != ')')
-	{
-	  next = decode_signature_piece (stream, str, limit, &need_space);
-	  if (! next)
-	    {
-	      error ("unparseable signature: '%s'", str0);
-	      return;
-	    }
-	  
-	  if (next < limit && *next != ')')
-	    fputs (", ", stream);
-	  str = next;
-	}
-      
-      fputs (")", stream);
-    }
-}
-
-/* This is a helper for print_stub_or_jni.  */
-static void
-print_name_for_stub_or_jni (FILE *stream, JCF *jcf, int name_index,
-			    int signature_index, int is_init,
-			    const char *name_override, int flags)
-{
-  const char *const prefix = flag_jni ? "Java_" : "";
-  print_cxx_classname (stream, prefix, jcf, jcf->this_class, 1);
-  fputs (flag_jni ? "_" : "::", stream);
-  print_full_cxx_name (stream, jcf, name_index, 
-		       signature_index, is_init, name_override,
-		       flags);
-}
-
-static void
-print_stub_or_jni (FILE* stream, JCF* jcf, int name_index,
-		   int signature_index, int is_init,
-		   const char *name_override, int flags)
-{
-  if (JPOOL_TAG (jcf, signature_index) != CONSTANT_Utf8)
-    {
-      fprintf (stream, "<not a UTF8 constant>");
-      found_error = 1;
-    }
-  else
-    {
-      int length = JPOOL_UTF_LENGTH (jcf, signature_index);
-      const unsigned char *str0 = JPOOL_UTF_DATA (jcf, signature_index);
-      const unsigned char *str = str0;
-      const unsigned char *limit = str + length;
-      int need_space = 0;
-      int is_method = str[0] == '(';
-      const unsigned char *next;
-
-      /* Don't print fields in the JNI case.  */
-      if (! is_method && flag_jni)
-	return;
-
-      if (flag_jni && ! stubs)
-	fputs ("JNIEXPORT ", stream);
-
-      /* If printing a method, skip to the return signature and print
-	 that first.  However, there is no return value if this is a
-	 constructor.  */
-      if (is_method && ! is_init)
-	{
-	  while (str < limit)
-	    {
-	      int ch = *str++;
-	      if (ch == ')')
-		break;
-	    }
-	}
-
-      /* If printing a field or an ordinary method, then print the
-	 "return value" now.  Note that a constructor can't be native,
-	 so we don't bother checking this in the JNI case.  */
-      if (! is_method || ! is_init)
-	{
-	  next = decode_signature_piece (stream, str, limit, &need_space);
-	  if (! next)
-	    {
-	      error ("unparseable signature: '%s'", str0);
-	      return;
-	    }
-	}
-
-      /* When printing a JNI header we need to respect the space.  In
-	 other cases we're just going to insert a newline anyway.  */
-      fputs (need_space && ! stubs ? " " : "\n", stream);
-
-      if (flag_jni && ! stubs)
-	fputs ("JNICALL ", stream);
-      
-      /* Now print the name of the thing.  */
-      print_name_for_stub_or_jni (stream, jcf, name_index,
-				  signature_index, is_init, name_override,
-				  flags);
-
-      /* Print the body.  */
-      if (stubs)
-	{
-	  if (flag_jni)
-	    fputs ("\n{\n  (*env)->FatalError (env, \"", stream);
-	  else
-	    fputs ("\n{\n  throw new ::java::lang::UnsupportedOperationException (JvNewStringLatin1 (\"", stream);
-	  print_name_for_stub_or_jni (stream, jcf, name_index,
-				      signature_index, is_init,
-				      name_override,
-				      flags);
-	  fprintf (stream, " not implemented\")%s;\n}\n\n",
-		   flag_jni ? "" : ")");
-	}
-    }
-}
-
-static void
-print_mangled_classname (FILE *stream, JCF *jcf, const char *prefix, int index)
-{
-  int name_index = JPOOL_USHORT1 (jcf, index);
-  fputs (prefix, stream);
-  jcf_print_utf8_replace (out,
-			  JPOOL_UTF_DATA (jcf, name_index),
-			  JPOOL_UTF_LENGTH (jcf, name_index),
-			  '/', '_');
-}
-
-/* Print PREFIX, then a class name in C++ format.  If the name refers
-   to an array, ignore it and don't print PREFIX.  Returns 1 if
-   something was printed, 0 otherwise.  */
-static int
-print_cxx_classname (FILE *stream, const char *prefix,
-		     JCF *jcf, int index, int add_scope)
-{
-  int name_index = JPOOL_USHORT1 (jcf, index);
-  int len, c;
-  const unsigned char *s, *p, *limit;
-
-  s = JPOOL_UTF_DATA (jcf, name_index);
-  len = JPOOL_UTF_LENGTH (jcf, name_index);
-  limit = s + len;
-
-  /* Explicitly omit arrays here.  */
-  p = s;
-  c = UTF8_GET (p, limit);
-  if (c == '[')
-    return 0;
-
-  fputs (prefix, stream);
-
-  /* Print a leading "::" so we look in the right namespace.  */
-  if (! flag_jni && ! stubs && add_scope)
-    fputs ("::", stream);
-
-  while (s < limit)
-    {
-      c = UTF8_GET (s, limit);
-      if (c == '/')
-	fputs (flag_jni ? "_" : "::", stream);
-      else
-	jni_print_char (stream, c);
-    }
-
-  return 1;
-}
-
-int written_class_count = 0;
-
-/* Return name of superclass.  If LEN is not NULL, fill it with length
-   of name.  */
-static const unsigned char *
-super_class_name (JCF *derived_jcf, int *len)
-{
-  int supername_index = JPOOL_USHORT1 (derived_jcf, derived_jcf->super_class);
-  int supername_length = JPOOL_UTF_LENGTH (derived_jcf, supername_index);
-  const unsigned char *supername =
-    JPOOL_UTF_DATA (derived_jcf, supername_index);
-
-  if (len)
-    *len = supername_length;
-
-  return supername;
-}
-
-static void
-handle_inner_classes (int count)
-{
-  int i;
-
-  if (out && ! flag_jni && ! stubs && count > 0)
-    fprintf (out, "\n");
-
-  for (i = 0; i < count; ++i)
-    {
-      JCF_u2 inner_info_index = JCF_readu2 (current_jcf);
-
-      /* There are a few more values here, but we don't care about
-	 them.  The (void) cast is apparently the only way to avoid a
-	 warning here.  */
-      (void) JCF_readu2 (current_jcf);
-      (void) JCF_readu2 (current_jcf);
-      (void) JCF_readu2 (current_jcf);
-
-      if (out && ! flag_jni && ! stubs)
-	{
-	  print_mangled_classname (out, current_jcf, "  friend class ",
-				   inner_info_index);
-	  fprintf (out, ";\n");
-	}
-    }
-}
-
-
-
-/* We keep track of all the `#include's we generate, so we can avoid
-   duplicates.  */
-struct include
-{
-  char *name;
-  struct include *next;
-};
-
-/* List of all includes.  */
-static struct include *all_includes = NULL;
-
-/* Generate a #include.  */
-static void
-print_include (FILE *out, const unsigned char *utf8, int len)
-{
-  struct include *incl;
-
-  if (! out)
-    return;
-
-  if (len == -1)
-    len = strlen ((const char *) utf8);
-
-  for (incl = all_includes; incl; incl = incl->next)
-    {
-      /* We check the length because we might have a proper prefix.  */
-      if (len == (int) strlen (incl->name)
-	  && ! strncmp (incl->name, (const char *) utf8, len))
-	return;
-    }
-
-  incl = XNEW (struct include);
-  incl->name = XNEWVEC (char, len + 1);
-  strncpy (incl->name, (const char *) utf8, len);
-  incl->name[len] = '\0';
-  incl->next = all_includes;
-  all_includes = incl;
-
-  fputs ("#include <", out);
-  jcf_print_utf8_replace (out, utf8, len,
-			  '/',
-			  flag_jni ? '_' : '/');
-  fputs (".h>\n", out);
-}
-
-
-
-/* This is used to represent part of a package or class name.  */
-struct namelet
-{
-  /* The text of this part of the name.  */
-  char *name;
-  /* True if this represents a class.  */
-  int is_class;
-  /* Linked list of all classes and packages inside this one.  */
-  struct namelet *subnamelets;
-  /* Pointer to next sibling.  */
-  struct namelet *next;
-};
-
-static void add_namelet (const unsigned char *, const unsigned char *,
-			 struct namelet *);
-static void print_namelet (FILE *, struct namelet *, int);
-
-/* The special root namelet.  */
-static struct namelet root =
-{
-  NULL,
-  0,
-  NULL,
-  NULL
-};
-
-/* This extracts the next name segment from the full UTF-8 encoded
-   package or class name and links it into the tree.  It does this
-   recursively.  */
-static void
-add_namelet (const unsigned char *name, const unsigned char *name_limit,
-	     struct namelet *parent)
-{
-  const unsigned char *p;
-  struct namelet *n = NULL, *np;
-
-  /* We want to skip the standard namespaces that we assume the
-     runtime already knows about.  We only do this at the top level,
-     though, hence the check for `root'.  */
-  if (parent == &root)
-    {
-#define JAVALANG "java/lang/"
-#define JAVAIO "java/io/"
-#define JAVAUTIL "java/util/"
-      if ((name_limit - name >= (int) sizeof (JAVALANG) - 1
-	   && ! strncmp ((const char *) name, JAVALANG, sizeof (JAVALANG) - 1))
-	  || (name_limit - name >= (int) sizeof (JAVAUTIL) - 1
-	      && ! strncmp ((const char *) name, JAVAUTIL, sizeof (JAVAUTIL) - 1))
-	  || (name_limit - name >= (int) sizeof (JAVAIO) - 1
-	      && ! strncmp ((const char *) name, JAVAIO, sizeof (JAVAIO) - 1)))
-	return;
-    }
-
-  for (p = name; p < name_limit && *p != '/'; ++p)
-    ;
-
-  /* Search for this name beneath the PARENT node.  */
-  for (np = parent->subnamelets; np != NULL; np = np->next)
-    {
-      /* We check the length because we might have a proper prefix.  */
-      if ((int) strlen (np->name) == p - name &&
-	  ! strncmp ((const char *) name, np->name, p - name))
-	{
-	  n = np;
-	  break;
-	}
-    }
-
-  if (n == NULL)
-    {
-      n = XNEW (struct namelet);
-      n->name = XNEWVEC (char, p - name + 1);
-      strncpy (n->name, (const char *) name, p - name);
-      n->name[p - name] = '\0';
-      n->is_class = (p == name_limit);
-      n->subnamelets = NULL;
-      n->next = parent->subnamelets;
-      parent->subnamelets = n;
-    }
-
-  /* We recurse if there is more text, and if the trailing piece does
-     not represent an inner class. */
-  if (p < name_limit)
-    add_namelet (p + 1, name_limit, n);
-}
-
-/* Print a single namelet.  Destroys namelets while printing.  */
-static void
-print_namelet (FILE *out, struct namelet *name, int depth)
-{
-  int i, term = 0;
-  struct namelet *c;
-
-  if (name->name)
-    {
-      for (i = 0; i < depth; ++i)
-	fputc (' ', out);
-      fprintf (out, "%s %s", name->is_class ? "class" : "namespace",
-	       name->name);
-      if (name->is_class && name->subnamelets == NULL)
-	fputs (";\n", out);
-      else
-	{
-	  term = 1;
-	  fputs ("\n", out);
-	  for (i = 0; i < depth; ++i)
-	    fputc (' ', out);
-	  fputs ("{\n", out);
-	}
-    }
-
-  c = name->subnamelets;
-  while (c != NULL)
-    {
-      struct namelet *next = c->next;
-      print_namelet (out, c, depth + 2);
-      c = next;
-    }
-  name->subnamelets = NULL;
-
-  if (name->name)
-    {
-      if (term)
-	{
-	  for (i = 0; i < depth; ++i)
-	    fputc (' ', out);
-	  fputs ("}\n", out);
-	  /* Only print a `;' when printing a class.  C++ is evil.  */
-	  if (name->is_class)
-	    fputs (";", out);
-	}
-
-      free (name->name);
-      free (name);
-    }
-}
-
-/* This is called to add some classes to the list of classes for which
-   we need decls.  The signature argument can be a function
-   signature.  */
-static void
-add_class_decl (FILE *out, JCF *jcf, JCF_u2 signature)
-{
-  const unsigned char *s = JPOOL_UTF_DATA (jcf, signature);
-  int len = JPOOL_UTF_LENGTH (jcf, signature);
-  int i;
-
-  for (i = 0; i < len; ++i)
-    {
-      int start;
-
-      /* If we see an array, then we include the array header.  */
-      if (s[i] == '[')
-	{
-	  print_include (out, (const unsigned char *) "gcj/array", -1);
-	  continue;
-	}
-
-      /* We're looking for `L<stuff>;' -- everything else is
-	 ignorable.  */
-      if (s[i] != 'L')
-	continue;
-
-      for (start = ++i; i < len && s[i] != ';'; ++i)
-	;
-
-      add_namelet (&s[start], &s[i], &root);
-    }
-}
-
-/* Print declarations for all classes required by this class.  Any
-   class or package in the `java' package is assumed to be handled
-   statically in libjava; we don't generate declarations for these.
-   This makes the generated headers a bit easier to read.  */
-static void
-print_class_decls (FILE *out, JCF *jcf, int self)
-{
-  /* Make sure to always add the current class to the list of things
-     that should be declared.  */
-  int name_index = JPOOL_USHORT1 (jcf, self);
-  int len;
-  const unsigned char *s;
-
-  s = JPOOL_UTF_DATA (jcf, name_index);
-  len = JPOOL_UTF_LENGTH (jcf, name_index);
-  add_namelet (s, s + len, &root);
-
-  if (root.subnamelets)
-    {
-      fputs ("extern \"Java\"\n{\n", out);
-      /* We use an initial offset of 0 because the root namelet
-	 doesn't cause anything to print.  */
-      print_namelet (out, &root, 0);
-      fputs ("}\n\n", out);
-    }
-}
-
-
-
-static void
-process_file (JCF *jcf, FILE *out)
-{
-  int code, i;
-  uint32 field_start, method_end, method_start;
-
-  current_jcf = jcf;
-
-  last_access = -1;
-
-  if (jcf_parse_preamble (jcf) != 0)
-    {
-      error ("Not a valid Java .class file.");
-      return;
-    }
-
-  /* Parse and possibly print constant pool */
-  code = jcf_parse_constant_pool (jcf);
-  if (code != 0)
-    {
-      error ("error while parsing constant pool");
-      return;
-    }
-  code = verify_constant_pool (jcf);
-  if (code > 0)
-    {
-      error ("error in constant pool entry #%d", code);
-      return;
-    }
-
-  jcf_parse_class (jcf);
-
-  if (written_class_count++ == 0 && out)
-    {
-      const char *cstart, *cstart2, *mode, *cend, *what, *jflag;
-      if (flag_jni)
-	{
-	  cstart = "/*";
-	  cstart2 = "  ";
-	  cend = " */";
-	  mode = "";
-	  what = "JNI";
-	  jflag = " -jni";
-	}
-      else
-	{
-	  cstart = "//";
-	  cstart2 = "//";
-	  cend = "";
-	  mode = " -*- c++ -*-";
-	  what = "CNI";
-	  jflag = "";
-	}
-
-      if (! stubs)
-	fprintf (out, "%s DO NOT EDIT THIS FILE - it is machine generated%s%s\n\n",
-		 cstart, mode, cend);
-      else
-	{
-	  fprintf (out, "%s This file was created by `" TOOLNAME " -stubs%s'.%s\n\
-%s\n\
-%s This file is intended to give you a head start on implementing native\n\
-%s methods using %s.\n\
-%s Be aware: running `" TOOLNAME " -stubs %s' once more for this class may\n\
-%s overwrite any edits you have made to this file.%s\n\n",
-		   cstart, jflag, mode,
-		   cstart2,
-		   cstart2,
-		   cstart2,
-		   what,
-		   cstart2,
-		   jflag,
-		   cstart2,
-		   cend);
-	}
-    }
-
-  if (out)
-    {
-      if (! stubs)
-	{
-	  print_mangled_classname (out, jcf, "#ifndef __", jcf->this_class);
-	  fprintf (out, "__\n");
-
-	  print_mangled_classname (out, jcf, "#define __", jcf->this_class);
-	  fprintf (out, "__\n\n");
-
-	  if (flag_jni)
-	    {
-	      fprintf (out, "#include <jni.h>\n\n");
-	      fprintf (out, "#ifdef __cplusplus\n");
-	      fprintf (out, "extern \"C\"\n");
-	      fprintf (out, "{\n");
-	      fprintf (out, "#endif\n");
-	    }
-	  else  
-	    {
-	      /* We do this to ensure that inline methods won't be
-		 `outlined' by g++.  This works as long as method and
-		 fields are not added by the user.  */
-	      fprintf (out, "#pragma interface\n");
-
-	      if (jcf->super_class)
-		{
-		  int super_length;
-		  const unsigned char *supername =
-		    super_class_name (jcf, &super_length);
-
-		  fputs ("\n", out);
-		  print_include (out, supername, super_length);
-		}
-	    }
-	}
-      else
-	{
-	  /* Strip off the ".class" portion of the name when printing
-	     the include file name.  */
-	  char *name;
-	  int i, len = strlen (jcf->classname);
-	  if (len > 6 && ! strcmp (&jcf->classname[len - 6], ".class"))
-	    len -= 6;
-	  /* Turn the class name into a file name.  */
-	  name = XNEWVEC (char, len + 1);
-	  for (i = 0; i < len; ++i)
-	    name[i] = jcf->classname[i] == '.' ? '/' : jcf->classname[i];
-	  name[i] = '\0';
-	  print_include (out, (const unsigned char *) name, len);
-	  free (name);
-
-	  if (! flag_jni)
-	    {
-	      print_include (out, (const unsigned char *) "gcj/cni", -1);
-	      print_include (out, (const unsigned char *) "java/lang/UnsupportedOperationException",
-			     -1);
-	    }
-	}
-    }
-
-  /* We want to parse the methods first.  But we need to find where
-     they start.  So first we skip the fields, then parse the methods.
-     Then we parse the fields and skip the methods.  This is ugly, but
-     not too bad since we need two full passes to get class decl
-     information anyway.  */
-  field_pass = 0;
-  field_start = JCF_TELL (jcf);
-  jcf_parse_fields (jcf);
-
-  method_start = JCF_TELL (jcf);
-  method_pass = 0;
-  jcf_parse_methods (jcf);
-
-  if (out)
-    fputs ("\n", out);
-
-  if (out && ! flag_jni)
-    {
-      if (! stubs)
-	print_class_decls (out, jcf, jcf->this_class);
-
-      for (i = 0; i < prepend_count; ++i)
-	fprintf (out, "%s\n", prepend_specs[i]);
-      if (prepend_count > 0)
-	fputc ('\n', out);
-
-      if (! stubs)
-	{
-	  if (! print_cxx_classname (out, "class ", jcf,
-				     jcf->this_class, 0))
-	    {
-	      error ("class is of array type\n");
-	      return;
-	    }
-	  if (jcf->super_class)
-	    {
-	      if (! print_cxx_classname (out, " : public ", 
-					 jcf, jcf->super_class, 1))
-		{
-		  error ("base class is of array type");
-		  return;
-		}
-	    }
-
-	  fputs ("\n{\n", out);
-	}
-    }
-
-  /* Now go back for second pass over methods and fields.  */
-  is_first_data_member = 1;
-
-  JCF_SEEK (jcf, method_start);
-  method_pass = 1;
-  jcf_parse_methods (jcf);
-  method_end = JCF_TELL (jcf);
-
-  field_pass = 1;
-  JCF_SEEK (jcf, field_start);
-  jcf_parse_fields (jcf);
-  JCF_SEEK (jcf, method_end);
-
-  jcf_parse_final_attributes (jcf);
-
-  if (out && ! stubs)
-    {
-      if (flag_jni)
-	{
-	  fprintf (out, "\n#ifdef __cplusplus\n");
-	  fprintf (out, "}\n");
-	  fprintf (out, "#endif\n");
-	}
-      else
-	{
-	  /* Generate friend decl if we still must.  */
-	  for (i = 0; i < friend_count; ++i)
-	    fprintf (out, "  friend %s\n", friend_specs[i]);
-
-	  /* Generate extra declarations.  */
-	  if (add_count > 0)
-	    fputc ('\n', out);
-	  for (i = 0; i < add_count; ++i)
-	    fprintf (out, "  %s\n", add_specs[i]);
-
-	  /* Generate an entry for the class object.  */
-	  generate_access (out, ACC_PUBLIC);
-	  fprintf (out, "\n  static ::java::lang::Class class$;\n");
-
-	  fputs ("}", out);
-	  
-	  if (jcf->access_flags & ACC_INTERFACE)
-	    fputs (" __attribute__ ((java_interface))", out);
-
-	  fputs (";\n", out);
-
-	  if (append_count > 0)
-	    fputc ('\n', out);
-	  for (i = 0; i < append_count; ++i)
-	    fprintf (out, "%s\n", append_specs[i]);
-	}
-
-      print_mangled_classname (out, jcf, 
-			       "\n#endif /* __", jcf->this_class);
-      fprintf (out, "__ */\n");
-    }
-}
-
-
-
-/* This is used to mark options with no short value.  */
-#define LONG_OPT(Num)  ((Num) + 128)
-
-#define OPT_classpath     LONG_OPT (0)
-#define OPT_CLASSPATH     OPT_classpath
-#define OPT_bootclasspath LONG_OPT (1)
-#define OPT_extdirs       LONG_OPT (2)
-#define OPT_HELP          LONG_OPT (3)
-#define OPT_TEMP          LONG_OPT (4)
-#define OPT_VERSION       LONG_OPT (5)
-#define OPT_PREPEND       LONG_OPT (6)
-#define OPT_FRIEND        LONG_OPT (7)
-#define OPT_ADD           LONG_OPT (8)
-#define OPT_APPEND        LONG_OPT (9)
-#define OPT_M             LONG_OPT (10)
-#define OPT_MM            LONG_OPT (11)
-#define OPT_MG            LONG_OPT (12)
-#define OPT_MD            LONG_OPT (13)
-#define OPT_MMD           LONG_OPT (14)
-#define OPT_FORCE         LONG_OPT (15)
-#define OPT_OLD           LONG_OPT (16)
-#define OPT_TRACE         LONG_OPT (17)
-
-static const struct option options[] =
-{
-  { "classpath",     required_argument, NULL, OPT_classpath },
-  { "bootclasspath", required_argument, NULL, OPT_bootclasspath },
-  { "extdirs",       required_argument, NULL, OPT_extdirs },
-  { "CLASSPATH",     required_argument, NULL, OPT_CLASSPATH },
-  { "help",          no_argument,       NULL, OPT_HELP },
-  { "stubs",         no_argument,       &stubs, 1 },
-  { "td",            required_argument, NULL, OPT_TEMP },
-  { "verbose",       no_argument,       NULL, 'v' },
-  { "version",       no_argument,       NULL, OPT_VERSION },
-  { "prepend",       required_argument, NULL, OPT_PREPEND },
-  { "friend",        required_argument, NULL, OPT_FRIEND },
-  { "add",           required_argument, NULL, OPT_ADD },
-  { "append",        required_argument, NULL, OPT_APPEND },
-  { "M",             no_argument,       NULL, OPT_M   },
-  { "MM",            no_argument,       NULL, OPT_MM  },
-  { "MG",            no_argument,       NULL, OPT_MG  },
-  { "MD",            no_argument,       NULL, OPT_MD  },
-  { "MMD",           no_argument,       NULL, OPT_MMD },
-  { "jni",           no_argument,       &flag_jni, 1 },
-  { "force",         no_argument,       NULL, OPT_FORCE },
-  /* If the output file should be named "ld" then a space is needed
-     between -o and its argument, ld. */
-  { "old",           no_argument,       NULL, OPT_OLD },
-  { "trace",         no_argument,       NULL, OPT_TRACE },
-  { NULL,            required_argument, NULL, 'J' },
-  { NULL,            no_argument,       NULL, 0 }
-};
-
-static void
-usage (void)
-{
-  fprintf (stderr, _("Try '" TOOLNAME " --help' for more information.\n"));
-  exit (1);
-}
-
-static void
-help (void)
-{
-  printf (_("Usage: " TOOLNAME " [OPTION]... CLASS...\n\n"));
-  printf (_("Generate C or C++ header files from .class files\n\n"));
-  printf (_("  -stubs                  Generate an implementation stub file\n"));
-  printf (_("  -jni                    Generate a JNI header or stub\n"));
-  printf (_("  -force                  Always overwrite output files\n"));
-  printf (_("  -old                    Unused compatibility option\n"));
-  printf (_("  -trace                  Unused compatibility option\n"));
-  printf (_("  -J OPTION               Unused compatibility option\n"));
-  printf ("\n");
-  printf (_("  -add TEXT               Insert TEXT into class body\n"));
-  printf (_("  -append TEXT            Insert TEXT after class declaration\n"));
-  printf (_("  -friend TEXT            Insert TEXT as 'friend' declaration\n"));
-  printf (_("  -prepend TEXT           Insert TEXT before start of class\n"));
-  printf ("\n");
-  printf (_("  --classpath PATH        Set path to find .class files\n"));
-  printf (_("  -IDIR                   Append directory to class path\n"));
-  printf (_("  --bootclasspath PATH    Override built-in class path\n"));
-  printf (_("  --extdirs PATH          Set extensions directory path\n"));
-  printf (_("  -d DIRECTORY            Set output directory name\n"));
-  printf (_("  -o FILE                 Set output file name\n"));
-  printf (_("  -td DIRECTORY           Set temporary directory name\n"));
-  printf ("\n");
-  printf (_("  --help                  Print this help, then exit\n"));
-  printf (_("  --version               Print version number, then exit\n"));
-  printf (_("  -v, --verbose           Print extra information while running\n"));
-  printf ("\n");
-  printf (_("  -M                      Print all dependencies to stdout;\n"
-	    "                             suppress ordinary output\n"));
-  printf (_("  -MM                     Print non-system dependencies to stdout;\n"
-	    "                             suppress ordinary output\n"));
-  printf (_("  -MD                     Print all dependencies to stdout\n"));
-  printf (_("  -MMD                    Print non-system dependencies to stdout\n"));
-  /* We omit -MG until it is implemented.  */
-  printf ("\n");
-  printf (_("For bug reporting instructions, please see:\n"
-	    "%s.\n"), bug_report_url);
-  exit (0);
-}
-
-static void
-version (void)
-{
-  printf (TOOLNAME " (GCC) %s\n\n", version_string);
-  printf ("Copyright %s 2006 Free Software Foundation, Inc.\n", _("(C)"));
-  printf (_("This is free software; see the source for copying conditions.  There is NO\n"
-	    "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"));
-  exit (0);
-}
-
-int
-main (int argc, char** argv)
-{
-  JCF jcf;
-  int argi;
-  char *output_file = NULL;
-  int emit_dependencies = 0, suppress_output = 0;
-  int opt;
-  int local_found_error;
-
-  /* Unlock the stdio streams.  */
-  unlock_std_streams ();
-
-  gcc_init_libintl ();
-
-  if (argc <= 1)
-    {
-      error ("no classes specified");
-      usage ();
-    }
-
-  jcf_path_init ();
-
-  /* We use getopt_long_only to allow single `-' long options.  For
-     some of our options this is more natural.  */
-  while ((opt = getopt_long_only (argc, argv, "J:I:d:o:v", options, NULL)) != -1)
-    {
-      switch (opt)
-	{
-	case 0:
-	  /* Already handled.  */
-	  break;
-
-	case 'o':
-	  output_file = optarg;
-	  break;
-
-	case 'd':
-	  output_directory = optarg;
-	  break;
-
-	case 'I':
-	  jcf_path_include_arg (optarg);
-	  break;
-
-	case 'v':
-	  verbose++;
-	  break;
-
-	case OPT_classpath:
-	  jcf_path_classpath_arg (optarg);
-	  break;
-
-	case OPT_bootclasspath:
-	  jcf_path_bootclasspath_arg (optarg);
-	  break;
-
-	case OPT_extdirs:
-	  jcf_path_extdirs_arg (optarg);
-	  break;
-
-	case OPT_HELP:
-	  help ();
-	  break;
-
-	case OPT_TEMP:
-	  temp_directory = optarg;
-	  break;
-
-	case OPT_VERSION:
-	  version ();
-	  break;
-
-	case OPT_PREPEND:
-	  if (prepend_count == 0)
-	    prepend_specs = XNEWVEC (char *, argc);
-	  prepend_specs[prepend_count++] = optarg;
-	  break;
-
-	case OPT_FRIEND:
-	  if (friend_count == 0)
-	    friend_specs = XNEWVEC (char *, argc);
-	  friend_specs[friend_count++] = optarg;
-	  break;
-
-	case OPT_ADD:
-	  if (add_count == 0)
-	    add_specs = XNEWVEC (char *, argc);
-	  add_specs[add_count++] = optarg;
-	  break;
-
-	case OPT_APPEND:
-	  if (append_count == 0)
-	    append_specs = XNEWVEC (char *, argc);
-	  append_specs[append_count++] = optarg;
-	  break;
-
-	case OPT_M:
-	  emit_dependencies = 1;
-	  suppress_output = 1;
-	  jcf_dependency_init (1);
-	  break;
-
-	case OPT_MM:
-	  emit_dependencies = 1;
-	  suppress_output = 1;
-	  jcf_dependency_init (0);
-	  break;
-
-	case OPT_MG:
-	  error ("'-MG' option is unimplemented");
-	  exit (1);
-
-	case OPT_MD:
-	  emit_dependencies = 1;
-	  jcf_dependency_init (1);
-	  break;
-
-	case OPT_MMD:
-	  emit_dependencies = 1;
-	  jcf_dependency_init (0);
-	  break;
-
-	case OPT_FORCE:
-	  break;
-
-	case OPT_OLD:
-	  break;
-
-	case OPT_TRACE:
-	  break;
-
-	case 'J':
-          /* Ignore -J options. */
-	  break;
-
-	default:
-	  usage ();
-	  break;
-	}
-    }
-
-  if (optind == argc)
-    {
-      error ("no classes specified");
-      usage ();
-    }
-
-  jcf_path_seal (verbose);
-
-  if (output_file && emit_dependencies)
-    {
-      error ("can't specify both -o and -MD");
-      exit (1);
-    }
-
-  local_found_error = 0;
-  for (argi = optind; argi < argc; argi++)
-    {
-      char *classname = argv[argi];
-      char *current_output_file = NULL;
-      const char *classfile_name;
-
-      /* We reset the error state here so that we can detect errors
-	 that occur when processing this file, so the output can be
-	 unlinked if need be.  */
-      found_error = 0;
-
-      if (verbose)
-	printf (_("Processing %s\n"), classname);
-      if (! output_file)
-	jcf_dependency_reset ();
-      classfile_name = find_class (classname, strlen (classname), &jcf, 0);
-      if (classfile_name == NULL)
-	{
-	  error ("%s: no such class", classname);
-	  exit (1);
-	}
-      if (verbose)
-	printf (_("Found in %s\n"), classfile_name);
-      if (output_file)
-	{
-	  if (strcmp (output_file, "-") == 0)
-	    out = stdout;
-	  else if (out == NULL)
-	    {
-	      out = fopen (output_file, "w");
-	    }
-	  if (out == NULL)
-	    {
-	      perror (output_file);
-	      exit (1);
-	    }
-	  current_output_file = output_file;
-	}
-      else
-	{
-	  int dir_len = strlen (output_directory);
-	  int i, classname_length = strlen (classname);
-	  current_output_file = XNEWVEC (char, dir_len + classname_length + 5);
-	  strcpy (current_output_file, output_directory);
-	  if (dir_len > 0 && output_directory[dir_len-1] != '/')
-	    current_output_file[dir_len++] = '/';
-	  for (i = 0; classname[i] != '\0'; i++)
-	    {
-	      char ch = classname[i];
-	      if (ch == '.')
-		ch = '/';
-	      if (flag_jni && ch == '/')
-		ch = '_';
-	      current_output_file[dir_len++] = ch;
-	    }
-	  if (emit_dependencies)
-	    {
-	      if (suppress_output)
-		{
-		  jcf_dependency_set_dep_file ("-");
-		  out = NULL;
-		}
-	      else
-		{
-		  /* We use `.hd' and not `.d' to avoid clashes with
-		     dependency tracking from straight compilation.  */
-		  strcpy (current_output_file + dir_len, ".hd");
-		  jcf_dependency_set_dep_file (current_output_file);
-		}
-	    }
-	  strcpy (current_output_file + dir_len, 
-		  stubs ? (flag_jni ? ".c" : ".cc") : ".h");
-	  jcf_dependency_set_target (current_output_file);
-	  if (! suppress_output)
-	    {
-	      out = fopen (current_output_file, "w");
-	      if (out == NULL)
-		{
-		  perror (current_output_file);
-		  exit (1);
-		}
-	    }
-	}
-      free_method_name_list ();
-      process_file (&jcf, out);
-      JCF_FINISH (&jcf);
-
-      /* If we found an error and we're writing to a real file,
-	 delete it.  */
-      if (found_error && ! suppress_output && current_output_file != NULL
-	  && strcmp (current_output_file, "-"))
-	unlink (current_output_file);
-
-      if (current_output_file != output_file)
-	free (current_output_file);
-      jcf_dependency_write ();
-
-      local_found_error |= found_error;
-    }
-
-  if (out != NULL && out != stdout)
-    fclose (out);
-
-  return local_found_error;
-}
diff --git a/gcc/java/java-gimplify.c b/gcc/java/java-gimplify.c
index 76d299f..f084154 100644
--- a/gcc/java/java-gimplify.c
+++ b/gcc/java/java-gimplify.c
@@ -1,5 +1,5 @@
 /* Java(TM) language-specific gimplification routines.
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -34,10 +34,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 
 static tree java_gimplify_labeled_block_expr (tree);
 static tree java_gimplify_exit_block_expr (tree);
-static tree java_gimplify_case_expr (tree);
-static tree java_gimplify_default_expr (tree);
 static tree java_gimplify_block (tree);
-static tree java_gimplify_new_array_init (tree);
 static tree java_gimplify_try_expr (tree);
 static enum gimplify_status java_gimplify_modify_expr (tree*, tree*, tree *);
 static enum gimplify_status java_gimplify_component_ref (tree*, tree*, tree *);
@@ -92,30 +89,10 @@ java_gimplify_expr (tree *expr_p, tree *pre_p ATTRIBUTE_UNUSED,
       *expr_p = java_gimplify_exit_block_expr (*expr_p);
       break;
 
-    case CASE_EXPR:
-      *expr_p = java_gimplify_case_expr (*expr_p);
-      break;
-
-    case DEFAULT_EXPR:
-      *expr_p = java_gimplify_default_expr (*expr_p);
-      break;
-
-    case NEW_ARRAY_INIT:
-      *expr_p = java_gimplify_new_array_init (*expr_p);
-      break;
-
     case TRY_EXPR:
       *expr_p = java_gimplify_try_expr (*expr_p);
       break;
 
-    case JAVA_CATCH_EXPR:
-      *expr_p = TREE_OPERAND (*expr_p, 0);
-      break;
-
-    case JAVA_EXC_OBJ_EXPR:
-      *expr_p = build_exception_object_ref (TREE_TYPE (*expr_p));
-      break;
-
     case VAR_DECL:
       *expr_p = java_replace_reference (*expr_p, /* want_lvalue */ false);
       return GS_UNHANDLED;
@@ -147,15 +124,6 @@ java_gimplify_expr (tree *expr_p, tree *pre_p ATTRIBUTE_UNUSED,
     case COMPARE_EXPR:
     case COMPARE_L_EXPR:
     case COMPARE_G_EXPR:
-    case UNARY_PLUS_EXPR:
-    case NEW_ARRAY_EXPR:
-    case NEW_ANONYMOUS_ARRAY_EXPR:
-    case NEW_CLASS_EXPR:
-    case THIS_EXPR:
-    case SYNCHRONIZED_EXPR:
-    case CONDITIONAL_EXPR:
-    case INSTANCEOF_EXPR:
-    case CLASS_LITERAL:
       gcc_unreachable ();
 
     case COMPONENT_REF:
@@ -360,21 +328,6 @@ java_gimplify_self_mod_expr (tree *expr_p, tree *pre_p ATTRIBUTE_UNUSED,
 }
 
     
-static tree
-java_gimplify_case_expr (tree expr)
-{
-  tree label = create_artificial_label ();
-  return build3 (CASE_LABEL_EXPR, void_type_node,
-		 TREE_OPERAND (expr, 0), NULL_TREE, label);
-}
-
-static tree
-java_gimplify_default_expr (tree expr ATTRIBUTE_UNUSED)
-{
-  tree label = create_artificial_label ();
-  return build3 (CASE_LABEL_EXPR, void_type_node, NULL_TREE, NULL_TREE, label);
-}
-
 /* Gimplify BLOCK into a BIND_EXPR.  */
 
 static tree
@@ -411,46 +364,6 @@ java_gimplify_block (tree java_block)
   return build3 (BIND_EXPR, TREE_TYPE (java_block), decls, body, block);
 }
 
-/* Gimplify a NEW_ARRAY_INIT node into array/element assignments.  */
-
-static tree
-java_gimplify_new_array_init (tree exp)
-{
-  tree array_type = TREE_TYPE (TREE_TYPE (exp));
-  tree data_field = lookup_field (&array_type, get_identifier ("data"));
-  tree element_type = TYPE_ARRAY_ELEMENT (array_type);
-  HOST_WIDE_INT ilength = java_array_type_length (array_type);
-  tree length = build_int_cst (NULL_TREE, ilength);
-  tree init = TREE_OPERAND (exp, 0);
-  tree value;
-  unsigned HOST_WIDE_INT cnt;
-
-  tree array_ptr_type = build_pointer_type (array_type);
-  tree tmp = create_tmp_var (array_ptr_type, "array");
-  tree body = build2 (GIMPLE_MODIFY_STMT, array_ptr_type, tmp,
-		      build_new_array (element_type, length));
-
-  int index = 0;
-
-  /* FIXME: try to allocate array statically?  */
-  FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (init), cnt, value)
-    {
-      /* FIXME: Should use build_java_arrayaccess here, but avoid
-	 bounds checking.  */
-      tree lhs = build3 (COMPONENT_REF, TREE_TYPE (data_field),    
-			 build_java_indirect_ref (array_type, tmp, 0),
-			 data_field, NULL_TREE);
-      tree assignment = build2 (GIMPLE_MODIFY_STMT, element_type,
-				build4 (ARRAY_REF, element_type, lhs,
-					build_int_cst (NULL_TREE, index++),
-					NULL_TREE, NULL_TREE),
-				value);
-      body = build2 (COMPOUND_EXPR, element_type, body, assignment);
-    }
-
-  return build2 (COMPOUND_EXPR, array_ptr_type, body, tmp);
-}
-
 static tree
 java_gimplify_try_expr (tree try_expr)
 {
diff --git a/gcc/java/java-tree.def b/gcc/java/java-tree.def
index 7e2c650..a93d413a 100644
--- a/gcc/java/java-tree.def
+++ b/gcc/java/java-tree.def
@@ -11,36 +11,6 @@ DEFTREECODE (COMPARE_L_EXPR, "compare_l_expr", tcc_binary, 2)
 /* Same as COMPARE_EXPR, but if either value is NaN, the result is 1. */
 DEFTREECODE (COMPARE_G_EXPR, "compare_g_expr", tcc_binary, 2)
 
-/* Unary plus. Operand 0 is the expression the unary plus is applied
-   to */
-DEFTREECODE (UNARY_PLUS_EXPR, "unary_plus_expr", tcc_unary, 1)
-
-/* New array creation expression.
-   Operand 0 is the array base type.
-   Operand 1 is the list of dimension expressions. 
-   Operand 2 is the number of other dimensions of unspecified range.
-   Once patched, the node will bear the type of the created array.  */
-DEFTREECODE (NEW_ARRAY_EXPR, "new_array_expr", tcc_expression, 3)
-
-/* New anonymous array creation expression.
-   Operand 0 is the base type of the anonymous array.
-   Operand 1 is the signature of the dimensions this array contains.
-   Operand 2 is the anonymous array initializer.
-   Once patched, the node will bear the type of the created array.  */
-DEFTREECODE (NEW_ANONYMOUS_ARRAY_EXPR, "new_anonymous_array",
-	     tcc_expression, 3)
-
-/* New class creation expression.
-   Operand 0 is the name of the class to be created
-   Operand 1 is the argument list used to select a constructor.
-   There is no operand 2.  That slot is used for the
-   CALL_EXPR_RTL macro (see preexpand_calls).
-   The type should be the one of the created class.  */
-DEFTREECODE (NEW_CLASS_EXPR, "new_class_expr", tcc_expression, 3)
-
-/* Defines `this' as an expression.  */
-DEFTREECODE (THIS_EXPR, "this", tcc_expression, 0)
-
 /* A labeled block. Operand 0 is the label that will be generated to
    mark the end of the block.  Operand 1 is the labeled block body.  */
 DEFTREECODE (LABELED_BLOCK_EXPR, "labeled_block_expr", tcc_expression, 2)
@@ -49,57 +19,11 @@ DEFTREECODE (LABELED_BLOCK_EXPR, "labeled_block_expr", tcc_expression, 2)
    LABELED_BLOCK_EXPR to exit.  */
 DEFTREECODE (EXIT_BLOCK_EXPR, "exit_block_expr", tcc_statement, 1)
 
-/* Case statement expression.
-   Operand 1 is the case value.  */
-DEFTREECODE (CASE_EXPR, "case", tcc_expression, 1)
-
-/* Default statement expression. */
-DEFTREECODE (DEFAULT_EXPR, "default", tcc_expression, 0)
-
 /* Try expression
    Operand 0 is the tried block,
    Operand 1 contains chained catch nodes. */
 DEFTREECODE (TRY_EXPR, "try-catch", tcc_expression, 2)
 
-/* Catch clause.
-   Operand 0 is the catch clause block, which contains the declaration of
-   the catch clause parameter.  */
-DEFTREECODE (JAVA_CATCH_EXPR, "catch", tcc_unary, 1)
-
-/* Synchronized statement.
-   Operand 0 is the expression on which we wish to synchronize,
-   Operand 1 is the synchronized expression block.  */
-DEFTREECODE (SYNCHRONIZED_EXPR, "synchronized", tcc_expression, 2)
-
-/* Throw statement.
-   Operand 0 is the throw expression.  */
-DEFTREECODE (THROW_EXPR, "throw", tcc_unary, 1)
-
-/* Conditional operator.
-   Operand 0 is the condition expression
-   Operand 1 is the then-value
-   Operand 2 is the else-value.  */
-DEFTREECODE (CONDITIONAL_EXPR, "?:", tcc_expression, 3)
-
-/* instanceof operator.
-   Operand 0 is the expression that is getting tested
-   Operand 1 is the class used for the test.  */
-DEFTREECODE (INSTANCEOF_EXPR, "instanceof", tcc_expression, 2)
-
-/* Array initializers.
-   Operand 0 is the (sub) array target to initialize, left to NULL_TREE
-   when the node is created.
-   Operand 1 is a CONSTRUCTOR node.  */
-DEFTREECODE (NEW_ARRAY_INIT, "new_array_init", tcc_unary, 1)
-
-/* Class literal.
-   Operand 0 is the name of the class we're trying to build a
-   reference from.  */
-DEFTREECODE (CLASS_LITERAL, "class_literal", tcc_unary, 1)
-
-/* The Java object within the exception object from the runtime.  */
-DEFTREECODE (JAVA_EXC_OBJ_EXPR, "java_exc_obj_expr", tcc_expression, 0)
-
 /* Annotates a tree node (usually an expression) with source location
    information: a file name (EXPR_WFL_FILENAME);  a line number
    (EXPR_WFL_LINENO); and column number (EXPR_WFL_COLNO).  It is
diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h
index a7bfa38..3b0f0f6 100644
--- a/gcc/java/java-tree.h
+++ b/gcc/java/java-tree.h
@@ -1,7 +1,7 @@
 /* Definitions for parsing and type checking for the GNU compiler for
    the Java(TM) language.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -43,37 +43,15 @@ enum java_tree_code {
 struct JCF;
 
 /* Usage of TREE_LANG_FLAG_?:
-   0: IS_A_SINGLE_IMPORT_CLASSFILE_NAME_P (in IDENTIFIER_NODE)
-      FOR_LOOP_P (in LOOP_EXPR)
-      SUPPRESS_UNREACHABLE_ERROR (for other _EXPR nodes)
-      ANONYMOUS_CLASS_P (in RECORD_TYPE)
-      ARG_FINAL_P (in TREE_LIST)
-   1: IS_A_CLASSFILE_NAME (in IDENTIFIER_NODE)
-      COMPOUND_ASSIGN_P (in EXPR (binop_*))
-      LOCAL_CLASS_P (in RECORD_TYPE)
-      BLOCK_IS_IMPLICIT (in BLOCK)
    2: QUALIFIED_P (in IDENTIFIER_NODE)
-      PRIMARY_P (in EXPR_WITH_FILE_LOCATION)
-      MODIFY_EXPR_FROM_INITIALIZATION_P (in MODIFY_EXPR)
-      CLASS_METHOD_CHECKED_P (in RECORD_TYPE) 
       CLASS_FILE_P (in a TRANSLATION_UNIT_DECL in current_file_list)
-   3: IS_AN_IMPORT_ON_DEMAND_P (in IDENTIFIER_NODE)
-      RESOLVE_PACKAGE_NAME_P (in EXPR_WITH_FILE_LOCATION)
-      SWITCH_HAS_DEFAULT (in SWITCH_EXPR)
-      HAS_FINALIZER (in RECORD_TYPE)
+   3: HAS_FINALIZER (in RECORD_TYPE)
    4: IS_A_COMMAND_LINE_FILENAME_P (in IDENTIFIER_NODE)
-      RESOLVE_TYPE_NAME_P (in EXPR_WITH_FILE_LOCATION)
-      CALL_USING_SUPER (in CALL_EXPR)
       IS_ARRAY_LENGTH_ACCESS (in INDIRECT_REF)
    5: HAS_BEEN_ALREADY_PARSED_P (in IDENTIFIER_NODE)
-      IS_BREAK_STMT_P (in EXPR_WITH_FILE_LOCATION)
-      IS_CRAFTED_STRING_BUFFER_P (in CALL_EXPR)
-      IS_INIT_CHECKED (in SAVE_EXPR)
    6: CAN_COMPLETE_NORMALLY (in statement nodes)
-      NESTED_FIELD_ACCESS_IDENTIFIER_P (in IDENTIFIER_NODE)
 
    Usage of TYPE_LANG_FLAG_?:
-   0: CLASS_ACCESS0_GENERATED_P (in RECORD_TYPE)
    1: TYPE_ARRAY_P (in RECORD_TYPE).
    2: CLASS_PARSED_P (in RECORD_TYPE).
    3: CLASS_FROM_SOURCE_P (in RECORD_TYPE).
@@ -124,10 +102,6 @@ struct JCF;
   ? BINFO_TYPE (BINFO_BASE_BINFO (TYPE_BINFO (TYPE), 0)) \
   : NULL_TREE)
 
-/* True if the class we are compiling is a .java source file;
-   false if it is a .class bytecode file. */
-extern int compiling_from_source;
-
 /* The class defined by the actual (main) file we are compiling. */
 #define main_class \
   java_global_trees[JTI_MAIN_CLASS]
@@ -221,9 +195,6 @@ extern int flag_store_check;
 /* When nonzero, generate only a limited set of class meta-data. */
 extern int flag_reduced_reflection;
 
-/* Encoding used for source files.  */
-extern const char *current_encoding;
-
 /* The Java .class file that provides main_class;  the main input file. */
 extern GTY(()) struct JCF * current_jcf;
 
@@ -243,6 +214,11 @@ typedef struct CPool constant_pool;
 
 #define CONSTANT_ResolvedFlag 16
 
+/* Don't eagerly resolve this entry.  When this flag is set, constant
+   pool entries are resolved only at runtime when the entry is first
+   referred to.  */
+#define CONSTANT_LazyFlag 32
+
 /* The cpool->data[i] for a ResolvedString points to a STRING_CST. */
 #define CONSTANT_ResolvedString    (CONSTANT_String+CONSTANT_ResolvedFlag)
 
@@ -332,15 +308,9 @@ enum java_tree_index
   JTI_TYPE_IDENTIFIER_NODE,      
   JTI_INIT_IDENTIFIER_NODE,      
   JTI_CLINIT_IDENTIFIER_NODE,      
-  JTI_FINIT_IDENTIFIER_NODE,      
-  JTI_INSTINIT_IDENTIFIER_NODE,
   JTI_VOID_SIGNATURE_NODE,       
-  JTI_LENGTH_IDENTIFIER_NODE,  
   JTI_FINALIZE_IDENTIFIER_NODE,
   JTI_THIS_IDENTIFIER_NODE,  
-  JTI_SUPER_IDENTIFIER_NODE,  
-  JTI_CONTINUE_IDENTIFIER_NODE,  
-  JTI_ACCESS0_IDENTIFIER_NODE, 
   JTI_CLASSDOLLAR_IDENTIFIER_NODE,
   JTI_ONE_ELT_ARRAY_DOMAIN_TYPE,
 
@@ -418,8 +388,6 @@ enum java_tree_index
 
   JTI_NATIVECODE_PTR_ARRAY_TYPE_NODE,
 
-  JTI_WFL_OPERATOR,
-
   JTI_MAIN_CLASS,
   JTI_CURRENT_CLASS,
   JTI_OUTPUT_CLASS,
@@ -532,25 +500,12 @@ extern GTY(()) tree java_global_trees[JTI_MAX];
   java_global_trees[JTI_INIT_IDENTIFIER_NODE]      /* "<init>" */
 #define clinit_identifier_node \
   java_global_trees[JTI_CLINIT_IDENTIFIER_NODE]      /* "<clinit>" */
-#define finit_identifier_node \
-  java_global_trees[JTI_FINIT_IDENTIFIER_NODE]      /* "finit$" */
-/* FIXME "instinit$" and "finit$" should be merged  */
-#define instinit_identifier_node \
-  java_global_trees[JTI_INSTINIT_IDENTIFIER_NODE]  /* "instinit$" */
 #define void_signature_node \
   java_global_trees[JTI_VOID_SIGNATURE_NODE]       /* "()V" */
-#define length_identifier_node \
-  java_global_trees[JTI_LENGTH_IDENTIFIER_NODE]  /* "length" */
 #define finalize_identifier_node \
   java_global_trees[JTI_FINALIZE_IDENTIFIER_NODE]  /* "finalize" */
 #define this_identifier_node \
   java_global_trees[JTI_THIS_IDENTIFIER_NODE]  /* "this" */
-#define super_identifier_node \
-  java_global_trees[JTI_SUPER_IDENTIFIER_NODE]  /* "super" */
-#define continue_identifier_node \
-  java_global_trees[JTI_CONTINUE_IDENTIFIER_NODE]  /* "continue" */
-#define access0_identifier_node \
-  java_global_trees[JTI_ACCESS0_IDENTIFIER_NODE] /* "access$0" */
 #define classdollar_identifier_node \
   java_global_trees[JTI_CLASSDOLLAR_IDENTIFIER_NODE] /* "class$" */
 #define one_elt_array_domain_type \
@@ -703,14 +658,9 @@ extern GTY(()) tree java_global_trees[JTI_MAX];
 
 #define nativecode_ptr_type_node ptr_type_node
 
-#define wfl_operator \
-  java_global_trees[JTI_WFL_OPERATOR]
-
 /* The decl for "_Jv_ResolvePoolEntry".  */
 extern GTY(()) tree soft_resolvepoolentry_node;
 
-extern const char *cyclic_inheritance_report;
-
 struct lang_identifier GTY(())
 {
   struct tree_identifier ignore;
@@ -824,20 +774,6 @@ union lang_tree_node
    in DECL.  */
 #define DECL_FUNCTION_INITIALIZED_CLASS_TABLE(DECL) \
   (DECL_LANG_SPECIFIC(DECL)->u.f.ict)
-/* A list of all the static method calls in the method DECL (if optimizing).
-   Actually each TREE_VALUE points to a COMPONT_EXPR that wraps the
-   invocation so we can later patch it.  */
-#define DECL_FUNCTION_STATIC_METHOD_INVOCATION_COMPOUND(DECL) \
-  (DECL_LANG_SPECIFIC(DECL)->u.f.smic)
-/* The Number of Artificial Parameters (NAP) DECL contains. this$<n>
-   is excluded, because sometimes created as a parameter before the
-   function decl exists. */
-#define DECL_FUNCTION_NAP(DECL) (DECL_LANG_SPECIFIC(DECL)->u.f.nap)
-/* True if DECL is a synthetic ctor.  */
-#define DECL_FUNCTION_SYNTHETIC_CTOR(DECL) \
-  (DECL_LANG_SPECIFIC(DECL)->u.f.synthetic_ctor)
-#define DECL_FIXED_CONSTRUCTOR_P(DECL) \
-  (DECL_LANG_SPECIFIC(DECL)->u.f.fixed_ctor)
 
 #define DECL_LOCAL_CNI_METHOD_P(NODE) \
     (DECL_LANG_SPECIFIC (NODE)->u.f.local_cni)
@@ -902,6 +838,7 @@ union lang_tree_node
 /* True if NODE is a final field. */
 #define FINAL_VARIABLE_P(NODE) (FIELD_FINAL (NODE) && !FIELD_STATIC (NODE))
 /* True if NODE is a class final field. */
+#define FIELD_ENUM(DECL)	    (DECL_LANG_SPECIFIC (DECL)->u.v.field_enum)
 #define CLASS_FINAL_VARIABLE_P(NODE) \
   (FIELD_FINAL (NODE) && FIELD_STATIC (NODE))
 /* True if NODE is a class initialization flag. This macro accesses
@@ -971,14 +908,10 @@ struct lang_decl_func GTY(())
   /* Initialized (static) Class Table */
   htab_t GTY ((param_is (union tree_node))) ict;
 
-  tree smic;			/* Static method invocation compound */
   tree inner_access;		/* The identifier of the access method
 				   used for invocation from inner classes */
-  int nap;			/* Number of artificial parameters */
   unsigned int native : 1;	/* Nonzero if this is a native method  */
-  unsigned int synthetic_ctor : 1; /* Nonzero if this is a synthetic ctor */
   unsigned int init_final : 1;	/* Nonzero all finals are initialized */
-  unsigned int fixed_ctor : 1;
   unsigned int init_calls_this : 1;
   unsigned int strictfp : 1;
   unsigned int invisible : 1;	/* Set for methods we generate
@@ -986,6 +919,8 @@ struct lang_decl_func GTY(())
 				   written to the .class file.  */
   unsigned int dummy : 1;
   unsigned int local_cni : 1;	/* Decl needs mangle_local_cni_method.  */
+  unsigned int bridge : 1;	/* Bridge method.  */
+  unsigned int varargs : 1;	/* Varargs method.  */
 };
 
 struct treetreehash_entry GTY(())
@@ -994,7 +929,7 @@ struct treetreehash_entry GTY(())
   tree value;
 };
 
-/* These represent the possible assertion_code's that can be emitted in the
+/* These represent the possible assertion_codes that can be emitted in the
    type assertion table.  */
 enum
 {
@@ -1003,6 +938,28 @@ enum
   JV_ASSERT_IS_INSTANTIABLE = 2   /* Operand A is an instantiable class.  */
 };
 
+/* Annotation types used in the reflection_data.  See
+   java.lang.Class.getDeclaredAnnotations() in the runtime library for
+   an example of how these are used.  */
+
+typedef enum
+{
+  JV_CLASS_ATTR,
+  JV_METHOD_ATTR,
+  JV_FIELD_ATTR,
+  JV_DONE_ATTR
+} jv_attr_type;
+
+typedef enum
+{
+  JV_INNER_CLASSES_KIND,
+  JV_ENCLOSING_METHOD_KIND,
+  JV_SIGNATURE_KIND,
+  JV_ANNOTATIONS_KIND,
+  JV_PARAMETER_ANNOTATIONS_KIND,
+  JV_ANNOTATION_DEFAULT_KIND
+} jv_attr_kind;
+
 typedef struct type_assertion GTY(())
 {
   int assertion_code; /* 'opcode' for the type of this assertion. */
@@ -1031,6 +988,7 @@ struct lang_decl_var GTY(())
   unsigned int local_slot : 1;	/* Decl is a temporary in the stack frame.  */
   unsigned int class_field : 1; /* Decl needs mangle_class_field.  */
   unsigned int vtable : 1;	/* Decl needs mangle_vtable.  */
+  unsigned int field_enum:1;	/* Field is an enum.  */
 };
 
 /* This is what 'lang_decl' really points to.  */
@@ -1058,10 +1016,6 @@ struct lang_decl GTY(())
      TYPE_LANG_SPECIFIC ((T))			\
      = ggc_alloc_cleared (sizeof (struct lang_type));
 
-#define TYPE_FINIT_STMT_LIST(T)  (TYPE_LANG_SPECIFIC (T)->finit_stmt_list)
-#define TYPE_CLINIT_STMT_LIST(T) (TYPE_LANG_SPECIFIC (T)->clinit_stmt_list)
-#define TYPE_II_STMT_LIST(T)     (TYPE_LANG_SPECIFIC (T)->ii_block)
-
 #define TYPE_DUMMY(T)		(TYPE_LANG_SPECIFIC(T)->dummy_class)
 
 /* The decl of the synthetic method `class$' used to handle `.class'
@@ -1069,11 +1023,13 @@ struct lang_decl GTY(())
 
 #define TYPE_DOT_CLASS(T)        (TYPE_LANG_SPECIFIC (T)->dot_class)
 #define TYPE_PACKAGE_LIST(T)     (TYPE_LANG_SPECIFIC (T)->package_list)
-#define TYPE_IMPORT_LIST(T)      (TYPE_LANG_SPECIFIC (T)->import_list)
-#define TYPE_IMPORT_DEMAND_LIST(T) (TYPE_LANG_SPECIFIC (T)->import_demand_list)
 #define TYPE_PRIVATE_INNER_CLASS(T) (TYPE_LANG_SPECIFIC (T)->pic)
 #define TYPE_PROTECTED_INNER_CLASS(T) (TYPE_LANG_SPECIFIC (T)->poic)
 #define TYPE_STRICTFP(T) (TYPE_LANG_SPECIFIC (T)->strictfp)
+#define TYPE_ENUM(T) 		(TYPE_LANG_SPECIFIC (T)->enum_class)
+#define TYPE_SYNTHETIC(T)	(TYPE_LANG_SPECIFIC (T)->synthetic)
+#define TYPE_ANNOTATION(T)	(TYPE_LANG_SPECIFIC (T)->annotation)
+
 #define TYPE_USES_ASSERTIONS(T) (TYPE_LANG_SPECIFIC (T)->assertions)
 
 #define TYPE_ATABLE_METHODS(T)   (TYPE_LANG_SPECIFIC (T)->atable_methods)
@@ -1096,22 +1052,21 @@ struct lang_decl GTY(())
 #define TYPE_ASSERTIONS(T)   	 (TYPE_LANG_SPECIFIC (T)->type_assertions)
 #define TYPE_PACKAGE(T)     	 (TYPE_LANG_SPECIFIC (T)->package)
 
+#define TYPE_REFLECTION_DATA(T)	 (TYPE_LANG_SPECIFIC (T)->reflection_data)
+#define TYPE_REFLECTION_DATASIZE(T)					\
+				(TYPE_LANG_SPECIFIC (T)->reflection_datasize)
+
 struct lang_type GTY(())
 {
   tree signature;
   struct JCF *jcf;
   struct CPool *cpool;
   tree cpool_data_ref;		/* Cached */
-  tree finit_stmt_list;		/* List of statements finit$ will use */
-  tree clinit_stmt_list;	/* List of statements <clinit> will use  */
-  tree ii_block;		/* Instance initializer block */
   tree dot_class;		/* The decl of the `class$' function that
 				   needs to be invoked and generated when
 				   compiling to bytecode to implement
 				   <non_primitive_type>.class */
   tree package_list;		/* List of package names, progressive */
-  tree import_list;		/* Imported types, in the CU of this class */
-  tree import_demand_list;	/* Imported types, in the CU of this class */
 
   tree otable_methods;          /* List of static decls referred to by this
 				   class.  */
@@ -1146,11 +1101,20 @@ struct lang_type GTY(())
   tree package;			/* IDENTIFIER_NODE for package this class is
   				   a member of.  */
 
+  unsigned char* GTY((skip)) reflection_data;	/* The raw reflection
+						   data for this
+						   class.  */
+  long reflection_datasize;	/* The size of the raw reflection data
+				   for this class, in bytes.  */
+
   unsigned pic:1;		/* Private Inner Class. */
   unsigned poic:1;		/* Protected Inner Class. */
   unsigned strictfp:1;		/* `strictfp' class.  */
   unsigned assertions:1;	/* Any method uses `assert'.  */
-  unsigned dummy_class:1;		/* Not a real class, just a placeholder.  */
+  unsigned dummy_class:1;	/* Not a real class, just a placeholder.  */
+  unsigned enum_class:1;	/* Class is an enum type.  */
+  unsigned synthetic:1;		/* Class is synthetic.  */
+  unsigned annotation:1;	/* Class is an annotation type.  */
 };
 
 #define JCF_u4 unsigned long
@@ -1294,8 +1258,9 @@ extern void lang_init_source (int);
 extern void write_classfile (tree);
 extern char *print_int_node (tree);
 extern void finish_class (void);
-extern void java_layout_seen_class_methods (void);
 extern void check_for_initialization (tree, tree);
+extern struct CPool *cpool_for_class (tree);
+extern int find_class_or_string_constant (struct CPool *, int, tree);
 
 extern tree pushdecl_top_level (tree);
 extern tree pushdecl_function_level (tree);
@@ -1362,10 +1327,7 @@ extern tree get_boehm_type_descriptor (tree);
 extern bool uses_jv_markobj_p (tree);
 extern bool class_has_finalize_method (tree);
 extern void java_check_methods (tree);
-extern void init_jcf_parse (void);
-extern void init_src_parse (void);
 
-extern int cxx_keyword_p (const char *, int);
 extern void java_mangle_decl (tree);
 extern tree java_mangle_class_field (struct obstack *, tree);
 extern tree java_mangle_vtable (struct obstack *, tree);
@@ -1403,6 +1365,10 @@ extern void gen_indirect_dispatch_tables (tree type);
 extern int split_qualified_name (tree *left, tree *right, tree source);
 extern int in_same_package (tree, tree);
 
+extern void java_read_sourcefilenames (const char *fsource_filename);
+
+extern void rewrite_reflection_indexes (void *);
+
 #define DECL_FINAL(DECL) DECL_LANG_FLAG_3 (DECL)
 
 /* Access flags etc for a method (a FUNCTION_DECL): */
@@ -1422,6 +1388,10 @@ extern int in_same_package (tree, tree);
   (DECL_LANG_SPECIFIC (FUNCTION_DECL_CHECK (DECL))->u.f.strictfp)
 #define METHOD_INVISIBLE(DECL) \
   (DECL_LANG_SPECIFIC (FUNCTION_DECL_CHECK (DECL))->u.f.invisible)
+#define METHOD_BRIDGE(DECL) \
+  (DECL_LANG_SPECIFIC (FUNCTION_DECL_CHECK (DECL))->u.f.bridge)
+#define METHOD_VARARGS(DECL) \
+  (DECL_LANG_SPECIFIC (FUNCTION_DECL_CHECK (DECL))->u.f.varargs)
 
 #define CLASS_FILE_P(NODE) TREE_LANG_FLAG_3 (NODE)
 
@@ -1430,17 +1400,13 @@ extern int in_same_package (tree, tree);
 #define DECL_CONSTRUCTOR_P(DECL) DECL_LANG_FLAG_7 (FUNCTION_DECL_CHECK (DECL))
 
 #define DECL_INIT_P(DECL)   (ID_INIT_P (DECL_NAME (DECL)))
-#define DECL_FINIT_P(DECL)  (ID_FINIT_P (DECL_NAME (DECL)))
 #define DECL_CLINIT_P(DECL) (ID_CLINIT_P (DECL_NAME (DECL)))
-#define DECL_INSTINIT_P(DECL) (ID_INSTINIT_P (DECL_NAME (DECL)))
 
 /* Predicates on method identifiers. Kept close to other macros using
    them  */
 #define ID_INIT_P(ID)   ((ID) == init_identifier_node)
-#define ID_FINIT_P(ID)  ((ID) == finit_identifier_node)
 #define ID_CLINIT_P(ID) ((ID) == clinit_identifier_node)
 #define ID_CLASSDOLLAR_P(ID) ((ID) == classdollar_identifier_node)
-#define ID_INSTINIT_P(ID) ((ID) == instinit_identifier_node)
 
 /* Access flags etc for variable/field (FIELD_DECL, VAR_DECL, or PARM_DECL): */
 
@@ -1463,7 +1429,10 @@ extern int in_same_package (tree, tree);
 #define CLASS_PRIVATE(DECL)	(TYPE_PRIVATE_INNER_CLASS (TREE_TYPE (DECL)))
 #define CLASS_PROTECTED(DECL)	(TYPE_PROTECTED_INNER_CLASS (TREE_TYPE (DECL)))
 #define CLASS_STRICTFP(DECL)	(TYPE_STRICTFP (TREE_TYPE (DECL)))
+#define CLASS_ENUM(DECL)	(TYPE_ENUM (TREE_TYPE (DECL)))
 #define CLASS_USES_ASSERTIONS(DECL) (TYPE_USES_ASSERTIONS (TREE_TYPE (DECL)))
+#define CLASS_SYNTHETIC(DECL)   (TYPE_SYNTHETIC (TREE_TYPE (DECL)))
+#define CLASS_ANNOTATION(DECL)  (TYPE_ANNOTATION (TREE_TYPE (DECL)))
 
 /* @deprecated marker flag on methods, fields and classes */
 
@@ -1527,16 +1496,6 @@ extern int linenumber_count;
 /* In a type map means the type the address subroutine return address. */
 #define TYPE_RETURN_ADDR return_address_type_node
 
-/* In a subroutine's return type map, indicates that the slot was neither
-   used nor set in the subroutine. */
-#define TYPE_UNUSED error_mark_node
-
-/* When returned from pop_type_0, indicates stack underflow. */
-#define TYPE_UNDERFLOW integer_zero_node
-
-/* When returned from pop_type_0, indicates a type mismatch. */
-#define TYPE_UNEXPECTED NULL_TREE
-
 /* A array mapping variable/stack slot index to the type current
    in that variable/stack slot.
    TYPE_UNKNOWN, TYPE_SECOND, and TYPE_NULL are special cases. */
@@ -1549,9 +1508,6 @@ extern tree *type_map;
 #define TYPE_IS_WIDE(TYPE) \
   ((TYPE) == double_type_node || (TYPE) == long_type_node)
 
-/* True iif CLASS has it's access$0 method generated.  */
-#define CLASS_ACCESS0_GENERATED_P(CLASS) TYPE_LANG_FLAG_0 (CLASS)
-
 /* True iff TYPE is a Java array type. */
 #define TYPE_ARRAY_P(TYPE) TYPE_LANG_FLAG_1 (TYPE)
 
@@ -1588,119 +1544,32 @@ extern tree *type_map;
    layout of a class.  */
 #define CLASS_BEING_LAIDOUT(TYPE) TYPE_LANG_FLAG_6 (TYPE)
 
-/* True if class TYPE has a field initializer finit$ function */
-#define CLASS_HAS_FINIT_P(TYPE) TYPE_FINIT_STMT_LIST (TYPE)
-
-/* True if identifier ID was seen while processing a single type import stmt */
-#define IS_A_SINGLE_IMPORT_CLASSFILE_NAME_P(ID) TREE_LANG_FLAG_0 (ID)
-
-/* True if identifier ID was seen while processing an import statement */
-#define IS_A_CLASSFILE_NAME(ID) TREE_LANG_FLAG_1 (ID)
-
 /* True if ID is a qualified named (contains . or /) */
 #define QUALIFIED_P(ID) TREE_LANG_FLAG_2 (ID)
 
-/* True if ID is an already processed import on demand */
-#define IS_AN_IMPORT_ON_DEMAND_P(ID) TREE_LANG_FLAG_3 (ID)
-
 /* True if ID is a command-line specified filename */
 #define IS_A_COMMAND_LINE_FILENAME_P(ID) TREE_LANG_FLAG_4 (ID)
 
 /* True if filename ID has already been parsed */
 #define HAS_BEEN_ALREADY_PARSED_P(ID) TREE_LANG_FLAG_5 (ID)
 
-/* True if EXPR is RHS sub-tree of a compound assign expression */
-#define COMPOUND_ASSIGN_P(EXPR) TREE_LANG_FLAG_1 (EXPR)
-
-/* True if a SWITCH_EXPR has a DEFAULT_EXPR. */
-#define SWITCH_HAS_DEFAULT(NODE) TREE_LANG_FLAG_3 (SWITCH_EXPR_CHECK (NODE))
-
-/* True if EXPR (a WFL in that case) was created after the
-   reduction of PRIMARY . XXX */
-#define PRIMARY_P(EXPR) TREE_LANG_FLAG_2 (EXPR_CHECK (EXPR))
-
-/* True if EXPR (a MODIFY_EXPR in that case) is the result of variable
-   initialization during its declaration */
-#define MODIFY_EXPR_FROM_INITIALIZATION_P(EXPR) \
-  TREE_LANG_FLAG_2 (MODIFY_EXPR_CHECK (EXPR))
-
-/* True if EXPR (a TREE_TYPE denoting a class type) has its methods
-   already checked (for redefinitions, etc, see java_check_regular_methods.) */
-#define CLASS_METHOD_CHECKED_P(EXPR) TREE_LANG_FLAG_2 (EXPR)
-
 /* True if TYPE (a TREE_TYPE denoting a class type) was found to
    feature a finalizer method. */
 #define HAS_FINALIZER_P(EXPR) TREE_LANG_FLAG_3 (EXPR)
 
-/* True if EXPR (a LOOP_EXPR in that case) is part of a for statement */
-#define FOR_LOOP_P(EXPR) TREE_LANG_FLAG_0 (EXPR_CHECK (EXPR))
-
-/* True if NODE (a RECORD_TYPE in that case) is an anonymous class.  */
-#define ANONYMOUS_CLASS_P(NODE) TREE_LANG_FLAG_0 (RECORD_TYPE_CHECK (NODE))
-
-/* True if NODE (a RECORD_TYPE in that case) is a block local class.  */
-#define LOCAL_CLASS_P(NODE) TREE_LANG_FLAG_1 (RECORD_TYPE_CHECK (NODE))
-
-/* True if NODE (a TREE_LIST) hold a pair of argument name/type
-   declared with the final modifier */
-#define ARG_FINAL_P(NODE) TREE_LANG_FLAG_0 (TREE_LIST_CHECK (NODE))
-
-/* True if NODE (some kind of EXPR, but not a WFL) should not give an
-   error if it is found to be unreachable.  This can only be applied
-   to those EXPRs which can be used as the update expression of a
-   `for' loop.  In particular it can't be set on a LOOP_EXPR.  */
-#define SUPPRESS_UNREACHABLE_ERROR(NODE) TREE_LANG_FLAG_0 (EXPR_CHECK (NODE))
-
-/* True if EXPR (a WFL in that case) resolves into a package name */
-#define RESOLVE_PACKAGE_NAME_P(WFL) TREE_LANG_FLAG_3 (EXPR_CHECK (WFL))
-
-/* True if EXPR (a WFL in that case) resolves into a type name */
-#define RESOLVE_TYPE_NAME_P(WFL) TREE_LANG_FLAG_4 (EXPR_CHECK (WFL))
-
-/* True if STMT (a WFL in that case) holds a BREAK statement */
-#define IS_BREAK_STMT_P(WFL) TREE_LANG_FLAG_5 (WFL)
-
-/* True if EXPR (a CALL_EXPR in that case) is a crafted StringBuffer */
-#define IS_CRAFTED_STRING_BUFFER_P(EXPR) TREE_LANG_FLAG_5 (EXPR)
-
-/* True if EXPR (a SAVE_EXPR in that case) had its content already
-   checked for (un)initialized local variables.  */
-#define IS_INIT_CHECKED(EXPR) TREE_LANG_FLAG_5 (SAVE_EXPR_CHECK (EXPR))
-
-/* If set in CALL_EXPR, the receiver is 'super'. */
-#define CALL_USING_SUPER(EXPR) TREE_LANG_FLAG_4 (EXPR_CHECK (EXPR))
-
 /* True if NODE (a statement) can complete normally. */
 #define CAN_COMPLETE_NORMALLY(NODE) TREE_LANG_FLAG_6 (NODE)
 
-/* True if NODE (an IDENTIFIER) bears the name of an outer field from
-   inner class (or vice versa) access function.  */
-#define NESTED_FIELD_ACCESS_IDENTIFIER_P(NODE) \
-  TREE_LANG_FLAG_6 (IDENTIFIER_NODE_CHECK (NODE))
-
 /* True if NODE belongs to an inner class TYPE_DECL node.
    Verifies that NODE as the attributes of a decl.  */
 #define INNER_CLASS_DECL_P(NODE) (TYPE_NAME (TREE_TYPE (NODE)) == NODE	\
 				  && DECL_CONTEXT (NODE))
 
-/* True if NODE is a top level class TYPE_DECL node: NODE isn't
-   an inner class or NODE is a static class.  */
-#define TOPLEVEL_CLASS_DECL_P(NODE) (!INNER_CLASS_DECL_P (NODE) 	\
-				     || CLASS_STATIC (NODE))
-
-/* True if the class decl NODE was declared in an inner scope and is
-   not a toplevel class */
-#define PURE_INNER_CLASS_DECL_P(NODE) \
-  (INNER_CLASS_DECL_P (NODE) && !CLASS_STATIC (NODE))
-
 /* True if NODE belongs to an inner class RECORD_TYPE node. Checks
    that TYPE_NAME bears a decl. An array type wouldn't.  */
 #define INNER_CLASS_TYPE_P(NODE) (TREE_CODE (TYPE_NAME (NODE)) == TYPE_DECL \
 				  && DECL_CONTEXT (TYPE_NAME (NODE)))
 
-#define TOPLEVEL_CLASS_TYPE_P(NODE) (!INNER_CLASS_TYPE_P (NODE) 	\
-				     || CLASS_STATIC (TYPE_NAME (NODE)))
-
 /* True if the class type NODE was declared in an inner scope and is
    not a toplevel class */
 #define PURE_INNER_CLASS_TYPE_P(NODE) \
@@ -1782,33 +1651,9 @@ extern tree *type_map;
 #define FINISH_RECORD_CONSTRUCTOR(CONS) \
   VEC_pop (constructor_elt, CONSTRUCTOR_ELTS (CONS))
 
-/* Macros on constructors invocations.  */
-#define CALL_CONSTRUCTOR_P(NODE)		\
-  (TREE_CODE (NODE) == NEW_CLASS_EXPR || CALL_EXPLICIT_CONSTRUCTOR_P (NODE))
-
-#define CALL_EXPLICIT_CONSTRUCTOR_P(NODE)				\
-  (CALL_THIS_CONSTRUCTOR_P (NODE) || CALL_SUPER_CONSTRUCTOR_P (NODE))
-
-#define CALL_THIS_CONSTRUCTOR_P(NODE)					\
-  (TREE_CODE (NODE) == CALL_EXPR					\
-   && EXPR_WFL_NODE (TREE_OPERAND (NODE, 0)) == this_identifier_node)
-
-#define CALL_SUPER_CONSTRUCTOR_P(NODE)					\
-  (TREE_CODE (NODE) == CALL_EXPR					\
-   && EXPR_WFL_NODE (TREE_OPERAND (NODE, 0)) == super_identifier_node)
-
-/* Using a FINALLY_EXPR node */
-#define FINALLY_EXPR_LABEL(NODE) TREE_OPERAND (FINALLY_EXPR_CHECK (NODE), 0)
-#define FINALLY_EXPR_BLOCK(NODE) TREE_OPERAND (FINALLY_EXPR_CHECK (NODE), 1)
-
 #define BLOCK_EXPR_DECLS(NODE)  BLOCK_VARS(NODE)
 #define BLOCK_EXPR_BODY(NODE)   BLOCK_SUBBLOCKS(NODE)
 
-/* True for an implicit block surrounding declaration not at start of {...}. */
-#define BLOCK_IS_IMPLICIT(NODE) TREE_LANG_FLAG_1 (BLOCK_CHECK (NODE))
-#define BLOCK_EMPTY_P(NODE) \
-  (TREE_CODE (NODE) == BLOCK && BLOCK_EXPR_BODY (NODE) == empty_stmt_node)
-
 #define BUILD_MONITOR_ENTER(WHERE, ARG)					\
   {									\
     (WHERE) = build3 (CALL_EXPR, int_type_node,				\
@@ -1827,25 +1672,10 @@ extern tree *type_map;
     TREE_SIDE_EFFECTS (WHERE) = 1;				\
   }
 
-/* Nonzero if TYPE is an unchecked exception */
-#define IS_UNCHECKED_EXCEPTION_P(TYPE)				\
-  (inherits_from_p ((TYPE), runtime_exception_type_node)	\
-   || inherits_from_p ((TYPE), error_exception_type_node))
-
 /* True when we can perform static class initialization optimization */
 #define STATIC_CLASS_INIT_OPT_P() \
   (flag_optimize_sci && (optimize >= 2) && ! flag_emit_class_files)
 
-extern int java_error_count;
-
-/* Make the current function where this macro is invoked report error
-   messages and and return, if any */
-#define java_parse_abort_on_error()					\
-  {									\
-     if (java_error_count > save_error_count)				\
-       return;								\
-   }
-
 /* These are the possible values for the `state' field of the class
    structure.  This must be kept in sync with libgcj.  */
 enum
@@ -1913,6 +1743,6 @@ extern tree build_expr_wfl (tree, const char *, int, int);
 extern void java_genericize (tree);
 extern int java_gimplify_expr (tree *, tree *, tree *);
 
-extern tree extract_field_decl (tree);
+extern FILE *finput;
 
 #endif /* ! GCC_JAVA_TREE_H */
diff --git a/gcc/java/jcf-depend.c b/gcc/java/jcf-depend.c
index 1134d36..63c7d23 100644
--- a/gcc/java/jcf-depend.c
+++ b/gcc/java/jcf-depend.c
@@ -1,6 +1,6 @@
 /* Functions for handling dependency tracking when reading .class files.
 
-   Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2003, 2006 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -100,7 +100,7 @@ jcf_dependency_set_dep_file (const char *name)
 }
 
 void
-jcf_dependency_add_file (const char *filename, int system_p)
+jcf_dependency_add_file (const char *filename ATTRIBUTE_UNUSED, int system_p)
 {
   if (! dependencies)
     return;
@@ -109,7 +109,10 @@ jcf_dependency_add_file (const char *filename, int system_p)
   if (system_p && ! system_files)
     return;
 
-  deps_add_dep (dependencies, filename);
+
+  /* FIXME: Don't emit any dependencies.  In many cases we'll just see
+     temporary files emitted by ecj... */
+  /* deps_add_dep (dependencies, filename); */
 }
 
 void
diff --git a/gcc/java/jcf-dump.c b/gcc/java/jcf-dump.c
index a5e3444..66c2515 100644
--- a/gcc/java/jcf-dump.c
+++ b/gcc/java/jcf-dump.c
@@ -96,6 +96,7 @@ int flag_javap_compatible = 0;
 
 static void print_access_flags (FILE *, uint16, char);
 static void print_constant_terse (FILE*, JCF*, int, int);
+static void print_constant_terse_with_index (FILE *, JCF *, int, int);
 static void print_constant (FILE *, JCF *, int, int);
 static void print_constant_ref (FILE *, JCF *, int);
 static void disassemble_method (JCF*, const unsigned char *, int);
@@ -109,6 +110,11 @@ static void process_class (struct JCF *);
 static void print_constant_pool (struct JCF *);
 static void print_exception_table (struct JCF *, const unsigned char *entries,
 				   int);
+static void indent (FILE *, int);
+static void print_element_value (FILE *, JCF *, int);
+static void print_annotation (FILE *, JCF *, int);
+static void print_annotations (FILE *, JCF *, int);
+static void print_parameter_annotations (FILE *, JCF *, int);
 
 #define PRINT_SIGNATURE_RESULT_ONLY 1
 #define PRINT_SIGNATURE_ARGS_ONLY 2
@@ -184,7 +190,7 @@ utf8_equal_string (JCF *jcf, int index, const char * value)
     { fprintf (out, "Field name:"); \
       print_constant_terse (out, jcf, NAME, CONSTANT_Utf8); \
       print_access_flags (out, ACCESS_FLAGS, 'f'); \
-      fprintf (out, " Signature: "); \
+      fprintf (out, " Descriptor: "); \
       if (flag_print_constant_pool) \
         fprintf (out, "%d=", SIGNATURE); \
       print_signature (out, jcf, SIGNATURE, 0); \
@@ -227,7 +233,7 @@ utf8_equal_string (JCF *jcf, int index, const char * value)
 	  fprintf (out, "\nMethod name:"); \
 	  print_constant_terse (out, jcf, NAME, CONSTANT_Utf8); \
 	  print_access_flags (out, ACCESS_FLAGS, 'm'); \
-	  fprintf (out, " Signature: "); \
+	  fprintf (out, " Descriptor: "); \
 	  if (flag_print_constant_pool) \
 	    fprintf (out, "%d=", SIGNATURE); \
 	  print_signature (out, jcf, SIGNATURE, 0); \
@@ -295,6 +301,26 @@ utf8_equal_string (JCF *jcf, int index, const char * value)
     print_signature (out, jcf, signature_index, 0); \
     fprintf (out, " (pc: %d length: %d)\n", start_pc, length); }}
 
+#define HANDLE_LOCALVARIABLETYPETABLE_ATTRIBUTE(COUNT)			\
+{ int n = (COUNT); int i;						\
+  COMMON_HANDLE_ATTRIBUTE(JCF, attribute_name, attribute_length);	\
+  fprintf (out, ", count: %d\n", n);					\
+  for (i = 0; i < n; i++) {						\
+    int start_pc = JCF_readu2 (jcf);					\
+    int length = JCF_readu2 (jcf);					\
+    int name_index = JCF_readu2 (jcf);					\
+    int signature_index = JCF_readu2 (jcf);				\
+    int slot = JCF_readu2 (jcf);					\
+    fprintf (out, "  slot#%d: name: ", slot);				\
+    if (flag_print_constant_pool)					\
+      fprintf (out, "%d=", name_index);					\
+    print_name (out, jcf, name_index);					\
+    fprintf (out, ", type: ");						\
+    if (flag_print_constant_pool)					\
+      fprintf (out, "%d=", signature_index);				\
+    print_signature (out, jcf, signature_index, 0);			\
+    fprintf (out, " (pc: %d length: %d)\n", start_pc, length); }}
+
 #define HANDLE_LINENUMBERTABLE_ATTRIBUTE(COUNT) \
 { int n = (COUNT); int i; \
   COMMON_HANDLE_ATTRIBUTE(jcf, attribute_name, attribute_length); \
@@ -357,6 +383,60 @@ utf8_equal_string (JCF *jcf, int index, const char * value)
   for (i = 0;  i < n;  i++) { c = JCF_readu(jcf); fputc(c, out); } \
   if (c != '\r' && c != '\n') fputc('\n', out); }
 
+#define HANDLE_ENCLOSINGMETHOD_ATTRIBUTE()				\
+  { uint16 class_index, method_index;					\
+  COMMON_HANDLE_ATTRIBUTE(jcf, attribute_name, attribute_length);	\
+  class_index = JCF_readu2 (jcf);					\
+  method_index = JCF_readu2 (jcf);					\
+  fprintf (out, "\n  Class: ");						\
+  print_constant_terse_with_index (out, jcf, class_index, CONSTANT_Class); \
+  fprintf (out, "\n  Method: ");					\
+  print_constant_terse_with_index (out, jcf, method_index,		\
+				   CONSTANT_NameAndType);		\
+  fputc ('\n', out);							\
+}
+
+#define HANDLE_SIGNATURE_ATTRIBUTE()					\
+{									\
+  uint16 signature;							\
+  COMMON_HANDLE_ATTRIBUTE(jcf, attribute_name, attribute_length);	\
+  signature = JCF_readu2 (jcf);						\
+  fprintf (out, "\n  Value: ");						\
+  print_constant_terse_with_index (out, jcf, signature, CONSTANT_Utf8);	\
+  fputc ('\n', out);							\
+}
+
+#define HANDLE_RUNTIMEVISIBLEANNOTATIONS_ATTRIBUTE()			\
+{									\
+  COMMON_HANDLE_ATTRIBUTE(jcf, attribute_name, attribute_length);	\
+  print_annotations (out, jcf, 1);					\
+}
+
+#define HANDLE_RUNTIMEINVISIBLEANNOTATIONS_ATTRIBUTE()			\
+{									\
+  COMMON_HANDLE_ATTRIBUTE(jcf, attribute_name, attribute_length);	\
+  print_annotations (out, jcf, 1);					\
+}
+
+#define HANDLE_RUNTIMEVISIBLEPARAMETERANNOTATIONS_ATTRIBUTE()		\
+{									\
+  COMMON_HANDLE_ATTRIBUTE(jcf, attribute_name, attribute_length);	\
+  print_parameter_annotations (out, jcf, 1);				\
+}
+
+#define HANDLE_RUNTIMEINVISIBLEPARAMETERANNOTATIONS_ATTRIBUTE()		\
+{									\
+  COMMON_HANDLE_ATTRIBUTE(jcf, attribute_name, attribute_length);	\
+  print_parameter_annotations (out, jcf, 1);				\
+}
+
+#define HANDLE_ANNOTATIONDEFAULT_ATTRIBUTE()				\
+{									\
+  COMMON_HANDLE_ATTRIBUTE(jcf, attribute_name, attribute_length);	\
+  print_element_value (out, jcf, 1);					\
+}
+
+
 #define PROCESS_OTHER_ATTRIBUTE(JCF, INDEX, LENGTH) \
 { COMMON_HANDLE_ATTRIBUTE(JCF, INDEX, LENGTH); \
   fputc ('\n', out); JCF_SKIP (JCF, LENGTH); }
@@ -367,6 +447,158 @@ utf8_equal_string (JCF *jcf, int index, const char * value)
 
 #include "javaop.h"
 
+
+
+static void
+indent (FILE *stream, int level)
+{
+  int i;
+  for (i = 0; i < level; ++i)
+    fprintf (stream, "  ");
+}
+
+static void
+print_element_value (FILE *stream, JCF *jcf, int level)
+{
+  uint8 tag = JCF_readu (jcf);
+  indent (stream, level);
+  switch (tag)
+    {
+    case 'B':
+    case 'C':
+    case 'S':
+    case 'Z':
+    case 'I':
+      {
+	uint16 cindex = JCF_readu2 (jcf);
+	print_constant_terse_with_index (stream, jcf, cindex,
+					 CONSTANT_Integer);
+      }
+      break;
+    case 'D':
+      {
+	uint16 cindex = JCF_readu2 (jcf);
+	print_constant_terse_with_index (stream, jcf, cindex,
+					 CONSTANT_Double);
+      }
+      break;
+    case 'F':
+      {
+	uint16 cindex = JCF_readu2 (jcf);
+	print_constant_terse_with_index (stream, jcf, cindex,
+					 CONSTANT_Float);
+      }
+      break;
+    case 'J':
+      {
+	uint16 cindex = JCF_readu2 (jcf);
+	print_constant_terse_with_index (stream, jcf, cindex,
+					 CONSTANT_Long);
+      }
+      break;
+    case 's':
+      {
+	uint16 cindex = JCF_readu2 (jcf);
+	/* Despite what the JVM spec says, compilers generate a Utf8
+	   constant here, not a String.  */
+	print_constant_terse_with_index (stream, jcf, cindex,
+					 CONSTANT_Utf8);
+      }
+      break;
+
+    case 'e':
+      {
+	uint16 type_name_index = JCF_readu2 (jcf);
+	uint16 const_name_index = JCF_readu2 (jcf);
+	fprintf (stream, "enum class: ");
+	print_constant_terse_with_index (stream, jcf, type_name_index,
+					 CONSTANT_Utf8);
+	fprintf (stream, "\n");
+	indent (stream, level);
+	fprintf (stream, "Field: ");
+	print_constant_terse_with_index (stream, jcf, const_name_index,
+					 CONSTANT_Utf8);
+      }
+      break;
+    case 'c':
+      {
+	uint16 class_info_index = JCF_readu2 (jcf);
+	print_constant_terse_with_index (stream, jcf, class_info_index,
+					 CONSTANT_Utf8);
+      }
+      break;
+    case '@':
+      {
+	fprintf (stream, "Annotation:\n");
+	print_annotation (stream, jcf, level + 1);
+      }
+      break;
+    case '[':
+      {
+	uint16 n_array_elts = JCF_readu2 (jcf);
+	fprintf (stream, "array[%d]: [\n", (int) n_array_elts);
+	while (n_array_elts--)
+	  print_element_value (stream, jcf, level + 1);
+	indent (stream, level);
+	fprintf (stream, "]");
+      }
+      break;
+    default:
+      fprintf (stream, "Unexpected tag value: %d", (int) tag);
+      break;
+    }
+  fputc ('\n', stream);
+}
+
+static void
+print_annotation (FILE *stream, JCF *jcf, int level)
+{
+  uint16 type_index = JCF_readu2 (jcf);
+  uint16 npairs = JCF_readu2 (jcf);
+  fprintf (stream, "\n");
+  indent (stream, level);
+  fprintf (stream, "Annotation name: ");
+  print_constant_terse_with_index (stream, jcf, type_index,
+				   CONSTANT_Utf8);
+  if (npairs)
+    {
+      fprintf (stream, "\n");
+      while (npairs--)
+	{
+	  uint16 name_index = JCF_readu2 (jcf);
+	  indent (stream, level + 1);
+	  fprintf (stream, "Name: ");
+	  print_constant_terse_with_index (stream, jcf, name_index,
+					   CONSTANT_Utf8);
+	  fprintf (stream, "\n");
+	  print_element_value (stream, jcf, level + 2);
+	}
+    }
+}
+
+static void
+print_annotations (FILE *stream, JCF *jcf, int level)
+{
+  uint16 num = JCF_readu2 (jcf);
+  while (num--)
+    print_annotation (stream, jcf, level);
+}
+
+static void
+print_parameter_annotations (FILE *stream, JCF *jcf, int level)
+{
+  uint8 nparams = JCF_readu (jcf);
+  uint8 i;
+  for (i = 0; i < nparams; ++i)
+    {
+      indent (stream, level);
+      fprintf (stream, "Parameter annotations (%d):\n", (int) i);
+      print_annotations (stream, jcf, level + 1);
+    }
+}
+
+
+
 static void
 print_constant_ref (FILE *stream, JCF *jcf, int index)
 {
diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c
index c8651b6..426b253 100644
--- a/gcc/java/jcf-io.c
+++ b/gcc/java/jcf-io.c
@@ -1,5 +1,5 @@
 /* Utility routines for finding and reading Java(TM) .class files.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -450,6 +450,9 @@ find_class (const char *classname, int classname_length, JCF *jcf,
   char *buffer;
   hashval_t hash;
 
+  /* FIXME: ecj hack.  */
+  source_ok = 0;
+
   /* Create the hash table, if it does not already exist.  */
   if (!memoized_class_lookups)
     memoized_class_lookups = htab_create (37, 
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index 9f0ccaa..079228e 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -1,6 +1,6 @@
 /* Parser for Java(TM) .class files.
-   Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -35,6 +35,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "flags.h"
 #include "java-except.h"
 #include "input.h"
+#include "javaop.h"
 #include "java-tree.h"
 #include "toplev.h"
 #include "parse.h"
@@ -43,6 +44,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "assert.h"
 #include "tm_p.h"
 #include "cgraph.h"
+#include "vecprim.h"
 
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
@@ -89,23 +91,32 @@ static location_t file_start_location;
 /* The Java archive that provides main_class;  the main input file. */
 static GTY(()) struct JCF * main_jcf;
 
+/* The number of source files passd to us by -fsource-filename and an
+   array of pointers to each name.  Used by find_sourcefile().  */
+static int num_files = 0;
+static char **filenames;
+
 static struct ZipFile *localToFile;
 
+/* A map of byte offsets in the reflection data that are fields which
+   need renumbering.  */
+bitmap field_offsets;
+bitmap_obstack bit_obstack;
+
 /* Declarations of some functions used here.  */
-static void handle_innerclass_attribute (int count, JCF *);
+static void handle_innerclass_attribute (int count, JCF *, int len);
 static tree give_name_to_class (JCF *jcf, int index);
 static char *compute_class_name (struct ZipDirectory *zdir);
 static int classify_zip_file (struct ZipDirectory *zdir);
 static void parse_zip_file_entries (void);
 static void process_zip_dir (FILE *);
-static void parse_source_file_1 (tree, const char *, FILE *);
-static void parse_source_file_2 (void);
-static void parse_source_file_3 (void);
 static void parse_class_file (void);
 static void handle_deprecated (void);
 static void set_source_filename (JCF *, int);
 static void jcf_parse (struct JCF*);
 static void load_inner_classes (tree);
+static void handle_annotation (JCF *jcf, int level);
+static void java_layout_seen_class_methods (void);
 
 /* Handle "Deprecated" attribute.  */
 static void
@@ -124,6 +135,181 @@ handle_deprecated (void)
     }
 }
 
+
+
+/* Reverse a string.  */
+static char *
+reverse (const char *s)
+{
+  if (s == NULL)
+    return NULL;
+  else
+    {
+      int len = strlen (s);
+      char *d = xmalloc (len + 1);
+      const char *sp;
+      char *dp;
+      
+      d[len] = 0;
+      for (dp = &d[0], sp = &s[len-1]; sp >= s; dp++, sp--)
+	*dp = *sp;
+
+      return d;
+    }
+}
+
+/* Compare two strings for qsort().  */
+static int
+cmpstringp (const void *p1, const void *p2)
+{
+  /* The arguments to this function are "pointers to
+     pointers to char", but strcmp() arguments are "pointers
+     to char", hence the following cast plus dereference */
+
+  return strcmp(*(char **) p1, *(char **) p2);
+}
+
+/* Create an array of strings, one for each source file that we've
+   seen.  fsource_filename can either be the name of a single .java
+   file or a file that contains a list of filenames separated by
+   newlines.  */
+void 
+java_read_sourcefilenames (const char *fsource_filename)
+{
+  if (fsource_filename 
+      && filenames == 0
+      && strlen (fsource_filename) > strlen (".java")
+      && strcmp ((fsource_filename 
+		  + strlen (fsource_filename)
+		  - strlen (".java")),
+		 ".java") != 0)
+    {
+/*       fsource_filename isn't a .java file but a list of filenames
+       separated by newlines */
+      FILE *finput = fopen (fsource_filename, "r");
+      int len = 0;
+      int longest_line = 0;
+
+      gcc_assert (finput);
+
+      /* Find out how many files there are, and how long the filenames are.  */
+      while (! feof (finput))
+	{
+	  int ch = getc (finput);
+	  if (ch == '\n')
+	    {
+	      num_files++;
+	      if (len > longest_line)
+		longest_line = len;
+	      len = 0;
+	      continue;
+	    }
+	  if (ch == EOF)
+	    break;
+	  len++;
+	}
+
+      rewind (finput);
+
+      /* Read the filenames.  Put a pointer to each filename into the
+	 array FILENAMES.  */
+      {
+	char *linebuf = alloca (longest_line + 1);
+	int i = 0;
+	int charpos;
+
+	filenames = xmalloc (num_files * sizeof (char*));
+
+	charpos = 0;
+	for (;;)
+	  {
+	    int ch = getc (finput);
+	    if (ch == EOF)
+	      break;
+	    if (ch == '\n')
+	      {
+		linebuf[charpos] = 0;
+		gcc_assert (i < num_files);		
+		/* ???  Perhaps we should use lrealpath() here.  Doing
+		   so would tidy up things like /../ but the rest of
+		   gcc seems to assume relative pathnames, not
+		   absolute pathnames.  */
+/* 		realname = lrealpath (linebuf); */
+		filenames[i++] = reverse (linebuf);
+		charpos = 0;
+		continue;
+	      }
+	    gcc_assert (charpos < longest_line);
+	    linebuf[charpos++] = ch;
+	  }
+
+	if (num_files > 1)
+	  qsort (filenames, num_files, sizeof (char *), cmpstringp);
+      }
+      fclose (finput);
+    }
+  else
+    {
+      filenames = xmalloc (sizeof (char*));      
+      filenames[0] = reverse (fsource_filename);
+      num_files = 1;
+    }
+}
+
+/* Given a relative pathname such as foo/bar.java, attempt to find a
+   longer pathname with the same suffix.  
+
+   This is a best guess heuristic; with some weird class hierarcies we
+   may fail to pick the correct source file.  For example, if we have
+   the filenames foo/bar.java and also foo/foo/bar.java, we do not
+   have enough information to know which one is the right match for
+   foo/bar.java.  */
+
+static const char *
+find_sourcefile (const char *name)
+{
+  int i = 0, j = num_files-1;
+  char *found = NULL;
+  
+  if (filenames)
+    {
+      char *revname = reverse (name);
+
+      do
+	{
+	  int k = (i+j) / 2;
+	  int cmp = strncmp (revname, filenames[k], strlen (revname));
+	  if (cmp == 0)
+	    {
+	      /*  OK, so we found one.  But is it a unique match?  */
+	      if ((k > i
+		   && strncmp (revname, filenames[k-1], strlen (revname)) == 0)
+		  || (k < j
+		      && (strncmp (revname, filenames[k+1], strlen (revname)) 
+			  == 0)))
+		;
+	      else
+		found = filenames[k];
+	      break;
+	    }
+	  if (cmp > 0)
+	    i = k+1;
+	  else
+	    j = k-1;
+	}
+      while (i <= j);
+
+      free (revname);
+    }
+
+  if (found && strlen (found) > strlen (name))
+    return reverse (found);
+  else
+    return name;
+}
+
+
+
 /* Handle "SourceFile" attribute. */
 
 static void
@@ -144,6 +330,7 @@ set_source_filename (JCF *jcf, int index)
 	      || old_filename[old_len - new_len - 1] == '\\'))
 	{
 #ifndef USE_MAPPED_LOCATION
+	  input_filename = find_sourcefile (input_filename);
 	  DECL_SOURCE_LOCATION (TYPE_NAME (current_class)) = input_location;
 	  file_start_location = input_location;
 #endif
@@ -177,6 +364,7 @@ set_source_filename (JCF *jcf, int index)
 	}
     }
       
+  sfname = find_sourcefile (sfname);
 #ifdef USE_MAPPED_LOCATION
   line_table.maps[line_table.used-1].to_file = sfname;
 #else
@@ -187,6 +375,519 @@ set_source_filename (JCF *jcf, int index)
   if (current_class == main_class) main_input_filename = sfname;
 }
 
+
+
+
+/* Annotation handling.  
+
+   The technique we use here is to copy the annotation data directly
+   from the input class file into the ouput file.  We don't decode the
+   data at all, merely rewriting constant indexes whenever we come
+   across them: this is necessary becasue the constant pool in the
+   output file isn't the same as the constant pool in in the input.
+
+   The main advantage of this technique is that the resulting
+   annotation data is pointer-free, so it doesn't have to be relocated
+   at startup time.  As a consequence of this, annotations have no
+   peformance impact unless they are used.  Also, this representation
+   is very dense.  */
+
+
+/* Expand TYPE_REFLECTION_DATA by DELTA bytes.  Return the address of
+   the start of the newly allocated region.  */
+
+static unsigned char*
+annotation_grow (int delta)
+{
+  unsigned char **data = &TYPE_REFLECTION_DATA (current_class);
+  long *datasize = &TYPE_REFLECTION_DATASIZE (current_class);
+  long len = *datasize;
+
+  if (*data == NULL)
+    {
+      *data = xmalloc (delta);
+    }
+  else
+    {
+      int newlen = *datasize + delta;
+      if (floor_log2 (newlen) != floor_log2 (*datasize))
+	*data = xrealloc (*data,  2 << (floor_log2 (newlen)));
+    }
+  *datasize += delta;
+  return *data + len;
+}
+
+/* annotation_rewrite_TYPE.  Rewrite various int types at p.  Use Java
+   byte order (i.e. big endian.)  */
+
+static void
+annotation_rewrite_byte (unsigned int n, unsigned char *p)
+{
+  p[0] = n;
+}
+
+static void
+annotation_rewrite_short (unsigned int n, unsigned char *p)
+{
+  p[0] = n>>8;
+  p[1] = n;
+}
+
+static void
+annotation_rewrite_int (unsigned int n, unsigned char *p)
+{
+  p[0] = n>>24;
+  p[1] = n>>16;
+  p[2] = n>>8;
+  p[3] = n;
+}
+
+/* Read a 16-bit unsigned int in Java byte order (i.e. big
+   endian.)  */
+
+static uint16
+annotation_read_short (unsigned char *p)
+{
+  uint16 tmp = p[0];
+  tmp = (tmp << 8) | p[1];
+  return tmp;
+}
+
+/* annotation_write_TYPE.  Rewrite various int types, appending them
+   to TYPE_REFLECTION_DATA.  Use Java byte order (i.e. big
+   endian.)  */
+
+static void
+annotation_write_byte (unsigned int n)
+{
+  annotation_rewrite_byte (n, annotation_grow (1));
+}
+
+static void
+annotation_write_short (unsigned int n)
+{
+  annotation_rewrite_short (n, annotation_grow (2));
+}
+
+static void
+annotation_write_int (unsigned int n)
+{
+  annotation_rewrite_int (n, annotation_grow (4));
+}
+
+/* Create a 64-bit constant in the constant pool.
+
+   This is used for both integer and floating-point types.  As a
+   consequence, it will not work if the target floating-point format
+   is anything other than IEEE-754.  While this is arguably a bug, the
+   runtime library makes exactly the same assumption and it's unlikely
+   that Java will ever run on a non-IEEE machine.  */
+
+static int 
+handle_long_constant (JCF *jcf, CPool *cpool, enum cpool_tag kind,
+		    int index, bool big_endian)
+{
+  /* If we're on a 64-bit platform we can fit a long or double
+     into the same space as a jword.  */
+  if (POINTER_SIZE >= 64)
+    index = find_constant1 (cpool, kind, JPOOL_LONG (jcf, index));
+
+  /* In a compiled program the constant pool is in native word
+     order.  How weird is that???  */
+  else if (big_endian)
+    index = find_constant2 (cpool, kind,
+			    JPOOL_INT (jcf, index), 
+			    JPOOL_INT (jcf, index+1));
+  else
+    index = find_constant2 (cpool, kind,
+			    JPOOL_INT (jcf, index+1), 
+			    JPOOL_INT (jcf, index));
+  
+  return index;
+}
+
+/* Given a class file and an index into its constant pool, create an
+   entry in the outgoing constant pool for the same item.  */
+
+static uint16
+handle_constant (JCF *jcf, int index, enum cpool_tag purpose)
+{
+  enum cpool_tag kind;
+  CPool *cpool = cpool_for_class (output_class);
+  
+  if (index == 0)
+    return 0;
+
+  if (! CPOOL_INDEX_IN_RANGE (&jcf->cpool, index))
+    error ("<constant pool index %d not in range>", index);
+  
+  kind = JPOOL_TAG (jcf, index);
+
+  if ((kind & ~CONSTANT_ResolvedFlag) != purpose)
+    {
+      if (purpose == CONSTANT_Class
+	  && kind == CONSTANT_Utf8)
+	;
+      else
+	error ("<constant pool index %d unexpected type", index);
+    }
+
+  switch (kind)
+    {
+    case CONSTANT_Class:
+    case CONSTANT_ResolvedClass:
+      {
+	/* For some reason I know not the what of, class names in
+	   annotations are UTF-8 strings in the constant pool but
+	   class names in EnclosingMethod attributes are real class
+	   references.  Set CONSTANT_LazyFlag here so that the VM
+	   doesn't attempt to resolve them at class initialization
+	   time.  */
+	tree resolved_class, class_name;
+	resolved_class = get_class_constant (jcf, index);
+	class_name = build_internal_class_name (resolved_class);
+	index = alloc_name_constant (CONSTANT_Class | CONSTANT_LazyFlag,
+				     (unmangle_classname 
+				      (IDENTIFIER_POINTER(class_name),
+				       IDENTIFIER_LENGTH(class_name))));
+	break;
+      }
+    case CONSTANT_Utf8:
+      {
+	tree utf8 = get_constant (jcf, index);
+	if (purpose == CONSTANT_Class)
+	  /* Create a constant pool entry for a type signature.  This
+	     one has '.' rather than '/' because it isn't going into a
+	     class file, it's going into a compiled object.
+	     
+	     This has to match the logic in
+	     _Jv_ClassReader::prepare_pool_entry().  */
+	  utf8 = unmangle_classname (IDENTIFIER_POINTER(utf8),
+				     IDENTIFIER_LENGTH(utf8));
+	index = alloc_name_constant (kind, utf8);
+      }
+      break;
+
+    case CONSTANT_Long:
+      index = handle_long_constant (jcf, cpool, kind, index, 
+				    WORDS_BIG_ENDIAN);
+      break;
+      
+    case CONSTANT_Double:
+      index = handle_long_constant (jcf, cpool, kind, index, 
+				    FLOAT_WORDS_BIG_ENDIAN);
+      break;
+
+    case CONSTANT_Float:
+    case CONSTANT_Integer:
+      index = find_constant1 (cpool, kind, JPOOL_INT (jcf, index));
+      break;
+      
+    case CONSTANT_NameAndType:
+      {
+	uint16 name = JPOOL_USHORT1 (jcf, index);
+	uint16 sig = JPOOL_USHORT2 (jcf, index);
+	uint32 name_index = handle_constant (jcf, name, CONSTANT_Utf8);
+	uint32 sig_index = handle_constant (jcf, sig, CONSTANT_Class);
+	jword new_index = (name_index << 16) | sig_index;
+	index = find_constant1 (cpool, kind, new_index);
+      }
+      break;
+
+    default:
+      abort ();
+    }
+  
+  return index;
+}
+
+/* Read an element_value structure from an annotation in JCF.  Return
+   the constant pool index for the resulting constant pool entry.  */
+
+static int
+handle_element_value (JCF *jcf, int level)
+{
+  uint8 tag = JCF_readu (jcf);
+  int index = 0;
+
+  annotation_write_byte (tag);
+  switch (tag)
+    {
+    case 'B':
+    case 'C':
+    case 'S':
+    case 'Z':
+    case 'I':
+      {
+	uint16 cindex = JCF_readu2 (jcf);
+	index = handle_constant (jcf, cindex,
+				 CONSTANT_Integer);
+	annotation_write_short (index);
+      }
+      break;
+    case 'D':
+      {
+	uint16 cindex = JCF_readu2 (jcf);
+	index = handle_constant (jcf, cindex,
+				 CONSTANT_Double);
+	annotation_write_short (index);
+      }
+      break;
+    case 'F':
+      {
+	uint16 cindex = JCF_readu2 (jcf);
+	index = handle_constant (jcf, cindex,
+				 CONSTANT_Float);
+	annotation_write_short (index);
+      }
+      break;
+    case 'J':
+      {
+	uint16 cindex = JCF_readu2 (jcf);
+	index = handle_constant (jcf, cindex,
+				 CONSTANT_Long);
+	annotation_write_short (index);
+      }
+      break;
+    case 's':
+      {
+	uint16 cindex = JCF_readu2 (jcf);
+	/* Despite what the JVM spec says, compilers generate a Utf8
+	   constant here, not a String.  */
+	index = handle_constant (jcf, cindex,
+				 CONSTANT_Utf8);
+	annotation_write_short (index);
+      }
+      break;
+
+    case 'e':
+      {
+	uint16 type_name_index = JCF_readu2 (jcf);
+	uint16 const_name_index = JCF_readu2 (jcf);
+	index = handle_constant (jcf, type_name_index,
+				 CONSTANT_Class);
+	annotation_write_short (index);
+	index = handle_constant (jcf, const_name_index,
+				 CONSTANT_Utf8);
+	annotation_write_short (index);
+     }
+      break;
+    case 'c':
+      {
+	uint16 class_info_index = JCF_readu2 (jcf);
+	index = handle_constant (jcf, class_info_index,
+				 CONSTANT_Class);
+	annotation_write_short (index);
+      }
+      break;
+    case '@':
+      {
+	handle_annotation (jcf, level + 1);
+      }
+      break;
+    case '[':
+      {
+	uint16 n_array_elts = JCF_readu2 (jcf);
+	annotation_write_short (n_array_elts);
+	while (n_array_elts--)
+	  handle_element_value (jcf, level + 1);
+      }
+      break;
+    default:
+      abort();
+      break;
+    }
+  return index;
+}
+
+/* Read an annotation structure from JCF.  Write it to the
+   reflection_data field of the outgoing class.  */
+
+static void
+handle_annotation (JCF *jcf, int level)
+{
+  uint16 type_index = JCF_readu2 (jcf);
+  uint16 npairs = JCF_readu2 (jcf);
+  int index = handle_constant (jcf, type_index,
+			       CONSTANT_Class);
+  annotation_write_short (index);
+  annotation_write_short (npairs);
+  while (npairs--)
+    {
+      uint16 name_index = JCF_readu2 (jcf);
+      index = handle_constant (jcf, name_index,
+			       CONSTANT_Utf8);
+      annotation_write_short (index);
+      handle_element_value (jcf, level + 2);
+    }
+}
+
+/* Read an annotation count from JCF, and write the following
+   annotatons to the reflection_data field of the outgoing class.  */
+
+static void
+handle_annotations (JCF *jcf, int level)
+{
+  uint16 num = JCF_readu2 (jcf);
+  annotation_write_short (num);
+  while (num--)
+    handle_annotation (jcf, level);
+}
+
+/* As handle_annotations(), but perform a sanity check that we write
+   the same number of bytes that we were expecting.  */
+
+static void
+handle_annotation_attribute (int ATTRIBUTE_UNUSED index, JCF *jcf, 
+			     long length)
+{
+  long old_datasize = TYPE_REFLECTION_DATASIZE (current_class);
+
+  handle_annotations (jcf, 0);
+
+  gcc_assert (old_datasize + length
+	      == TYPE_REFLECTION_DATASIZE (current_class));
+}
+
+/* gcj permutes its fields array after generating annotation_data, so
+   we have to fixup field indexes for fields that have moved.  Given
+   ARG, a VEC_int, fixup the field indexes in the reflection_data of
+   the outgoing class.  We use field_offsets to tell us where the
+   fixups must go.  */
+
+void
+rewrite_reflection_indexes (void *arg)
+{
+  bitmap_iterator bi;
+  unsigned int offset;
+  VEC(int, heap) *map = arg;
+  unsigned char *data = TYPE_REFLECTION_DATA (current_class);
+
+  if (map)
+    {
+      EXECUTE_IF_SET_IN_BITMAP (field_offsets, 0, offset, bi)
+	{
+	  uint16 index = annotation_read_short (data + offset);
+	  annotation_rewrite_short 
+	    (VEC_index (int, map, index), data + offset);
+	}
+    }
+}
+
+/* Read the RuntimeVisibleAnnotations from JCF and write them to the
+   reflection_data of the outgoing class.  */
+
+static void
+handle_member_annotations (int member_index, JCF *jcf, 
+			   const unsigned char *name ATTRIBUTE_UNUSED, 
+			   long len, jv_attr_type member_type)
+{
+  int new_len = len + 1;
+  annotation_write_byte (member_type);
+  if (member_type != JV_CLASS_ATTR)
+    new_len += 2;
+  annotation_write_int (new_len);
+  annotation_write_byte (JV_ANNOTATIONS_KIND);
+  if (member_type == JV_FIELD_ATTR)
+    bitmap_set_bit (field_offsets, TYPE_REFLECTION_DATASIZE (current_class));
+  if (member_type != JV_CLASS_ATTR)
+    annotation_write_short (member_index);
+  handle_annotation_attribute (member_index, jcf, len);
+}
+
+/* Read the RuntimeVisibleParameterAnnotations from JCF and write them
+   to the reflection_data of the outgoing class.  */
+
+static void
+handle_parameter_annotations (int member_index, JCF *jcf, 
+			      const unsigned char *name ATTRIBUTE_UNUSED, 
+			      long len, jv_attr_type member_type)
+{
+  int new_len = len + 1;
+  uint8 num;
+  annotation_write_byte (member_type);
+  if (member_type != JV_CLASS_ATTR)
+    new_len += 2;
+  annotation_write_int (new_len);
+  annotation_write_byte (JV_PARAMETER_ANNOTATIONS_KIND);
+  if (member_type != JV_CLASS_ATTR)
+    annotation_write_short (member_index);
+  num = JCF_readu (jcf);
+  annotation_write_byte (num);
+  while (num--)
+    handle_annotations (jcf, 0);
+}
+
+
+/* Read the AnnotationDefault data from JCF and write them to the
+   reflection_data of the outgoing class.  */
+
+static void
+handle_default_annotation (int member_index, JCF *jcf, 
+			   const unsigned char *name ATTRIBUTE_UNUSED, 
+			   long len, jv_attr_type member_type)
+{
+  int new_len = len + 1;
+  annotation_write_byte (member_type);
+  if (member_type != JV_CLASS_ATTR)
+    new_len += 2;
+  annotation_write_int (new_len);
+  annotation_write_byte (JV_ANNOTATION_DEFAULT_KIND);
+  if (member_type != JV_CLASS_ATTR)
+    annotation_write_short (member_index);
+  handle_element_value (jcf, 0);
+}
+
+/* As above, for the EnclosingMethod attribute.  */
+
+static void
+handle_enclosingmethod_attribute (int member_index, JCF *jcf, 
+			   const unsigned char *name ATTRIBUTE_UNUSED, 
+			   long len, jv_attr_type member_type)
+{
+  int new_len = len + 1;
+  uint16 index;
+  annotation_write_byte (member_type);
+  if (member_type != JV_CLASS_ATTR)
+    new_len += 2;
+  annotation_write_int (new_len);
+  annotation_write_byte (JV_ENCLOSING_METHOD_KIND);
+  if (member_type != JV_CLASS_ATTR)
+    annotation_write_short (member_index);
+
+  index = JCF_readu2 (jcf);
+  index = handle_constant (jcf, index, CONSTANT_Class);
+  annotation_write_short (index);
+
+  index = JCF_readu2 (jcf);
+  index = handle_constant (jcf, index, CONSTANT_NameAndType);
+  annotation_write_short (index);
+}
+
+/* As above, for the Signature attribute.  */
+
+static void
+handle_signature_attribute (int member_index, JCF *jcf, 
+			   const unsigned char *name ATTRIBUTE_UNUSED, 
+			   long len, jv_attr_type member_type)
+{
+  int new_len = len + 1;
+  uint16 index;
+  annotation_write_byte (member_type);
+  if (member_type != JV_CLASS_ATTR)
+    new_len += 2;
+  annotation_write_int (new_len);
+  annotation_write_byte (JV_SIGNATURE_KIND);
+  if (member_type != JV_CLASS_ATTR)
+    annotation_write_short (member_index);
+
+  index = JCF_readu2 (jcf);
+  index = handle_constant (jcf, index, CONSTANT_Utf8);
+  annotation_write_short (index);
+}
+  
+
+
 #define HANDLE_SOURCEFILE(INDEX) set_source_filename (jcf, INDEX)
 
 #define HANDLE_CLASS_INFO(ACCESS_FLAGS, THIS, SUPER, INTERFACES_COUNT) \
@@ -262,16 +963,19 @@ set_source_filename (JCF *jcf, int index)
 /* Link seen inner classes to their outer context and register the
    inner class to its outer context. They will be later loaded.  */
 #define HANDLE_INNERCLASSES_ATTRIBUTE(COUNT) \
-  handle_innerclass_attribute (COUNT, jcf)
+  handle_innerclass_attribute (COUNT, jcf, attribute_length)
 
 #define HANDLE_SYNTHETIC_ATTRIBUTE()					\
 {									\
   /* Irrelevant decls should have been nullified by the END macros.	\
-     We only handle the `Synthetic' attribute on method DECLs.		\
      DECL_ARTIFICIAL on fields is used for something else (See		\
      PUSH_FIELD in java-tree.h) */					\
   if (current_method)							\
     DECL_ARTIFICIAL (current_method) = 1;				\
+  else if (current_field)						\
+    FIELD_SYNTHETIC (current_field) = 1;				\
+  else									\
+    CLASS_SYNTHETIC (current_class) = 1;				\
 }
 
 #define HANDLE_GCJCOMPILED_ATTRIBUTE()		\
@@ -280,6 +984,43 @@ set_source_filename (JCF *jcf, int index)
     jcf->right_zip = 1;				\
 }
 
+#define HANDLE_RUNTIMEVISIBLEANNOTATIONS_ATTRIBUTE()			\
+{									\
+  handle_member_annotations (index, jcf, name_data, attribute_length, attr_type); \
+}
+
+#define HANDLE_RUNTIMEINVISIBLEANNOTATIONS_ATTRIBUTE()	\
+{							\
+  JCF_SKIP(jcf, attribute_length);			\
+}
+
+#define HANDLE_RUNTIMEVISIBLEPARAMETERANNOTATIONS_ATTRIBUTE()		\
+{									\
+  handle_parameter_annotations (index, jcf, name_data, attribute_length, attr_type); \
+}
+
+#define HANDLE_RUNTIMEINVISIBLEPARAMETERANNOTATIONS_ATTRIBUTE()	\
+{								\
+  JCF_SKIP(jcf, attribute_length);				\
+}
+
+#define HANDLE_ANNOTATIONDEFAULT_ATTRIBUTE()				\
+{									\
+  handle_default_annotation (index, jcf, name_data, attribute_length, attr_type); \
+}
+
+#define HANDLE_ENCLOSINGMETHOD_ATTRIBUTE()				\
+{									\
+  handle_enclosingmethod_attribute (index, jcf, name_data,		\
+				    attribute_length, attr_type);	\
+}
+
+#define HANDLE_SIGNATURE_ATTRIBUTE()				\
+{								\
+  handle_signature_attribute (index, jcf, name_data,		\
+			      attribute_length, attr_type);	\
+}
+
 #include "jcf-reader.c"
 
 tree
@@ -403,9 +1144,15 @@ get_name_constant (JCF *jcf, int index)
    the outer context with the newly resolved innerclass.  */
 
 static void
-handle_innerclass_attribute (int count, JCF *jcf)
+handle_innerclass_attribute (int count, JCF *jcf, int attribute_length)
 {
-  int c = (count);
+  int c = count;
+
+  annotation_write_byte (JV_CLASS_ATTR);
+  annotation_write_int (attribute_length+1);
+  annotation_write_byte (JV_INNER_CLASSES_KIND);
+  annotation_write_short (count);
+
   while (c--)
     {
       /* Read inner_class_info_index. This may be 0 */
@@ -418,6 +1165,12 @@ handle_innerclass_attribute (int count, JCF *jcf)
       int ini = JCF_readu2 (jcf);
       /* Read the access flag. */
       int acc = JCF_readu2 (jcf);
+
+      annotation_write_short (handle_constant (jcf, icii, CONSTANT_Class));
+      annotation_write_short (handle_constant (jcf, ocii, CONSTANT_Class));
+      annotation_write_short (handle_constant (jcf, ini, CONSTANT_Utf8));
+      annotation_write_short (acc);
+
       /* If icii is 0, don't try to read the class. */
       if (icii >= 0)
 	{
@@ -553,6 +1306,8 @@ read_class (tree name)
 
   if (current_jcf->java_source)
     {
+      gcc_unreachable ();
+#if 0
       const char *filename = current_jcf->filename;
       char *real_path;
       tree given_file, real_file;
@@ -590,15 +1345,16 @@ read_class (tree name)
       JCF_FINISH (current_jcf);
       java_pop_parser_context (generate);
       java_parser_context_restore_global ();
+#endif
     }
   else
     {
       if (class == NULL_TREE || ! CLASS_PARSED_P (class))
 	{
-	  java_parser_context_save_global ();
-	  java_push_parser_context ();
+/* 	  java_parser_context_save_global (); */
+/* 	  java_push_parser_context (); */
 	  output_class = current_class = class;
-	  ctxp->save_location = input_location;
+/* 	  ctxp->save_location = input_location; */
 	  if (JCF_SEEN_IN_ZIP (current_jcf))
 	    read_zip_member(current_jcf,
 			    current_jcf->zipd, current_jcf->zipd->zipf);
@@ -608,8 +1364,8 @@ read_class (tree name)
 	  if (current_class != class && icv != NULL_TREE)
 	    TREE_TYPE (icv) = current_class;
 	  class = current_class;
-	  java_pop_parser_context (0);
-	  java_parser_context_restore_global ();
+/* 	  java_pop_parser_context (0); */
+/* 	  java_parser_context_restore_global (); */
 	}
       layout_class (class);
       load_inner_classes (class);
@@ -789,6 +1545,10 @@ jcf_parse (JCF* jcf)
   code = jcf_parse_final_attributes (jcf);
   if (code != 0)
     fatal_error ("error while parsing final attributes");
+
+  if (TYPE_REFLECTION_DATA (current_class))
+    annotation_write_byte (JV_DONE_ATTR);
+
 #ifdef USE_MAPPED_LOCATION
   linemap_add (&line_table, LC_LEAVE, false, NULL, 0);
 #endif
@@ -803,9 +1563,12 @@ jcf_parse (JCF* jcf)
       /* If we don't have the right archive, emit a verbose warning.
 	 If we're generating bytecode, emit the warning only if
 	 -fforce-classes-archive-check was specified. */
+#if 0
+      /* ECJ HACK: ignore this.  */
       if (!jcf->right_zip
 	  && (!flag_emit_class_files || flag_force_classes_archive_check))
 	fatal_error ("the %<java.lang.Object%> that was found in %qs didn't have the special zero-length %<gnu.gcj.gcj-compiled%> attribute.  This generally means that your classpath is incorrectly set.  Use %<info gcj \"Input Options\"%> to see the info page describing how to set the classpath", jcf->filename);
+#endif
     }
   else
     all_class_list = tree_cons (NULL_TREE,
@@ -843,6 +1606,42 @@ duplicate_class_warning (const char *filename)
 }
 
 static void
+java_layout_seen_class_methods (void)
+{
+  tree previous_list = all_class_list;
+  tree end = NULL_TREE;
+  tree current;
+
+  while (1)
+    {
+      for (current = previous_list;
+	   current != end; current = TREE_CHAIN (current))
+        {
+	  tree decl = TREE_VALUE (current);
+          tree cls = TREE_TYPE (decl);
+
+	  input_location = DECL_SOURCE_LOCATION (decl);
+
+          if (! CLASS_LOADED_P (cls))
+            load_class (cls, 0);
+
+          layout_class_methods (cls);
+        }
+
+      /* Note that new classes might have been added while laying out
+         methods, changing the value of all_class_list.  */
+
+      if (previous_list != all_class_list)
+	{
+	  end = previous_list;
+	  previous_list = all_class_list;
+	}
+      else
+	break;
+    }
+}
+
+static void
 parse_class_file (void)
 {
   tree method;
@@ -856,8 +1655,6 @@ parse_class_file (void)
 
   gen_indirect_dispatch_tables (current_class);
 
-  java_mark_class_local (current_class);
-
   for (method = TYPE_METHODS (current_class);
        method != NULL_TREE; method = TREE_CHAIN (method))
     {
@@ -956,80 +1753,12 @@ parse_class_file (void)
       end_java_method ();
     }
 
-  if (flag_emit_class_files)
-    write_classfile (current_class);
-
   finish_class ();
 
   (*debug_hooks->end_source_file) (LOCATION_LINE (save_location));
   input_location = save_location;
 }
 
-/* Parse a source file, as pointed by the current value of INPUT_FILENAME. */
-
-static void
-parse_source_file_1 (tree real_file, const char *filename, FILE *finput)
-{
-  int save_error_count = java_error_count;
-
-  /* Mark the file as parsed.  */
-  HAS_BEEN_ALREADY_PARSED_P (real_file) = 1;
-
-  lang_init_source (1);		    /* Error msgs have no method prototypes */
-
-  /* There's no point in trying to find the current encoding unless we
-     are going to do something intelligent with it -- hence the test
-     for iconv.  */
-#if defined (HAVE_LOCALE_H) && defined (HAVE_ICONV) && defined (HAVE_LANGINFO_CODESET)
-  setlocale (LC_CTYPE, "");
-  if (current_encoding == NULL)
-    current_encoding = nl_langinfo (CODESET);
-#endif 
-  if (current_encoding == NULL || *current_encoding == '\0')
-    current_encoding = DEFAULT_ENCODING;
-
-#ifdef USE_MAPPED_LOCATION
-  linemap_add (&line_table, LC_ENTER, false, filename, 0);
-  input_location = linemap_line_start (&line_table, 0, 125);
-#else
-  input_filename = filename;
-  input_line = 0;
-#endif
-  ctxp->file_start_location = input_location;
-  ctxp->filename = filename;
-
-  jcf_dependency_add_file (input_filename, 0);
-
-  /* Initialize the parser */
-  java_init_lex (finput, current_encoding);
-  java_parse_abort_on_error ();
-
-  java_parse ();		    /* Parse and build partial tree nodes. */
-  java_parse_abort_on_error ();
-}
-
-/* Process a parsed source file, resolving names etc. */
-
-static void
-parse_source_file_2 (void)
-{
-  int save_error_count = java_error_count;
-  flag_verify_invocations = true;
-  java_complete_class ();	    /* Parse unsatisfied class decl. */
-  java_parse_abort_on_error ();
-}
-
-static void
-parse_source_file_3 (void)
-{
-  int save_error_count = java_error_count;
-  java_check_circular_reference (); /* Check on circular references */
-  java_parse_abort_on_error ();
-  java_fix_constructors ();	    /* Fix the constructors */
-  java_parse_abort_on_error ();
-  java_reorder_fields ();	    /* Reorder the fields */
-}
-
 void
 add_predefined_file (tree name)
 {
@@ -1074,6 +1803,9 @@ java_parse_file (int set_yydebug ATTRIBUTE_UNUSED)
   FILE *finput = NULL;
   int in_quotes = 0;
  
+  bitmap_obstack_initialize (&bit_obstack);
+  field_offsets = BITMAP_ALLOC (&bit_obstack);
+
   if (flag_filelist_file)
     {
       int avail = 2000;
@@ -1150,7 +1882,12 @@ java_parse_file (int set_yydebug ATTRIBUTE_UNUSED)
 	  next++;
 	}
 
-      if (list[0]) 
+      /* Exclude .java files.  */
+      if (strlen (list) > 5 && ! strcmp (list + strlen (list) - 5, ".java"))
+	{
+	  /* Nothing. */
+	}
+      else if (list[0]) 
 	{
 	  node = get_identifier (list);
 
@@ -1268,6 +2005,8 @@ java_parse_file (int set_yydebug ATTRIBUTE_UNUSED)
 	}
       else
 	{
+	  gcc_unreachable ();
+#if 0
 	  java_push_parser_context ();
 	  java_parser_context_save_global ();
 
@@ -1277,19 +2016,15 @@ java_parse_file (int set_yydebug ATTRIBUTE_UNUSED)
 #ifdef USE_MAPPED_LOCATION
 	  linemap_add (&line_table, LC_LEAVE, false, NULL, 0);
 #endif
+#endif
 	}
     }
 
-  for (ctxp = ctxp_for_generation;  ctxp;  ctxp = ctxp->next)
-    {
-      input_location = ctxp->file_start_location;
-      parse_source_file_2 ();
-    }
-
-  for (ctxp = ctxp_for_generation; ctxp; ctxp = ctxp->next)
+  /* Do this before lowering any code.  */
+  for (node = current_file_list; node; node = TREE_CHAIN (node))
     {
-      input_location = ctxp->file_start_location;
-      parse_source_file_3 ();
+      if (CLASS_FILE_P (node))
+	java_mark_class_local (TREE_TYPE (node));
     }
 
   for (node = current_file_list; node; node = TREE_CHAIN (node))
@@ -1312,12 +2047,14 @@ java_parse_file (int set_yydebug ATTRIBUTE_UNUSED)
     }
   input_location = save_location;
 
-  java_expand_classes ();
-  if (java_report_errors () || flag_syntax_only)
-    return;
+  bitmap_obstack_release (&bit_obstack);
+
+/*   java_expand_classes (); */
+/*   if (java_report_errors () || flag_syntax_only) */
+/*     return; */
     
   /* Expand all classes compiled from source.  */
-  java_finish_classes ();
+/*   java_finish_classes (); */
 
  finish:
   /* Arrange for any necessary initialization to happen.  */
@@ -1408,15 +2145,6 @@ parse_zip_file_entries (void)
 	    current_jcf = TYPE_JCF (class);
 	    output_class = current_class = class;
 
-	    if (CLASS_FROM_CURRENTLY_COMPILED_P (current_class))
-	      {
-	        /* We've already compiled this class.  */
-		duplicate_class_warning (current_jcf->filename);
-		break;
-	      }
-	    
-	    CLASS_FROM_CURRENTLY_COMPILED_P (current_class) = 1;
-
 	    /* This is a dummy class, and now we're compiling it for
 	       real.  */
 	    gcc_assert (! TYPE_DUMMY (class));
@@ -1531,6 +2259,16 @@ process_zip_dir (FILE *finput)
 
       class = lookup_class (get_identifier (class_name));
 
+      if (CLASS_FROM_CURRENTLY_COMPILED_P (class))
+	{
+	  /* We've already compiled this class.  */
+	  duplicate_class_warning (file_name);
+	  continue;
+	}
+      /* This function is only called when processing a zip file seen
+	 on the command line.  */
+      CLASS_FROM_CURRENTLY_COMPILED_P (class) = 1;
+
       jcf->read_state  = finput;
       jcf->filbuf      = jcf_filbuf_from_stdio;
       jcf->java_source = 0;
@@ -1542,12 +2280,5 @@ process_zip_dir (FILE *finput)
     }
 }
 
-/* Initialization.  */
-
-void
-init_jcf_parse (void)
-{
-  init_src_parse ();
-}
-
 #include "gt-java-jcf-parse.h"
+#include "gtype-java.h"
diff --git a/gcc/java/jcf-path.c b/gcc/java/jcf-path.c
index 65cd80e..7baef2e 100644
--- a/gcc/java/jcf-path.c
+++ b/gcc/java/jcf-path.c
@@ -1,5 +1,5 @@
 /* Handle CLASSPATH, -classpath, and path searching.
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -457,6 +457,38 @@ jcf_path_next (void *x)
   return (void *) ent->next;
 }
 
+static const char
+PATH_SEPARATOR_STR[] = {PATH_SEPARATOR, '\0'};
+
+char *
+jcf_path_compute (const char *prefix)
+{
+  struct entry *iter;
+  char *result;
+  int length = strlen (prefix) + 1;
+  int first;
+
+  for (iter = sealed; iter != NULL; iter = iter->next)
+    length += strlen (iter->name) + 1;
+
+  result = (char *) xmalloc (length);
+  strcpy (result, prefix);
+  first = 1;
+  for (iter = sealed; iter != NULL; iter = iter->next)
+    {
+      if (! first)
+	strcat (result, PATH_SEPARATOR_STR);
+      first = 0;
+      strcat (result, iter->name);
+      /* Ugly: we want to strip the '/' from zip entries when
+	 computing a string classpath.  */
+      if ((iter->flags & FLAG_ZIP) != 0)
+	result[strlen (result) - 1] = '\0';
+    }
+
+  return result;
+}
+
 /* We guarantee that the return path will either be a zip file, or it
    will end with a directory separator.  */
 char *
diff --git a/gcc/java/jcf-reader.c b/gcc/java/jcf-reader.c
index 219cf65..2ac3124 100644
--- a/gcc/java/jcf-reader.c
+++ b/gcc/java/jcf-reader.c
@@ -1,7 +1,7 @@
 /* This file read a Java(TM) .class file.
    It is not stand-alone:  It depends on tons of macros, and the
    intent is you #include this file after you've defined the macros.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -28,12 +28,12 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "jcf.h"
 #include "zipfile.h"
 
-static int get_attribute (JCF *);
+static int get_attribute (JCF *, int, jv_attr_type);
 static int jcf_parse_preamble (JCF *);
 static int jcf_parse_constant_pool (JCF *);
 static void jcf_parse_class (JCF *);
 static int jcf_parse_fields (JCF *);
-static int jcf_parse_one_method (JCF *);
+static int jcf_parse_one_method (JCF *, int);
 static int jcf_parse_methods (JCF *);
 static int jcf_parse_final_attributes (JCF *);
 #ifdef NEED_PEEK_ATTRIBUTE
@@ -103,7 +103,8 @@ skip_attribute (JCF *jcf, int number_of_attribute)
 #endif
 
 static int
-get_attribute (JCF *jcf)
+get_attribute (JCF *jcf, int index, 
+	       jv_attr_type attr_type ATTRIBUTE_UNUSED)
 {
   uint16 attribute_name = (JCF_FILL (jcf, 6), JCF_readu2 (jcf));
   uint32 attribute_length = JCF_readu4 (jcf);
@@ -168,7 +169,7 @@ get_attribute (JCF *jcf)
       attributes_count = JCF_readu2 (jcf);
       for (j = 0; j < attributes_count; j++)
 	{
-	  int code = get_attribute (jcf);
+	  int code = get_attribute (jcf, index, JV_METHOD_ATTR);
 	  if (code != 0)
 	    return code;
 	}
@@ -199,6 +200,14 @@ get_attribute (JCF *jcf)
     }
   else
 #endif
+#ifdef HANDLE_LOCALVARIABLETYPETABLE_ATTRIBUTE
+  if (MATCH_ATTRIBUTE ("LocalVariableTypeTable"))
+    {
+      uint16 count = JCF_readu2 (jcf);
+      HANDLE_LOCALVARIABLETYPETABLE_ATTRIBUTE (count);
+    }
+  else
+#endif
 #ifdef HANDLE_INNERCLASSES_ATTRIBUTE
   if (MATCH_ATTRIBUTE ("InnerClasses"))
     {
@@ -235,6 +244,55 @@ get_attribute (JCF *jcf)
     }
   else
 #endif
+#ifdef HANDLE_ENCLOSINGMETHOD_ATTRIBUTE
+  if (MATCH_ATTRIBUTE ("EnclosingMethod"))
+    {
+      HANDLE_ENCLOSINGMETHOD_ATTRIBUTE ();
+    }
+  else
+#endif
+#ifdef HANDLE_SIGNATURE_ATTRIBUTE
+  if (MATCH_ATTRIBUTE ("Signature"))
+    {
+      HANDLE_SIGNATURE_ATTRIBUTE ();
+    }
+  else
+#endif
+#ifdef HANDLE_RUNTIMEVISIBLEANNOTATIONS_ATTRIBUTE
+  if (MATCH_ATTRIBUTE ("RuntimeVisibleAnnotations"))
+    {
+      HANDLE_RUNTIMEVISIBLEANNOTATIONS_ATTRIBUTE ();
+    }
+  else
+#endif
+#ifdef HANDLE_RUNTIMEINVISIBLEANNOTATIONS_ATTRIBUTE
+  if (MATCH_ATTRIBUTE ("RuntimeInvisibleAnnotations"))
+    {
+      HANDLE_RUNTIMEINVISIBLEANNOTATIONS_ATTRIBUTE ();
+    }
+  else
+#endif
+#ifdef HANDLE_RUNTIMEVISIBLEPARAMETERANNOTATIONS_ATTRIBUTE
+  if (MATCH_ATTRIBUTE ("RuntimeVisibleParameterAnnotations"))
+    {
+      HANDLE_RUNTIMEVISIBLEPARAMETERANNOTATIONS_ATTRIBUTE ();
+    }
+  else
+#endif
+#ifdef HANDLE_RUNTIMEINVISIBLEPARAMETERANNOTATIONS_ATTRIBUTE
+  if (MATCH_ATTRIBUTE ("RuntimeInvisibleParameterAnnotations"))
+    {
+      HANDLE_RUNTIMEINVISIBLEPARAMETERANNOTATIONS_ATTRIBUTE ();
+    }
+  else
+#endif
+#ifdef HANDLE_ANNOTATIONDEFAULT_ATTRIBUTE
+  if (MATCH_ATTRIBUTE ("AnnotationDefault"))
+    {
+      HANDLE_ANNOTATIONDEFAULT_ATTRIBUTE ();
+    }
+  else
+#endif
     {
 #ifdef PROCESS_OTHER_ATTRIBUTE
       PROCESS_OTHER_ATTRIBUTE(jcf, attribute_name, attribute_length);
@@ -384,7 +442,7 @@ jcf_parse_fields (JCF* jcf)
 #endif
       for (j = 0; j < attribute_count; j++)
 	{
-	  int code = get_attribute (jcf);
+	  int code = get_attribute (jcf, i, JV_FIELD_ATTR);
 	  if (code != 0)
 	    return code;
 	}
@@ -401,7 +459,7 @@ jcf_parse_fields (JCF* jcf)
 /* Read methods. */
 
 static int
-jcf_parse_one_method (JCF* jcf)
+jcf_parse_one_method (JCF* jcf, int index)
 {
   int i;
   uint16 access_flags = (JCF_FILL (jcf, 8), JCF_readu2 (jcf));
@@ -413,7 +471,7 @@ jcf_parse_one_method (JCF* jcf)
 #endif
   for (i = 0; i < attribute_count; i++)
     {
-      int code = get_attribute (jcf);
+      int code = get_attribute (jcf, index, JV_METHOD_ATTR);
       if (code != 0)
 	return code;
     }
@@ -435,7 +493,7 @@ jcf_parse_methods (JCF* jcf)
 #endif
   for (i = 0; i < methods_count; i++)
     {
-      int code = jcf_parse_one_method (jcf);
+      int code = jcf_parse_one_method (jcf, i);
       if (code != 0)
 	return code;
     }
@@ -456,7 +514,7 @@ jcf_parse_final_attributes (JCF *jcf)
 #endif
   for (i = 0; i < attributes_count; i++)
     {
-      int code = get_attribute (jcf);
+      int code = get_attribute (jcf, i, JV_CLASS_ATTR);
       if (code != 0)
 	return code;
     }
diff --git a/gcc/java/jcf-write.c b/gcc/java/jcf-write.c
deleted file mode 100644
index b68ec25..0000000
--- a/gcc/java/jcf-write.c
+++ /dev/null
@@ -1,3569 +0,0 @@
-/* Write out a Java(TM) class file.
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-
-This file is part of GCC.
-
-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.
-
-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 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.
-The Free Software Foundation is independent of Sun Microsystems, Inc.  */
-
-#include "config.h"
-#include "system.h"
-#include "coretypes.h"
-#include "tm.h"
-#include "jcf.h"
-#include "tree.h"
-#include "real.h"
-#include "java-tree.h"
-#include "obstack.h"
-#include "rtl.h"
-#include "flags.h"
-#include "java-opcodes.h"
-#include "parse.h" /* for BLOCK_EXPR_BODY */
-#include "buffer.h"
-#include "toplev.h"
-#include "ggc.h"
-#include "tm_p.h"
-
-extern struct obstack temporary_obstack;
-
-/* Base directory in which `.class' files should be written.
-   NULL means to put the file into the same directory as the
-   corresponding .java file.  */
-const char *jcf_write_base_directory = NULL;
-
-/* Make sure bytecode.data is big enough for at least N more bytes. */
-
-#define RESERVE(N) \
-  do { CHECK_OP(state); \
-    if (state->bytecode.ptr + (N) > state->bytecode.limit) \
-    buffer_grow (&state->bytecode, N); } while (0)
-
-/* Add a 1-byte instruction/operand I to bytecode.data,
-   assuming space has already been RESERVE'd. */
-
-#define OP1(I) (*state->bytecode.ptr++ = (I), CHECK_OP(state))
-
-/* Like OP1, but I is a 2-byte big endian integer. */
-
-#define OP2(I) \
-  do { int _i = (I); OP1 (_i >> 8);  OP1 (_i); CHECK_OP(state); } while (0)
-
-/* Like OP1, but I is a 4-byte big endian integer. */
-
-#define OP4(I) \
-  do { int _i = (I);  OP1 (_i >> 24);  OP1 (_i >> 16); \
-       OP1 (_i >> 8); OP1 (_i); CHECK_OP(state); } while (0)
-
-/* Macro to call each time we push I words on the JVM stack. */
-
-#define NOTE_PUSH(I) \
-  do { state->code_SP += (I); \
-    if (state->code_SP > state->code_SP_max) \
-      state->code_SP_max = state->code_SP; } while (0)
-
-/* Macro to call each time we pop I words from the JVM stack. */
-
-#define NOTE_POP(I) \
-  do { state->code_SP -= (I); gcc_assert (state->code_SP >= 0); } while (0)
-
-/* A chunk or segment of a .class file. */
-
-struct chunk
-{
-  /* The next segment of this .class file. */
-  struct chunk *next;
-
-  /* The actual data in this segment to be written to the .class file. */
-  unsigned char *data;
-
-  /* The size of the segment to be written to the .class file. */
-  int size;
-};
-
-#define PENDING_CLEANUP_PC (-3)
-#define PENDING_EXIT_PC (-2)
-#define UNDEFINED_PC (-1)
-
-/* Each "block" represents a label plus the bytecode instructions following.
-   There may be branches out of the block, but no incoming jumps, except
-   to the beginning of the block.
-
-   If (pc < 0), the jcf_block is not an actual block (i.e. it has no
-   associated code yet), but it is an undefined label.
-*/
-
-struct jcf_block
-{
-  /* For blocks that that are defined, the next block (in pc order).
-     For blocks that are not-yet-defined the end label of a LABELED_BLOCK_EXPR
-     or a cleanup expression (from a TRY_FINALLY_EXPR),
-     this is the next (outer) such end label, in a stack headed by
-     labeled_blocks in jcf_partial. */
-  struct jcf_block *next;
-
-  /* In the not-yet-defined end label for an unfinished EXIT_BLOCK_EXPR.
-     pc is PENDING_EXIT_PC.
-     In the not-yet-defined end label for pending cleanup subroutine,
-     pc is PENDING_CLEANUP_PC.
-     For other not-yet-defined labels, pc is UNDEFINED_PC.
-
-     If the label has been defined:
-     Until perform_relocations is finished, this is the maximum possible
-     value of the bytecode offset at the beginning of this block.
-     After perform_relocations, it is the actual offset (pc). */
-  int pc;
-
-  int linenumber;
-
-  /* After finish_jcf_block is called, the actual instructions
-     contained in this block.  Before that NULL, and the instructions
-     are in state->bytecode. */
-  union {
-    struct chunk *chunk;
-
-    /* If pc==PENDING_CLEANUP_PC, start_label is the start of the region
-       covered by the cleanup. */
-    struct jcf_block *start_label;
-  } v;
-
-  union {
-    /* Set of relocations (in reverse offset order) for this block. */
-    struct jcf_relocation *relocations;
-
-    /* If this block is that of the not-yet-defined end label of
-       a LABELED_BLOCK_EXPR, where LABELED_BLOCK is that LABELED_BLOCK_EXPR.
-       If pc==PENDING_CLEANUP_PC, the cleanup that needs to be run. */
-    tree labeled_block;
-  } u;
-};
-
-/* A "relocation" type for the 0-3 bytes of padding at the start
-   of a tableswitch or a lookupswitch. */
-#define SWITCH_ALIGN_RELOC 4
-
-/* A relocation type for the labels in a tableswitch or a lookupswitch;
-   these are relative to the start of the instruction, but (due to
-   th 0-3 bytes of padding), we don't know the offset before relocation. */
-#define BLOCK_START_RELOC 1
-
-struct jcf_relocation
-{
-  /* Next relocation for the current jcf_block. */
-  struct jcf_relocation *next;
-
-  /* The (byte) offset within the current block that needs to be relocated. */
-  HOST_WIDE_INT offset;
-
-  /* 0 if offset is a 4-byte relative offset.
-     4 (SWITCH_ALIGN_RELOC) if offset points to 0-3 padding bytes inserted
-     for proper alignment in tableswitch/lookupswitch instructions.
-     1 (BLOCK_START_RELOC) if offset points to a 4-byte offset relative
-     to the start of the containing block.
-     -1 if offset is a 2-byte relative offset.
-     < -1 if offset is the address of an instruction with a 2-byte offset
-     that does not have a corresponding 4-byte offset version, in which
-     case the absolute value of kind is the inverted opcode.
-     > 4 if offset is the address of an instruction (such as jsr) with a
-     2-byte offset that does have a corresponding 4-byte offset version,
-     in which case kind is the opcode of the 4-byte version (such as jsr_w). */
-  int kind;
-
-  /* The label the relocation wants to actually transfer to. */
-  struct jcf_block *label;
-};
-
-#define RELOCATION_VALUE_0 ((HOST_WIDE_INT)0)
-#define RELOCATION_VALUE_1 ((HOST_WIDE_INT)1)
-
-/* State for single catch clause. */
-
-struct jcf_handler
-{
-  struct jcf_handler *next;
-
-  struct jcf_block *start_label;
-  struct jcf_block *end_label;
-  struct jcf_block *handler_label;
-
-  /* The sub-class of Throwable handled, or NULL_TREE (for finally). */
-  tree type;
-};
-
-/* State for the current switch statement. */
-
-struct jcf_switch_state
-{
-  struct jcf_switch_state *prev;
-  struct jcf_block *default_label;
-
-  struct jcf_relocation *cases;
-  int num_cases;
-  HOST_WIDE_INT min_case, max_case;
-};
-
-/* This structure is used to contain the various pieces that will
-   become a .class file. */
-
-struct jcf_partial
-{
-  struct chunk *first;
-  struct chunk *chunk;
-  struct obstack *chunk_obstack;
-  tree current_method;
-
-  /* List of basic blocks for the current method. */
-  struct jcf_block *blocks;
-  struct jcf_block *last_block;
-
-  struct localvar_info *first_lvar;
-  struct localvar_info *last_lvar;
-  int lvar_count;
-
-  CPool cpool;
-
-  int linenumber_count;
-
-  /* Until perform_relocations, this is a upper bound on the number
-     of bytes (so far) in the instructions for the current method. */
-  int code_length;
-
-  /* Stack of undefined ending labels for LABELED_BLOCK_EXPR. */
-  struct jcf_block *labeled_blocks;
-  
-  /* The current stack size (stack pointer) in the current method. */
-  int code_SP;
-
-  /* The largest extent of stack size (stack pointer) in the current method. */
-  int code_SP_max;
-
-  /* Contains a mapping from local var slot number to localvar_info. */
-  struct buffer localvars;
-
-  /* The buffer allocated for bytecode for the current jcf_block. */
-  struct buffer bytecode;
-
-  /* Chain of exception handlers for the current method. */
-  struct jcf_handler *handlers;
-
-  /* Last element in handlers chain. */
-  struct jcf_handler *last_handler;
-
-  /* Number of exception handlers for the current method. */
-  int num_handlers;
-
-  /* Number of finalizers we are currently nested within. */
-  int num_finalizers;
-
-  /* If non-NULL, use this for the return value. */
-  tree return_value_decl;
-
-  /* Information about the current switch statement. */
-  struct jcf_switch_state *sw_state;
-
-  /* The count of jsr instructions that have been emitted.  */
-  long num_jsrs;
-};
-
-static void generate_bytecode_insns (tree, int, struct jcf_partial *);
-static struct chunk * alloc_chunk (struct chunk *, unsigned char *,
-				   int, struct obstack *);
-static unsigned char * append_chunk (unsigned char *, int,
-				     struct jcf_partial *);
-static void append_chunk_copy (unsigned char *, int, struct jcf_partial *);
-static struct jcf_block * gen_jcf_label (struct jcf_partial *);
-static void finish_jcf_block (struct jcf_partial *);
-static void define_jcf_label (struct jcf_block *, struct jcf_partial *);
-static struct jcf_block * get_jcf_label_here (struct jcf_partial *);
-static void put_linenumber (int, struct jcf_partial *);
-static void localvar_alloc (tree, struct jcf_partial *);
-static void maybe_free_localvar (tree, struct jcf_partial *, int);
-static int get_access_flags (tree);
-static void write_chunks (FILE *, struct chunk *);
-static int adjust_typed_op (tree, int);
-static void generate_bytecode_conditional (tree, struct jcf_block *,
-					   struct jcf_block *, int,
-					   struct jcf_partial *);
-static void generate_bytecode_return (tree, struct jcf_partial *);
-static void perform_relocations (struct jcf_partial *);
-static void init_jcf_state (struct jcf_partial *, struct obstack *);
-static void init_jcf_method (struct jcf_partial *, tree);
-static void release_jcf_state (struct jcf_partial *);
-static int get_classfile_modifiers (tree class);
-static struct chunk * generate_classfile (tree, struct jcf_partial *);
-static struct jcf_handler *alloc_handler (struct jcf_block *,
-					  struct jcf_block *,
-					  struct jcf_partial *);
-static void emit_iinc (tree, HOST_WIDE_INT, struct jcf_partial *);
-static void emit_reloc (HOST_WIDE_INT, int, struct jcf_block *, 
-			struct jcf_partial *);
-static void push_constant1 (HOST_WIDE_INT, struct jcf_partial *);
-static void push_constant2 (HOST_WIDE_INT, struct jcf_partial *);
-static void push_int_const (HOST_WIDE_INT, struct jcf_partial *);
-static int find_constant_wide (HOST_WIDE_INT, HOST_WIDE_INT,
-			       struct jcf_partial *);
-static void push_long_const (HOST_WIDE_INT, HOST_WIDE_INT,
-			     struct jcf_partial *);
-static int find_constant_index (tree, struct jcf_partial *);
-static void push_long_const (HOST_WIDE_INT, HOST_WIDE_INT,
-			     struct jcf_partial *);
-static void field_op (tree, int, struct jcf_partial *);
-static void maybe_wide (int, int, struct jcf_partial *);
-static void emit_dup (int, int, struct jcf_partial *);
-static void emit_pop (int, struct jcf_partial *);
-static void emit_load_or_store (tree, int, struct jcf_partial *);
-static void emit_load (tree, struct jcf_partial *);
-static void emit_store (tree, struct jcf_partial *);
-static void emit_unop (enum java_opcode, tree, struct jcf_partial *);
-static void emit_binop (enum java_opcode, tree, struct jcf_partial *);
-static void emit_reloc (HOST_WIDE_INT, int, struct jcf_block *,
-			struct jcf_partial *);
-static void emit_switch_reloc (struct jcf_block *, struct jcf_partial *);
-static void emit_case_reloc (struct jcf_relocation *, struct jcf_partial *);
-static void emit_if (struct jcf_block *, int, int, struct jcf_partial *);
-static void emit_goto (struct jcf_block *, struct jcf_partial *);
-static void emit_jsr (struct jcf_block *, struct jcf_partial *);
-static void call_cleanups (struct jcf_block *, struct jcf_partial *);
-static char *make_class_file_name (tree);
-static unsigned char *append_synthetic_attribute (struct jcf_partial *);
-static void append_deprecated_attribute (struct jcf_partial *);
-static void append_innerclasses_attribute (struct jcf_partial *, tree);
-static void append_innerclasses_attribute_entry (struct jcf_partial *, tree, tree);
-static void append_gcj_attribute (struct jcf_partial *, tree);
-
-/* Utility macros for appending (big-endian) data to a buffer.
-   We assume a local variable 'ptr' points into where we want to
-   write next, and we assume enough space has been allocated. */
-
-#ifdef ENABLE_JC1_CHECKING
-static int CHECK_PUT (void *, struct jcf_partial *, int);
-
-static int
-CHECK_PUT (void *ptr, struct jcf_partial *state, int i)
-{
-  gcc_assert ((unsigned char *) ptr >= state->chunk->data
-	      && (unsigned char *) ptr + i <= state->chunk->data + state->chunk->size);
-  return 0;
-}
-#else
-#define CHECK_PUT(PTR, STATE, I) ((void)0)
-#endif
-
-#define PUT1(X)  (CHECK_PUT(ptr, state, 1), *ptr++ = (X))
-#define PUT2(X)  (PUT1((X) >> 8), PUT1((X) & 0xFF))
-#define PUT4(X)  (PUT2((X) >> 16), PUT2((X) & 0xFFFF))
-#define PUTN(P, N)  (CHECK_PUT(ptr, state, N), memcpy(ptr, P, N), ptr += (N))
-
-/* There are some cases below where CHECK_PUT is guaranteed to fail.
-   Use the following macros in those specific cases.  */
-#define UNSAFE_PUT1(X)  (*ptr++ = (X))
-#define UNSAFE_PUT2(X)  (UNSAFE_PUT1((X) >> 8), UNSAFE_PUT1((X) & 0xFF))
-#define UNSAFE_PUT4(X)  (UNSAFE_PUT2((X) >> 16), UNSAFE_PUT2((X) & 0xFFFF))
-#define UNSAFE_PUTN(P, N)  (memcpy(ptr, P, N), ptr += (N))
-
-
-/* Allocate a new chunk on obstack WORK, and link it in after LAST.
-   Set the data and size fields to DATA and SIZE, respectively.
-   However, if DATA is NULL and SIZE>0, allocate a buffer as well. */
-
-static struct chunk *
-alloc_chunk (struct chunk *last, unsigned char *data,
-	     int size, struct obstack *work)
-{
-  struct chunk *chunk = obstack_alloc (work, sizeof(struct chunk));
-
-  if (data == NULL && size > 0)
-    data = obstack_alloc (work, size);
-
-  chunk->next = NULL;
-  chunk->data = data;
-  chunk->size = size;
-  if (last != NULL)
-    last->next = chunk;
-  return chunk;
-}
-
-#ifdef ENABLE_JC1_CHECKING
-static int CHECK_OP (struct jcf_partial *);
-
-static int
-CHECK_OP (struct jcf_partial *state)
-{
-  gcc_assert (state->bytecode.ptr <= state->bytecode.limit);
-  return 0;
-}
-#else
-#define CHECK_OP(STATE) ((void) 0)
-#endif
-
-static unsigned char *
-append_chunk (unsigned char *data, int size, struct jcf_partial *state)
-{
-  state->chunk = alloc_chunk (state->chunk, data, size, state->chunk_obstack);
-  if (state->first == NULL)
-    state->first = state->chunk;
-  return state->chunk->data;
-}
-
-static void
-append_chunk_copy (unsigned char *data, int size, struct jcf_partial *state)
-{
-  unsigned char *ptr = append_chunk (NULL, size, state);
-  memcpy (ptr, data, size);
-}
-
-static struct jcf_block *
-gen_jcf_label (struct jcf_partial *state)
-{
-  struct jcf_block *block
-    = obstack_alloc (state->chunk_obstack, sizeof (struct jcf_block));
-  block->next =	NULL;
-  block->linenumber = -1;
-  block->pc = UNDEFINED_PC;
-  return block;
-}
-
-static void
-finish_jcf_block (struct jcf_partial *state)
-{
-  struct jcf_block *block = state->last_block;
-  struct jcf_relocation *reloc;
-  int code_length = BUFFER_LENGTH (&state->bytecode);
-  int pc = state->code_length;
-  append_chunk_copy (state->bytecode.data, code_length, state);
-  BUFFER_RESET (&state->bytecode);
-  block->v.chunk = state->chunk;
-
-  /* Calculate code_length to the maximum value it can have. */
-  pc += block->v.chunk->size;
-  for (reloc = block->u.relocations;  reloc != NULL;  reloc = reloc->next)
-    {
-      int kind = reloc->kind;
-      if (kind == SWITCH_ALIGN_RELOC)
-	pc += 3;
-      else if (kind > BLOCK_START_RELOC)
-	pc += 2; /* 2-byte offset may grow to 4-byte offset */
-      else if (kind < -1)
-	pc += 5; /* May need to add a goto_w. */
-    }
-  state->code_length = pc;
-}
-
-static void
-define_jcf_label (struct jcf_block *label, struct jcf_partial *state)
-{
-  if (state->last_block != NULL)
-    finish_jcf_block (state);
-  label->pc = state->code_length;
-  if (state->blocks == NULL)
-    state->blocks = label;
-  else
-    state->last_block->next = label;
-  state->last_block = label;
-  label->next = NULL;
-  label->u.relocations = NULL;
-}
-
-static struct jcf_block *
-get_jcf_label_here (struct jcf_partial *state)
-{
-  if (state->last_block != NULL && BUFFER_LENGTH (&state->bytecode) == 0)
-    return state->last_block;
-  else
-    {
-      struct jcf_block *label = gen_jcf_label (state);
-      define_jcf_label (label, state);
-      return label;
-    }
-}
-
-/* Note a line number entry for the current PC and given LINE. */
-
-static void
-put_linenumber (int line, struct jcf_partial *state)
-{
-  struct jcf_block *label = get_jcf_label_here (state);
-  if (label->linenumber > 0)
-    {
-      label = gen_jcf_label (state);
-      define_jcf_label (label, state);
-    }
-  label->linenumber = line;
-  state->linenumber_count++;
-}
-
-/* Allocate a new jcf_handler, for a catch clause that catches exceptions
-   in the range (START_LABEL, END_LABEL). */
-
-static struct jcf_handler *
-alloc_handler (struct jcf_block *start_label, struct jcf_block *end_label,
-	       struct jcf_partial *state)
-{
-  struct jcf_handler *handler
-    = obstack_alloc (state->chunk_obstack, sizeof (struct jcf_handler));
-  handler->start_label = start_label;
-  handler->end_label = end_label;
-  handler->handler_label = get_jcf_label_here (state);
-  if (state->handlers == NULL)
-    state->handlers = handler;
-  else
-    state->last_handler->next = handler;
-  state->last_handler = handler;
-  handler->next = NULL;
-  state->num_handlers++;
-  return handler;
-}
-
-
-/* The index of jvm local variable allocated for this DECL.
-   This is assigned when generating .class files;
-   contrast DECL_LOCAL_SLOT_NUMBER which is set when *reading* a .class file.
-   (We don't allocate DECL_LANG_SPECIFIC for locals from Java source code.) */
-
-#define DECL_LOCAL_INDEX(DECL) DECL_ALIGN(DECL)
-
-struct localvar_info
-{
-  struct localvar_info *next;
-
-  tree decl;
-  struct jcf_block *start_label;
-  struct jcf_block *end_label;
-};
-
-#define localvar_buffer ((struct localvar_info**) state->localvars.data)
-#define localvar_max \
-  ((struct localvar_info**) state->localvars.ptr - localvar_buffer)
-
-static void
-localvar_alloc (tree decl, struct jcf_partial *state)
-{
-  struct jcf_block *start_label = get_jcf_label_here (state);
-  int wide = TYPE_IS_WIDE (TREE_TYPE (decl));
-  int index;
-  struct localvar_info *info;
-  struct localvar_info **ptr = localvar_buffer;
-  struct localvar_info **limit
-    = (struct localvar_info**) state->localvars.ptr;
-  for (index = 0;  ptr < limit;  index++, ptr++)
-    {
-      if (ptr[0] == NULL
-	  && (! wide || ((ptr+1) < limit && ptr[1] == NULL)))
-	break;
-    }
-  if (ptr == limit)
-    {
-      buffer_grow (&state->localvars, 2 * sizeof (struct localvar_info*));
-      ptr = (struct localvar_info**) state->localvars.data + index;
-      state->localvars.ptr = (unsigned char *) (ptr + 1 + wide);
-    }
-  info = obstack_alloc (state->chunk_obstack, sizeof (struct localvar_info));
-  ptr[0] = info;
-  if (wide)
-    ptr[1] = (struct localvar_info *)(~0);
-  DECL_LOCAL_INDEX (decl) = index;
-  info->decl = decl;
-  info->start_label = start_label;
-
-  if (debug_info_level > DINFO_LEVEL_TERSE
-      && DECL_NAME (decl) != NULL_TREE)
-    {
-      /* Generate debugging info. */
-      info->next = NULL;
-      if (state->last_lvar != NULL)
-	state->last_lvar->next = info;
-      else
-	state->first_lvar = info;
-      state->last_lvar = info;
-      state->lvar_count++;
-    }
-}
-
-static void
-maybe_free_localvar (tree decl, struct jcf_partial *state, int really)
-{
-  struct jcf_block *end_label = get_jcf_label_here (state);
-  int index = DECL_LOCAL_INDEX (decl);
-  struct localvar_info **ptr = &localvar_buffer [index];
-  struct localvar_info *info = *ptr;
-  int wide = TYPE_IS_WIDE (TREE_TYPE (decl));
-
-  info->end_label = end_label;
-
-  gcc_assert (info->decl == decl);
-  if (! really)
-    return;
-  ptr[0] = NULL;
-  if (wide)
-    {
-      gcc_assert (ptr[1] == (struct localvar_info *) (~0));
-      ptr[1] = NULL;
-    }
-}
-
-
-#define STACK_TARGET 1
-#define IGNORE_TARGET 2
-
-/* Get the access flags of a class (TYPE_DECL), a method (FUNCTION_DECL), or
-   a field (FIELD_DECL or VAR_DECL, if static), as encoded in a .class file. */
-
-static int
-get_access_flags (tree decl)
-{
-  int flags = 0;
-  int isfield = TREE_CODE (decl) == FIELD_DECL || TREE_CODE (decl) == VAR_DECL;
-
-  if (isfield || TREE_CODE (decl) == FUNCTION_DECL)
-    {
-      if (TREE_PROTECTED (decl))
-	flags |= ACC_PROTECTED;
-      if (TREE_PRIVATE (decl))
-	flags |= ACC_PRIVATE;
-    }
-  else if (TREE_CODE (decl) == TYPE_DECL)
-    {
-      if (CLASS_PUBLIC (decl))
-	flags |= ACC_PUBLIC;
-      if (CLASS_FINAL (decl))
-	flags |= ACC_FINAL;
-      if (CLASS_SUPER (decl))
-	flags |= ACC_SUPER;
-      if (CLASS_ABSTRACT (decl))
-	flags |= ACC_ABSTRACT;
-      if (CLASS_INTERFACE (decl))
-	flags |= ACC_INTERFACE;
-      if (CLASS_STATIC (decl))
-	flags |= ACC_STATIC;
-      if (CLASS_PRIVATE (decl))
-	flags |= ACC_PRIVATE;
-      if (CLASS_PROTECTED (decl))
-	flags |= ACC_PROTECTED;
-      if (ANONYMOUS_CLASS_P (TREE_TYPE (decl))
-	  || LOCAL_CLASS_P (TREE_TYPE (decl)))
-	flags |= ACC_PRIVATE;
-      if (CLASS_STRICTFP (decl))
-	flags |= ACC_STRICT;
-    }
-  else
-    gcc_unreachable ();
-
-  if (TREE_CODE (decl) == FUNCTION_DECL)
-    {
-      if (METHOD_PUBLIC (decl))
-	flags |= ACC_PUBLIC;
-      if (METHOD_FINAL (decl))
-	flags |= ACC_FINAL;
-      if (METHOD_NATIVE (decl))
-	flags |= ACC_NATIVE;
-      if (METHOD_STATIC (decl))
-	flags |= ACC_STATIC;
-      if (METHOD_SYNCHRONIZED (decl))
-	flags |= ACC_SYNCHRONIZED;
-      if (METHOD_ABSTRACT (decl))
-	flags |= ACC_ABSTRACT;
-      if (METHOD_STRICTFP (decl))
-	flags |= ACC_STRICT;
-    }
-  if (isfield)
-    {
-      if (FIELD_PUBLIC (decl))
-	flags |= ACC_PUBLIC;
-      if (FIELD_FINAL (decl))
-	flags |= ACC_FINAL;
-      if (FIELD_STATIC (decl))
-	flags |= ACC_STATIC;
-      if (FIELD_VOLATILE (decl))
-	flags |= ACC_VOLATILE;
-      if (FIELD_TRANSIENT (decl))
-	flags |= ACC_TRANSIENT;
-    }
-  return flags;
-}
-
-/* Write the list of segments starting at CHUNKS to STREAM. */
-
-static void
-write_chunks (FILE* stream, struct chunk *chunks)
-{
-  for (;  chunks != NULL;  chunks = chunks->next)
-    fwrite (chunks->data, chunks->size, 1, stream);
-}
-
-/* Push a 1-word constant in the constant pool at the given INDEX.
-   (Caller is responsible for doing NOTE_PUSH.) */
-
-static void
-push_constant1 (HOST_WIDE_INT index, struct jcf_partial *state)
-{
-  RESERVE (3);
-  if (index < 256)
-    {
-      OP1 (OPCODE_ldc);
-      OP1 (index);
-    }
-  else
-    {
-      OP1 (OPCODE_ldc_w);
-      OP2 (index);
-    }
-}
-
-/* Push a 2-word constant in the constant pool at the given INDEX.
-   (Caller is responsible for doing NOTE_PUSH.) */
-
-static void
-push_constant2 (HOST_WIDE_INT index, struct jcf_partial *state)
-{
-  RESERVE (3);
-  OP1 (OPCODE_ldc2_w);
-  OP2 (index);
-}
-
-/* Push 32-bit integer constant on VM stack.
-   Caller is responsible for doing NOTE_PUSH. */
-
-static void
-push_int_const (HOST_WIDE_INT i, struct jcf_partial *state)
-{
-  RESERVE(3);
-  if (i >= -1 && i <= 5)
-    OP1(OPCODE_iconst_0 + i);
-  else if (i >= -128 && i < 128)
-    {
-      OP1(OPCODE_bipush);
-      OP1(i);
-    }
-  else if (i >= -32768 && i < 32768)
-    {
-      OP1(OPCODE_sipush);
-      OP2(i);
-    }
-  else
-    {
-      i = find_constant1 (&state->cpool, CONSTANT_Integer, 
-			  (jword)(i & 0xFFFFFFFF));
-      push_constant1 (i, state);
-    }
-}
-
-static int
-find_constant_wide (HOST_WIDE_INT lo, HOST_WIDE_INT hi,
-		    struct jcf_partial *state)
-{
-  unsigned HOST_WIDE_INT w1;
-  HOST_WIDE_INT w2;
-  lshift_double (lo, hi, -32, 64, &w1, &w2, 1);
-  return find_constant2 (&state->cpool, CONSTANT_Long,
-			 (jword)(w1 & 0xFFFFFFFF), (jword)(lo & 0xFFFFFFFF));
-}
-
-/* Find or allocate a constant pool entry for the given VALUE.
-   Return the index in the constant pool. */
-
-static int
-find_constant_index (tree value, struct jcf_partial *state)
-{
-  if (TREE_CODE (value) == INTEGER_CST)
-    {
-      if (TYPE_PRECISION (TREE_TYPE (value)) <= 32)
-	return find_constant1 (&state->cpool, CONSTANT_Integer,
-			       (jword)(TREE_INT_CST_LOW (value) & 0xFFFFFFFF));
-      else
-	return find_constant_wide (TREE_INT_CST_LOW (value),
-				   TREE_INT_CST_HIGH (value), state);
-    }
-  else if (TREE_CODE (value) == REAL_CST)
-    {
-      long words[2];
-
-      /* IEEE NaN can have many values, but the Java VM spec defines a
-	 canonical NaN.  */      
-      if (flag_emit_class_files
-	  && REAL_VALUE_ISNAN (TREE_REAL_CST (value)))
-	{
-	  if (TYPE_PRECISION (TREE_TYPE (value)) == 32)
- 	    return find_constant1 (&state->cpool, CONSTANT_Float,
- 				   0x7fc00000);
-	  else
- 	    return find_constant2 (&state->cpool, CONSTANT_Double,
- 				   0x7ff80000, 0x00000000);
-	}	    
-      
-      real_to_target (words, &TREE_REAL_CST (value),
-		      TYPE_MODE (TREE_TYPE (value)));
-      words[0] &= 0xffffffff;
-      words[1] &= 0xffffffff;
-
-      if (TYPE_PRECISION (TREE_TYPE (value)) == 32)
-	return find_constant1 (&state->cpool, CONSTANT_Float, (jword)words[0]);
-      else
-	return find_constant2 (&state->cpool, CONSTANT_Double,
-			       (jword)words[1-FLOAT_WORDS_BIG_ENDIAN],
-			       (jword)words[FLOAT_WORDS_BIG_ENDIAN]);
-    }
-  else if (TREE_CODE (value) == STRING_CST)
-    return find_string_constant (&state->cpool, value);
-
-  else
-    gcc_unreachable ();
-}
-
-/* Push 64-bit long constant on VM stack.
-   Caller is responsible for doing NOTE_PUSH. */
-
-static void
-push_long_const (HOST_WIDE_INT lo, HOST_WIDE_INT hi, struct jcf_partial *state)
-{
-  unsigned HOST_WIDE_INT highpart;
-  HOST_WIDE_INT dummy;
-  jint lowpart = WORD_TO_INT (lo);
-
-  rshift_double (lo, hi, 32, 64, &highpart, &dummy, 1);
-
-  if (highpart == 0 && (lowpart == 0 || lowpart == 1))
-    {
-      RESERVE(1);
-      OP1(OPCODE_lconst_0 + lowpart);
-    }
-  else if ((highpart == 0 && lowpart > 0 && lowpart < 32768) 
-	   || (highpart == (unsigned HOST_WIDE_INT)-1
-	       && lowpart < 0 && lowpart >= -32768))
-      {
-        push_int_const (lowpart, state);
-        RESERVE (1);
-        OP1 (OPCODE_i2l);
-      }
-  else
-    push_constant2 (find_constant_wide (lo, hi, state), state);
-}
-
-static void
-field_op (tree field, int opcode, struct jcf_partial *state)
-{
-  int index = find_fieldref_index (&state->cpool, field);
-  RESERVE (3);
-  OP1 (opcode);
-  OP2 (index);
-}
-
-/* Returns an integer in the range 0 (for 'int') through 4 (for object
-   reference) to 7 (for 'short') which matches the pattern of how JVM
-   opcodes typically depend on the operand type. */
-
-static int
-adjust_typed_op (tree type, int max)
-{
-  switch (TREE_CODE (type))
-    {
-    case POINTER_TYPE:
-    case RECORD_TYPE:   return 4;
-    case BOOLEAN_TYPE:
-      return TYPE_PRECISION (type) == 32 || max < 5 ? 0 : 5;
-    case INTEGER_TYPE:
-      if (type == char_type_node || type == promoted_char_type_node)
-	return TYPE_PRECISION (type) == 32 || max < 6 ? 0 : 6;
-      switch (TYPE_PRECISION (type))
-	{
-	case  8:       return max < 5 ? 0 : 5;
-	case 16:       return max < 7 ? 0 : 7;
-	case 32:       return 0;
-	case 64:       return 1;
-	}
-      break;
-    case REAL_TYPE:
-      switch (TYPE_PRECISION (type))
-	{
-	case 32:       return 2;
-	case 64:       return 3;
-	}
-      break;
-    default:
-      break;
-    }
-  gcc_unreachable ();
-}
-
-static void
-maybe_wide (int opcode, int index, struct jcf_partial *state)
-{
-  if (index >= 256)
-    {
-      RESERVE (4);
-      OP1 (OPCODE_wide);
-      OP1 (opcode);
-      OP2 (index);
-    }
-  else
-    {
-      RESERVE (2);
-      OP1 (opcode);
-      OP1 (index);
-    }
-}
-
-/* Compile code to duplicate with offset, where
-   SIZE is the size of the stack item to duplicate (1 or 2), abd
-   OFFSET is where to insert the result (must be 0, 1, or 2).
-   (The new words get inserted at stack[SP-size-offset].) */
-
-static void
-emit_dup (int size, int offset, struct jcf_partial *state)
-{
-  int kind;
-  if (size == 0)
-    return;
-  RESERVE(1);
-  if (offset == 0)
-    kind = size == 1 ? OPCODE_dup : OPCODE_dup2;
-  else if (offset == 1)
-    kind = size == 1 ? OPCODE_dup_x1 : OPCODE_dup2_x1;
-  else if (offset == 2)
-    kind = size == 1 ? OPCODE_dup_x2 : OPCODE_dup2_x2;
-  else
-    gcc_unreachable ();
-  OP1 (kind);
-  NOTE_PUSH (size);
-}
-
-static void
-emit_pop (int size, struct jcf_partial *state)
-{
-  RESERVE (1);
-  OP1 (OPCODE_pop - 1 + size);
-}
-
-static void
-emit_iinc (tree var, HOST_WIDE_INT value, struct jcf_partial *state)
-{
-  int slot = DECL_LOCAL_INDEX (var);
-
-  if (value < -128 || value > 127 || slot >= 256)
-    {
-      RESERVE (6);
-      OP1 (OPCODE_wide);
-      OP1 (OPCODE_iinc);
-      OP2 (slot);
-      OP2 (value);
-    }
-  else
-    {
-      RESERVE (3);
-      OP1 (OPCODE_iinc);
-      OP1 (slot);
-      OP1 (value);
-    }
-}
-
-static void
-emit_load_or_store (tree var,    /* Variable to load from or store into. */
-		    int opcode,  /* Either OPCODE_iload or OPCODE_istore. */
-		    struct jcf_partial *state)
-{
-  tree type = TREE_TYPE (var);
-  int kind = adjust_typed_op (type, 4);
-  int index = DECL_LOCAL_INDEX (var);
-  if (index <= 3)
-    {
-      RESERVE (1);
-      OP1 (opcode + 5 + 4 * kind + index);    /* [ilfda]{load,store}_[0123] */
-    }
-  else
-    maybe_wide (opcode + kind, index, state);  /* [ilfda]{load,store} */
-}
-
-static void
-emit_load (tree var, struct jcf_partial *state)
-{
-  emit_load_or_store (var, OPCODE_iload, state);
-  NOTE_PUSH (TYPE_IS_WIDE (TREE_TYPE (var)) ? 2 : 1);
-}
-
-static void
-emit_store (tree var, struct jcf_partial *state)
-{
-  emit_load_or_store (var, OPCODE_istore, state);
-  NOTE_POP (TYPE_IS_WIDE (TREE_TYPE (var)) ? 2 : 1);
-}
-
-static void
-emit_unop (enum java_opcode opcode, tree type ATTRIBUTE_UNUSED,
-	   struct jcf_partial *state)
-{
-  RESERVE(1);
-  OP1 (opcode);
-}
-
-static void
-emit_binop (enum java_opcode opcode, tree type, struct jcf_partial *state)
-{
-  int size = TYPE_IS_WIDE (type) ? 2 : 1;
-  RESERVE(1);
-  OP1 (opcode);
-  NOTE_POP (size);
-}
-
-static void
-emit_reloc (HOST_WIDE_INT value, int kind,
-	    struct jcf_block *target, struct jcf_partial *state)
-{
-  struct jcf_relocation *reloc
-    = obstack_alloc (state->chunk_obstack, sizeof (struct jcf_relocation));
-  struct jcf_block *block = state->last_block;
-  reloc->next = block->u.relocations;
-  block->u.relocations = reloc;
-  reloc->offset = BUFFER_LENGTH (&state->bytecode);
-  reloc->label = target;
-  reloc->kind = kind;
-  if (kind == 0 || kind == BLOCK_START_RELOC)
-    OP4 (value);
-  else if (kind != SWITCH_ALIGN_RELOC)
-    OP2 (value);
-}
-
-static void
-emit_switch_reloc (struct jcf_block *label, struct jcf_partial *state)
-{
-  emit_reloc (RELOCATION_VALUE_0, BLOCK_START_RELOC, label, state);
-}
-
-/* Similar to emit_switch_reloc,
-   but re-uses an existing case reloc. */
-
-static void
-emit_case_reloc (struct jcf_relocation *reloc, struct jcf_partial *state)
-{
-  struct jcf_block *block = state->last_block;
-  reloc->next = block->u.relocations;
-  block->u.relocations = reloc;
-  reloc->offset = BUFFER_LENGTH (&state->bytecode);
-  reloc->kind = BLOCK_START_RELOC;
-  OP4 (0);
-}
-
-/* Emit a conditional jump to TARGET with a 2-byte relative jump offset
-   The opcode is OPCODE, the inverted opcode is INV_OPCODE. */
-
-static void
-emit_if (struct jcf_block *target, int opcode, int inv_opcode,
-	 struct jcf_partial *state)
-{
-  RESERVE(3);
-  OP1 (opcode);
-  /* value is 1 byte from reloc back to start of instruction.  */
-  emit_reloc (RELOCATION_VALUE_1, - inv_opcode, target, state);
-}
-
-static void
-emit_goto (struct jcf_block *target, struct jcf_partial *state)
-{
-  RESERVE(3);
-  OP1 (OPCODE_goto);
-  /* Value is 1 byte from reloc back to start of instruction.  */
-  emit_reloc (RELOCATION_VALUE_1, OPCODE_goto_w, target, state);
-}
-
-static void
-emit_jsr (struct jcf_block *target, struct jcf_partial *state)
-{
-  RESERVE(3);
-  OP1 (OPCODE_jsr);
-  /* Value is 1 byte from reloc back to start of instruction.  */
-  emit_reloc (RELOCATION_VALUE_1, OPCODE_jsr_w, target, state);
-  state->num_jsrs++;
-}
-
-/* Generate code to evaluate EXP.  If the result is true,
-   branch to TRUE_LABEL; otherwise, branch to FALSE_LABEL.
-   TRUE_BRANCH_FIRST is a code generation hint that the
-   TRUE_LABEL may follow right after this. (The idea is that we
-   may be able to optimize away GOTO TRUE_LABEL; TRUE_LABEL:) */
-
-static void
-generate_bytecode_conditional (tree exp,
-			       struct jcf_block *true_label,
-			       struct jcf_block *false_label,
-			       int true_branch_first,
-			       struct jcf_partial *state)
-{
-  tree exp0, exp1, type;
-  int save_SP = state->code_SP;
-  enum java_opcode op, negop;
-  bool unordered = 0;
-  
-  switch (TREE_CODE (exp))
-    {
-    case INTEGER_CST:
-      emit_goto (integer_zerop (exp) ? false_label : true_label, state);
-      break;
-    case COND_EXPR:
-      {
-	struct jcf_block *then_label = gen_jcf_label (state);
-	struct jcf_block *else_label = gen_jcf_label (state);
-	int save_SP_before, save_SP_after;
-	generate_bytecode_conditional (TREE_OPERAND (exp, 0),
-				       then_label, else_label, 1, state);
-	define_jcf_label (then_label, state);
-	save_SP_before = state->code_SP;
-	generate_bytecode_conditional (TREE_OPERAND (exp, 1),
-				       true_label, false_label, 1, state);
-	save_SP_after = state->code_SP;
-	state->code_SP = save_SP_before;
-	define_jcf_label (else_label, state);
-	generate_bytecode_conditional (TREE_OPERAND (exp, 2),
-				       true_label, false_label,
-				       true_branch_first, state);
-	gcc_assert (state->code_SP == save_SP_after);
-      }
-      break;
-    case TRUTH_NOT_EXPR:
-      generate_bytecode_conditional (TREE_OPERAND (exp, 0), false_label,
-				     true_label, ! true_branch_first, state);
-      break;
-    case TRUTH_ANDIF_EXPR:
-      {
-	struct jcf_block *next_label = gen_jcf_label (state);
-	generate_bytecode_conditional (TREE_OPERAND (exp, 0),
-				       next_label, false_label, 1, state);
-	define_jcf_label (next_label, state);
-	generate_bytecode_conditional (TREE_OPERAND (exp, 1),
-				       true_label, false_label, 1, state);
-      }
-      break;
-    case TRUTH_ORIF_EXPR:
-      {
-	struct jcf_block *next_label = gen_jcf_label (state);
-	generate_bytecode_conditional (TREE_OPERAND (exp, 0),
-				       true_label, next_label, 1, state);
-	define_jcf_label (next_label, state);
-	generate_bytecode_conditional (TREE_OPERAND (exp, 1),
-				       true_label, false_label, 1, state);
-      }
-      break;
-    compare_1:
-      /* Assuming op is one of the 2-operand if_icmp<COND> instructions,
-	 set it to the corresponding 1-operand if<COND> instructions. */
-      op = op - 6;
-      /* FALLTHROUGH */
-    compare_2:
-      /* The opcodes with their inverses are allocated in pairs.
-	 E.g.  The inverse of if_icmplt (161) is if_icmpge (162). */
-      negop = (op & 1) ? op + 1 : op - 1;
-    compare_2_ptr:
-      if (true_branch_first)
-	{
-	  emit_if (false_label, negop, op, state);
-	  emit_goto (true_label, state);
-	}
-      else
-	{
-	  emit_if (true_label, op, negop, state);
-	  emit_goto (false_label, state);
-	}
-      break;
-
-    case UNEQ_EXPR:
-      unordered = 1;
-    case EQ_EXPR:
-      op = OPCODE_if_icmpeq;
-      goto compare;
-
-    case LTGT_EXPR:
-      unordered = 1;
-    case NE_EXPR:
-      op = OPCODE_if_icmpne;
-      goto compare;
-
-    case UNLE_EXPR:
-      unordered = 1;
-    case GT_EXPR:
-      op = OPCODE_if_icmpgt;
-      goto compare;
-
-    case UNGE_EXPR:
-      unordered = 1;
-    case LT_EXPR:
-      op = OPCODE_if_icmplt;
-      goto compare;
-
-    case UNLT_EXPR:
-      unordered = 1;
-    case GE_EXPR:
-      op = OPCODE_if_icmpge;
-      goto compare;
-
-    case UNGT_EXPR:
-      unordered = 1;
-    case LE_EXPR:
-      op = OPCODE_if_icmple;
-      goto compare;
-
-    compare:
-      if (unordered)
-        {
-	  /* UNLT_EXPR(a, b) means 'a < b || unordered(a, b)'.  This is 
-	  the same as the Java source expression '!(a >= b)', so handle 
-	  it that way.  */
-	  struct jcf_block *tmp = true_label;
-	  true_label = false_label;
-	  false_label = tmp;
-          true_branch_first = !true_branch_first;
-	}
-	
-      exp0 = TREE_OPERAND (exp, 0);
-      exp1 = TREE_OPERAND (exp, 1);
-      type = TREE_TYPE (exp0);
-      switch (TREE_CODE (type))
-	{
-	  int opf;
-	case POINTER_TYPE:  case RECORD_TYPE:
-	  switch (TREE_CODE (exp))
-	    {
-	    case EQ_EXPR:  op = OPCODE_if_acmpeq;  break;
-	    case NE_EXPR:  op = OPCODE_if_acmpne;  break;
-	    default:
-	      gcc_unreachable ();
-	    }
-	  if (integer_zerop (exp1) || integer_zerop (exp0))
-	    {
-	      generate_bytecode_insns (integer_zerop (exp0) ? exp1 : exp0,
-				       STACK_TARGET, state);
-	      op = op + (OPCODE_ifnull - OPCODE_if_acmpeq);
-	      negop = (op & 1) ? op - 1 : op + 1;
-	      NOTE_POP (1);
-	      goto compare_2_ptr;
-	    }
-	  generate_bytecode_insns (exp0, STACK_TARGET, state);
-	  generate_bytecode_insns (exp1, STACK_TARGET, state);
-	  NOTE_POP (2);
-	  goto compare_2;
-	case REAL_TYPE:
-	  generate_bytecode_insns (exp0, STACK_TARGET, state);
-	  generate_bytecode_insns (exp1, STACK_TARGET, state);
-	  if (op == OPCODE_if_icmplt || op == OPCODE_if_icmple)
-	    opf = OPCODE_fcmpg;
-	  else
-	    opf = OPCODE_fcmpl;
-	  if (TYPE_PRECISION (type) > 32)
-	    {
-	      opf += 2;
-	      NOTE_POP (4);
-	    }
-	  else
-	    NOTE_POP (2);
-	  RESERVE (1);
-	  OP1 (opf);
-	  goto compare_1;
-	case INTEGER_TYPE:
-	  if (TYPE_PRECISION (type) > 32)
-	    {
-	      generate_bytecode_insns (exp0, STACK_TARGET, state);
-	      generate_bytecode_insns (exp1, STACK_TARGET, state);
-	      NOTE_POP (4);
-	      RESERVE (1);
-	      OP1 (OPCODE_lcmp);
-	      goto compare_1;
-	    }
-	  /* FALLTHROUGH */
-	default:
-	  if (integer_zerop (exp1))
-	    {
-	      generate_bytecode_insns (exp0, STACK_TARGET, state);
-	      NOTE_POP (1);
-	      goto compare_1;
-	    }
-	  if (integer_zerop (exp0))
-	    {
-	      switch (op)
-		{
-		case OPCODE_if_icmplt:
-		case OPCODE_if_icmpge:
-		  op += 2;
-		  break;
-		case OPCODE_if_icmpgt:
-		case OPCODE_if_icmple:
-		  op -= 2;
-		  break;
-		default:
-		  break;
-		}
-	      generate_bytecode_insns (exp1, STACK_TARGET, state);
-	      NOTE_POP (1);
-	      goto compare_1;
-	    }
-	  generate_bytecode_insns (exp0, STACK_TARGET, state);
-	  generate_bytecode_insns (exp1, STACK_TARGET, state);
-	  NOTE_POP (2);
-	  goto compare_2;
-	}
-
-    default:
-      generate_bytecode_insns (exp, STACK_TARGET, state);
-      NOTE_POP (1);
-      if (true_branch_first)
-	{
-	  emit_if (false_label, OPCODE_ifeq, OPCODE_ifne, state);
-	  emit_goto (true_label, state);
-	}
-      else
-	{
-	  emit_if (true_label, OPCODE_ifne, OPCODE_ifeq, state);
-	  emit_goto (false_label, state);
-	}
-      break;
-    }
-  gcc_assert (save_SP == state->code_SP);
-}
-
-/* Call pending cleanups i.e. those for surrounding TRY_FINALLY_EXPRs.
-   but only as far out as LIMIT (since we are about to jump to the
-   emit label that is LIMIT). */
-
-static void
-call_cleanups (struct jcf_block *limit, struct jcf_partial *state)
-{
-  struct jcf_block *block = state->labeled_blocks;
-  for (;  block != limit;  block = block->next)
-    {
-      if (block->pc == PENDING_CLEANUP_PC)
-	emit_jsr (block, state);
-    }
-}
-
-static void
-generate_bytecode_return (tree exp, struct jcf_partial *state)
-{
-  tree return_type = TREE_TYPE (TREE_TYPE (state->current_method));
-  int returns_void = TREE_CODE (return_type) == VOID_TYPE;
-  int op;
- again:
-  if (exp != NULL)
-    {
-      switch (TREE_CODE (exp))
-	{
- 	case COMPOUND_EXPR:	
-	  generate_bytecode_insns (TREE_OPERAND (exp, 0), IGNORE_TARGET,
-				   state);
-	  exp = TREE_OPERAND (exp, 1);
-	  goto again;
-	case COND_EXPR:
-	  {
-	    struct jcf_block *then_label = gen_jcf_label (state);
-	    struct jcf_block *else_label = gen_jcf_label (state);
-	    generate_bytecode_conditional (TREE_OPERAND (exp, 0),
-					   then_label, else_label, 1, state);
-	    define_jcf_label (then_label, state);
-	    generate_bytecode_return (TREE_OPERAND (exp, 1), state);
-	    define_jcf_label (else_label, state);
-	    generate_bytecode_return (TREE_OPERAND (exp, 2), state);
-	  }
-	  return;
-	default:
-	  generate_bytecode_insns (exp,
-				   returns_void ? IGNORE_TARGET
-				   : STACK_TARGET, state);
-	}
-    }
-  if (returns_void)
-    {
-      op = OPCODE_return;
-      call_cleanups (NULL, state);
-    }
-  else
-    {
-      op = OPCODE_ireturn + adjust_typed_op (return_type, 4);
-      if (state->num_finalizers > 0)
-	{
-	  if (state->return_value_decl == NULL_TREE)
-	    {
-	      state->return_value_decl
-		= build_decl (VAR_DECL, NULL_TREE, TREE_TYPE (exp));
-	      localvar_alloc (state->return_value_decl, state);
-	    }
-	  emit_store (state->return_value_decl, state);
-	  call_cleanups (NULL, state);
-	  emit_load (state->return_value_decl, state);
-	  /* If we call maybe_free_localvar (state->return_value_decl, state, 1),
-	     then we risk the save decl erroneously re-used in the
-	     finalizer.  Instead, we keep the state->return_value_decl
-	     allocated through the rest of the method.  This is not
-	     the greatest solution, but it is at least simple and safe. */
-	}
-    }
-  RESERVE (1);
-  OP1 (op);
-}
-
-/* Generate bytecode for sub-expression EXP of METHOD.
-   TARGET is one of STACK_TARGET or IGNORE_TARGET. */
-
-static void
-generate_bytecode_insns (tree exp, int target, struct jcf_partial *state)
-{
-  tree type, arg;
-  enum java_opcode jopcode;
-  int op;
-  HOST_WIDE_INT value;
-  int post_op;
-  int size;
-  int offset;
-
-  if (exp == NULL && target == IGNORE_TARGET)
-    return;
-
-  type = TREE_TYPE (exp);
-
-  switch (TREE_CODE (exp))
-    {
-    case BLOCK:
-      if (BLOCK_EXPR_BODY (exp))
-	{
-	  tree local;
-	  tree body = BLOCK_EXPR_BODY (exp);
-	  long jsrs = state->num_jsrs;
-	  for (local = BLOCK_EXPR_DECLS (exp); local; )
-	    {
-	      tree next = TREE_CHAIN (local);
-	      localvar_alloc (local, state);
-	      local = next;
-	    }
-	  /* Avoid deep recursion for long blocks. */
-	  while (TREE_CODE (body) == COMPOUND_EXPR)
-	    {
-	      generate_bytecode_insns (TREE_OPERAND (body, 0), target, state);
-	      body = TREE_OPERAND (body, 1);
-	    }
-	  generate_bytecode_insns (body, target, state);
-	  
-	  for (local = BLOCK_EXPR_DECLS (exp); local; )
-	    {
-	      tree next = TREE_CHAIN (local);
-	      maybe_free_localvar (local, state, state->num_jsrs <= jsrs);
-	      local = next;
-	    }
-	}
-      break;
-    case COMPOUND_EXPR:	
-      generate_bytecode_insns (TREE_OPERAND (exp, 0), IGNORE_TARGET, state);
-      /* Normally the first operand to a COMPOUND_EXPR must complete
-	 normally.  However, in the special case of a do-while
-	 statement this is not necessarily the case.  */
-      if (CAN_COMPLETE_NORMALLY (TREE_OPERAND (exp, 0)))
-	generate_bytecode_insns (TREE_OPERAND (exp, 1), target, state);
-      break;
-    case EXPR_WITH_FILE_LOCATION:
-      {
-	location_t saved_location = input_location;
-	tree body = EXPR_WFL_NODE (exp);
-	if (IS_EMPTY_STMT (body))
-	  break;
-#ifdef USE_MAPPED_LOCATION
-	input_location = EXPR_LOCATION (exp);
-#else
-	input_filename = EXPR_WFL_FILENAME (exp);
-	input_line = EXPR_WFL_LINENO (exp);
-#endif
-	if (EXPR_WFL_EMIT_LINE_NOTE (exp) && input_line > 0
-	    && debug_info_level > DINFO_LEVEL_NONE)
-	  put_linenumber (input_line, state);
-	generate_bytecode_insns (body, target, state);
-	input_location = saved_location;
-      }
-      break;
-    case INTEGER_CST:
-      if (target == IGNORE_TARGET) ; /* do nothing */
-      else if (TREE_CODE (type) == POINTER_TYPE)
-	{
-	  gcc_assert (integer_zerop (exp));
-	  RESERVE(1);
-	  OP1 (OPCODE_aconst_null);
-	  NOTE_PUSH (1);
-	}
-      else if (TYPE_PRECISION (type) <= 32)
-	{
-	  push_int_const (TREE_INT_CST_LOW (exp), state);
-	  NOTE_PUSH (1);
-	}
-      else
-	{
-	  push_long_const (TREE_INT_CST_LOW (exp), TREE_INT_CST_HIGH (exp),
-			   state);
-	  NOTE_PUSH (2);
-	}
-      break;
-    case REAL_CST:
-      {
-	int prec = TYPE_PRECISION (type) >> 5;
-	RESERVE(1);
-	if (real_zerop (exp) && ! REAL_VALUE_MINUS_ZERO (TREE_REAL_CST (exp)))
-	  OP1 (prec == 1 ? OPCODE_fconst_0 : OPCODE_dconst_0);
-	else if (real_onep (exp))
-	  OP1 (prec == 1 ? OPCODE_fconst_1 : OPCODE_dconst_1);
-	else if (prec == 1 && real_twop (exp))
-	  OP1 (OPCODE_fconst_2);
-	/* ??? We could also use iconst_3/ldc followed by i2f/i2d
-	   for other float/double when the value is a small integer. */
-	else
-	  {
-	    offset = find_constant_index (exp, state);
-	    if (prec == 1)
-	      push_constant1 (offset, state);
-	    else
-	      push_constant2 (offset, state);
-	  }
-	NOTE_PUSH (prec);
-      }
-      break;
-    case STRING_CST:
-      push_constant1 (find_string_constant (&state->cpool, exp), state);
-      NOTE_PUSH (1);
-      break;
-    case VAR_DECL:
-      if (TREE_STATIC (exp))
-	{
-	  field_op (exp, OPCODE_getstatic, state);
-	  NOTE_PUSH (TYPE_IS_WIDE (TREE_TYPE (exp)) ? 2 : 1);
-	  break;
-	}
-      /* ... fall through ... */
-    case PARM_DECL:
-      emit_load (exp, state);
-      break;
-    case NON_LVALUE_EXPR:
-    case INDIRECT_REF:
-      generate_bytecode_insns (TREE_OPERAND (exp, 0), target, state);
-      break;
-    case ARRAY_REF:
-      generate_bytecode_insns (TREE_OPERAND (exp, 0), target, state);
-      generate_bytecode_insns (TREE_OPERAND (exp, 1), target, state);
-      if (target != IGNORE_TARGET)
-	{
-	  jopcode = OPCODE_iaload + adjust_typed_op (type, 7);
-	  RESERVE(1);
-	  OP1 (jopcode);
-	  if (! TYPE_IS_WIDE (type))
-	    NOTE_POP (1);
-	}
-      break;
-    case COMPONENT_REF:
-      {
-	tree obj = TREE_OPERAND (exp, 0);
-	tree field = TREE_OPERAND (exp, 1);
-	int is_static = FIELD_STATIC (field);
-	generate_bytecode_insns (obj,
-				 is_static ? IGNORE_TARGET : target, state);
-	if (target != IGNORE_TARGET)
-	  {
-	    if (DECL_NAME (field) == length_identifier_node && !is_static
-		&& TYPE_ARRAY_P (TREE_TYPE (obj)))
-	      {
-		RESERVE (1);
-		OP1 (OPCODE_arraylength);
-	      }
-	    else
-	      {
-		field_op (field, is_static ? OPCODE_getstatic : OPCODE_getfield,
-			  state);
-		if (! is_static)
-		  NOTE_POP (1);
-		NOTE_PUSH (TYPE_IS_WIDE (TREE_TYPE (field)) ? 2 : 1);
-	      }
-	  }
-      }
-      break;
-    case TRUTH_ANDIF_EXPR:
-    case TRUTH_ORIF_EXPR:
-    case EQ_EXPR:
-    case NE_EXPR:
-    case GT_EXPR:
-    case LT_EXPR:
-    case GE_EXPR:
-    case LE_EXPR:
-    case UNLT_EXPR:
-    case UNLE_EXPR:
-    case UNGT_EXPR:
-    case UNGE_EXPR:
-    case UNEQ_EXPR:
-    case LTGT_EXPR:
-      {
-	struct jcf_block *then_label = gen_jcf_label (state);
-	struct jcf_block *else_label = gen_jcf_label (state);
-	struct jcf_block *end_label = gen_jcf_label (state);
-	generate_bytecode_conditional (exp,
-				       then_label, else_label, 1, state);
-	define_jcf_label (then_label, state);
-	push_int_const (1, state);
-	emit_goto (end_label, state);
-	define_jcf_label (else_label, state);
-	push_int_const (0, state);
-	define_jcf_label (end_label, state);
-	NOTE_PUSH (1);
-      }
-      break;
-    case COND_EXPR:
-      {
-	struct jcf_block *then_label = gen_jcf_label (state);
-	struct jcf_block *else_label = gen_jcf_label (state);
-	struct jcf_block *end_label = gen_jcf_label (state);
-	generate_bytecode_conditional (TREE_OPERAND (exp, 0),
-				       then_label, else_label, 1, state);
-	define_jcf_label (then_label, state);
-	generate_bytecode_insns (TREE_OPERAND (exp, 1), target, state);
-	if (CAN_COMPLETE_NORMALLY (TREE_OPERAND (exp, 1))
-	    /* Not all expressions have CAN_COMPLETE_NORMALLY set properly. */
-	    || TREE_CODE (TREE_TYPE (exp)) != VOID_TYPE)
-	  emit_goto (end_label, state);
-	define_jcf_label (else_label, state);
-	generate_bytecode_insns (TREE_OPERAND (exp, 2), target, state);
-	define_jcf_label (end_label, state);
-	/* COND_EXPR can be used in a binop. The stack must be adjusted. */
-	if (TREE_TYPE (exp) != void_type_node)
-	  NOTE_POP (TYPE_IS_WIDE (TREE_TYPE (exp)) ? 2 : 1);
-      }
-      break;
-    case CASE_EXPR:
-      {
-	struct jcf_switch_state *sw_state = state->sw_state;
-	struct jcf_relocation *reloc
-	  = obstack_alloc (state->chunk_obstack, sizeof (struct jcf_relocation));
-	HOST_WIDE_INT case_value = TREE_INT_CST_LOW (TREE_OPERAND (exp, 0));
-	reloc->kind = 0;
-	reloc->label = get_jcf_label_here (state);
-	reloc->offset = case_value;
-	reloc->next = sw_state->cases;
-	sw_state->cases = reloc;
-	if (sw_state->num_cases == 0)
-	  {
-	    sw_state->min_case = case_value;
-	    sw_state->max_case = case_value;
-	  }
-	else
-	  {
-	    if (case_value < sw_state->min_case)
-	      sw_state->min_case = case_value;
-	    if (case_value > sw_state->max_case)
-	      sw_state->max_case = case_value;
-	  }
-	sw_state->num_cases++;
-      }
-      break;
-    case DEFAULT_EXPR:
-      state->sw_state->default_label = get_jcf_label_here (state);
-      break;
-
-    case SWITCH_EXPR:
-      {
-	/* The SWITCH_EXPR has three parts, generated in the following order:
-	   1.  the switch_expression (the value used to select the correct case);
-	   2.  the switch_body;
-	   3.  the switch_instruction (the tableswitch/loopupswitch instruction.).
-	   After code generation, we will re-order them in the order 1, 3, 2.
-	   This is to avoid any extra GOTOs. */
-	struct jcf_switch_state sw_state;
-	struct jcf_block *expression_last; /* Last block of the switch_expression. */
-	struct jcf_block *body_last; /* Last block of the switch_body. */
-	struct jcf_block *switch_instruction;  /* First block of switch_instruction. */
-	struct jcf_block *instruction_last; /* Last block of the switch_instruction. */
-	struct jcf_block *body_block;
-	int switch_length;
-	sw_state.prev = state->sw_state;
-	state->sw_state = &sw_state;
-	sw_state.cases = NULL;
-	sw_state.num_cases = 0;
-	sw_state.default_label = NULL;
-	generate_bytecode_insns (TREE_OPERAND (exp, 0), STACK_TARGET, state);
-	expression_last = state->last_block;
-	/* Force a new block here.  */
-	body_block = gen_jcf_label (state);
-	define_jcf_label (body_block, state);
-	generate_bytecode_insns (TREE_OPERAND (exp, 1), IGNORE_TARGET, state);
-	body_last = state->last_block;
-
-	switch_instruction = gen_jcf_label (state);
-	define_jcf_label (switch_instruction, state);
-	if (sw_state.default_label == NULL)
-	  sw_state.default_label = gen_jcf_label (state);
-
-	if (sw_state.num_cases <= 1)
-	  {
-	    if (sw_state.num_cases == 0)
-	      {
-		emit_pop (1, state);
-		NOTE_POP (1);
-	      }
-	    else
-	      {
-		push_int_const (sw_state.cases->offset, state);
-		NOTE_PUSH (1);
-		emit_if (sw_state.cases->label,
-			 OPCODE_if_icmpeq, OPCODE_if_icmpne, state);
-	      }
-	    emit_goto (sw_state.default_label, state);
-	  }
-	else
-	  {
-	    HOST_WIDE_INT i;
-	    unsigned HOST_WIDE_INT delta;
-	    /* Copy the chain of relocs into a sorted array. */
-	    struct jcf_relocation **relocs
-	      = XNEWVEC (struct jcf_relocation *, sw_state.num_cases);
-	    /* The relocs arrays is a buffer with a gap.
-	       The assumption is that cases will normally come in "runs". */
-	    int gap_start = 0;
-	    int gap_end = sw_state.num_cases;
-	    struct jcf_relocation *reloc;
-	    for (reloc = sw_state.cases;  reloc != NULL;  reloc = reloc->next)
-	      {
-		HOST_WIDE_INT case_value = reloc->offset;
-		while (gap_end < sw_state.num_cases)
-		  {
-		    struct jcf_relocation *end = relocs[gap_end];
-		    if (case_value <= end->offset)
-		      break;
-		    relocs[gap_start++] = end;
-		    gap_end++;
-		  }
-		while (gap_start > 0)
-		  {
-		    struct jcf_relocation *before = relocs[gap_start-1];
-		    if (case_value >= before->offset)
-		      break;
-		    relocs[--gap_end] = before;
-		    gap_start--;
-		  }
-		relocs[gap_start++] = reloc;
-		/* Note we don't check for duplicates.  This is
-		   handled by the parser.  */
-	      }
-
-	    /* We could have DELTA < 0 if sw_state.min_case is
-	       something like Integer.MIN_VALUE.  That is why delta is
-	       unsigned.  */
-	    delta = sw_state.max_case - sw_state.min_case;
-	    if (2 * (unsigned) sw_state.num_cases >= delta)
-	      { /* Use tableswitch. */
-		int index = 0;
-		RESERVE (13 + 4 * (sw_state.max_case - sw_state.min_case + 1));
-		OP1 (OPCODE_tableswitch);
-		emit_reloc (RELOCATION_VALUE_0, 
-			    SWITCH_ALIGN_RELOC, NULL, state);
-		emit_switch_reloc (sw_state.default_label, state);
-		OP4 (sw_state.min_case);
-		OP4 (sw_state.max_case);
-		for (i = sw_state.min_case; ; )
-		  {
-		    reloc = relocs[index];
-		    if (i == reloc->offset)
-		      {
-			emit_case_reloc (reloc, state);
-			if (i == sw_state.max_case)
-			  break;
-			index++;
-		      }
-		    else
-		      emit_switch_reloc (sw_state.default_label, state);
-		    i++;
-		  }
-	      }
-	    else
-	      { /* Use lookupswitch. */
-		RESERVE(9 + 8 * sw_state.num_cases);
-		OP1 (OPCODE_lookupswitch);
-		emit_reloc (RELOCATION_VALUE_0,
-			    SWITCH_ALIGN_RELOC, NULL, state);
-		emit_switch_reloc (sw_state.default_label, state);
-		OP4 (sw_state.num_cases);
-		for (i = 0;  i < sw_state.num_cases;  i++)
-		  {
-		    struct jcf_relocation *reloc = relocs[i];
-		    OP4 (reloc->offset);
-		    emit_case_reloc (reloc, state);
-		  }
-	      }
-	    free (relocs);
-	  }
-
-	instruction_last = state->last_block;
-	if (sw_state.default_label->pc < 0)
-	  define_jcf_label (sw_state.default_label, state);
-	else /* Force a new block. */
-	  sw_state.default_label = get_jcf_label_here (state);
-	/* Now re-arrange the blocks so the switch_instruction
-	   comes before the switch_body. */
-	switch_length = state->code_length - switch_instruction->pc;
-	switch_instruction->pc = body_block->pc;
-	instruction_last->next = body_block;
-	instruction_last->v.chunk->next = body_block->v.chunk;
-	expression_last->next = switch_instruction;
-	expression_last->v.chunk->next = switch_instruction->v.chunk;
-	body_last->next = sw_state.default_label;
-	body_last->v.chunk->next = NULL;
-	state->chunk = body_last->v.chunk;
-	for (;  body_block != sw_state.default_label;  body_block = body_block->next)
-	  body_block->pc += switch_length;
-
-	state->sw_state = sw_state.prev;
-	break;
-      }
-
-    case RETURN_EXPR:
-      exp = TREE_OPERAND (exp, 0);
-      if (exp == NULL_TREE)
-	exp = build_java_empty_stmt ();
-      else if (TREE_CODE (exp) != MODIFY_EXPR) 
-	gcc_unreachable ();
-      else
-	exp = TREE_OPERAND (exp, 1);
-      generate_bytecode_return (exp, state);
-      break;
-    case LABELED_BLOCK_EXPR:
-      {
-	struct jcf_block *end_label = gen_jcf_label (state);
-	end_label->next = state->labeled_blocks;
-	state->labeled_blocks = end_label;
-	end_label->pc = PENDING_EXIT_PC;
-	end_label->u.labeled_block = exp;
-	if (LABELED_BLOCK_BODY (exp))
-	  generate_bytecode_insns (LABELED_BLOCK_BODY (exp), target, state);
-	gcc_assert (state->labeled_blocks == end_label);
-	state->labeled_blocks = end_label->next;
-	define_jcf_label (end_label, state);
-      }
-      break;
-    case LOOP_EXPR:
-      {
-	tree body = TREE_OPERAND (exp, 0);
-#if 0
-	if (TREE_CODE (body) == COMPOUND_EXPR
-	    && TREE_CODE (TREE_OPERAND (body, 0)) == EXIT_EXPR)
-	  {
-	    /* Optimize:  H: if (TEST) GOTO L; BODY; GOTO H; L:
-	       to:  GOTO L;  BODY;  L:  if (!TEST) GOTO L; */
-	    struct jcf_block *head_label;
-	    struct jcf_block *body_label;
-	    struct jcf_block *end_label = gen_jcf_label (state);
-	    struct jcf_block *exit_label = state->labeled_blocks;
-	    head_label = gen_jcf_label (state);
-	    emit_goto (head_label, state);
-	    body_label = get_jcf_label_here (state);
-	    generate_bytecode_insns (TREE_OPERAND (body, 1), target, state);
-	    define_jcf_label (head_label, state);
-	    generate_bytecode_conditional (TREE_OPERAND (body, 0),
-					   end_label, body_label, 1, state);
-	    define_jcf_label (end_label, state);
-	  }
-	else
-#endif
-	  {
-	    struct jcf_block *head_label = get_jcf_label_here (state);
-	    generate_bytecode_insns (body, IGNORE_TARGET, state);
-	    if (CAN_COMPLETE_NORMALLY (body))
-	      emit_goto (head_label, state);
-	  }
-      }
-      break;
-    case EXIT_EXPR:
-      {
-	struct jcf_block *label = state->labeled_blocks;
-	struct jcf_block *end_label = gen_jcf_label (state);
-	generate_bytecode_conditional (TREE_OPERAND (exp, 0),
-				       label, end_label, 0, state);
-	define_jcf_label (end_label, state);
-      }
-      break;
-    case EXIT_BLOCK_EXPR:
-      {
-	struct jcf_block *label = state->labeled_blocks;
-	while (label->u.labeled_block != EXIT_BLOCK_LABELED_BLOCK (exp))
-	  label = label->next;
-	call_cleanups (label, state);
-	emit_goto (label, state);
-      }
-      break;
-
-    case PREDECREMENT_EXPR:  value = -1; post_op = 0;  goto increment;
-    case PREINCREMENT_EXPR:  value =  1; post_op = 0;  goto increment;
-    case POSTDECREMENT_EXPR: value = -1; post_op = 1;  goto increment;
-    case POSTINCREMENT_EXPR: value =  1; post_op = 1;  goto increment;
-    increment:
-
-      arg = TREE_OPERAND (exp, 1);
-      exp = TREE_OPERAND (exp, 0);
-      type = TREE_TYPE (exp);
-      size = TYPE_IS_WIDE (type) ? 2 : 1;
-      if ((TREE_CODE (exp) == VAR_DECL || TREE_CODE (exp) == PARM_DECL)
-	  && ! TREE_STATIC (exp)
-	  && TREE_CODE (type) == INTEGER_TYPE
-	  && TYPE_PRECISION (type) == 32)
-	{
-	  if (target != IGNORE_TARGET && post_op)
-	    emit_load (exp, state);
-	  emit_iinc (exp, value, state);
-	  if (target != IGNORE_TARGET && ! post_op)
-	    emit_load (exp, state);
-	  break;
-	}
-      if (TREE_CODE (exp) == COMPONENT_REF)
-	{
-	  generate_bytecode_insns (TREE_OPERAND (exp, 0), STACK_TARGET, state);
-	  emit_dup (1, 0, state);
-	  /* Stack:  ..., objectref, objectref. */
-	  field_op (TREE_OPERAND (exp, 1), OPCODE_getfield, state);
-	  NOTE_PUSH (size-1);
-	  /* Stack:  ..., objectref, oldvalue. */
-	  offset = 1;
-	}
-      else if (TREE_CODE (exp) == ARRAY_REF)
-	{
-	  generate_bytecode_insns (TREE_OPERAND (exp, 0), STACK_TARGET, state);
-	  generate_bytecode_insns (TREE_OPERAND (exp, 1), STACK_TARGET, state);
-	  emit_dup (2, 0, state);
-	  /* Stack:  ..., array, index, array, index. */
-	  jopcode = OPCODE_iaload + adjust_typed_op (TREE_TYPE (exp), 7);
-	  RESERVE(1);
-	  OP1 (jopcode);
-	  NOTE_POP (2-size);
-	  /* Stack:  ..., array, index, oldvalue. */
-	  offset = 2;
-	}
-      else if (TREE_CODE (exp) == VAR_DECL || TREE_CODE (exp) == PARM_DECL)
-	{
-	  generate_bytecode_insns (exp, STACK_TARGET, state);
-	  /* Stack:  ..., oldvalue. */
-	  offset = 0;
-	}
-      else
-	gcc_unreachable ();
-
-      if (target != IGNORE_TARGET && post_op)
-	emit_dup (size, offset, state);
-      /* Stack, if ARRAY_REF:  ..., [result, ] array, index, oldvalue. */
-      /* Stack, if COMPONENT_REF:  ..., [result, ] objectref, oldvalue. */
-      /* Stack, otherwise:  ..., [result, ] oldvalue. */
-      generate_bytecode_insns (arg, STACK_TARGET, state);
-      emit_binop ((value >= 0 ? OPCODE_iadd : OPCODE_isub)
-		  + adjust_typed_op (type, 3),
-		  type, state);
-      if (target != IGNORE_TARGET && ! post_op)
-	emit_dup (size, offset, state);
-      /* Stack, if ARRAY_REF:  ..., [result, ] array, index, newvalue. */
-      /* Stack, if COMPONENT_REF:  ..., [result, ] objectref, newvalue. */
-      /* Stack, otherwise:  ..., [result, ] newvalue. */
-      goto finish_assignment;
-
-    case MODIFY_EXPR:
-      {
-	tree lhs = TREE_OPERAND (exp, 0);
-	tree rhs = TREE_OPERAND (exp, 1);
-	int offset = 0;
-
-	/* See if we can use the iinc instruction. */
-	if ((TREE_CODE (lhs) == VAR_DECL || TREE_CODE (lhs) == PARM_DECL)
-	    && ! TREE_STATIC (lhs)
-	    && TREE_CODE (TREE_TYPE (lhs)) == INTEGER_TYPE
-	    && TYPE_PRECISION (TREE_TYPE (lhs)) == 32
-	    && (TREE_CODE (rhs) == PLUS_EXPR || TREE_CODE (rhs) == MINUS_EXPR))
-	  {
-	    tree arg0 = TREE_OPERAND (rhs, 0);
-	    tree arg1 = TREE_OPERAND (rhs, 1);
-	    HOST_WIDE_INT min_value = -32768;
-	    HOST_WIDE_INT max_value = 32767;
-	    if (TREE_CODE (rhs) == MINUS_EXPR)
-	      {
-		min_value++;
-		max_value++;
-	      }
-	    else if (arg1 == lhs)
-	      {
-		arg0 = arg1;
-		arg1 = TREE_OPERAND (rhs, 0);
-	      }
-	    if (lhs == arg0 && TREE_CODE (arg1) == INTEGER_CST)
-	      {
-		HOST_WIDE_INT hi_value = TREE_INT_CST_HIGH (arg1);
-		value = TREE_INT_CST_LOW (arg1);
-		if ((hi_value == 0 && value <= max_value)
-		    || (hi_value == -1 && value >= min_value))
-		  {
-		    if (TREE_CODE (rhs) == MINUS_EXPR)
-		      value = -value;
-		    emit_iinc (lhs, value, state);
-		    if (target != IGNORE_TARGET)
-		      emit_load (lhs, state);
-		    break;
-		  }
-	      }
-	  }
-
-	if (TREE_CODE (lhs) == COMPONENT_REF)
-	  {
-	    generate_bytecode_insns (TREE_OPERAND (lhs, 0),
-				     STACK_TARGET, state);
-	    offset = 1;
-	  }
-	else if (TREE_CODE (lhs) == ARRAY_REF)
-	  {
-	    generate_bytecode_insns (TREE_OPERAND(lhs, 0),
-				     STACK_TARGET, state);
-	    generate_bytecode_insns (TREE_OPERAND(lhs, 1),
-				     STACK_TARGET, state);
-	    offset = 2;
-	  }
-	else
-	  offset = 0;
-
-	/* If the rhs is a binary expression and the left operand is
-	   `==' to the lhs then we have an OP= expression.  In this
-	   case we must do some special processing.  */
-	if (BINARY_CLASS_P (rhs) && lhs == TREE_OPERAND (rhs, 0))
-	  {
-	    if (TREE_CODE (lhs) == COMPONENT_REF)
-	      {
-		tree field = TREE_OPERAND (lhs, 1);
-		if (! FIELD_STATIC (field))
-		  {
-		    /* Duplicate the object reference so we can get
-		       the field.  */
-		    emit_dup (TYPE_IS_WIDE (field) ? 2 : 1, 0, state);
-		    NOTE_POP (1);
-		  }
-		field_op (field, (FIELD_STATIC (field)
-				  ? OPCODE_getstatic
-				  : OPCODE_getfield),
-			  state);
-
-		NOTE_PUSH (TYPE_IS_WIDE (TREE_TYPE (field)) ? 2 : 1);
-	      }
-	    else if (TREE_CODE (lhs) == VAR_DECL
-		     || TREE_CODE (lhs) == PARM_DECL)
-	      {
-		if (FIELD_STATIC (lhs))
-		  {
-		    field_op (lhs, OPCODE_getstatic, state);
-		    NOTE_PUSH (TYPE_IS_WIDE (TREE_TYPE (lhs)) ? 2 : 1);
-		  }
-		else
-		  emit_load (lhs, state);
-	      }
-	    else if (TREE_CODE (lhs) == ARRAY_REF)
-	      {
-		/* Duplicate the array and index, which are on the
-		   stack, so that we can load the old value.  */
-		emit_dup (2, 0, state);
-		NOTE_POP (2);
-		jopcode = OPCODE_iaload + adjust_typed_op (TREE_TYPE (lhs), 7);
-		RESERVE (1);
-		OP1 (jopcode);
-		NOTE_PUSH (TYPE_IS_WIDE (TREE_TYPE (lhs)) ? 2 : 1);
-	      }
-	    else
-	      gcc_unreachable ();
-
-	    /* This function correctly handles the case where the LHS
-	       of a binary expression is NULL_TREE.  */
-	    rhs = build2 (TREE_CODE (rhs), TREE_TYPE (rhs),
-			  NULL_TREE, TREE_OPERAND (rhs, 1));
-	  }
-
-	generate_bytecode_insns (rhs, STACK_TARGET, state);
-	if (target != IGNORE_TARGET)
-	  emit_dup (TYPE_IS_WIDE (type) ? 2 : 1 , offset, state);
-	exp = lhs;
-      }
-      /* FALLTHROUGH */
-
-    finish_assignment:
-      if (TREE_CODE (exp) == COMPONENT_REF)
-	{
-	  tree field = TREE_OPERAND (exp, 1);
-	  if (! FIELD_STATIC (field))
-	    NOTE_POP (1);
-	  field_op (field,
-		    FIELD_STATIC (field) ? OPCODE_putstatic : OPCODE_putfield,
-		    state);
-
-	  NOTE_POP (TYPE_IS_WIDE (TREE_TYPE (field)) ? 2 : 1);
-	}
-      else if (TREE_CODE (exp) == VAR_DECL
-	       || TREE_CODE (exp) == PARM_DECL)
-	{
-	  if (FIELD_STATIC (exp))
-	    {
-	      field_op (exp, OPCODE_putstatic, state);
-	      NOTE_POP (TYPE_IS_WIDE (TREE_TYPE (exp)) ? 2 : 1);
-	    }
-	  else
-	    emit_store (exp, state);
-	}
-      else if (TREE_CODE (exp) == ARRAY_REF)
-	{
-	  jopcode = OPCODE_iastore + adjust_typed_op (TREE_TYPE (exp), 7);
-	  RESERVE (1);
-	  OP1 (jopcode);
-	  NOTE_POP (TYPE_IS_WIDE (TREE_TYPE (exp)) ? 4 : 3);
-	}
-      else
-	gcc_unreachable ();
-      break;
-    case PLUS_EXPR:
-      jopcode = OPCODE_iadd;
-      goto binop;
-    case MINUS_EXPR:
-      jopcode = OPCODE_isub;
-      goto binop;
-    case MULT_EXPR:
-      jopcode = OPCODE_imul;
-      goto binop;
-    case TRUNC_DIV_EXPR:
-    case RDIV_EXPR:
-      jopcode = OPCODE_idiv;
-      goto binop;
-    case TRUNC_MOD_EXPR:
-      jopcode = OPCODE_irem;
-      goto binop;
-    case LSHIFT_EXPR:   jopcode = OPCODE_ishl;   goto binop;
-    case RSHIFT_EXPR:
-      jopcode = TYPE_UNSIGNED (type) ? OPCODE_iushr : OPCODE_ishr;
-      goto binop;
-    case URSHIFT_EXPR:  jopcode = OPCODE_iushr;  goto binop;
-    case TRUTH_AND_EXPR:
-    case BIT_AND_EXPR:  jopcode = OPCODE_iand;   goto binop;
-    case TRUTH_OR_EXPR:
-    case BIT_IOR_EXPR:  jopcode = OPCODE_ior;    goto binop;
-    case TRUTH_XOR_EXPR:
-    case BIT_XOR_EXPR:  jopcode = OPCODE_ixor;   goto binop;
-    binop:
-    {
-      tree arg0 = TREE_OPERAND (exp, 0);
-      tree arg1 = TREE_OPERAND (exp, 1);
-      jopcode += adjust_typed_op (type, 3);
-      if (arg0 != NULL_TREE && operand_equal_p (arg0, arg1, 0))
-	{
-	  /* fold may (e.g) convert 2*x to x+x. */
-	  generate_bytecode_insns (arg0, target, state);
-	  emit_dup (TYPE_PRECISION (TREE_TYPE (arg0)) > 32 ? 2 : 1, 0, state);
-	}
-      else
-	{
-	  /* ARG0 will be NULL_TREE if we're handling an `OP='
-	     expression.  In this case the stack already holds the
-	     LHS.  See the MODIFY_EXPR case.  */
-	  if (arg0 != NULL_TREE)
-	    generate_bytecode_insns (arg0, target, state);
-	  if (jopcode >= OPCODE_lshl && jopcode <= OPCODE_lushr)
-	    arg1 = convert (int_type_node, arg1);
-	  generate_bytecode_insns (arg1, target, state);
-	}
-      /* For most binary operations, both operands and the result have the
-	 same type.  Shift operations are different.  Using arg1's type
-	 gets us the correct SP adjustment in all cases. */
-      if (target == STACK_TARGET)
-	emit_binop (jopcode, TREE_TYPE (arg1), state);
-      break;
-    }
-    case TRUTH_NOT_EXPR:
-    case BIT_NOT_EXPR:
-      generate_bytecode_insns (TREE_OPERAND (exp, 0), target, state);
-      if (target == STACK_TARGET)
-	{
-	  int is_long = TYPE_PRECISION (TREE_TYPE (exp)) > 32;
-	  push_int_const (TREE_CODE (exp) == BIT_NOT_EXPR ? -1 : 1, state); 
-	  RESERVE (2);
-	  if (is_long)
-	    OP1 (OPCODE_i2l);
-	  NOTE_PUSH (1 + is_long);
-	  OP1 (OPCODE_ixor + is_long);
-	  NOTE_POP (1 + is_long);
-	}
-      break;
-    case NEGATE_EXPR:
-      jopcode = OPCODE_ineg;
-      jopcode += adjust_typed_op (type, 3);
-      generate_bytecode_insns (TREE_OPERAND (exp, 0), target, state);
-      if (target == STACK_TARGET)
-	emit_unop (jopcode, type, state);
-      break;
-    case INSTANCEOF_EXPR:
-      {
-	int index = find_class_constant (&state->cpool, TREE_OPERAND (exp, 1));
-	generate_bytecode_insns (TREE_OPERAND (exp, 0), target, state);
-	RESERVE (3);
-	OP1 (OPCODE_instanceof);
-	OP2 (index);
-      }
-      break;
-    case SAVE_EXPR:
-      /* The first time through, the argument of the SAVE_EXPR will be
-	 something complex.  Evaluate it, and replace the argument with
-	 a VAR_DECL that holds the result.  */
-      arg = TREE_OPERAND (exp, 0);
-      if (TREE_CODE (arg) != VAR_DECL || DECL_NAME (arg))
-	{
-	  tree type = TREE_TYPE (exp);
-	  tree decl = build_decl (VAR_DECL, NULL_TREE, type);
-	  generate_bytecode_insns (arg, STACK_TARGET, state);
-	  localvar_alloc (decl, state);
-	  TREE_OPERAND (exp, 0) = decl;
-	  emit_dup (TYPE_IS_WIDE (type) ? 2 : 1, 0, state);
-	  emit_store (decl, state);
-	}
-      else
-	{
-	  emit_load (arg, state);
-	}
-      break;
-    case CONVERT_EXPR:
-    case NOP_EXPR:
-    case FLOAT_EXPR:
-    case FIX_TRUNC_EXPR:
-      {
-	tree src = TREE_OPERAND (exp, 0);
-	tree src_type = TREE_TYPE (src);
-	tree dst_type = TREE_TYPE (exp);
-	generate_bytecode_insns (TREE_OPERAND (exp, 0), target, state);
-	if (target == IGNORE_TARGET || src_type == dst_type)
-	  break;
-	if (TREE_CODE (dst_type) == POINTER_TYPE)
-	  {
-	    if (TREE_CODE (exp) == CONVERT_EXPR)
-	      {
-		int index = find_class_constant (&state->cpool, 
-						 TREE_TYPE (dst_type));
-		RESERVE (3);
-		OP1 (OPCODE_checkcast);
-		OP2 (index);
-	      }
-	  }
-	else /* Convert numeric types. */
-	  {
-	    int src_prec = TYPE_PRECISION (src_type);
-	    int dst_prec = TYPE_PRECISION (dst_type);
-	    int wide_src = src_prec > 32;
-	    int wide_dst = dst_prec > 32;
-	    if (TREE_CODE (dst_type) == REAL_TYPE)
-	      {
-		NOTE_POP (1 + wide_src);
-		RESERVE (1);
-		if (TREE_CODE (src_type) == REAL_TYPE)
-		  OP1 (wide_dst ? OPCODE_f2d : OPCODE_d2f);
-		else if (src_prec == 64)
-		  OP1 (OPCODE_l2f + wide_dst);
-		else
-		  OP1 (OPCODE_i2f + wide_dst);
-		NOTE_PUSH (1 + wide_dst);
-	      }
-	    /* Convert to integral type (but ignore non-widening
-	       and non-narrowing integer type conversions).  */
-	    else if (TREE_CODE (src_type) == REAL_TYPE
-		     || src_prec != dst_prec)
-	      {
-		NOTE_POP (1 + wide_src);
-		RESERVE (1);
-		if (TREE_CODE (src_type) == REAL_TYPE)
-		  OP1 (OPCODE_f2i + wide_dst + 3 * wide_src);
-		else if (wide_dst)
-		  OP1 (OPCODE_i2l);
-		else if (wide_src)
-		  OP1 (OPCODE_l2i);
-		if (dst_prec < 32)
-		  {
-		    RESERVE (1);
-		    /* Already converted to int, if needed. */
-		    if (dst_prec <= 8)
-		      OP1 (OPCODE_i2b);
-		    else if (TYPE_UNSIGNED (dst_type))
-		      OP1 (OPCODE_i2c);
-		    else
-		      OP1 (OPCODE_i2s);
-		  }
-		NOTE_PUSH (1 + wide_dst);
-	      }
-	  }
-      }
-      break;
-
-    case TRY_EXPR:
-      {
-	tree try_clause = TREE_OPERAND (exp, 0);
-	struct jcf_block *start_label = get_jcf_label_here (state);
-	struct jcf_block *end_label;  /* End of try clause. */
-	struct jcf_block *finished_label = gen_jcf_label (state);
-	tree clause = TREE_OPERAND (exp, 1);
-	gcc_assert (target == IGNORE_TARGET);
-	generate_bytecode_insns (try_clause, IGNORE_TARGET, state);
-	end_label = get_jcf_label_here (state);
-	if (end_label == start_label)
-	  break;
-	if (CAN_COMPLETE_NORMALLY (try_clause))
-	  emit_goto (finished_label, state);
-	while (clause != NULL_TREE)
-	  {
-	    tree catch_clause = TREE_OPERAND (clause, 0);
-	    tree exception_decl = BLOCK_EXPR_DECLS (catch_clause);
-	    struct jcf_handler *handler = alloc_handler (start_label,
-							 end_label, state);
-	    if (exception_decl == NULL_TREE)
-	      handler->type = NULL_TREE;
-	    else
-	      handler->type = TREE_TYPE (TREE_TYPE (exception_decl));
-	    generate_bytecode_insns (catch_clause, IGNORE_TARGET, state);
-	    clause = TREE_CHAIN (clause);
-	    if (CAN_COMPLETE_NORMALLY (catch_clause) && clause != NULL_TREE)
-	      emit_goto (finished_label, state);
-	  }
-	define_jcf_label (finished_label, state);
-      }
-      break;
-
-    case TRY_FINALLY_EXPR:
-      {
-	struct jcf_block *finished_label = NULL;
-	struct jcf_block *finally_label, *start_label, *end_label;
-	struct jcf_handler *handler;
-	tree try_block = TREE_OPERAND (exp, 0);
-	tree finally = TREE_OPERAND (exp, 1);
-	tree return_link = NULL_TREE, exception_decl = NULL_TREE;
-
-	tree exception_type;
-
-	finally_label = gen_jcf_label (state);
-	start_label = get_jcf_label_here (state);
-	/* If the `finally' clause can complete normally, we emit it
-	   as a subroutine and let the other clauses call it via
-	   `jsr'.  If it can't complete normally, then we simply emit
-	   `goto's directly to it.  */
-	if (CAN_COMPLETE_NORMALLY (finally))
-	  {
-	    finally_label->pc = PENDING_CLEANUP_PC;
-	    finally_label->next = state->labeled_blocks;
-	    state->labeled_blocks = finally_label;
-	    state->num_finalizers++;
-	  }
-
-	generate_bytecode_insns (try_block, target, state);
-
-	if (CAN_COMPLETE_NORMALLY (finally))
-	  {
-	    gcc_assert (state->labeled_blocks == finally_label);
-	    state->labeled_blocks = finally_label->next;
-	  }
-	end_label = get_jcf_label_here (state);
-
-	if (end_label == start_label)
-	  {
-	    state->num_finalizers--;
-	    define_jcf_label (finally_label, state);
-	    generate_bytecode_insns (finally, IGNORE_TARGET, state);
-	    break;
-	  }
-
-	if (CAN_COMPLETE_NORMALLY (finally))
-	  {
-	    return_link = build_decl (VAR_DECL, NULL_TREE,
-				      return_address_type_node);
-	    finished_label = gen_jcf_label (state);
-	  }
-
-	if (CAN_COMPLETE_NORMALLY (try_block))
-	  {
-	    if (CAN_COMPLETE_NORMALLY (finally))
-	      {
-		emit_jsr (finally_label, state);
-		emit_goto (finished_label, state);
-	      }
-	    else
-	      emit_goto (finally_label, state);
-	  }
-
-	/* Handle exceptions.  */
-
-	exception_type = build_pointer_type (throwable_type_node);
-	if (CAN_COMPLETE_NORMALLY (finally))
-	  {
-	    /* We're going to generate a subroutine, so we'll need to
-	       save and restore the exception around the `jsr'.  */ 
-	    exception_decl = build_decl (VAR_DECL, NULL_TREE, exception_type);
-	    localvar_alloc (return_link, state);
-	  }
-	handler = alloc_handler (start_label, end_label, state);
-	handler->type = NULL_TREE;
-	if (CAN_COMPLETE_NORMALLY (finally))
-	  {
-	    localvar_alloc (exception_decl, state);
-	    NOTE_PUSH (1);
-	    emit_store (exception_decl, state);
-	    emit_jsr (finally_label, state);
-	    emit_load (exception_decl, state);
-	    RESERVE (1);
-	    OP1 (OPCODE_athrow);
-	    NOTE_POP (1);
-	  }
-	else
-	  {
-	    /* We're not generating a subroutine.  In this case we can
-	       simply have the exception handler pop the exception and
-	       then fall through to the `finally' block.  */
-	    NOTE_PUSH (1);
-	    emit_pop (1, state);
-	    NOTE_POP (1);
-	  }
-
-	/* The finally block.  If we're generating a subroutine, first
-	   save return PC into return_link.  Otherwise, just generate
-	   the code for the `finally' block.  */
-	define_jcf_label (finally_label, state);
-	if (CAN_COMPLETE_NORMALLY (finally))
-	  {
-	    NOTE_PUSH (1);
-	    emit_store (return_link, state);
-	  }
-
-	generate_bytecode_insns (finally, IGNORE_TARGET, state);
-	if (CAN_COMPLETE_NORMALLY (finally))
-	  {
-	    maybe_wide (OPCODE_ret, DECL_LOCAL_INDEX (return_link), state);
-	    maybe_free_localvar (exception_decl, state, 1);
-	    maybe_free_localvar (return_link, state, 1);
-	    define_jcf_label (finished_label, state);
-	  }
-      }
-      break;
-    case THROW_EXPR:
-      generate_bytecode_insns (TREE_OPERAND (exp, 0), STACK_TARGET, state);
-      RESERVE (1);
-      OP1 (OPCODE_athrow);
-      break;
-    case NEW_ARRAY_INIT:
-      {
-	VEC(constructor_elt,gc) *v = CONSTRUCTOR_ELTS (TREE_OPERAND (exp, 0));
-	tree array_type = TREE_TYPE (TREE_TYPE (exp));
-	tree element_type = TYPE_ARRAY_ELEMENT (array_type);
-	unsigned HOST_WIDE_INT idx;
-	tree value;
-	HOST_WIDE_INT length = java_array_type_length (array_type);
-	if (target == IGNORE_TARGET)
-	  {
-	    FOR_EACH_CONSTRUCTOR_VALUE (v, idx, value)
-	      generate_bytecode_insns (value, target, state);
-	    break;
-	  }
-	push_int_const (length, state);
-	NOTE_PUSH (1);
-	RESERVE (3);
-	if (JPRIMITIVE_TYPE_P (element_type))
-	  {
-	    int atype = encode_newarray_type (element_type);
-	    OP1 (OPCODE_newarray);
-	    OP1 (atype);
-	  }
-	else
-	  {
-	    int index = find_class_constant (&state->cpool,
-					     TREE_TYPE (element_type));
-	    OP1 (OPCODE_anewarray);
-	    OP2 (index);
-	  }
-	offset = 0;
-	jopcode = OPCODE_iastore + adjust_typed_op (element_type, 7);
-	FOR_EACH_CONSTRUCTOR_VALUE (v, idx, value)
-	  {
-	    int save_SP = state->code_SP;
-	    emit_dup (1, 0, state);
-	    push_int_const (offset, state);
-	    NOTE_PUSH (1);
-	    generate_bytecode_insns (value, STACK_TARGET, state);
-	    RESERVE (1);
-	    OP1 (jopcode);
-	    state->code_SP = save_SP;
-	    offset++;
-	  }
-      }
-      break;
-    case JAVA_EXC_OBJ_EXPR:
-      NOTE_PUSH (1);  /* Pushed by exception system. */
-      break;
-    case MIN_EXPR:
-    case MAX_EXPR:
-      {
-	/* This copes with cases where fold() has created MIN or MAX
-	   from a conditional expression.  */
-	enum tree_code code = TREE_CODE (exp) == MIN_EXPR ? LT_EXPR : GT_EXPR;
-	tree op0 = TREE_OPERAND (exp, 0);
-	tree op1 = TREE_OPERAND (exp, 1);
-	tree x;
-	gcc_assert (! TREE_SIDE_EFFECTS (op0) && ! TREE_SIDE_EFFECTS (op1));
-	x = build3 (COND_EXPR, TREE_TYPE (exp), 
-		    build2 (code, boolean_type_node, op0, op1), 
-		    op0, op1);	  
-	generate_bytecode_insns (x, target, state);
-	break;
-      }					     
-    case NEW_CLASS_EXPR:
-      {
-	tree class = TREE_TYPE (TREE_TYPE (exp));
-	int need_result = target != IGNORE_TARGET;
-	int index = find_class_constant (&state->cpool, class);
-	RESERVE (4);
-	OP1 (OPCODE_new);
-	OP2 (index);
-	if (need_result)
-	  OP1 (OPCODE_dup);
-	NOTE_PUSH (1 + need_result);
-      }
-      /* ... fall though ... */
-    case CALL_EXPR:
-      {
-	tree f = TREE_OPERAND (exp, 0);
-	tree x = TREE_OPERAND (exp, 1);
-	int save_SP = state->code_SP;
-	int nargs;
-	if (TREE_CODE (f) == ADDR_EXPR)
-	  f = TREE_OPERAND (f, 0);
-	if (f == soft_newarray_node)
-	  {
-	    int type_code = TREE_INT_CST_LOW (TREE_VALUE (x));
-	    generate_bytecode_insns (TREE_VALUE (TREE_CHAIN (x)),
-				     STACK_TARGET, state);
-	    RESERVE (2);
-	    OP1 (OPCODE_newarray);
-	    OP1 (type_code);
-	    break;
-	  }
-	else if (f == soft_multianewarray_node)
-	  {
-	    int ndims;
-	    int idim;
-	    int index = find_class_constant (&state->cpool,
-					     TREE_TYPE (TREE_TYPE (exp)));
-	    x = TREE_CHAIN (x);  /* Skip class argument. */
-	    ndims = TREE_INT_CST_LOW (TREE_VALUE (x));
-	    for (idim = ndims;  --idim >= 0; )
-	      {
-		x = TREE_CHAIN (x);
-		generate_bytecode_insns (TREE_VALUE (x), STACK_TARGET, state);
-	      }
-	    RESERVE (4);
-	    OP1 (OPCODE_multianewarray);
-	    OP2 (index);
-	    OP1 (ndims);
-	    NOTE_POP (ndims - 1);
-	    break;
-	  }
-	else if (f == soft_anewarray_node)
-	  {
-	    tree cl = TYPE_ARRAY_ELEMENT (TREE_TYPE (TREE_TYPE (exp)));
-	    int index = find_class_constant (&state->cpool, TREE_TYPE (cl));
-	    generate_bytecode_insns (TREE_VALUE (x), STACK_TARGET, state);
-	    RESERVE (3);
-	    OP1 (OPCODE_anewarray);
-	    OP2 (index);
-	    break;
-	  }
-	else if (f == soft_monitorenter_node
-		 || f == soft_monitorexit_node
-		 || f == throw_node)
-	  {
-	    if (f == soft_monitorenter_node)
-	      op = OPCODE_monitorenter;
-	    else if (f == soft_monitorexit_node)
-	      op = OPCODE_monitorexit;
-	    else
-	      op = OPCODE_athrow;
-	    generate_bytecode_insns (TREE_VALUE (x), STACK_TARGET, state);
-	    RESERVE (1);
-	    OP1 (op);
-	    NOTE_POP (1);
-	    break;
-	  }
-	for ( ;  x != NULL_TREE;  x = TREE_CHAIN (x))
-	  {
-	    generate_bytecode_insns (TREE_VALUE (x), STACK_TARGET, state);
-	  }
-	nargs = state->code_SP - save_SP;
-	state->code_SP = save_SP;
-	if (f == soft_fmod_node)
-	  {
-	    RESERVE (1);
-	    OP1 (OPCODE_drem);
-	    NOTE_PUSH (2);
-	    break;
-	  }
-	if (TREE_CODE (exp) == NEW_CLASS_EXPR)
-	  NOTE_POP (1);  /* Pop implicit this. */
-	if (TREE_CODE (f) == FUNCTION_DECL && DECL_CONTEXT (f) != NULL_TREE)
-	  {
-	    tree context = DECL_CONTEXT (f);
-	    int index, interface = 0;
-	    RESERVE (5);
-
-	    /* If the method is not static, use the qualifying type.
-	       However, don't use the qualifying type if the method
-	       was declared in Object.  */
-	    if (! METHOD_STATIC (f)
-		&& ! DECL_CONSTRUCTOR_P (f)
-		&& ! METHOD_PRIVATE (f)
-		&& DECL_CONTEXT (f) != object_type_node)
-	      {
-		tree arg1 = TREE_VALUE (TREE_OPERAND (exp, 1));
-		context = TREE_TYPE (TREE_TYPE (arg1));
-	      }
-
-	    if (METHOD_STATIC (f))
-	      OP1 (OPCODE_invokestatic);
-	    else if (DECL_CONSTRUCTOR_P (f) || CALL_USING_SUPER (exp)
-		     || METHOD_PRIVATE (f))
-	      OP1 (OPCODE_invokespecial);
-	    else
-	      {
-		if (CLASS_INTERFACE (TYPE_NAME (context)))
-		  interface = 1;
-		if (interface)
-		  OP1 (OPCODE_invokeinterface);
-		else
-		  OP1 (OPCODE_invokevirtual);
-	      }
-
-	    index = find_methodref_with_class_index (&state->cpool, f,
-						     context);
-	    OP2 (index);
-	    if (interface)
-	      {
-		gcc_assert (nargs > 0);
-		OP1 (nargs);
-		OP1 (0);
-	      }
-	    f = TREE_TYPE (TREE_TYPE (f));
-	    if (TREE_CODE (f) != VOID_TYPE)
-	      {
-		int size = TYPE_IS_WIDE (f) ? 2 : 1;
-		/* Always note the push here, so that we correctly
-		   compute the required maximum stack size.  */
-		NOTE_PUSH (size);
-		if (target == IGNORE_TARGET)
-		  {
-		    emit_pop (size, state);
-		    NOTE_POP (size);
-		  }
-	      }
-	    break;
-	  }
-      }
-      /* fall through */
-    default:
-      error("internal error in generate_bytecode_insn - tree code not implemented: %s",
-	    tree_code_name [(int) TREE_CODE (exp)]);
-    }
-}
-
-static void
-perform_relocations (struct jcf_partial *state)
-{
-  struct jcf_block *block;
-  struct jcf_relocation *reloc;
-  int pc;
-  int shrink;
-
-  /* Before we start, the pc field of each block is an upper bound on
-     the block's start pc (it may be less, if previous blocks need less
-     than their maximum).
-
-     The minimum size of each block is in the block's chunk->size. */
-
-  /* First, figure out the actual locations of each block. */
-  pc = 0;
-  shrink = 0;
-  for (block = state->blocks;  block != NULL;  block = block->next)
-    {
-      int block_size = block->v.chunk->size;
-
-      block->pc = pc;
-
-      /* Optimize GOTO L; L: by getting rid of the redundant goto.
-	 Assumes relocations are in reverse order. */
-      reloc = block->u.relocations;
-      while (reloc != NULL
-	     && reloc->kind == OPCODE_goto_w
-	     && reloc->label->pc == block->next->pc
-	     && reloc->offset + 2 == block_size)
-	{
-	  reloc = reloc->next;
-	  block->u.relocations = reloc;
-	  block->v.chunk->size -= 3;
-	  block_size -= 3;
-	  shrink += 3;
-	}
-
-      /* Optimize GOTO L; ... L: GOTO X by changing the first goto to
-	 jump directly to X.  We're careful here to avoid an infinite
-	 loop if the `goto's themselves form one.  We do this
-	 optimization because we can generate a goto-to-goto for some
-	 try/finally blocks.  */
-      while (reloc != NULL
-	     && reloc->kind == OPCODE_goto_w
-	     && reloc->label != block
-	     && reloc->label->v.chunk->data != NULL
-	     && reloc->label->v.chunk->data[0] == OPCODE_goto)
-	{
-	  /* Find the reloc for the first instruction of the
-	     destination block.  */
-	  struct jcf_relocation *first_reloc;
-	  for (first_reloc = reloc->label->u.relocations;
-	       first_reloc;
-	       first_reloc = first_reloc->next)
-	    {
-	      if (first_reloc->offset == 1
-		  && first_reloc->kind == OPCODE_goto_w)
-		{
-		  reloc->label = first_reloc->label;
-		  break;
-		}
-	    }
-
-	  /* If we didn't do anything, exit the loop.  */
-	  if (first_reloc == NULL)
-	    break;
-	}
-
-      for (reloc = block->u.relocations;  reloc != NULL;  reloc = reloc->next)
-	{
-	  if (reloc->kind == SWITCH_ALIGN_RELOC)
-	    {
-	      /* We assume this is the first relocation in this block,
-		 so we know its final pc. */
-	      int where = pc + reloc->offset;
-	      int pad = ((where + 3) & ~3) - where;
-	      block_size += pad;
-	    }
-	  else if (reloc->kind < -1 || reloc->kind > BLOCK_START_RELOC)
-	    {
-	      int delta = reloc->label->pc - (pc + reloc->offset - 1);
-	      int expand = reloc->kind > 0 ? 2 : 5;
-
-	      if (delta > 0)
-		delta -= shrink;
-	      if (delta >= -32768 && delta <= 32767)
-		{
-		  shrink += expand;
-		  reloc->kind = -1;
-		}
-	      else
-		block_size += expand;
-	    }
-	}
-      pc += block_size;
-    }
-
-  for (block = state->blocks;  block != NULL;  block = block->next)
-    {
-      struct chunk *chunk = block->v.chunk;
-      int old_size = chunk->size;
-      int next_pc = block->next == NULL ? pc : block->next->pc;
-      int new_size = next_pc - block->pc;
-      unsigned char *new_ptr;
-      unsigned char *old_buffer = chunk->data;
-      unsigned char *old_ptr = old_buffer + old_size;
-      if (new_size != old_size)
-	{
-	  chunk->data = obstack_alloc (state->chunk_obstack, new_size);
-	  chunk->size = new_size;
-	}
-      new_ptr = chunk->data + new_size;
-
-      /* We do the relocations from back to front, because
-	 the relocations are in reverse order. */
-      for (reloc = block->u.relocations; ; reloc = reloc->next)
-	{
-	  /* new_ptr and old_ptr point into the old and new buffers,
-	     respectively.  (If no relocations cause the buffer to
-	     grow, the buffer will be the same buffer, and new_ptr==old_ptr.)
-	     The bytes at higher address have been copied and relocations
-	     handled; those at lower addresses remain to process. */
-
-	  /* Lower old index of piece to be copied with no relocation.
-	     I.e. high index of the first piece that does need relocation. */
-	  int start = reloc == NULL ? 0
-	    : reloc->kind == SWITCH_ALIGN_RELOC ? reloc->offset
-	    : (reloc->kind == 0 || reloc->kind == BLOCK_START_RELOC)
-	    ? reloc->offset + 4
-	    : reloc->offset + 2;
-	  int32 value;
-	  int new_offset;
-	  int n = (old_ptr - old_buffer) - start;
-	  new_ptr -= n;
-	  old_ptr -= n;
-	  /* Don't "copy" bytes in place, this causes valgrind
-	     warnings.  */
-	  if (n > 0 && new_ptr != old_ptr)
-	    memcpy (new_ptr, old_ptr, n);
-	  if (old_ptr == old_buffer)
-	    break;
-
-	  new_offset = new_ptr - chunk->data;
-	  new_offset -= (reloc->kind == -1 ? 2 : 4);
-	  if (reloc->kind == 0)
-	    {
-	      old_ptr -= 4;
-	      value = GET_u4 (old_ptr);
-	    }
-	  else if (reloc->kind == BLOCK_START_RELOC)
-	    {
-	      old_ptr -= 4;
-	      value = 0;
-	      new_offset = 0;
-	    }
-	  else if (reloc->kind == SWITCH_ALIGN_RELOC)
-	    {
-	      int where = block->pc + reloc->offset;
-	      int pad = ((where + 3) & ~3) - where;
-	      while (--pad >= 0)
-		*--new_ptr = 0;
-	      continue;
-	    }
-	  else
-	    {
-	      old_ptr -= 2;
-	      value = GET_u2 (old_ptr);
-	    }
-	  value += reloc->label->pc - (block->pc + new_offset);
-	  *--new_ptr = (unsigned char) value;  value >>= 8;
-	  *--new_ptr = (unsigned char) value;  value >>= 8;
-	  if (reloc->kind != -1)
-	    {
-	      *--new_ptr = (unsigned char) value;  value >>= 8;
-	      *--new_ptr = (unsigned char) value;
-	    }
-	  if (reloc->kind > BLOCK_START_RELOC)
-	    {
-	      /* Convert: OP TARGET to: OP_w TARGET;  (OP is goto or jsr). */
-	      --old_ptr;
-	      *--new_ptr = reloc->kind;
-	    }
-	  else if (reloc->kind < -1)
-	    {
-	      /* Convert: ifCOND TARGET to: ifNCOND T; goto_w TARGET; T: */
-	      --old_ptr;
-	      *--new_ptr = OPCODE_goto_w;
-	      *--new_ptr = 3;
-	      *--new_ptr = 0;
-	      *--new_ptr = - reloc->kind;
-	    }
-	}
-      gcc_assert (new_ptr == chunk->data);
-    }
-  state->code_length = pc;
-}
-
-static void
-init_jcf_state (struct jcf_partial *state, struct obstack *work)
-{
-  state->chunk_obstack = work;
-  state->first = state->chunk = NULL;
-  CPOOL_INIT (&state->cpool);
-  BUFFER_INIT (&state->localvars);
-  BUFFER_INIT (&state->bytecode);
-}
-
-static void
-init_jcf_method (struct jcf_partial *state, tree method)
-{
-  state->current_method = method;
-  state->blocks = state->last_block = NULL;
-  state->linenumber_count = 0;
-  state->first_lvar = state->last_lvar = NULL;
-  state->lvar_count = 0;
-  state->labeled_blocks = NULL;
-  state->code_length = 0;
-  BUFFER_RESET (&state->bytecode);
-  BUFFER_RESET (&state->localvars);
-  state->code_SP = 0;
-  state->code_SP_max = 0;
-  state->handlers = NULL;
-  state->last_handler = NULL;
-  state->num_handlers = 0;
-  state->num_finalizers = 0;
-  state->return_value_decl = NULL_TREE;
-}
-
-static void
-release_jcf_state (struct jcf_partial *state)
-{
-  CPOOL_FINISH (&state->cpool);
-  obstack_free (state->chunk_obstack, state->first);
-}
-
-/* Get the access flags (modifiers) of a class (TYPE_DECL) to be used in the
-   access_flags field of the class file header.  */
-
-static int
-get_classfile_modifiers (tree class)
-{
-  /* These are the flags which are valid class file modifiers. 
-     See JVMS2 S4.1.  */
-  int valid_toplevel_class_flags = (ACC_PUBLIC | ACC_FINAL | ACC_SUPER | 
-				    ACC_INTERFACE | ACC_ABSTRACT);
-  int flags = get_access_flags (class);
-
-  /* ACC_SUPER should always be set, except for interfaces.  */
-  if (! (flags & ACC_INTERFACE))
-    flags |= ACC_SUPER;
-   
-  /* A protected member class becomes public at the top level. */
-  if (flags & ACC_PROTECTED)
-    flags |= ACC_PUBLIC;
- 
-  /* Filter out flags that are not valid for a class or interface in the 
-     top-level access_flags field.  */
-  flags &= valid_toplevel_class_flags;
-
-  return flags;
-}
-
-/* Get the access flags (modifiers) for a method to be used in the class 
-   file.  */
-
-static int
-get_method_access_flags (tree decl)
-{
-  int flags = get_access_flags (decl);
-
-  /* Promote "private" inner-class constructors to package-private.  */
-  if (DECL_CONSTRUCTOR_P (decl)
-      && INNER_CLASS_DECL_P (TYPE_NAME (DECL_CONTEXT (decl))))
-    flags &= ~(ACC_PRIVATE);
-
-  return flags;
-}
-
-/* Generate and return a list of chunks containing the class CLAS
-   in the .class file representation.  The list can be written to a
-   .class file using write_chunks.  Allocate chunks from obstack WORK. */
-
-static GTY(()) tree SourceFile_node;
-static struct chunk *
-generate_classfile (tree clas, struct jcf_partial *state)
-{
-  struct chunk *cpool_chunk;
-  const char *source_file, *s;
-  unsigned char *ptr;
-  int i;
-  unsigned char *fields_count_ptr;
-  int fields_count = 0;
-  unsigned char *methods_count_ptr;
-  int methods_count = 0;
-  tree part;
-  int total_supers
-    = clas == object_type_node ? 0 : BINFO_N_BASE_BINFOS (TYPE_BINFO (clas));
-  
-  ptr = append_chunk (NULL, 8, state);
-  PUT4 (0xCafeBabe);  /* Magic number */
-  PUT2 (3);  /* Minor version */
-  PUT2 (45);  /* Major version */
-  
-  append_chunk (NULL, 0, state);
-  cpool_chunk = state->chunk;
-
-  /* Next allocate the chunk containing access_flags through fields_count. */
-  if (clas == object_type_node)
-    i = 10;
-  else
-    i = 8 + 2 * total_supers;
-  ptr = append_chunk (NULL, i, state);
-  i = get_classfile_modifiers (TYPE_NAME (clas));  
-  PUT2 (i); /* access_flags */
-  i = find_class_constant (&state->cpool, clas);  PUT2 (i);  /* this_class */
-  if (clas == object_type_node)
-    {
-      PUT2(0);  /* super_class */
-      PUT2(0);  /* interfaces_count */
-    }
-  else
-    {
-      tree binfo = TYPE_BINFO (clas);
-      tree base_binfo = BINFO_BASE_BINFO (binfo, 0);
-      int j = find_class_constant (&state->cpool, BINFO_TYPE (base_binfo));
-      
-      PUT2 (j);  /* super_class */
-      PUT2 (total_supers - 1);  /* interfaces_count */
-      for (i = 1; BINFO_BASE_ITERATE (binfo, i, base_binfo); i++)
-	{
-	  j = find_class_constant (&state->cpool, BINFO_TYPE (base_binfo));
-	  PUT2 (j);
-	}
-    }
-  fields_count_ptr = ptr;
-
-  for (part = TYPE_FIELDS (clas);  part;  part = TREE_CHAIN (part))
-    {
-      int have_value, attr_count = 0;
-      if (DECL_NAME (part) == NULL_TREE || DECL_ARTIFICIAL (part))
-	continue;
-      ptr = append_chunk (NULL, 8, state);
-      i = get_access_flags (part);  PUT2 (i);
-      i = find_utf8_constant (&state->cpool, DECL_NAME (part));  PUT2 (i);
-      i = find_utf8_constant (&state->cpool, 
-			      build_java_signature (TREE_TYPE (part)));
-      PUT2(i);
-      have_value = DECL_INITIAL (part) != NULL_TREE 
-	&& FIELD_STATIC (part) && CONSTANT_VALUE_P (DECL_INITIAL (part))
-	&& FIELD_FINAL (part)
-	&& (JPRIMITIVE_TYPE_P (TREE_TYPE (part))
-	    || TREE_TYPE (part) == string_ptr_type_node);
-      if (have_value)
-	attr_count++;
-
-      if (FIELD_THISN (part) || FIELD_LOCAL_ALIAS (part)
-	  || FIELD_SYNTHETIC (part))
-	attr_count++;
-      if (FIELD_DEPRECATED (part))
-  	attr_count++;
-
-      PUT2 (attr_count);  /* attributes_count */
-      if (have_value)
-	{
-	  tree init = DECL_INITIAL (part);
-	  static tree ConstantValue_node = NULL_TREE;
-	  if (TREE_TYPE (part) != TREE_TYPE (init))
-	    fatal_error ("field initializer type mismatch");
-	  ptr = append_chunk (NULL, 8, state);
-	  if (ConstantValue_node == NULL_TREE)
-	    ConstantValue_node = get_identifier ("ConstantValue");
-	  i = find_utf8_constant (&state->cpool, ConstantValue_node);
-	  PUT2 (i);  /* attribute_name_index */
-	  PUT4 (2); /* attribute_length */
-	  i = find_constant_index (init, state);  PUT2 (i);
-	}
-      /* Emit the "Synthetic" attribute for val$<x> and this$<n>
-	 fields and other fields which need it.  */
-      if (FIELD_THISN (part) || FIELD_LOCAL_ALIAS (part)
-	  || FIELD_SYNTHETIC (part))
-	ptr = append_synthetic_attribute (state);
-      if (FIELD_DEPRECATED (part))
- 	append_deprecated_attribute (state);
-      fields_count++;
-    }
-  ptr = fields_count_ptr;  UNSAFE_PUT2 (fields_count);
-
-  ptr = methods_count_ptr = append_chunk (NULL, 2, state);
-  PUT2 (0);
-
-  for (part = TYPE_METHODS (clas);  part;  part = TREE_CHAIN (part))
-    {
-      struct jcf_block *block;
-      tree function_body = DECL_FUNCTION_BODY (part);
-      tree body = function_body == NULL_TREE ? NULL_TREE
-	: BLOCK_EXPR_BODY (function_body);
-      tree name = DECL_CONSTRUCTOR_P (part) ? init_identifier_node
-	: DECL_NAME (part);
-      tree type = TREE_TYPE (part);
-      tree save_function = current_function_decl;
-      int synthetic_p = 0;
-
-      /* Invisible Miranda methods shouldn't end up in the .class
-	 file.  */
-      if (METHOD_INVISIBLE (part))
-	continue;
-
-      current_function_decl = part;
-      ptr = append_chunk (NULL, 8, state);
-      i = get_method_access_flags (part);  PUT2 (i);
-      i = find_utf8_constant (&state->cpool, name);  PUT2 (i);
-      i = find_utf8_constant (&state->cpool, build_java_signature (type));
-      PUT2 (i);
-      i = (body != NULL_TREE) + (DECL_FUNCTION_THROWS (part) != NULL_TREE);
-
-      /* Make room for the Synthetic attribute (of zero length.)  */
-      if (DECL_FINIT_P (part)
-	  || DECL_INSTINIT_P (part)
-	  || NESTED_FIELD_ACCESS_IDENTIFIER_P (DECL_NAME (part))
-	  || TYPE_DOT_CLASS (clas) == part)
-	{
-	  i++;
-	  synthetic_p = 1;
-	}
-      /* Make room for Deprecated attribute.  */
-      if (METHOD_DEPRECATED (part))
- 	i++;
-
-      PUT2 (i);   /* attributes_count */
-
-      if (synthetic_p)
-	ptr = append_synthetic_attribute (state);
-
-      if (body != NULL_TREE)
-	{
-	  int code_attributes_count = 0;
-	  static tree Code_node = NULL_TREE;
-	  tree t;
-	  unsigned char *attr_len_ptr;
-	  struct jcf_handler *handler;
-	  if (Code_node == NULL_TREE)
-	    Code_node = get_identifier ("Code");
-	  ptr = append_chunk (NULL, 14, state);
-	  i = find_utf8_constant (&state->cpool, Code_node);  PUT2 (i);
-	  attr_len_ptr = ptr;
-	  init_jcf_method (state, part);
-	  get_jcf_label_here (state);  /* Force a first block. */
-	  for (t = DECL_ARGUMENTS (part);  t != NULL_TREE;  t = TREE_CHAIN (t))
-	    localvar_alloc (t, state);
-	  state->num_jsrs = 0;
-	  generate_bytecode_insns (body, IGNORE_TARGET, state);
-	  if (CAN_COMPLETE_NORMALLY (body))
-	    {
-	      gcc_assert (TREE_CODE (TREE_TYPE (type)) == VOID_TYPE);
-	      RESERVE (1);
-	      OP1 (OPCODE_return);
-	    }
-	  for (t = DECL_ARGUMENTS (part);  t != NULL_TREE;  t = TREE_CHAIN (t))
-	    maybe_free_localvar (t, state, 1);
-	  if (state->return_value_decl != NULL_TREE)
-	    maybe_free_localvar (state->return_value_decl, state, 1);
-	  finish_jcf_block (state);
-	  perform_relocations (state);
-
-	  ptr = attr_len_ptr;
-	  i = 8 + state->code_length + 4 + 8 * state->num_handlers;
-	  if (state->linenumber_count > 0)
-	    {
-	      code_attributes_count++;
-	      i += 8 + 4 * state->linenumber_count;
-	    }
-	  if (state->lvar_count > 0)
-	    {
-	      code_attributes_count++;
-	      i += 8 + 10 * state->lvar_count;
-	    }
-	  UNSAFE_PUT4 (i); /* attribute_length */
-	  UNSAFE_PUT2 (state->code_SP_max);  /* max_stack */
-	  UNSAFE_PUT2 (localvar_max);  /* max_locals */
-	  UNSAFE_PUT4 (state->code_length);
-
-	  /* Emit the exception table. */
-	  ptr = append_chunk (NULL, 2 + 8 * state->num_handlers, state);
-	  PUT2 (state->num_handlers);  /* exception_table_length */
-	  handler = state->handlers;
-	  for (; handler != NULL;  handler = handler->next)
-	    {
-	      int type_index;
-	      PUT2 (handler->start_label->pc);
-	      PUT2 (handler->end_label->pc);
-	      PUT2 (handler->handler_label->pc);
-	      if (handler->type == NULL_TREE)
-		type_index = 0;
-	      else
-		type_index = find_class_constant (&state->cpool,
-						  handler->type);
-	      PUT2 (type_index);
-	    }
-
-	  ptr = append_chunk (NULL, 2, state);
-	  PUT2 (code_attributes_count);
-
-	  /* Write the LineNumberTable attribute. */
-	  if (state->linenumber_count > 0)
-	    {
-	      static tree LineNumberTable_node = NULL_TREE;
-	      ptr = append_chunk (NULL, 
-				  8 + 4 * state->linenumber_count, state);
-	      if (LineNumberTable_node == NULL_TREE)
-		LineNumberTable_node = get_identifier ("LineNumberTable");
-	      i = find_utf8_constant (&state->cpool, LineNumberTable_node);
-	      PUT2 (i);  /* attribute_name_index */
-	      i = 2+4*state->linenumber_count;  PUT4(i); /* attribute_length */
-	      i = state->linenumber_count;  PUT2 (i);
-	      for (block = state->blocks;  block != NULL;  block = block->next)
-		{
-		  int line = block->linenumber;
-		  if (line > 0)
-		    {
-		      PUT2 (block->pc);
-		      PUT2 (line);
-		    }
-		}
-	    }
-
-	  /* Write the LocalVariableTable attribute. */
-	  if (state->lvar_count > 0)
-	    {
-	      static tree LocalVariableTable_node = NULL_TREE;
-	      struct localvar_info *lvar = state->first_lvar;
-	      ptr = append_chunk (NULL, 8 + 10 * state->lvar_count, state);
-	      if (LocalVariableTable_node == NULL_TREE)
-		LocalVariableTable_node = get_identifier("LocalVariableTable");
-	      i = find_utf8_constant (&state->cpool, LocalVariableTable_node);
-	      PUT2 (i);  /* attribute_name_index */
-	      i = 2 + 10 * state->lvar_count;  PUT4 (i); /* attribute_length */
-	      i = state->lvar_count;  PUT2 (i);
-	      for ( ; lvar != NULL;  lvar = lvar->next)
-		{
-		  tree name = DECL_NAME (lvar->decl);
-		  tree sig = build_java_signature (TREE_TYPE (lvar->decl));
-		  i = lvar->start_label->pc;  PUT2 (i);
-		  i = lvar->end_label->pc - i;  PUT2 (i);
-		  i = find_utf8_constant (&state->cpool, name);  PUT2 (i);
-		  i = find_utf8_constant (&state->cpool, sig);  PUT2 (i);
-		  i = DECL_LOCAL_INDEX (lvar->decl);  PUT2 (i);
-		}
-	    }
-	}
-      if (DECL_FUNCTION_THROWS (part) != NULL_TREE)
-	{
-	  tree t = DECL_FUNCTION_THROWS (part);
-	  int throws_count = list_length (t);
-	  static tree Exceptions_node = NULL_TREE;
-	  if (Exceptions_node == NULL_TREE)
-	    Exceptions_node = get_identifier ("Exceptions");
-	  ptr = append_chunk (NULL, 8 + 2 * throws_count, state);
-	  i = find_utf8_constant (&state->cpool, Exceptions_node);
-	  PUT2 (i);  /* attribute_name_index */ 
-	  i = 2 + 2 * throws_count;  PUT4(i); /* attribute_length */ 
-	  i = throws_count;  PUT2 (i); 
-	  for (;  t != NULL_TREE;  t = TREE_CHAIN (t))
-	    {
-	      i = find_class_constant (&state->cpool, TREE_VALUE (t));
-	      PUT2 (i);
-	    }
-	}
-
-      if (METHOD_DEPRECATED (part))
- 	append_deprecated_attribute (state);
- 
-      methods_count++;
-      current_function_decl = save_function;
-    }
-  ptr = methods_count_ptr;  UNSAFE_PUT2 (methods_count);
-
-  source_file = DECL_SOURCE_FILE (TYPE_NAME (clas));
-  for (s = source_file; ; s++)
-    {
-      char ch = *s;
-      if (ch == '\0')
-	break;
-      if (ch == '/' || ch == '\\')
-	source_file = s+1;
-    }
-  ptr = append_chunk (NULL, 10, state);
-
-  i = 1;		/* Source file always exists as an attribute */
-  if (INNER_CLASS_TYPE_P (clas) || DECL_INNER_CLASS_LIST (TYPE_NAME (clas)))
-    i++;
-  if (clas == object_type_node)
-    i++;
-  if (CLASS_DEPRECATED (TYPE_NAME (clas)))
-    i++;
-
-  PUT2 (i);			/* attributes_count */
-
-  /* generate the SourceFile attribute. */
-  if (SourceFile_node == NULL_TREE) 
-    {
-      SourceFile_node = get_identifier ("SourceFile");
-    }
-
-  i = find_utf8_constant (&state->cpool, SourceFile_node);
-  PUT2 (i);  /* attribute_name_index */
-  PUT4 (2);
-  i = find_utf8_constant (&state->cpool, get_identifier (source_file));
-  PUT2 (i);
-  append_gcj_attribute (state, clas);
-  append_innerclasses_attribute (state, clas);
-  if (CLASS_DEPRECATED (TYPE_NAME (clas)))
-    append_deprecated_attribute (state);
-
-  /* New finally generate the contents of the constant pool chunk. */
-  i = count_constant_pool_bytes (&state->cpool);
-  ptr = obstack_alloc (state->chunk_obstack, i);
-  cpool_chunk->data = ptr;
-  cpool_chunk->size = i;
-  write_constant_pool (&state->cpool, ptr, i);
-  return state->first;
-}
-
-static GTY(()) tree Synthetic_node;
-static unsigned char *
-append_synthetic_attribute (struct jcf_partial *state)
-{
-  unsigned char *ptr = append_chunk (NULL, 6, state);
-  int i;
-
-  if (Synthetic_node == NULL_TREE)
-    {
-      Synthetic_node = get_identifier ("Synthetic");
-    }
-  i = find_utf8_constant (&state->cpool, Synthetic_node);
-  PUT2 (i);		/* Attribute string index */
-  PUT4 (0);		/* Attribute length */
-
-  return ptr;
-}
-
-static void
-append_deprecated_attribute (struct jcf_partial *state)
-{
-  unsigned char *ptr = append_chunk (NULL, 6, state);
-  int i;
- 
-  i = find_utf8_constant (&state->cpool, get_identifier ("Deprecated"));
-  PUT2 (i);		/* Attribute string index */
-  PUT4 (0);		/* Attribute length */
-}
-
-static void
-append_gcj_attribute (struct jcf_partial *state, tree class)
-{
-  unsigned char *ptr;
-  int i;
-
-  if (class != object_type_node)
-    return;
-
-  ptr = append_chunk (NULL, 6, state); /* 2+4 */
-  i = find_utf8_constant (&state->cpool, 
-			  get_identifier ("gnu.gcj.gcj-compiled"));
-  PUT2 (i);			/* Attribute string index */
-  PUT4 (0);			/* Attribute length */
-}
-
-static tree InnerClasses_node;
-static void
-append_innerclasses_attribute (struct jcf_partial *state, tree class)
-{
-  tree orig_decl = TYPE_NAME (class);
-  tree current, decl;
-  int length = 0, i;
-  unsigned char *ptr, *length_marker, *number_marker;
-
-  if (!INNER_CLASS_TYPE_P (class) && !DECL_INNER_CLASS_LIST (orig_decl))
-    return;
-
-  ptr = append_chunk (NULL, 8, state); /* 2+4+2 */
-  
-  if (InnerClasses_node == NULL_TREE) 
-    {
-      InnerClasses_node = get_identifier ("InnerClasses");
-    }
-  i = find_utf8_constant (&state->cpool, InnerClasses_node);
-  PUT2 (i);
-  length_marker = ptr; PUT4 (0); /* length, to be later patched */
-  number_marker = ptr; PUT2 (0); /* number of classes, tblp */
-
-  /* Generate the entries: all inner classes visible from the one we
-     process: itself, up and down. */
-  while (class && INNER_CLASS_TYPE_P (class))
-    {
-      const char *n;
-
-      decl = TYPE_NAME (class);
-      n = IDENTIFIER_POINTER (DECL_NAME (decl)) + 
-	IDENTIFIER_LENGTH (DECL_NAME (decl));
-
-      while (n[-1] != '$')
-	n--;
-      append_innerclasses_attribute_entry (state, decl, get_identifier (n));
-      length++;
-
-      class = TREE_TYPE (DECL_CONTEXT (TYPE_NAME (class)));
-    }
-
-  decl = orig_decl;
-  for (current = DECL_INNER_CLASS_LIST (decl); 
-       current; current = TREE_CHAIN (current))
-    {
-      append_innerclasses_attribute_entry (state, TREE_PURPOSE (current),
-					   TREE_VALUE (current));
-      length++;
-    }
-  
-  ptr = length_marker; PUT4 (8*length+2);
-  ptr = number_marker; PUT2 (length);
-}
-
-static void
-append_innerclasses_attribute_entry (struct jcf_partial *state,
-				     tree decl, tree name)
-{
-  int icii, icaf;
-  int ocii = 0, ini = 0;
-  unsigned char *ptr = append_chunk (NULL, 8, state);
-
-  icii = find_class_constant (&state->cpool, TREE_TYPE (decl));
-
-  /* Sun's implementation seems to generate ocii to 0 for inner
-     classes (which aren't considered members of the class they're
-     in.) The specs are saying that if the class is anonymous,
-     inner_name_index must be zero. */
-  if (!ANONYMOUS_CLASS_P (TREE_TYPE (decl)))
-    {
-      ocii = find_class_constant (&state->cpool, 
-				  TREE_TYPE (DECL_CONTEXT (decl)));
-      ini = find_utf8_constant (&state->cpool, name);
-    }
-  icaf = get_access_flags (decl);
-
-  PUT2 (icii); PUT2 (ocii); PUT2 (ini);  PUT2 (icaf);
-}
-
-static char *
-make_class_file_name (tree clas)
-{
-  const char *dname, *cname, *slash;
-  char *r;
-  struct stat sb;
-  char sep;
-
-  cname = IDENTIFIER_POINTER (identifier_subst (DECL_NAME (TYPE_NAME (clas)),
-						"", '.', DIR_SEPARATOR,
-						".class"));
-  if (jcf_write_base_directory == NULL)
-    {
-      /* Make sure we put the class file into the .java file's
-	 directory, and not into some subdirectory thereof.  */
-      char *t;
-      dname = DECL_SOURCE_FILE (TYPE_NAME (clas));
-      slash = strrchr (dname, DIR_SEPARATOR);
-#ifdef DIR_SEPARATOR_2
-      if (! slash)
-        slash = strrchr (dname, DIR_SEPARATOR_2);
-#endif
-      if (! slash)
-        {
-          dname = ".";
-          slash = dname + 1;
-          sep = DIR_SEPARATOR;
-        }
-      else
-        sep = *slash;
-
-      t = strrchr (cname, DIR_SEPARATOR);
-      if (t)
-	cname = t + 1;
-    }
-  else
-    {
-      char *s;
-
-      dname = jcf_write_base_directory;
-
-      s = strrchr (dname, DIR_SEPARATOR);
-#ifdef DIR_SEPARATOR_2
-      if (! s)
-        s = strrchr (dname, DIR_SEPARATOR_2);
-#endif
-      if (s)
-        sep = *s;
-      else
-        sep = DIR_SEPARATOR;
-
-      slash = dname + strlen (dname);
-    }
-
-  r = XNEWVEC (char, slash - dname + strlen (cname) + 2);
-  strncpy (r, dname, slash - dname);
-  r[slash - dname] = sep;
-  strcpy (&r[slash - dname + 1], cname);
-
-  /* We try to make new directories when we need them.  We only do
-     this for directories which "might not" exist.  For instance, we
-     assume the `-d' directory exists, but we don't assume that any
-     subdirectory below it exists.  It might be worthwhile to keep
-     track of which directories we've created to avoid gratuitous
-     stat()s.  */
-  dname = r + (slash - dname) + 1;
-  while (1)
-    {
-      char *s = strchr (dname, sep);
-      if (s == NULL)
-	break;
-      *s = '\0';
-      /* Try to make directory if it doesn't already exist.  */
-      if (stat (r, &sb) == -1
-	  && mkdir (r, 0755) == -1
-	  /* The directory might have been made by another process.  */
-	  && errno != EEXIST)
-	fatal_error ("can't create directory %s: %m", r);
-
-      *s = sep;
-      /* Skip consecutive separators.  */
-      for (dname = s + 1; *dname && *dname == sep; ++dname)
-	;
-    }
-
-  return r;
-}
-
-/* Write out the contents of a class (RECORD_TYPE) CLAS, as a .class file.
-   The output .class file name is make_class_file_name(CLAS). */
-
-void
-write_classfile (tree clas)
-{
-  struct obstack *work = &temporary_obstack;
-  struct jcf_partial state[1];
-  char *class_file_name = make_class_file_name (clas);
-  struct chunk *chunks;
-
-  if (class_file_name != NULL)
-    {
-      FILE *stream;
-      char *temporary_file_name;
-      char pid [sizeof (long) * 2 + 2];
-
-      /* The .class file is initially written to a ".PID" file so that
-	 if multiple instances of the compiler are running at once
-	 they do not see partially formed class files nor override
-	 each other, which may happen in libjava with parallel build.
-       */
-      sprintf (pid, ".%lx", (unsigned long) getpid ());
-      temporary_file_name = concat (class_file_name, pid, NULL);
-      stream = fopen (temporary_file_name, "wb");
-      if (stream == NULL)
-	fatal_error ("can't open %s for writing: %m", temporary_file_name);
-
-      jcf_dependency_add_target (class_file_name);
-      init_jcf_state (state, work);
-      chunks = generate_classfile (clas, state);
-      write_chunks (stream, chunks);
-      if (fclose (stream))
-	fatal_error ("error closing %s: %m", temporary_file_name);
-
-      /* If a file named by the string pointed to by `new' exists
-         prior to the call to the `rename' function, the behavior
-         is implementation-defined.  ISO 9899-1990 7.9.4.2.
-
-         For example, on Win32 with MSVCRT, it is an error. */
-
-      unlink (class_file_name);
-
-      if (rename (temporary_file_name, class_file_name) == -1)
-	{
-	  int errno_saved = errno;
-	  remove (temporary_file_name);
-	  errno = errno_saved;
-	  fatal_error ("can't create %s: %m", class_file_name);
-	}
-      free (temporary_file_name);
-      free (class_file_name);
-    }
-  release_jcf_state (state);
-}
-
-/* TODO:
-   string concatenation
-   synchronized statement
-   */
-
-#include "gt-java-jcf-write.h"
diff --git a/gcc/java/jcf.h b/gcc/java/jcf.h
index 0e37897..866dc41 100644
--- a/gcc/java/jcf.h
+++ b/gcc/java/jcf.h
@@ -241,18 +241,22 @@ typedef struct JCF GTY(()) {
 
 #define ACC_VISIBILITY (ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED)
 
-#define CONSTANT_Class 7
-#define CONSTANT_Fieldref 9
-#define CONSTANT_Methodref 10
-#define CONSTANT_InterfaceMethodref 11
-#define CONSTANT_String 8
-#define CONSTANT_Integer 3
-#define CONSTANT_Float 4
-#define CONSTANT_Long 5
-#define CONSTANT_Double 6
-#define CONSTANT_NameAndType 12
-#define CONSTANT_Utf8 1
-#define CONSTANT_Unicode 2
+enum cpool_tag
+{
+  CONSTANT_Class = 7,
+  CONSTANT_Fieldref = 9,
+  CONSTANT_Methodref = 10,
+  CONSTANT_InterfaceMethodref = 11,
+  CONSTANT_String = 8,
+  CONSTANT_Integer = 3,
+  CONSTANT_Float = 4,
+  CONSTANT_Long = 5,
+  CONSTANT_Double = 6,
+  CONSTANT_NameAndType = 12,
+  CONSTANT_Utf8 = 1,
+  CONSTANT_Unicode = 2,
+  CONSTANT_None = 0
+};
 
 #define DEFAULT_CLASS_PATH "."
 
@@ -309,6 +313,7 @@ extern void jcf_path_seal (int);
 extern void *jcf_path_start (void);
 extern void *jcf_path_next (void *);
 extern char *jcf_path_name (void *);
+extern char *jcf_path_compute (const char *);
 extern int jcf_path_is_zipfile (void *);
 extern int jcf_path_is_system (void *);
 extern int jcf_path_max_len (void);
diff --git a/gcc/java/jv-scan.c b/gcc/java/jv-scan.c
deleted file mode 100644
index cb2bace..0000000
--- a/gcc/java/jv-scan.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/* Main for jv-scan
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-   Contributed by Alexandre Petit-Bianco (apbianco@cygnus.com)
-
-This file is part of GCC.
-
-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.
-
-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 GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-
-#include "config.h"
-#include "system.h"
-#include "coretypes.h"
-#include "tm.h"
-#include "intl.h"
-
-#include "obstack.h"		/* We use obstacks in lex.c */
-
-#include "version.h"
-
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
-#ifdef HAVE_LANGINFO_CODESET
-#include <langinfo.h>
-#endif
-
-#include <getopt.h>
-
-extern void fatal_error (const char *gmsgid, ...)
-     ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN;
-void warning (int opt, const char *gmsgid, ...) ATTRIBUTE_PRINTF_2;
-void warning0 (const char *gmsgid, ...) ATTRIBUTE_PRINTF_1;
-void report (void);
-
-static void usage (void) ATTRIBUTE_NORETURN;
-static void help (void) ATTRIBUTE_NORETURN;
-static void version (void) ATTRIBUTE_NORETURN;
-
-#define JC1_LITE
-#include "jcf.h"
-#include "parse.h"
-
-/* Current input file and output file IO streams.  */
-FILE *finput, *out;
-
-/* Executable name.  */
-char *exec_name;
-
-struct line_maps line_table;
-
-/* Flags matching command line options.  */
-int flag_find_main = 0;
-int flag_dump_class = 0;
-int flag_list_filename = 0;
-int flag_complexity = 0;
-int flag_assert = 1;
-
-int pedantic = 0;
-
-
-
-/* This is used to mark options with no short value.  */
-#define LONG_OPT(Num)  ((Num) + 128)
-
-#define OPT_HELP      LONG_OPT (0)
-#define OPT_VERSION   LONG_OPT (1)
-#define OPT_ENCODING  LONG_OPT (2)
-
-static const struct option options[] =
-{
-  { "help",      no_argument,       NULL, OPT_HELP },
-  { "version",   no_argument,       NULL, OPT_VERSION },
-  { "print-main", no_argument,      &flag_find_main, 1 },
-  { "list-filename", no_argument,   &flag_list_filename, 1 },
-  { "list-class", no_argument,      &flag_dump_class, 1 },
-  { "encoding",  required_argument, NULL, OPT_ENCODING },
-  { "complexity", no_argument,	    &flag_complexity, 1 },
-  { "no-assert", no_argument,       &flag_assert, 0 },
-  { "assert",    no_argument,       &flag_assert, 1 },
-  { NULL,        no_argument,       NULL, 0 }
-};
-
-static void
-usage (void)
-{
-  fprintf (stderr, _("Try 'jv-scan --help' for more information.\n"));
-  exit (1);
-}
-
-static void
-help (void)
-{
-  printf (_("Usage: jv-scan [OPTION]... FILE...\n\n"));
-  printf (_("Print useful information read from Java source files.\n\n"));
-  printf (_("  --no-assert             Don't recognize the assert keyword\n"));
-  printf (_("  --complexity            Print cyclomatic complexity of input file\n"));
-  printf (_("  --encoding NAME         Specify encoding of input file\n"));
-  printf (_("  --print-main            Print name of class containing 'main'\n"));
-  printf (_("  --list-class            List all classes defined in file\n"));
-  printf (_("  --list-filename         Print input filename when listing class names\n"));
-  printf (_("  -o FILE                 Set output file name\n"));
-  printf ("\n");
-  printf (_("  --help                  Print this help, then exit\n"));
-  printf (_("  --version               Print version number, then exit\n"));
-  printf ("\n");
-  printf (_("For bug reporting instructions, please see:\n"
-	    "%s.\n"), bug_report_url);
-  exit (0);
-}
-
-static void
-version (void)
-{
-  printf ("jv-scan (GCC) %s\n\n", version_string);
-  printf ("Copyright %s 2006 Free Software Foundation, Inc.\n", _("(C)"));
-  printf (_("This is free software; see the source for copying conditions.  There is NO\n"
-	    "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n"));
-  exit (0);
-}
-
-/* jc1-lite main entry point */
-int
-main (int argc, char **argv)
-{
-  int i = 1;
-  const char *output_file = NULL;
-  const char *encoding = NULL;
-  long ft;
-  int opt;
-
-  exec_name = argv[0];
-
-  /* Default for output */
-  out = stdout;
-
-  /* Unlock the stdio streams.  */
-  unlock_std_streams ();
-
-  gcc_init_libintl ();
-
-  /* Process options first.  We use getopt_long and not
-     getopt_long_only because we only support `--' long options here.  */
-  while ((opt = getopt_long (argc, argv, "o:", options, NULL)) != -1)
-    {
-      switch (opt)
-	{
-	case 0:
-	  /* Already handled.  */
-	  break;
-
-	case 'o':
-	  output_file = optarg;
-	  break;
-
-	case OPT_HELP:
-	  help ();
-	  break;
-
-	case OPT_VERSION:
-	  version ();
-	  break;
-
-	case OPT_ENCODING:
-	  encoding = optarg;
-	  break;
-
-	default:
-	  usage ();
-	  break;
-	}
-    }
-
-  /* No flags? Do nothing */
-  if (! flag_find_main && ! flag_dump_class && ! flag_complexity)
-    return 0;
-
-  /* Check on bad usage */
-  if (flag_find_main + flag_dump_class + flag_complexity > 1)
-    fatal_error
-      ("only one of '--print-main', '--list-class', and '--complexity' allowed");
-
-  if (output_file && !(out = fopen (output_file, "w")))
-    fatal_error ("can't open output file '%s'", output_file);
-
-  ft = ftell (out);
-
-  gcc_obstack_init (&temporary_obstack);
-  java_push_parser_context ();
-
-  for ( i = optind; i < argc; i++ )
-    if (argv [i])
-      {
-	char *filename = argv[i];
-	if ( (finput = fopen (filename, "r")) )
-	  {
-	    /* There's no point in trying to find the current encoding
-	       unless we are going to do something intelligent with it
-	       -- hence the test for iconv.  */
-#if defined (HAVE_LOCALE_H) && defined (HAVE_ICONV) && defined (HAVE_LANGINFO_CODESET)
-	    setlocale (LC_CTYPE, "");
-	    if (encoding == NULL)
-	      encoding = nl_langinfo (CODESET);
-#endif  
-	    if (encoding == NULL || *encoding == '\0')
-	      encoding = DEFAULT_ENCODING;
-
-            main_input_filename = filename;
-	    java_init_lex (finput, encoding);
-	    ctxp->filename = filename;
-	    yyparse ();
-	    report ();
-	    if (ftell (out) != ft)
-	      fputc ('\n', out);
-	    ft = ftell (out);
-	    fclose (finput);
-	    reset_report ();
-	  }
-	else
-	  fatal_error ("file not found '%s'", argv [i]);
-      }
-
-  /* Flush and close */
-  if (ftell (out) != ft)
-    fputc ('\n', out);
-  if (!output_file)
-    fclose (out);
-
-  return 0;
-}
-
-
-
-/* Error report, memory, obstack initialization and other utility
-   functions.  Use actually c-format msgid, but as functions with
-   the same name elsewhere use gcc-internal-format, assume all users
-   here use intersection between c-format and gcc-internal-format.  */
-
-void
-fatal_error (const char *gmsgid, ...)
-{
-  va_list ap;
-  va_start (ap, gmsgid);
-  fprintf (stderr, _("%s: error: "), exec_name);
-  vfprintf (stderr, _(gmsgid), ap);
-  fputc ('\n', stderr);
-  va_end (ap);
-  exit (1);
-}
-
-void
-warning (int opt ATTRIBUTE_UNUSED, const char *gmsgid, ...)
-{
-  va_list ap;
-  va_start (ap, gmsgid);
-  fprintf (stderr, _("%s: warning: "), exec_name);
-  vfprintf (stderr, _(gmsgid), ap);
-  fputc ('\n', stderr);
-  va_end (ap);
-}
-
-void
-warning0 (const char *gmsgid, ...)
-{
-  va_list ap;
-  va_start (ap, gmsgid);
-  fprintf (stderr, _("%s: warning: "), exec_name);
-  vfprintf (stderr, _(gmsgid), ap);
-  fputc ('\n', stderr);
-  va_end (ap);
-}
-
-void
-fancy_abort (const char *file, int line, const char *func)
-{
-  fatal_error ("abort in %s, at %s:%d", func, file, line);
-}
diff --git a/gcc/java/jvgenmain.c b/gcc/java/jvgenmain.c
index e0cddc0..f4fb0ba 100644
--- a/gcc/java/jvgenmain.c
+++ b/gcc/java/jvgenmain.c
@@ -1,5 +1,5 @@
 /* Program to generate "main" a Java(TM) class containing a main method.
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -57,14 +57,23 @@ main (int argc, char **argv)
   FILE *stream;
   const char *mangled_classname;
   int i, last_arg;
+  int indirect = 0;
+  char *prog_name = argv[0];
 
   /* Unlock the stdio streams.  */
   unlock_std_streams ();
 
   gcc_init_libintl ();
 
+  if (argc > 1 && ! strcmp (argv[1], "-findirect-dispatch"))
+    {
+      indirect = 1;
+      ++argv;
+      --argc;
+    }
+
   if (argc < 2)
-    usage (argv[0]);
+    usage (prog_name);
 
   for (i = 1; i < argc; ++i)
     {
@@ -77,7 +86,7 @@ main (int argc, char **argv)
     }
 
   if (i < argc - 2 || i == argc)
-    usage (argv[0]);
+    usage (prog_name);
   last_arg = i;
 
   classname = argv[i];
@@ -85,7 +94,7 @@ main (int argc, char **argv)
   /* gcj always appends `main' to classname.  We need to strip this here.  */
   p = strrchr (classname, 'm');
   if (p == NULL || p == classname || strcmp (p, "main") != 0)
-    usage (argv[0]);
+    usage (prog_name);
   else
     *p = '\0';
 
@@ -99,7 +108,7 @@ main (int argc, char **argv)
       if (stream == NULL)
 	{
 	  fprintf (stderr, _("%s: Cannot open output file: %s\n"),
-		   argv[0], outfile);
+		   prog_name, outfile);
 	  exit (1);
 	}
     }
@@ -130,13 +139,18 @@ main (int argc, char **argv)
   fprintf (stream, "int main (int argc, const char **argv)\n");
   fprintf (stream, "{\n");
   fprintf (stream, "   _Jv_Compiler_Properties = props;\n");
-  fprintf (stream, "   extern void *%s;\n", mangled_classname);
-  fprintf (stream, "   JvRunMain (%s, argc, argv);\n", mangled_classname);
+  if (indirect)
+    fprintf (stream, "   JvRunMainName (\"%s\", argc, argv);\n", classname);
+  else
+    {
+      fprintf (stream, "   extern void *%s;\n", mangled_classname);
+      fprintf (stream, "   JvRunMain (%s, argc, argv);\n", mangled_classname);
+    }
   fprintf (stream, "}\n");
   if (stream != stdout && fclose (stream) != 0)
     {
       fprintf (stderr, _("%s: Failed to close output file %s\n"),
-	       argv[0], argv[2]);
+	       prog_name, argv[2]);
       exit (1);
     }
   return 0;
diff --git a/gcc/java/jvspec.c b/gcc/java/jvspec.c
index 275dda7..a26f4f6 100644
--- a/gcc/java/jvspec.c
+++ b/gcc/java/jvspec.c
@@ -1,7 +1,7 @@
 /* Specific flags and argument handling of the front-end of the 
    GNU compiler for the Java(TM) language.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -29,6 +29,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #include "coretypes.h"
 #include "tm.h"
 #include "gcc.h"
+#include "jcf.h"
 
 /* Name of spec file.  */
 #define SPEC_FILE "libgcj.spec"
@@ -58,7 +59,7 @@ int lang_specific_extra_outfiles = 0;
 int shared_libgcc = 1;
 
 static const char jvgenmain_spec[] =
-  "jvgenmain %{D*} %b %m.i |\n\
+  "jvgenmain %{findirect-dispatch} %{D*} %b %m.i |\n\
    cc1 %m.i %1 \
 		   %{!Q:-quiet} -dumpbase %b.c %{d*} %{m*} %{a*}\
 		   %{g*} %{O*} \
@@ -74,7 +75,7 @@ static const char jvgenmain_spec[] =
 		   %<fextdirs*\
 		   %<fuse-divide-subroutine %<fno-use-divide-subroutine\
 		   %<fcheck-references %<fno-check-references\
-		   %<ffilelist-file\
+		   %<ffilelist-file %<fsaw-java-file %<fsource* %<ftarget*\
 		   %{f*} -fdollars-in-identifiers\
 		   %{aux-info*}\
 		   %{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
@@ -103,7 +104,6 @@ find_spec_file (const char *dir)
   return NULL;
 }
 
-/* FIXME: these should come from lex.h.  */
 #define JAVA_START_CHAR_P(c) (c < 128 && (ISIDST (c) || c == '$'))
 #define JAVA_PART_CHAR_P(c) (c < 128					      \
 			     && (ISIDNUM (c)				      \
@@ -189,23 +189,6 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
      already gave a language for the file.  */
   int saw_speclang = 0;
 
-#if 0
-  /* "-lm" or "-lmath" if it appears on the command line.  */
-  const char *saw_math ATTRIBUTE_UNUSED = 0;
-
-  /* "-lc" if it appears on the command line.  */
-  const char *saw_libc ATTRIBUTE_UNUSED = 0;
-
-  /* "-lgcjgc" if it appears on the command line.  */
-  const char *saw_gc ATTRIBUTE_UNUSED = 0;
-
-  /* Saw `-l' option for the thread library.  */
-  const char *saw_threadlib ATTRIBUTE_UNUSED = 0;
-
-  /* Saw `-lgcj' on command line.  */
-  int saw_libgcj ATTRIBUTE_UNUSED = 0;
-#endif
-
   /* Saw --resource, -C or -o options, respectively. */
   int saw_resource = 0;
   int saw_C = 0;
@@ -231,6 +214,10 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
   /* The number of libraries added in.  */
   int added_libraries;
 
+  /* The total number of arguments having to do with classpath
+     setting.  */
+  int classpath_args = 0;
+
   /* The total number of arguments with the new stuff.  */
   int num_args = 1;
 
@@ -467,14 +454,6 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
       num_args -= java_files_count + class_files_count + zip_files_count;
       num_args += 3;  /* for the combined arg "-xjava", and "-xnone" */
     }
-  /* If we know we don't have to do anything, bail now.  */
-#if 0
-  if (! added && ! library && main_class_name == NULL && ! saw_C)
-    {
-      free (args);
-      return;
-    }
-#endif
 
   if (main_class_name)
     {
@@ -483,6 +462,8 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
   if (saw_g + saw_O == 0)
     num_args++;
   num_args++;
+  /* An additional entry for the classpath.  */
+  num_args++;
 
   if (combine_inputs || indirect_files_count > 0)
     num_args += 1; /* for "-ffilelist-file" */
@@ -495,6 +476,9 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
   shared_libgcc = 0;
 #endif  
   
+  if (java_files_count > 0)
+    ++num_args;
+
   num_args += shared_libgcc;
 
   num_args += link_for_bc_abi;
@@ -514,6 +498,10 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
       arglist[j++] = "-xnone";
     }
 
+  if (java_files_count > 0)
+    arglist[j++] = "-fsaw-java-file";
+
+  jcf_path_init ();
   for (i = 1; i < argc; i++, j++)
     {
       arglist[j] = argv[i];
@@ -528,11 +516,51 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
 	  arglist[j] = "-xnone";
 	}
 
-      if (strcmp (argv[i], "-classpath") == 0
-	  || strcmp (argv[i], "-bootclasspath") == 0
-	  || strcmp (argv[i], "-CLASSPATH") == 0
-	  || strcmp (argv[i], "-encoding") == 0
-	  || strcmp (argv[i], "-extdirs") == 0)
+      if (argv[i][1] == 'I')
+	{
+	  jcf_path_include_arg (&argv[i][2]);
+	  --j;
+	  continue;
+	}
+      if (! strcmp (argv[i], "-classpath")
+	  || ! strcmp (argv[i], "-CLASSPATH"))
+	{
+	  jcf_path_classpath_arg (argv[i + 1]);
+	  ++i;
+	  --j;
+	  continue;
+	}
+      if (! strcmp (argv[i], "-bootclasspath"))
+	{
+	  jcf_path_bootclasspath_arg (argv[i + 1]);
+	  ++i;
+	  --j;
+	  continue;
+	}
+      if (! strncmp (argv[i], "-fCLASSPATH=", 12)
+	  || ! strncmp (argv[i], "-fclasspath=", 12))
+	{
+	  char *p = strchr (argv[i], '=');
+	  jcf_path_classpath_arg (p + 1);
+	  --j;
+	  continue;
+	}
+      if (! strncmp (argv[i], "-fbootclasspath=", 16))
+	{
+	  char *p = strchr (argv[i], '=');
+	  jcf_path_bootclasspath_arg (p + 1);
+	  --j;
+	  continue;
+	}
+      if (! strcmp (argv[i], "-extdirs"))
+	{
+	  jcf_path_extdirs_arg (argv[i + 1]);
+	  ++i;
+	  --j;
+	  continue;
+	}
+
+      if (strcmp (argv[i], "-encoding") == 0)
 	{
 	  arglist[j] = concat ("-f", argv[i]+1, "=", argv[i+1], NULL);
 	  i++;
@@ -580,6 +608,11 @@ lang_specific_driver (int *in_argc, const char *const **in_argv,
 	}
   }
 
+  /* Handle classpath setting.  We specify the bootclasspath since
+     that requires the fewest changes to our existing code...  */
+  jcf_path_seal (0);
+  arglist[j++] = jcf_path_compute ("-fbootclasspath=");
+
   if (combine_inputs)
     {
       if (fclose (filelist_file))
diff --git a/gcc/java/keyword.gperf b/gcc/java/keyword.gperf
deleted file mode 100644
index 922c987..0000000
--- a/gcc/java/keyword.gperf
+++ /dev/null
@@ -1,91 +0,0 @@
-%{
-/* Keyword definition for the GNU compiler for the Java(TM) language.
-   Copyright (C) 1997, 1998, 2001, 2002, 2003
-   Free Software Foundation, Inc.
-   Contributed by Alexandre Petit-Bianco (apbianco@cygnus.com)
-
-This file is part of GCC.
-
-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.
-
-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 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.
-The Free Software Foundation is independent of Sun Microsystems, Inc.  */
-
-%}
-struct java_keyword { const char *const name; const int token; };
-#ifdef __GNUC__
-__inline
-#endif
-static unsigned int hash (const char *, unsigned int);
-#ifdef __GNUC__
-__inline
-#endif
-const struct java_keyword *java_keyword (const char *, unsigned int);
-%%
-abstract, ABSTRACT_TK
-default, DEFAULT_TK
-if, IF_TK
-private, PRIVATE_TK
-throw, THROW_TK
-boolean, BOOLEAN_TK
-do, DO_TK
-implements, IMPLEMENTS_TK
-protected, PROTECTED_TK
-throws, THROWS_TK
-break, BREAK_TK
-double, DOUBLE_TK
-import, IMPORT_TK
-public, PUBLIC_TK
-transient, TRANSIENT_TK
-byte, BYTE_TK
-else, ELSE_TK
-instanceof, INSTANCEOF_TK
-return, RETURN_TK
-try, TRY_TK
-case, CASE_TK
-extends, EXTENDS_TK
-int, INT_TK
-short, SHORT_TK
-void, VOID_TK
-catch, CATCH_TK
-final, FINAL_TK
-interface, INTERFACE_TK
-static, STATIC_TK
-volatile, VOLATILE_TK
-char, CHAR_TK
-finally, FINALLY_TK
-long, LONG_TK
-super, SUPER_TK
-while, WHILE_TK
-class, CLASS_TK
-float, FLOAT_TK
-native, NATIVE_TK
-switch, SWITCH_TK
-const, CONST_TK
-for, FOR_TK
-new, NEW_TK
-synchronized, SYNCHRONIZED_TK
-continue, CONTINUE_TK
-goto, GOTO_TK
-package, PACKAGE_TK
-this, THIS_TK
-strictfp, STRICT_TK
-# true, false and null aren't keyword. But we match them easily this way
-true, TRUE_TK
-false, FALSE_TK
-null, NULL_TK
-assert, ASSERT_TK
diff --git a/gcc/java/keyword.h b/gcc/java/keyword.h
deleted file mode 100644
index a6faf74..0000000
--- a/gcc/java/keyword.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/* ANSI-C code produced by gperf version 2.7.2 */
-/* Command-line: gperf -L ANSI-C -C -F ', 0' -p -t -j1 -i 1 -g -o -N java_keyword -k'1,4,$' keyword.gperf  */
-/* Keyword definition for the GNU compiler for the Java(TM) language.
-   Copyright (C) 1997, 1998, 2001, 2002, 2003
-   Free Software Foundation, Inc.
-   Contributed by Alexandre Petit-Bianco (apbianco@cygnus.com)
-
-This file is part of GCC.
-
-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.
-
-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 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.
-The Free Software Foundation is independent of Sun Microsystems, Inc.  */
-
-struct java_keyword { const char *const name; const int token; };
-#ifdef __GNUC__
-__inline
-#endif
-static unsigned int hash (const char *, unsigned int);
-#ifdef __GNUC__
-__inline
-#endif
-const struct java_keyword *java_keyword (const char *, unsigned int);
-
-#define TOTAL_KEYWORDS 52
-#define MIN_WORD_LENGTH 2
-#define MAX_WORD_LENGTH 12
-#define MIN_HASH_VALUE 7
-#define MAX_HASH_VALUE 85
-/* maximum key range = 79, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-static unsigned int
-hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      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
-    };
-  int hval = len;
-
-  switch (hval)
-    {
-      default:
-      case 4:
-        hval += asso_values[(unsigned char)str[3]];
-      case 3:
-      case 2:
-      case 1:
-        hval += asso_values[(unsigned char)str[0]];
-        break;
-    }
-  return hval + asso_values[(unsigned char)str[len - 1]];
-}
-
-#ifdef __GNUC__
-__inline
-#endif
-const struct java_keyword *
-java_keyword (const char *str, unsigned int len)
-{
-  static const struct java_keyword wordlist[] =
-    {
-      {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
-      {"", 0},
-      {"else", ELSE_TK},
-      {"true", TRUE_TK},
-      {"case", CASE_TK},
-      {"assert", ASSERT_TK},
-      {"default", DEFAULT_TK},
-      {"", 0},
-      {"abstract", ABSTRACT_TK},
-      {"continue", CONTINUE_TK},
-      {"extends", EXTENDS_TK},
-      {"const", CONST_TK},
-      {"static", STATIC_TK},
-      {"this", THIS_TK},
-      {"long", LONG_TK},
-      {"class", CLASS_TK},
-      {"", 0},
-      {"synchronized", SYNCHRONIZED_TK},
-      {"do", DO_TK},
-      {"null", NULL_TK},
-      {"final", FINAL_TK},
-      {"float", FLOAT_TK},
-      {"super", SUPER_TK},
-      {"short", SHORT_TK},
-      {"", 0},
-      {"false", FALSE_TK},
-      {"transient", TRANSIENT_TK},
-      {"catch", CATCH_TK},
-      {"int", INT_TK},
-      {"throws", THROWS_TK},
-      {"switch", SWITCH_TK},
-      {"for", FOR_TK},
-      {"char", CHAR_TK},
-      {"", 0},
-      {"interface", INTERFACE_TK},
-      {"byte", BYTE_TK},
-      {"try", TRY_TK},
-      {"double", DOUBLE_TK},
-      {"while", WHILE_TK},
-      {"return", RETURN_TK},
-      {"implements", IMPLEMENTS_TK},
-      {"void", VOID_TK},
-      {"public", PUBLIC_TK},
-      {"if", IF_TK},
-      {"protected", PROTECTED_TK},
-      {"volatile", VOLATILE_TK},
-      {"goto", GOTO_TK},
-      {"", 0},
-      {"native", NATIVE_TK},
-      {"break", BREAK_TK},
-      {"", 0},
-      {"import", IMPORT_TK},
-      {"new", NEW_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},
-      {"strictfp", STRICT_TK},
-      {"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0},
-      {"private", PRIVATE_TK}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          const char *s = wordlist[key].name;
-
-          if (*str == *s && !strcmp (str + 1, s + 1))
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
diff --git a/gcc/java/lang-specs.h b/gcc/java/lang-specs.h
index 1531bf2..be439d4 100644
--- a/gcc/java/lang-specs.h
+++ b/gcc/java/lang-specs.h
@@ -1,5 +1,5 @@
 /* Definitions for specs for the GNU compiler for the Java(TM) language.
-   Copyright (C) 1996, 1998, 1999, 2000, 2001, 2003, 2004
+   Copyright (C) 1996, 1998, 1999, 2000, 2001, 2003, 2004, 2006
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -35,7 +35,30 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
     %{fjni:%{femit-class-file:%e-fjni and -femit-class-file are incompatible}}\
     %{femit-class-file:%{!fsyntax-only:%e-femit-class-file should used along with -fsyntax-only}}\
     %{femit-class-files:%{!fsyntax-only:%e-femit-class-file should used along with -fsyntax-only}}\
-    %{!E:jc1 %i %(jc1) %(cc1_options) %{+e*} %{I*}\
-             %{MD:-MD_} %{MMD:-MMD_} %{M} %{MM} %{MA} %{MT*} %{MF*}\
-             %{!fsyntax-only:%(invoke_as)}}", 0, 0, 0},
+    %{E:%{e-E is not valid for gcj}}\
+    %{.java|fsaw-java-file:ecj1 %i %{W*} %{w} %{g*}			\
+      %{fbootclasspath*}						\
+      %{fenable-assertions*}						\
+      %{fdisable-assertions*}						\
+      %{fencoding*} %{ffilelist-file}					\
+      %{foutput-class-dir*} %{g*}					\
+      %{fsource*} %{!fsource*:-fsource=1.5}				\
+      %{ftarget*} %{!femit-class-files|!ftarget*:-ftarget=1.5}		\
+      %{!findirect-dispatch:-fzip-dependency %U.zip}			\
+      %{!fsyntax-only:-fzip-target %U.jar}}\n				\
+    %{.class|.zip|.jar|!fsyntax-only:jc1				\
+      %{.java|fsaw-java-file:%U.jar -fsource-filename=%i %<ffilelist-file} \
+      %{.class|.zip|.jar|ffilelist-file|fcompile-resource*:%i}		\
+      %(jc1) %(cc1_options) %{I*} %{!findirect-dispatch:-faux-classpath %U.zip} \
+      %{MD:-MD_} %{MMD:-MMD_} %{M} %{MM} %{MA} %{MT*} %{MF*}\
+      %(invoke_as)}",
+      0, 0, 0},
 
+  /*
+    FIXME: we don't use %|, even though we could, because we need the
+    dependency zip to be ready early enough.  We could work around
+    this by not having a dependency zip and instead teaching jc1 to
+    read a special manifest file included in the sole zip, this
+    manifest would say which files are to be compiled and which are
+    not.
+   */
diff --git a/gcc/java/lang.c b/gcc/java/lang.c
index 6344c3c..51a59d2 100644
--- a/gcc/java/lang.c
+++ b/gcc/java/lang.c
@@ -1,6 +1,6 @@
 /* Java(TM) language-specific utility routines.
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -120,16 +120,11 @@ const struct attribute_spec java_attribute_table[] =
    prototypes.  Starts out false.  */
 static bool inhibit_error_function_printing;
 
-int compiling_from_source;
-
 const char *resource_name;
 
 /* When nonzero, -Wall was turned on.  */
 int flag_wall = 0;
 
-/* The encoding of the source file.  */
-const char *current_encoding = NULL;
-
 /* When nonzero, report use of deprecated classes, methods, or fields.  */
 int flag_deprecated = 1;
 
@@ -313,6 +308,7 @@ java_handle_option (size_t scode, const char *arg, int value)
       jcf_path_bootclasspath_arg (arg);
       break;
 
+    case OPT_faux_classpath:
     case OPT_fclasspath_:
     case OPT_fCLASSPATH_:
       jcf_path_classpath_arg (arg);
@@ -328,7 +324,7 @@ java_handle_option (size_t scode, const char *arg, int value)
       break;
 
     case OPT_fencoding_:
-      current_encoding = arg;
+      /* Nothing.  */
       break;
 
     case OPT_fextdirs_:
@@ -336,13 +332,17 @@ java_handle_option (size_t scode, const char *arg, int value)
       break;
 
     case OPT_foutput_class_dir_:
-      jcf_write_base_directory = arg;
+      /* FIXME: remove; this is handled by ecj1 now.  */
       break;
 
     case OPT_version:
       v_flag = 1;
       break;
       
+    case OPT_fsource_filename_:
+      java_read_sourcefilenames (arg);
+      break;
+      
     default:
       if (cl_options[code].flags & CL_Java)
 	break;
@@ -994,7 +994,8 @@ java_dump_tree (void *dump_info, tree t)
 static bool
 java_decl_ok_for_sibcall (tree decl)
 {
-  return decl != NULL && DECL_CONTEXT (decl) == output_class;
+  return (decl != NULL && DECL_CONTEXT (decl) == output_class
+	  && DECL_INLINE (decl));
 }
 
 /* Given a call_expr, try to figure out what its target might be.  In
diff --git a/gcc/java/lang.opt b/gcc/java/lang.opt
index d93f054..67852ee 100644
--- a/gcc/java/lang.opt
+++ b/gcc/java/lang.opt
@@ -81,6 +81,9 @@ fCLASSPATH=
 Java JoinedOrMissing RejectNegative
 --CLASSPATH	Deprecated; use --classpath instead
 
+faux-classpath
+Java Separate RejectNegative Undocumented
+
 fassert
 Java Var(flag_assert) Init(1)
 Permit the use of the assert keyword
@@ -134,10 +137,16 @@ fextdirs=
 Java Joined RejectNegative
 --extdirs=<path>	Set the extension directory path
 
+fsource-filename=
+Java Joined Undocumented 
+
 ffilelist-file
 Java Var(flag_filelist_file)
 Input file is a file with a list of filenames to compile
 
+fsaw-java-file
+Java Undocumented RejectNegative
+
 fforce-classes-archive-check
 Java Var(flag_force_classes_archive_check)
 Always check for non gcj generated classes archives
@@ -188,5 +197,175 @@ fbootstrap-classes
 Java Var(flag_bootstrap_classes)
 Generated should be loaded by bootstrap loader
 
+fsource=
+Java Joined
+Set the source language version
+
+ftarget=
+Java Joined
+Set the target VM version
+
 version
 Java
+
+;
+; Warnings handled by ecj.
+; FIXME: document them
+;
+
+Wconstructor-name
+Java
+
+Wpkg-default-method
+Java
+
+Wmasked-catch-block
+Java
+
+Wall-deprecation
+Java
+
+Wunused-local
+Java
+
+Wunused-argument
+Java
+
+Wunused-import
+Java
+
+Wunused-private
+Java
+
+Wunused-label
+Java
+
+Wlocal-hiding
+Java
+
+Wfield-hiding
+Java
+
+Wspecial-param-hiding
+Java
+
+Wcondition-assign
+Java
+
+Wsynthetic-access
+Java
+
+Wnls
+Java
+
+Wstatic-receiver
+Java
+
+Windirect-static
+Java
+
+Wno-effect-assign
+Java
+
+Wintf-non-inherited
+Java
+
+Wchar-concat
+Java
+
+Wserial
+Java
+
+Wempty-block
+Java
+
+Wuseless-type-check
+Java
+
+Wuncheck
+Java
+
+Wraw
+Java
+
+Wfinal-bound
+Java
+
+Wsuppress
+Java
+
+Wwarning-token
+Java
+
+Wunnecessary-else
+Java
+
+Wjavadoc
+Java
+
+Wall-javadoc
+Java
+
+Wtasks
+Java
+
+Wassert-identifier
+Java
+
+Wenum-identifier
+Java
+
+Wfinally
+Java
+
+Wunused-thrown
+Java
+
+Wunqualified-field
+Java
+
+Wtype-hiding
+Java
+
+Wvarargs-cast
+Java
+
+Wnull
+Java
+
+Wboxing
+Java
+
+Wover-ann
+Java
+
+Wdep-ann
+Java
+
+Wintf-annotation
+Java
+
+Wenum-switch
+Java
+
+Whiding
+Java
+
+Wstatic-access
+Java
+
+Wunused
+Java
+
+Wparam-assign
+Java
+
+Wdiscouraged
+Java
+
+Wforbidden
+Java
+
+Wfallthrough
+Java
+
diff --git a/gcc/java/lex.c b/gcc/java/lex.c
deleted file mode 100644
index 730c144..0000000
--- a/gcc/java/lex.c
+++ /dev/null
@@ -1,2073 +0,0 @@
-/* Language lexer for the GNU compiler for the Java(TM) language.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-   Free Software Foundation, Inc.
-   Contributed by Alexandre Petit-Bianco (apbianco@cygnus.com)
-
-This file is part of GCC.
-
-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.
-
-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 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.
-The Free Software Foundation is independent of Sun Microsystems, Inc.  */
-
-/* It defines java_lex (yylex) that reads a Java ASCII source file
-   possibly containing Unicode escape sequence or utf8 encoded
-   characters and returns a token for everything found but comments,
-   white spaces and line terminators. When necessary, it also fills
-   the java_lval (yylval) union. It's implemented to be called by a
-   re-entrant parser generated by Bison.
-
-   The lexical analysis conforms to the Java grammar described in "The
-   Java(TM) Language Specification. J. Gosling, B. Joy, G. Steele.
-   Addison Wesley 1996" (http://java.sun.com/docs/books/jls/html/3.doc.html) */
-
-#include "keyword.h"
-#include "flags.h"
-#include "chartables.h"
-#ifndef JC1_LITE
-#include "timevar.h"
-#endif
-
-/* Function declarations.  */
-static char *java_sprint_unicode (int);
-static void java_unicode_2_utf8 (unicode_t);
-static void java_lex_error (const char *, int);
-#ifndef JC1_LITE
-static int do_java_lex (YYSTYPE *);
-static int java_lex (YYSTYPE *);
-static int java_is_eol (FILE *, int);
-static tree build_wfl_node (tree);
-#endif
-static int java_parse_escape_sequence (void);
-static int java_start_char_p (unicode_t);
-static int java_part_char_p (unicode_t);
-static int java_space_char_p (unicode_t);
-static void java_parse_doc_section (int);
-static void java_parse_end_comment (int);
-static int java_read_char (java_lexer *);
-static int java_get_unicode (void);
-static int java_peek_unicode (void);
-static void java_next_unicode (void);
-static int java_read_unicode (java_lexer *, int *);
-#ifndef JC1_LITE
-static int utf8_cmp (const unsigned char *, int, const char *);
-#endif
-
-java_lexer *java_new_lexer (FILE *, const char *);
-#ifndef JC1_LITE
-static void error_if_numeric_overflow (tree);
-#endif
-
-#ifdef HAVE_ICONV
-/* This is nonzero if we have initialized `need_byteswap'.  */
-static int byteswap_init = 0;
-
-/* Some versions of iconv() (e.g., glibc 2.1.3) will return UCS-2 in
-   big-endian order -- not native endian order.  We handle this by
-   doing a conversion once at startup and seeing what happens.  This
-   flag holds the results of this determination.  */
-static int need_byteswap = 0;
-#endif
-
-void
-java_init_lex (FILE *finput, const char *encoding)
-{
-#ifndef JC1_LITE
-  int java_lang_imported = 0;
-
-  if (!java_lang_id)
-    java_lang_id = get_identifier ("java.lang");
-  if (!inst_id)
-    inst_id = get_identifier ("inst$");
-  if (!wpv_id)
-    wpv_id = get_identifier ("write_parm_value$");
-
-  if (!java_lang_imported)
-    {
-      tree node = build_tree_list (build_unknown_wfl (java_lang_id),
-				   NULL_TREE);
-      read_import_dir (TREE_PURPOSE (node));
-      TREE_CHAIN (node) = ctxp->import_demand_list;
-      ctxp->import_demand_list = node;
-      java_lang_imported = 1;
-    }
-
-  if (!wfl_operator)
-    {
-#ifndef JC1_LITE
-#ifdef USE_MAPPED_LOCATION
-      wfl_operator = build_expr_wfl (NULL_TREE, input_location);
-#else
-      wfl_operator = build_expr_wfl (NULL_TREE, ctxp->filename, 0, 0);
-#endif
-#endif
-    }
-  if (!label_id)
-    label_id = get_identifier ("$L");
-  if (!wfl_append) 
-    wfl_append = build_unknown_wfl (get_identifier ("append"));
-  if (!wfl_string_buffer)
-    wfl_string_buffer = 
-      build_unknown_wfl (get_identifier (flag_emit_class_files
-				      ? "java.lang.StringBuffer"
-					 : "gnu.gcj.runtime.StringBuffer"));
-  if (!wfl_to_string)
-    wfl_to_string = build_unknown_wfl (get_identifier ("toString"));
-
-  CPC_INITIALIZER_LIST (ctxp) = CPC_STATIC_INITIALIZER_LIST (ctxp) =
-    CPC_INSTANCE_INITIALIZER_LIST (ctxp) = NULL_TREE;
-
-  memset (ctxp->modifier_ctx, 0, sizeof (ctxp->modifier_ctx));
-  ctxp->current_parsed_class = NULL;
-  ctxp->package = NULL_TREE;
-#endif
-
-#ifndef JC1_LITE
-  ctxp->save_location = input_location;
-#endif
-  ctxp->java_error_flag = 0;
-  ctxp->lexer = java_new_lexer (finput, encoding);
-}
-
-static char *
-java_sprint_unicode (int c)
-{
-  static char buffer [10];
-  if (c < ' ' || c >= 127)
-    sprintf (buffer, "\\u%04x", c);
-  else
-    {
-      buffer [0] = c;
-      buffer [1] = '\0';
-    }
-  return buffer;
-}
-
-/* Create a new lexer object.  */
-
-java_lexer *
-java_new_lexer (FILE *finput, const char *encoding)
-{
-  java_lexer *lex = XNEW (java_lexer);
-  int enc_error = 0;
-
-  lex->finput = finput;
-  lex->bs_count = 0;
-  lex->unget_value = 0;
-  lex->next_unicode = 0;
-  lex->avail_unicode = 0;
-  lex->next_columns = 1;
-  lex->encoding = encoding;
-  lex->position.line = 1;
-  lex->position.col = 1;
-#ifndef JC1_LITE
-#ifdef USE_MAPPED_LOCATION
-      input_location
-	= linemap_line_start (&line_table, 1, 120);
-#else
-      input_line = 1;
-#endif
-#endif
-
-#ifdef HAVE_ICONV
-  lex->handle = iconv_open ("UCS-2", encoding);
-  if (lex->handle != (iconv_t) -1)
-    {
-      lex->first = -1;
-      lex->last = -1;
-      lex->out_first = -1;
-      lex->out_last = -1;
-      lex->read_anything = 0;
-      lex->use_fallback = 0;
-
-      /* Work around broken iconv() implementations by doing checking at
-	 runtime.  We assume that if the UTF-8 => UCS-2 encoder is broken,
-	 then all UCS-2 encoders will be broken.  Perhaps not a valid
-	 assumption.  */
-      if (! byteswap_init)
-	{
-	  iconv_t handle;
-
-	  byteswap_init = 1;
-
-	  handle = iconv_open ("UCS-2", "UTF-8");
-	  if (handle != (iconv_t) -1)
-	    {
-	      unicode_t result;
-	      unsigned char in[3];
-	      char *inp, *outp;
-	      size_t inc, outc, r;
-
-	      /* This is the UTF-8 encoding of \ufeff.  */
-	      in[0] = 0xef;
-	      in[1] = 0xbb;
-	      in[2] = 0xbf;
-
-	      inp = (char *) in;
-	      inc = 3;
-	      outp = (char *) &result;
-	      outc = 2;
-
-	      r = iconv (handle, (ICONV_CONST char **) &inp, &inc,
-			 &outp, &outc);
-	      iconv_close (handle);
-	      /* Conversion must be complete for us to use the result.  */
-	      if (r != (size_t) -1 && inc == 0 && outc == 0)
-		need_byteswap = (result != 0xfeff);
-	    }
-	}
-
-      lex->byte_swap = need_byteswap;
-    }
-  else
-#endif /* HAVE_ICONV */
-    {
-      /* If iconv failed, use the internal decoder if the default
-	 encoding was requested.  This code is used on platforms where
-	 iconv exists but is insufficient for our needs.  For
-	 instance, on Solaris 2.5 iconv cannot handle UTF-8 or UCS-2.
-
-	 On Solaris the default encoding, as returned by nl_langinfo(),
-	 is `646' (aka ASCII), but the Solaris iconv_open() doesn't
-	 understand that.  We work around that by pretending
-	 `646' to be the same as UTF-8.   */
-      if (strcmp (encoding, DEFAULT_ENCODING) && strcmp (encoding, "646"))
-	enc_error = 1;
-#ifdef HAVE_ICONV
-      else
-        {
-	  lex->use_fallback = 1;
-	  lex->encoding = "UTF-8";
-	}
-#endif /* HAVE_ICONV */
-    }
-
-  if (enc_error)
-    fatal_error ("unknown encoding: %qs\nThis might mean that your locale's encoding is not supported\nby your system's iconv(3) implementation.  If you aren't trying\nto use a particular encoding for your input file, try the\n%<--encoding=UTF-8%> option", encoding);
-
-  return lex;
-}
-
-void
-java_destroy_lexer (java_lexer *lex)
-{
-#ifdef HAVE_ICONV
-  if (! lex->use_fallback)
-    iconv_close (lex->handle);
-#endif
-  free (lex);
-}
-
-static int
-java_read_char (java_lexer *lex)
-{
-#ifdef HAVE_ICONV
-  if (! lex->use_fallback)
-    {
-      size_t ir, inbytesleft, in_save, out_count, out_save;
-      char *inp, *outp;
-      unicode_t result;
-
-      /* If there is data which has already been converted, use it.  */
-      if (lex->out_first == -1 || lex->out_first >= lex->out_last)
-	{
-	  lex->out_first = 0;
-	  lex->out_last = 0;
-
-	  while (1)
-	    {
-	      /* See if we need to read more data.  If FIRST == 0 then
-		 the previous conversion attempt ended in the middle of
-		 a character at the end of the buffer.  Otherwise we
-		 only have to read if the buffer is empty.  */
-	      if (lex->first == 0 || lex->first >= lex->last)
-		{
-		  int r;
-
-		  if (lex->first >= lex->last)
-		    {
-		      lex->first = 0;
-		      lex->last = 0;
-		    }
-		  if (feof (lex->finput))
-		    return UEOF;
-		  r = fread (&lex->buffer[lex->last], 1,
-			     sizeof (lex->buffer) - lex->last,
-			     lex->finput);
-		  lex->last += r;
-		}
-
-	      inbytesleft = lex->last - lex->first;
-	      out_count = sizeof (lex->out_buffer) - lex->out_last;
-
-	      if (inbytesleft == 0)
-		{
-		  /* We've tried to read and there is nothing left.  */
-		  return UEOF;
-		}
-
-	      in_save = inbytesleft;
-	      out_save = out_count;
-	      inp = &lex->buffer[lex->first];
-	      outp = (char *) &lex->out_buffer[lex->out_last];
-	      ir = iconv (lex->handle, (ICONV_CONST char **) &inp,
-			  &inbytesleft, &outp, &out_count);
-
-	      /* If we haven't read any bytes, then look to see if we
-		 have read a BOM.  */
-	      if (! lex->read_anything && out_save - out_count >= 2)
-		{
-		  unicode_t uc = * (unicode_t *) &lex->out_buffer[0];
-		  if (uc == 0xfeff)
-		    {
-		      lex->byte_swap = 0;
-		      lex->out_first += 2;
-		    }
-		  else if (uc == 0xfffe)
-		    {
-		      lex->byte_swap = 1;
-		      lex->out_first += 2;
-		    }
-		  lex->read_anything = 1;
-		}
-
-	      if (lex->byte_swap)
-		{
-		  unsigned int i;
-		  for (i = 0; i < out_save - out_count; i += 2)
-		    {
-		      char t = lex->out_buffer[lex->out_last + i];
-		      lex->out_buffer[lex->out_last + i]
-			= lex->out_buffer[lex->out_last + i + 1];
-		      lex->out_buffer[lex->out_last + i + 1] = t;
-		    }
-		}
-
-	      lex->first += in_save - inbytesleft;
-	      lex->out_last += out_save - out_count;
-
-	      /* If we converted anything at all, move along.  */
-	      if (out_count != out_save)
-		break;
-
-	      if (ir == (size_t) -1)
-		{
-		  if (errno == EINVAL)
-		    {
-		      /* This is ok.  This means that the end of our buffer
-			 is in the middle of a character sequence.  We just
-			 move the valid part of the buffer to the beginning
-			 to force a read.  */
-		      memmove (&lex->buffer[0], &lex->buffer[lex->first],
-			       lex->last - lex->first);
-		      lex->last -= lex->first;
-		      lex->first = 0;
-		    }
-		  else
-		    {
-		      /* A more serious error.  */
-		      char buffer[128];
-		      sprintf (buffer,
-			       "Unrecognized character for encoding '%s'", 
-		               lex->encoding);
-		      java_lex_error (buffer, 0);
-		      return UEOF;
-		    }
-		}
-	    }
-	}
-
-      if (lex->out_first == -1 || lex->out_first >= lex->out_last)
-	{
-	  /* Don't have any data.  */
-	  return UEOF;
-	}
-
-      /* Success.  */
-      result = * ((unicode_t *) &lex->out_buffer[lex->out_first]);
-      lex->out_first += 2;
-      return result;
-    }
-  else
-#endif /* HAVE_ICONV */
-    {
-      int c, c1, c2;
-      c = getc (lex->finput);
-
-      if (c == EOF)
-	return UEOF;
-      if (c < 128)
-	return (unicode_t) c;
-      else
-	{
-	  if ((c & 0xe0) == 0xc0)
-	    {
-	      c1 = getc (lex->finput);
-	      if ((c1 & 0xc0) == 0x80)
-		{
-		  unicode_t r = (unicode_t)(((c & 0x1f) << 6) + (c1 & 0x3f));
-		  /* Check for valid 2-byte characters.  We explicitly
-		     allow \0 because this encoding is common in the
-		     Java world.  */
-		  if (r == 0 || (r >= 0x80 && r <= 0x7ff))
-		    return r;
-		}
-	    }
-	  else if ((c & 0xf0) == 0xe0)
-	    {
-	      c1 = getc (lex->finput);
-	      if ((c1 & 0xc0) == 0x80)
-		{
-		  c2 = getc (lex->finput);
-		  if ((c2 & 0xc0) == 0x80)
-		    {
-		      unicode_t r =  (unicode_t)(((c & 0xf) << 12) + 
-						 (( c1 & 0x3f) << 6)
-						 + (c2 & 0x3f));
-		      /* Check for valid 3-byte characters.
-			 Don't allow surrogate, \ufffe or \uffff.  */
-		      if (IN_RANGE (r, 0x800, 0xffff)
-			  && ! IN_RANGE (r, 0xd800, 0xdfff)
-			  && r != 0xfffe && r != 0xffff)
-			return r;
-		    }
-		}
-	    }
-
-	  /* We simply don't support invalid characters.  We also
-	     don't support 4-, 5-, or 6-byte UTF-8 sequences, as these
-	     cannot be valid Java characters.  */
-	  java_lex_error ("malformed UTF-8 character", 0);
-	}
-    }
-
-  /* We only get here on error.  */
-  return UEOF;
-}
-
-static int
-java_read_unicode (java_lexer *lex, int *unicode_escape_p)
-{
-  int c;
-
-  if (lex->unget_value)
-    {
-      c = lex->unget_value;
-      lex->unget_value = 0;
-    }
-  else
-    c = java_read_char (lex);
-
-  *unicode_escape_p = 0;
-
-  if (c != '\\')
-    {
-      lex->bs_count = 0;
-      return c;
-    }
-
-  ++lex->bs_count;
-  if ((lex->bs_count) % 2 == 1)
-    {
-      /* Odd number of \ seen.  */
-      c = java_read_char (lex);
-      if (c == 'u')
-        {
-	  unicode_t unicode = 0;
-	  int shift = 12;
-
-	  /* Recognize any number of `u's in \u.  */
-	  while ((c = java_read_char (lex)) == 'u')
-	    ;
-
-	  shift = 12;
-	  do
-	    {
-	      if (c == UEOF)
-		{
-		  java_lex_error ("prematurely terminated \\u sequence", 0);
-		  return UEOF;
-		}
-
-	      if (hex_p (c))
-		unicode |= (unicode_t)(hex_value (c) << shift);
-	      else
-		{
-		  java_lex_error ("non-hex digit in \\u sequence", 0);
-		  break;
-		}
-
-	      c = java_read_char (lex);
-	      shift -= 4;
-	    }
-	  while (shift >= 0);
-
-	  if (c != UEOF)
-	    lex->unget_value = c;
-
-	  lex->bs_count = 0;
-	  *unicode_escape_p = 1;
-	  return unicode;
-	}
-      lex->unget_value = c;
-    }
-  return (unicode_t) '\\';
-}
-
-/* Get the next Unicode character (post-Unicode-escape-handling).
-   Move the current position to just after returned character. */
-
-static int
-java_get_unicode (void)
-{
-  int next = java_peek_unicode ();
-  java_next_unicode ();
-  return next;
-}
-
-/* Return the next Unicode character (post-Unicode-escape-handling).
-   Do not move the current position, which remains just before
-   the returned character. */
-
-static int
-java_peek_unicode (void)
-{
-  int unicode_escape_p;
-  java_lexer *lex = ctxp->lexer;
-  int next;
-
-  if (lex->avail_unicode)
-    return lex->next_unicode;
-
-  next = java_read_unicode (lex, &unicode_escape_p);
-
-  if (next == '\r')
-    {
-      /* We have to read ahead to see if we got \r\n.
-	 In that case we return a single line terminator.  */
-      int dummy;
-      next = java_read_unicode (lex, &dummy);
-      if (next != '\n' && next != UEOF)
-	lex->unget_value = next;
-      /* In either case we must return a newline.  */
-      next = '\n';
-    }
-
-  lex->next_unicode = next;
-  lex->avail_unicode = 1;
-
-  if (next == UEOF)
-    {
-      lex->next_columns = 0;
-      return next;
-    }
-
-  if (next == '\n')
-    {
-      lex->next_columns = 1 - lex->position.col;
-    }
-  else if (next == '\t')
-    {
-      int cur_col = lex->position.col;
-      lex->next_columns = ((cur_col + 7) & ~7) + 1 - cur_col;
-      
-    }
-  else
-    {
-      lex->next_columns = 1;
-    }
-  if (unicode_escape_p)
-    lex->next_columns = 6;
-  return next;
-}
-
-/* Move forward one Unicode character (post-Unicode-escape-handling).
-   Only allowed after java_peek_unicode.  The combination java_peek_unicode
-   followed by java_next_unicode is equivalent to java_get_unicode.  */
-
-static void java_next_unicode (void)
-{
-  struct java_lexer *lex = ctxp->lexer;
-  lex->position.col += lex->next_columns;
-  if (lex->next_unicode == '\n')
-    {
-      lex->position.line++; 
-#ifndef JC1_LITE
-#ifdef USE_MAPPED_LOCATION
-      input_location
-	= linemap_line_start (&line_table, lex->position.line, 120);
-#else
-      input_line = lex->position.line;
-#endif
-#endif
-    }
-  lex->avail_unicode = 0;
-}
-
-#if 0
-/* The inverse of java_next_unicode.
-   Not currently used, but could be if it would be cleaner or faster.
-   java_peek_unicode == java_get_unicode + java_unget_unicode.
-   java_get_unicode == java_peek_unicode + java_next_unicode.
-*/
-static void java_unget_unicode ()
-{
-  struct java_lexer *lex = ctxp->lexer;
-  if (lex->avail_unicode)
-    fatal_error ("internal error - bad unget");
-  lex->avail_unicode = 1;
-  lex->position.col -= lex->next_columns;
-}
-#endif
-
-/* Parse the end of a C style comment.
- * C is the first character following the '/' and '*'.  */
-static void
-java_parse_end_comment (int c)
-{
-  for ( ;; c = java_get_unicode ())
-    {
-      switch (c)
-	{
-	case UEOF:
-	  java_lex_error ("Comment not terminated at end of input", 0);
-	  return;
-	case '*':
-	  switch (c = java_peek_unicode ())
-	    {
-	    case UEOF:
-	      java_lex_error ("Comment not terminated at end of input", 0);
-	      return;
-	    case '/':
-	      java_next_unicode ();
-	      return;
-	    case '*':	/* Reparse only '*'.  */
-	      ;
-	    }
-	}
-    }
-}
-
-/* Parse the documentation section. Keywords must be at the beginning
-   of a documentation comment line (ignoring white space and any `*'
-   character). Parsed keyword(s): @DEPRECATED.  */
-
-static void
-java_parse_doc_section (int c)
-{
-  int last_was_star;
-
-  /* We reset this here, because only the most recent doc comment
-     applies to the following declaration.  */
-  ctxp->deprecated = 0;
-
-  /* We loop over all the lines of the comment.  We'll eventually exit
-     if we hit EOF prematurely, or when we see the comment
-     terminator.  */
-  while (1)
-    {
-      /* These first steps need only be done if we're still looking
-	 for the deprecated tag.  If we've already seen it, we might
-	 as well skip looking for it again.  */
-      if (! ctxp->deprecated)
-	{
-	  /* Skip whitespace and '*'s.  We must also check for the end
-	     of the comment here.  */
-	  while (JAVA_WHITE_SPACE_P (c) || c == '*')
-	    {
-	      last_was_star = (c == '*');
-	      c = java_get_unicode ();
-	      if (last_was_star && c == '/')
-		{
-		  /* We just saw the comment terminator.  */
-		  return;
-		}
-	    }
-
-	  if (c == UEOF)
-	    goto eof;
-
-	  if (c == '@')
-	    {
-	      const char *deprecated = "@deprecated";
-	      int i;
-
-	      for (i = 0; deprecated[i]; ++i)
-		{
-		  if (c != deprecated[i])
-		    break;
-		  /* We write the code in this way, with the
-		     update at the end, so that after the loop
-		     we're left with the next character in C.  */
-		  c = java_get_unicode ();
-		}
-
-	      if (c == UEOF)
-		goto eof;
-
-	      /* @deprecated must be followed by a space or newline.
-		 We also allow a '*' in case it appears just before
-		 the end of a comment.  In this position only we also
-		 must allow any Unicode space character.  */
-	      if (c == ' ' || c == '\n' || c == '*' || java_space_char_p (c))
-		{
-		  if (! deprecated[i])
-		    ctxp->deprecated = 1;
-		}
-	    }
-	}
-
-      /* We've examined the relevant content from this line.  Now we
-	 skip the remaining characters and start over with the next
-	 line.  We also check for end of comment here.  */
-      while (c != '\n' && c != UEOF)
-	{
-	  last_was_star = (c == '*');
-	  c = java_get_unicode ();
-	  if (last_was_star && c == '/')
-	    return;
-	}
-
-      if (c == UEOF)
-	goto eof;
-      /* We have to advance past the \n.  */
-      c = java_get_unicode ();
-      if (c == UEOF)
-	goto eof;
-    }
-
- eof:
-  java_lex_error ("Comment not terminated at end of input", 0);
-}
-
-/* Return true if C is a valid start character for a Java identifier.
-   This is only called if C >= 128 -- smaller values are handled
-   inline.  However, this function handles all values anyway.  */
-static int
-java_start_char_p (unicode_t c)
-{
-  unsigned int hi = c / 256;
-  const char *const page = type_table[hi];
-  unsigned long val = (unsigned long) page;
-  int flags;
-
-  if ((val & ~ LETTER_MASK) != 0)
-    flags = page[c & 255];
-  else
-    flags = val;
-
-  return flags & LETTER_START;
-}
-
-/* Return true if C is a valid part character for a Java identifier.
-   This is only called if C >= 128 -- smaller values are handled
-   inline.  However, this function handles all values anyway.  */
-static int
-java_part_char_p (unicode_t c)
-{
-  unsigned int hi = c / 256;
-  const char *const page = type_table[hi];
-  unsigned long val = (unsigned long) page;
-  int flags;
-
-  if ((val & ~ LETTER_MASK) != 0)
-    flags = page[c & 255];
-  else
-    flags = val;
-
-  return flags & LETTER_PART;
-}
-
-/* Return true if C is whitespace.  */
-static int
-java_space_char_p (unicode_t c)
-{
-  unsigned int hi = c / 256;
-  const char *const page = type_table[hi];
-  unsigned long val = (unsigned long) page;
-  int flags;
-
-  if ((val & ~ LETTER_MASK) != 0)
-    flags = page[c & 255];
-  else
-    flags = val;
-
-  return flags & LETTER_SPACE;
-}
-
-static int
-java_parse_escape_sequence (void)
-{
-  int c;
-
-  switch (c = java_get_unicode ())
-    {
-    case 'b':
-      return (unicode_t)0x8;
-    case 't':
-      return (unicode_t)0x9;
-    case 'n':
-      return (unicode_t)0xa;
-    case 'f':
-      return (unicode_t)0xc;
-    case 'r':
-      return (unicode_t)0xd;
-    case '"':
-      return (unicode_t)0x22;
-    case '\'':
-      return (unicode_t)0x27;
-    case '\\':
-      return (unicode_t)0x5c;
-    case '0': case '1': case '2': case '3': case '4':
-    case '5': case '6': case '7':
-      {
-	int more = 3;
-	unicode_t char_lit = 0;
-
-	if (c > '3')
-	  {
-	    /* According to the grammar, `\477' has a well-defined
-	       meaning -- it is `\47' followed by `7'.  */
-	    --more;
-	  }
-	char_lit = 0;
-	for (;;)
-	  {
-	    char_lit = 8 * char_lit + c - '0';
-	    if (--more == 0)
-	      break;
-	    c = java_peek_unicode ();
-	    if (! RANGE (c, '0', '7'))
-	      break;
-	    java_next_unicode ();
-	  }
-
-	return char_lit;
-      }
-    default:
-      java_lex_error ("Invalid character in escape sequence", -1);
-      return JAVA_CHAR_ERROR;
-    }
-}
-
-#ifndef JC1_LITE
-#define IS_ZERO(X) REAL_VALUES_EQUAL (X, dconst0)
-
-/* Subroutine of java_lex: converts floating-point literals to tree
-   nodes.  LITERAL_TOKEN is the input literal, JAVA_LVAL is where to
-   store the result.  FFLAG indicates whether the literal was tagged
-   with an 'f', indicating it is of type 'float'; NUMBER_BEGINNING
-   is the line number on which to report any error.  */
-
-static void java_perform_atof (YYSTYPE *, char *, int, int);
-
-static void
-java_perform_atof (YYSTYPE *java_lval, char *literal_token, int fflag,
-		   int number_beginning)
-{
-  REAL_VALUE_TYPE value;
-  tree type = (fflag ? FLOAT_TYPE_NODE : DOUBLE_TYPE_NODE);
-
-  SET_REAL_VALUE_ATOF (value,
-		       REAL_VALUE_ATOF (literal_token, TYPE_MODE (type)));
-
-  if (REAL_VALUE_ISINF (value) || REAL_VALUE_ISNAN (value))
-    {
-      JAVA_FLOAT_RANGE_ERROR (fflag ? "float" : "double");
-      value = DCONST0;
-    }
-  else if (IS_ZERO (value))
-    {
-      /* We check to see if the value is really 0 or if we've found an
-	 underflow.  We do this in the most primitive imaginable way.  */
-      int really_zero = 1;
-      char *p = literal_token;
-      if (*p == '-')
-	++p;
-      while (*p && *p != 'e' && *p != 'E')
-	{
-	  if (*p != '0' && *p != '.')
-	    {
-	      really_zero = 0;
-	      break;
-	    }
-	  ++p;
-	}
-      if (! really_zero)
-	{
-	  int save_col = ctxp->lexer->position.col;
-	  ctxp->lexer->position.col = number_beginning;
-	  java_lex_error ("Floating point literal underflow", 0);
-	  ctxp->lexer->position.col = save_col;
-	}
-    }
-
-  SET_LVAL_NODE (build_real (type, value));
-}
-#endif
-
-static int yylex (YYSTYPE *);
-
-static int
-#ifdef JC1_LITE
-yylex (YYSTYPE *java_lval)
-#else
-do_java_lex (YYSTYPE *java_lval)
-#endif
-{
-  int c;
-  char *string;
-
-  /* Translation of the Unicode escape in the raw stream of Unicode
-     characters. Takes care of line terminator.  */
- step1:
-  /* Skip white spaces: SP, TAB and FF or ULT.  */ 
-  for (;;)
-    {
-      c = java_peek_unicode ();
-      if (c != '\n' && ! JAVA_WHITE_SPACE_P (c))
-	break;
-      java_next_unicode ();
-    }
-
-  /* Handle EOF here.  */
-  if (c == UEOF)	/* Should probably do something here...  */
-    return 0;
-
-#ifndef JC1_LITE
-#ifdef USE_MAPPED_LOCATION
-  LINEMAP_POSITION_FOR_COLUMN (input_location, &line_table,
-			       ctxp->lexer->position.col);
-#else
-  ctxp->lexer->token_start = ctxp->lexer->position;
-#endif
-#endif
-
-  /* Numeric literals.  */
-  if (JAVA_ASCII_DIGIT (c) || (c == '.'))
-    {
-      /* This section of code is borrowed from gcc/c-lex.c.  */
-#define TOTAL_PARTS ((HOST_BITS_PER_WIDE_INT / HOST_BITS_PER_CHAR) * 2 + 2)
-      int parts[TOTAL_PARTS];
-      HOST_WIDE_INT high, low;
-      /* End borrowed section.  */
-
-#define MAX_TOKEN_LEN 256
-      char literal_token [MAX_TOKEN_LEN + 1];
-      int  literal_index = 0, radix = 10, long_suffix = 0, overflow = 0, bytes;
-      int  found_hex_digits = 0, found_non_octal_digits = -1;
-      int  i;
-#ifndef JC1_LITE
-      int  number_beginning = ctxp->lexer->position.col;
-      tree value;
-#endif
-     
-      for (i = 0; i < TOTAL_PARTS; i++)
-	parts [i] = 0;
-
-      if (c == '0')
-	{
-	  java_next_unicode ();
-	  c = java_peek_unicode ();
-	  if (c == 'x' || c == 'X')
-	    {
-	      radix = 16;
-	      java_next_unicode ();
-	      c = java_peek_unicode ();
-	    }
-	  else if (JAVA_ASCII_DIGIT (c))
-	    {
-	      literal_token [literal_index++] = '0';
-	      radix = 8;
-	    }
-	  else if (c == '.' || c == 'e' || c =='E')
-	    {
-	      literal_token [literal_index++] = '0';
-	      /* Handle C during floating-point parsing.  */
-	    }
-	  else
-	    {
-	      /* We have a zero literal: 0, 0{l,L}, 0{f,F}, 0{d,D}.  */
-              switch (c)
-		{		
-		case 'L': case 'l':
-		  java_next_unicode ();
-		  SET_LVAL_NODE (long_zero_node);
-		  return (INT_LIT_TK);
-		case 'f': case 'F':
-		  java_next_unicode ();
-		  SET_LVAL_NODE (float_zero_node);
-		  return (FP_LIT_TK);
-		case 'd': case 'D':
-		  java_next_unicode ();
-		  SET_LVAL_NODE (double_zero_node);
-		  return (FP_LIT_TK);
-		default:
-		  SET_LVAL_NODE (integer_zero_node);
-		  return (INT_LIT_TK);
-		}
-	    }
-	}
-
-      /* Terminate LITERAL_TOKEN in case we bail out on large tokens.  */
-      literal_token [MAX_TOKEN_LEN] = '\0';
-
-      /* Parse the first part of the literal, until we find something
-	 which is not a number.  */
-      while ((radix == 16 ? JAVA_ASCII_HEXDIGIT (c) : JAVA_ASCII_DIGIT (c))
-             && literal_index < MAX_TOKEN_LEN)
-	{
-	  /* We store in a string (in case it turns out to be a FP) and in
-	     PARTS if we have to process a integer literal.  */
-	  int numeric = hex_value (c);
-	  int count;
-
-	  /* Remember when we find a valid hexadecimal digit.  */
-	  if (radix == 16)
-	    found_hex_digits = 1;
-          /* Remember when we find an invalid octal digit.  */
-          else if (radix == 8 && numeric >= 8 && found_non_octal_digits < 0)
-	    found_non_octal_digits = literal_index;
-
-	  literal_token [literal_index++] = c;
-	  /* This section of code if borrowed from gcc/c-lex.c.  */
-	  for (count = 0; count < TOTAL_PARTS; count++)
-	    {
-	      parts[count] *= radix;
-	      if (count)
-		{
-		  parts[count]   += (parts[count-1] >> HOST_BITS_PER_CHAR);
-		  parts[count-1] &= (1 << HOST_BITS_PER_CHAR) - 1;
-		}
-	      else
-		parts[0] += numeric;
-	    }
-	  if (parts [TOTAL_PARTS-1] != 0)
-	    overflow = 1;
-	  /* End borrowed section.  */
-	  java_next_unicode ();
-	  c = java_peek_unicode ();
-	}
-
-      /* If we have something from the FP char set but not a digit, parse
-	 a FP literal.  */
-      if (JAVA_ASCII_FPCHAR (c) && !JAVA_ASCII_DIGIT (c))
-	{
-	  /* stage==0: seen digits only
-	   * stage==1: seen '.'
-	   * stage==2: seen 'e' or 'E'.
-	   * stage==3: seen '+' or '-' after 'e' or 'E'.
-	   * stage==4: seen type suffix ('f'/'F'/'d'/'D')
-	   */
-	  int stage = 0;
-	  int seen_digit = (literal_index ? 1 : 0);
-	  int seen_exponent = 0;
-	  int fflag = 0;	/* 1 for {f,F}, 0 for {d,D}. FP literal are
-				   double unless specified.  */
-
-	  /* It is ok if the radix is 8 because this just means we've
-	     seen a leading `0'.  However, radix==16 is invalid.  */
-	  if (radix == 16)
-	    java_lex_error ("Can't express non-decimal FP literal", 0);
-	  radix = 10;
-
-	  for (; literal_index < MAX_TOKEN_LEN;)
-	    {
-	      if (c == '.')
-		{
-		  if (stage < 1)
-		    {
-		      stage = 1;
-		      literal_token [literal_index++ ] = c;
-		      java_next_unicode ();
-		      c = java_peek_unicode ();
-		      if (literal_index == 1 && !JAVA_ASCII_DIGIT (c))
-			BUILD_OPERATOR (DOT_TK);
-		    }
-		  else
-		    java_lex_error ("Invalid character in FP literal", 0);
-		}
-
-	      if ((c == 'e' || c == 'E') && literal_index < MAX_TOKEN_LEN)
-		{
-		  if (stage < 2)
-		    {
-		      /* {E,e} must have seen at least a digit.  */
-		      if (!seen_digit)
-			java_lex_error
-                          ("Invalid FP literal, mantissa must have digit", 0);
-		      seen_digit = 0;
-		      seen_exponent = 1;
-		      stage = 2;
-		      literal_token [literal_index++] = c;
-		      java_next_unicode ();
-		      c = java_peek_unicode ();
-		    }
-		  else
-		    java_lex_error ("Invalid character in FP literal", 0);
-		}
-	      if ( c == 'f' || c == 'F' || c == 'd' || c == 'D')
-		{
-		  fflag = ((c == 'd') || (c == 'D')) ? 0 : 1;
-		  stage = 4;	/* So we fall through.  */
-		}
-
-	      if ((c=='-' || c =='+') && stage == 2
-                  && literal_index < MAX_TOKEN_LEN)
-		{
-		  stage = 3;
-		  literal_token [literal_index++] = c;
-		  java_next_unicode ();
-		  c = java_peek_unicode ();
-		}
-
-              if (((stage == 0 && JAVA_ASCII_FPCHAR (c))
-                   || (stage == 1 && JAVA_ASCII_FPCHAR (c) && !(c == '.'))
-                   || (stage == 2 && (JAVA_ASCII_DIGIT (c) || JAVA_FP_PM (c)))
-                   || (stage == 3 && JAVA_ASCII_DIGIT (c)))
-                  && literal_index < MAX_TOKEN_LEN)
-		{
-		  if (JAVA_ASCII_DIGIT (c))
-		    seen_digit = 1;
-                  if (stage == 2)
-                    stage = 3;
-		  literal_token [literal_index++ ] = c;
-		  java_next_unicode ();
-		  c = java_peek_unicode ();
-		}
-	      else if (literal_index < MAX_TOKEN_LEN)
-		{
-		  if (stage == 4) /* Don't push back fF/dD.  */
-		    java_next_unicode ();
-		  
-		  /* An exponent (if any) must have seen a digit.  */
-		  if (seen_exponent && !seen_digit)
-		    java_lex_error
-                      ("Invalid FP literal, exponent must have digit", 0);
-
-		  literal_token [literal_index] = '\0';
-
-#ifndef JC1_LITE
-		  java_perform_atof (java_lval, literal_token,
-				     fflag, number_beginning);
-#endif
-		  return FP_LIT_TK;
-		}
-	    }
-	} /* JAVA_ASCII_FPCHAR (c) */
-
-      /* Here we get back to converting the integral literal.  */
-      if (radix == 16 && ! found_hex_digits)
-	java_lex_error
-	  ("0x must be followed by at least one hexadecimal digit", 0);
-      else if (radix == 8 && found_non_octal_digits >= 0)
-	{
-	  int back = literal_index - found_non_octal_digits;
-	  ctxp->lexer->position.col -= back;
-	  java_lex_error ("Octal literal contains digit out of range", 0);
-	  ctxp->lexer->position.col += back;
-	}
-      else if (c == 'L' || c == 'l')
-	{
-	  java_next_unicode ();
-	  long_suffix = 1;
-	}
-
-      /* This section of code is borrowed from gcc/c-lex.c.  */
-      if (!overflow)
-	{
-	  bytes = GET_TYPE_PRECISION (long_type_node);
-	  for (i = bytes; i < TOTAL_PARTS; i++)
-	    if (parts [i])
-	      {
-	        overflow = 1;
-		break;
-	      }
-	}
-      high = low = 0;
-      for (i = 0; i < HOST_BITS_PER_WIDE_INT / HOST_BITS_PER_CHAR; i++)
-	{
-	  high |= ((HOST_WIDE_INT) parts[i + (HOST_BITS_PER_WIDE_INT
-					      / HOST_BITS_PER_CHAR)]
-		   << (i * HOST_BITS_PER_CHAR));
-	  low |= (HOST_WIDE_INT) parts[i] << (i * HOST_BITS_PER_CHAR);
-	}
-      /* End borrowed section.  */
-
-#ifndef JC1_LITE
-      /* Range checking.  */
-      /* Temporarily set type to unsigned.  */
-      value = build_int_cst_wide (long_suffix
-				  ? unsigned_long_type_node
-				  : unsigned_int_type_node, low, high);
-      SET_LVAL_NODE (value);
-
-      /* For base 10 numbers, only values up to the highest value
-	 (plus one) can be written.  For instance, only ints up to
-	 2147483648 can be written.  The special case of the largest
-	 negative value is handled elsewhere.  For other bases, any
-	 number can be represented.  */
-      if (overflow || (radix == 10
-		       && tree_int_cst_lt (long_suffix
-					   ? decimal_long_max
-					   : decimal_int_max,
-					   value)))
-	{
-	  if (long_suffix)
-	    JAVA_RANGE_ERROR ("Numeric overflow for 'long' literal");
-	  else
-	    JAVA_RANGE_ERROR ("Numeric overflow for 'int' literal");
-	}
-
-      /* Sign extend the value.  */
-      value = build_int_cst_wide_type (long_suffix ? long_type_node
-				       : int_type_node, low, high);
-
-      if (radix != 10)
-	{
-	  value = copy_node (value);
-	  JAVA_NOT_RADIX10_FLAG (value) = 1;
-	}
-      
-      SET_LVAL_NODE (value);
-#endif
-      return INT_LIT_TK;
-    }
-
-  /* We may have an ID here.  */
-  if (JAVA_START_CHAR_P (c))
-    {
-      int ascii_index = 0, all_ascii = 1;
-
-      /* Keyword, boolean literal or null literal.  */
-      while (c != UEOF && JAVA_PART_CHAR_P (c))
-	{
-	  java_unicode_2_utf8 (c);
-	  if (c >= 128)
-	    all_ascii = 0;
-	  java_next_unicode ();
-	  ascii_index++;
-	  c = java_peek_unicode ();
-	}
-
-      obstack_1grow (&temporary_obstack, '\0');
-      string = obstack_finish (&temporary_obstack);
-
-      /* If we have something all ascii, we consider a keyword, a boolean
-	 literal, a null literal or an all ASCII identifier.  Otherwise,
-	 this is an identifier (possibly not respecting formation rule).  */
-      if (all_ascii)
-	{
-	  const struct java_keyword *kw;
-	  if ((kw=java_keyword (string, ascii_index)))
-	    {
-	      switch (kw->token)
-		{
-		case PUBLIC_TK:       case PROTECTED_TK: case STATIC_TK:
-		case ABSTRACT_TK:     case FINAL_TK:     case NATIVE_TK:
-		case SYNCHRONIZED_TK: case TRANSIENT_TK: case VOLATILE_TK:
-		case PRIVATE_TK:      case STRICT_TK:
-		  SET_MODIFIER_CTX (kw->token);
-		  return MODIFIER_TK;
-		case FLOAT_TK:
-		  SET_LVAL_NODE (float_type_node);
-		  return FP_TK;
-		case DOUBLE_TK:
-		  SET_LVAL_NODE (double_type_node);
-		  return FP_TK;
-		case BOOLEAN_TK:
-		  SET_LVAL_NODE (boolean_type_node);
-		  return BOOLEAN_TK;
-		case BYTE_TK:
-		  SET_LVAL_NODE (byte_type_node);
-		  return INTEGRAL_TK;
-		case SHORT_TK:
-		  SET_LVAL_NODE (short_type_node);
-		  return INTEGRAL_TK;
-		case INT_TK:
-		  SET_LVAL_NODE (int_type_node);
-		  return INTEGRAL_TK;
-		case LONG_TK:
-		  SET_LVAL_NODE (long_type_node);
-		  return INTEGRAL_TK;
-		case CHAR_TK:
-		  SET_LVAL_NODE (char_type_node);
-		  return INTEGRAL_TK;
-
-		  /* Keyword based literals.  */
-		case TRUE_TK:
-		case FALSE_TK:
-		  SET_LVAL_NODE ((kw->token == TRUE_TK ? 
-				  boolean_true_node : boolean_false_node));
-		  return BOOL_LIT_TK;
-		case NULL_TK:
-		  SET_LVAL_NODE (null_pointer_node);
-		  return NULL_TK;
-
-		case ASSERT_TK:
-		  if (flag_assert)
-		    {
-		      BUILD_OPERATOR (kw->token);
-		      return kw->token;
-		    }
-		  else
-		    break;
-
-		  /* Some keyword we want to retain information on the location
-		     they where found.  */
-		case CASE_TK:
-		case DEFAULT_TK:
-		case SUPER_TK:
-		case THIS_TK:
-		case RETURN_TK:
-		case BREAK_TK:
-		case CONTINUE_TK:
-		case TRY_TK:
-		case CATCH_TK:
-		case THROW_TK:
-		case INSTANCEOF_TK:
-		  BUILD_OPERATOR (kw->token);
-
-		default:
-		  return kw->token;
-		}
-	    }
-	}
-
-      java_lval->node = BUILD_ID_WFL (GET_IDENTIFIER (string));
-      return ID_TK;
-    }
-
-  java_next_unicode ();
-
-  /* Character literals.  */
-  if (c == '\'')
-    {
-      int char_lit;
-      
-      if ((c = java_get_unicode ()) == '\\')
-	char_lit = java_parse_escape_sequence ();
-      else
-	{
-	  if (c == '\n' || c == '\'')
-	    java_lex_error ("Invalid character literal", 0);
-	  char_lit = c;
-	}
-
-      c = java_get_unicode ();
-
-      if ((c == '\n') || (c == UEOF))
-	java_lex_error ("Character literal not terminated at end of line", 0);
-      if (c != '\'')
-	java_lex_error ("Syntax error in character literal", 0);
-
-      if (char_lit == JAVA_CHAR_ERROR)
-        char_lit = 0;		/* We silently convert it to zero.  */
-
-      SET_LVAL_NODE (build_int_cst (char_type_node, char_lit));
-      return CHAR_LIT_TK;
-    }
-
-  /* String literals.  */
-  if (c == '"')
-    {
-      int no_error = 1;
-      char *string;
-
-      for (;;)
-	{
-	  c = java_peek_unicode ();
-	  if (c == '\n' || c == UEOF) /* ULT.  */
-	    {
-	      java_lex_error ("String not terminated at end of line", 0);
-	      break;
-	    }
-	  java_next_unicode ();
-	  if (c == '"')
-	    break;
-	  if (c == '\\')
-	    c = java_parse_escape_sequence ();
-	  if (c == JAVA_CHAR_ERROR)
-	    {
-	      no_error = 0;
-	      c = 0;		/* We silently convert it to zero.  */
-	    }
-	  java_unicode_2_utf8 (c);
-	}
-
-      obstack_1grow (&temporary_obstack, '\0');
-      string = obstack_finish (&temporary_obstack);
-#ifndef JC1_LITE
-      if (!no_error || (c != '"'))
-	java_lval->node = error_mark_node; /* FIXME: Requires further
-                                              testing.  */
-      else
-	java_lval->node = build_string (strlen (string), string);
-#endif
-      obstack_free (&temporary_obstack, string);
-      return STRING_LIT_TK;
-    }
-
-  switch (c)
-    {
-    case '/':
-      /* Check for comment.  */
-      switch (c = java_peek_unicode ())
-	{
-	case '/':
-	  java_next_unicode ();
-	  for (;;)
-	    {
-	      c = java_get_unicode ();
-	      if (c == UEOF)
-		{
-		  /* It is ok to end a `//' comment with EOF, unless
-		     we're being pedantic.  */
-		  if (pedantic)
-		    java_lex_error ("Comment not terminated at end of input",
-				    0);
-		  return 0;
-		}
-	      if (c == '\n')	/* ULT */
-		goto step1;
-	    }
-	  break;
-
-	case '*':
-	  java_next_unicode ();
-	  if ((c = java_get_unicode ()) == '*')
-	    {
-	      c = java_get_unicode ();
-	      if (c == '/')
-		{
-		  /* Empty documentation comment.  We have to reset
-		     the deprecation marker as only the most recent
-		     doc comment applies.  */
-		  ctxp->deprecated = 0;
-		}
-	      else
-		java_parse_doc_section (c);
-	    }
-	  else
-	    java_parse_end_comment ((c = java_get_unicode ()));
-	  goto step1;
-	  break;
-
-	case '=':
-	  java_next_unicode ();
-	  BUILD_OPERATOR2 (DIV_ASSIGN_TK);
-
-	default:
-	  BUILD_OPERATOR (DIV_TK);
-	}
-
-    case '(':
-      BUILD_OPERATOR (OP_TK);
-    case ')':
-      return CP_TK;
-    case '{':
-#ifndef JC1_LITE
-      java_lval->operator.token = OCB_TK;
-      java_lval->operator.location = BUILD_LOCATION();
-#ifdef USE_MAPPED_LOCATION
-      if (ctxp->ccb_indent == 1)
-	ctxp->first_ccb_indent1 = input_location;
-#else
-      if (ctxp->ccb_indent == 1)
-	ctxp->first_ccb_indent1 = input_line;
-#endif
-#endif
-      ctxp->ccb_indent++;
-      return OCB_TK;
-    case '}':
-      ctxp->ccb_indent--;
-#ifndef JC1_LITE
-      java_lval->operator.token = CCB_TK;
-      java_lval->operator.location = BUILD_LOCATION();
-#ifdef USE_MAPPED_LOCATION
-      if (ctxp->ccb_indent == 1)
-        ctxp->last_ccb_indent1 = input_location;
-#else
-      if (ctxp->ccb_indent == 1)
-        ctxp->last_ccb_indent1 = input_line;
-#endif
-#endif
-      return CCB_TK;
-    case '[':
-      BUILD_OPERATOR (OSB_TK);
-    case ']':
-      return CSB_TK;
-    case ';':
-      return SC_TK;
-    case ',':
-      return C_TK;
-    case '.':
-      BUILD_OPERATOR (DOT_TK);
-
-      /* Operators.  */
-    case '=':
-      c = java_peek_unicode ();
-      if (c == '=')
-	{
-	  java_next_unicode ();
-	  BUILD_OPERATOR (EQ_TK);
-	}
-      else
-	{
-	  /* Equals is used in two different locations. In the 
-	     variable_declarator: rule, it has to be seen as '=' as opposed
-	     to being seen as an ordinary assignment operator in
-	     assignment_operators: rule.  */
-	  BUILD_OPERATOR (ASSIGN_TK);
-	}
-      
-    case '>':
-      switch ((c = java_peek_unicode ()))
-	{
-	case '=':
-	  java_next_unicode ();
-	  BUILD_OPERATOR (GTE_TK);
-	case '>':
-	  java_next_unicode ();
-	  switch ((c = java_peek_unicode ()))
-	    {
-	    case '>':
-	      java_next_unicode ();
-	      c = java_peek_unicode ();
-	      if (c == '=')
-		{
-		  java_next_unicode ();
-		  BUILD_OPERATOR2 (ZRS_ASSIGN_TK);
-		}
-	      else
-		{
-		  BUILD_OPERATOR (ZRS_TK);
-		}
-	    case '=':
-	      java_next_unicode ();
-	      BUILD_OPERATOR2 (SRS_ASSIGN_TK);
-	    default:
-	      BUILD_OPERATOR (SRS_TK);
-	    }
-	default:
-	  BUILD_OPERATOR (GT_TK);
-	}
-	
-    case '<':
-      switch ((c = java_peek_unicode ()))
-	{
-	case '=':
-	  java_next_unicode ();
-	  BUILD_OPERATOR (LTE_TK);
-	case '<':
-	  java_next_unicode ();
-	  if ((c = java_peek_unicode ()) == '=')
-	    {
-	      java_next_unicode ();
-	      BUILD_OPERATOR2 (LS_ASSIGN_TK);
-	    }
-	  else
-	    {
-	      BUILD_OPERATOR (LS_TK);
-	    }
-	default:
-	  BUILD_OPERATOR (LT_TK);
-	}
-
-    case '&':
-      switch ((c = java_peek_unicode ()))
-	{
-	case '&':
-	  java_next_unicode ();
-	  BUILD_OPERATOR (BOOL_AND_TK);
-	case '=':
-	  java_next_unicode ();
-	  BUILD_OPERATOR2 (AND_ASSIGN_TK);
-	default:
-	  BUILD_OPERATOR (AND_TK);
-	}
-
-    case '|':
-      switch ((c = java_peek_unicode ()))
-	{
-	case '|':
-	  java_next_unicode ();
-	  BUILD_OPERATOR (BOOL_OR_TK);
-	case '=':
-	  java_next_unicode ();
-	  BUILD_OPERATOR2 (OR_ASSIGN_TK);
-	default:
-	  BUILD_OPERATOR (OR_TK);
-	}
-
-    case '+':
-      switch ((c = java_peek_unicode ()))
-	{
-	case '+':
-	  java_next_unicode ();
-	  BUILD_OPERATOR (INCR_TK);
-	case '=':
-	  java_next_unicode ();
-	  BUILD_OPERATOR2 (PLUS_ASSIGN_TK);
-	default:
-	  BUILD_OPERATOR (PLUS_TK);
-	}
-
-    case '-':
-      switch ((c = java_peek_unicode ()))
-	{
-	case '-':
-	  java_next_unicode ();
-	  BUILD_OPERATOR (DECR_TK);
-	case '=':
-	  java_next_unicode ();
-	  BUILD_OPERATOR2 (MINUS_ASSIGN_TK);
-	default:
-	  BUILD_OPERATOR (MINUS_TK);
-	}
-
-    case '*':
-      if ((c = java_peek_unicode ()) == '=')
-	{
-	  java_next_unicode ();
-	  BUILD_OPERATOR2 (MULT_ASSIGN_TK);
-	}
-      else
-	{
-	  BUILD_OPERATOR (MULT_TK);
-	}
-
-    case '^':
-      if ((c = java_peek_unicode ()) == '=')
-	{
-	  java_next_unicode ();
-	  BUILD_OPERATOR2 (XOR_ASSIGN_TK);
-	}
-      else
-	{
-	  BUILD_OPERATOR (XOR_TK);
-	}
-
-    case '%':
-      if ((c = java_peek_unicode ()) == '=')
-	{
-	  java_next_unicode ();
-	  BUILD_OPERATOR2 (REM_ASSIGN_TK);
-	}
-      else
-	{
-	  BUILD_OPERATOR (REM_TK);
-	}
-
-    case '!':
-      if ((c = java_peek_unicode()) == '=')
-	{
-	  java_next_unicode ();
-	  BUILD_OPERATOR (NEQ_TK);
-	}
-      else
-	{
-	  BUILD_OPERATOR (NEG_TK);
-	}
-	  
-    case '?':
-      BUILD_OPERATOR (REL_QM_TK);
-    case ':':
-      BUILD_OPERATOR (REL_CL_TK);
-    case '~':
-      BUILD_OPERATOR (NOT_TK);
-    }
-  
-  if (c == 0x1a)		/* CTRL-Z.  */
-    {
-      if ((c = java_peek_unicode ()) == UEOF)
-	return 0;		/* Ok here.  */
-    }
-
-  /* Everything else is an invalid character in the input.  */
-  {
-    char lex_error_buffer [128];
-    sprintf (lex_error_buffer, "Invalid character '%s' in input", 
-	     java_sprint_unicode (c));
-    java_lex_error (lex_error_buffer, -1);
-  }
-  return 0;
-}
-
-#ifndef JC1_LITE
-
-/* The exported interface to the lexer.  */
-static int
-java_lex (YYSTYPE *java_lval)
-{
-  int r;
-
-  timevar_push (TV_LEX);
-  r = do_java_lex (java_lval);
-  timevar_pop (TV_LEX);
-  return r;
-}
-
-/* This is called by the parser to see if an error should be generated
-   due to numeric overflow.  This function only handles the particular
-   case of the largest negative value, and is only called in the case
-   where this value is not preceded by `-'.  */
-static void
-error_if_numeric_overflow (tree value)
-{
-  if (TREE_CODE (value) == INTEGER_CST
-      && !JAVA_NOT_RADIX10_FLAG (value)
-      && tree_int_cst_sgn (value) < 0)
-    {
-      if (TREE_TYPE (value) == long_type_node)
-	java_lex_error ("Numeric overflow for 'long' literal", 0);
-      else
-	java_lex_error ("Numeric overflow for 'int' literal", 0);
-    }
-}
-
-#endif /* JC1_LITE */
-
-static void
-java_unicode_2_utf8 (unicode_t unicode)
-{
-  if (RANGE (unicode, 0x01, 0x7f))
-    obstack_1grow (&temporary_obstack, (char)unicode);
-  else if (RANGE (unicode, 0x80, 0x7ff) || unicode == 0)
-    {
-      obstack_1grow (&temporary_obstack,
-		     (unsigned char)(0xc0 | ((0x7c0 & unicode) >> 6)));
-      obstack_1grow (&temporary_obstack,
-		     (unsigned char)(0x80 | (unicode & 0x3f)));
-    }
-  else				/* Range 0x800-0xffff.  */
-    {
-      obstack_1grow (&temporary_obstack,
-		     (unsigned char)(0xe0 | (unicode & 0xf000) >> 12));
-      obstack_1grow (&temporary_obstack,
-		     (unsigned char)(0x80 | (unicode & 0x0fc0) >> 6));
-      obstack_1grow (&temporary_obstack,
-		     (unsigned char)(0x80 | (unicode & 0x003f)));
-    }
-}
-
-#ifndef JC1_LITE
-static tree
-build_wfl_node (tree node)
-{
-#ifdef USE_MAPPED_LOCATION
-  node = build_expr_wfl (node, input_location);
-#else
-  node = build_expr_wfl (node, ctxp->filename,
-			 ctxp->lexer->token_start.line,
-			 ctxp->lexer->token_start.col);
-#endif
-  /* Prevent java_complete_lhs from short-circuiting node (if constant).  */
-  TREE_TYPE (node) = NULL_TREE;
-  return node;
-}
-#endif
-
-static void
-java_lex_error (const char *msg ATTRIBUTE_UNUSED, int forward ATTRIBUTE_UNUSED)
-{
-#ifndef JC1_LITE
-  int col = (ctxp->lexer->position.col
-	     + forward * ctxp->lexer->next_columns);
-#if USE_MAPPED_LOCATION
-  source_location save_location = input_location;
-  LINEMAP_POSITION_FOR_COLUMN (input_location, &line_table, col);
-  
-  /* Might be caught in the middle of some error report.  */
-  ctxp->java_error_flag = 0;
-  java_error (NULL);
-  java_error (msg);
-  input_location = save_location;
-#else
-  java_lc save = ctxp->lexer->token_start;
-  ctxp->lexer->token_start.line = ctxp->lexer->position.line;
-  ctxp->lexer->token_start.col = col;
-
-  /* Might be caught in the middle of some error report.  */
-  ctxp->java_error_flag = 0;
-  java_error (NULL);
-  java_error (msg);
-  ctxp->lexer->token_start = save;
-#endif
-#endif
-}
-
-#ifndef JC1_LITE
-static int
-java_is_eol (FILE *fp, int c)
-{
-  int next;
-  switch (c)
-    {
-    case '\r':
-      next = getc (fp);
-      if (next != '\n' && next != EOF)
-	ungetc (next, fp);
-      return 1;
-    case '\n':
-      return 1;
-    default:
-      return 0;
-    }  
-}
-#endif
-
-char *
-java_get_line_col (const char *filename ATTRIBUTE_UNUSED,
-		   int line ATTRIBUTE_UNUSED, int col ATTRIBUTE_UNUSED)
-{
-#ifdef JC1_LITE
-  return 0;
-#else
-  /* Dumb implementation. Doesn't try to cache or optimize things.  */
-  /* First line of the file is line 1, first column is 1.  */
-
-  /* COL == -1 means, at the CR/LF in LINE.  */
-  /* COL == -2 means, at the first non space char in LINE.  */
-
-  FILE *fp;
-  int c, ccol, cline = 1;
-  int current_line_col = 0;
-  int first_non_space = 0;
-  char *base;
-
-  if (!(fp = fopen (filename, "r")))
-    fatal_error ("can't open %s: %m", filename);
-
-  while (cline != line)
-    {
-      c = getc (fp);
-      if (c == EOF)
-	{
-	  static const char msg[] = "<<file too short - unexpected EOF>>";
-	  obstack_grow (&temporary_obstack, msg, sizeof(msg)-1);
-	  goto have_line;
-	}
-      if (java_is_eol (fp, c))
-	cline++;
-    }
-
-  /* Gather the chars of the current line in a buffer.  */
-  for (;;)
-    {
-      c = getc (fp);
-      if (c < 0 || java_is_eol (fp, c))
-	break;
-      if (!first_non_space && !JAVA_WHITE_SPACE_P (c))
-	first_non_space = current_line_col;
-      obstack_1grow (&temporary_obstack, c);
-      current_line_col++;
-    }
- have_line:
-
-  obstack_1grow (&temporary_obstack, '\n');
-
-  if (col == -1)
-    {
-      col = current_line_col;
-      first_non_space = 0;
-    }
-  else if (col == -2)
-    col = first_non_space;
-  else
-    first_non_space = 0;
-
-  /* Place the '^' a the right position.  */
-  base = obstack_base (&temporary_obstack);
-  for (col += 2, ccol = 0; ccol < col; ccol++)
-    {
-      /* Compute \t when reaching first_non_space.  */
-      char c = (first_non_space ?
-		(base [ccol] == '\t' ? '\t' : ' ') : ' ');
-      obstack_1grow (&temporary_obstack, c);
-    }
-  obstack_grow0 (&temporary_obstack, "^", 1);
-
-  fclose (fp);
-  return obstack_finish (&temporary_obstack);
-#endif
-}
-
-#ifndef JC1_LITE
-static int
-utf8_cmp (const unsigned char *str, int length, const char *name)
-{
-  const unsigned char *limit = str + length;
-  int i;
-
-  for (i = 0; name[i]; ++i)
-    {
-      int ch = UTF8_GET (str, limit);
-      if (ch != name[i])
-	return ch - name[i];
-    }
-
-  return str == limit ? 0 : 1;
-}
-
-/* A sorted list of all C++ keywords.  */
-
-static const char *const cxx_keywords[] =
-{
-  "_Complex",
-  "__alignof",
-  "__alignof__",
-  "__asm",
-  "__asm__",
-  "__attribute",
-  "__attribute__",
-  "__builtin_va_arg",
-  "__complex",
-  "__complex__",
-  "__const",
-  "__const__",
-  "__extension__",
-  "__imag",
-  "__imag__",
-  "__inline",
-  "__inline__",
-  "__label__",
-  "__null",
-  "__real",
-  "__real__",
-  "__restrict",
-  "__restrict__",
-  "__signed",
-  "__signed__",
-  "__typeof",
-  "__typeof__",
-  "__volatile",
-  "__volatile__",
-  "and",
-  "and_eq",
-  "asm",
-  "auto",
-  "bitand",
-  "bitor",
-  "bool",
-  "break",
-  "case",
-  "catch",
-  "char",
-  "class",
-  "compl",
-  "const",
-  "const_cast",
-  "continue",
-  "default",
-  "delete",
-  "do",
-  "double",
-  "dynamic_cast",
-  "else",
-  "enum",
-  "explicit",
-  "export",
-  "extern",
-  "false",
-  "float",
-  "for",
-  "friend",
-  "goto",
-  "if",
-  "inline",
-  "int",
-  "long",
-  "mutable",
-  "namespace",
-  "new",
-  "not",
-  "not_eq",
-  "operator",
-  "or",
-  "or_eq",
-  "private",
-  "protected",
-  "public",
-  "register",
-  "reinterpret_cast",
-  "return",
-  "short",
-  "signed",
-  "sizeof",
-  "static",
-  "static_cast",
-  "struct",
-  "switch",
-  "template",
-  "this",      
-  "throw",
-  "true",
-  "try",
-  "typedef",
-  "typeid",
-  "typename",
-  "typeof",
-  "union",
-  "unsigned",
-  "using",
-  "virtual",
-  "void",
-  "volatile",
-  "wchar_t",
-  "while",
-  "xor",
-  "xor_eq"
-};
-
-/* Return true if NAME is a C++ keyword.  */
-
-int
-cxx_keyword_p (const char *name, int length)
-{
-  int last = ARRAY_SIZE (cxx_keywords);
-  int first = 0;
-  int mid = (last + first) / 2;
-  int old = -1;
-
-  for (mid = (last + first) / 2;
-       mid != old;
-       old = mid, mid = (last + first) / 2)
-    {
-      int kwl = strlen (cxx_keywords[mid]);
-      int min_length = kwl > length ? length : kwl;
-      int r = utf8_cmp ((const unsigned char *) name, min_length, cxx_keywords[mid]);
-
-      if (r == 0)
-	{
-	  int i;
-	  /* We've found a match if all the remaining characters are `$'.  */
-	  for (i = min_length; i < length && name[i] == '$'; ++i)
-	    ;
-	  if (i == length)
-	    return 1;
-	  r = 1;
-	}
-
-      if (r < 0)
-	last = mid;
-      else
-	first = mid;
-    }
-  return 0;
-}
-#endif /* JC1_LITE */
diff --git a/gcc/java/lex.h b/gcc/java/lex.h
deleted file mode 100644
index 20f7680..0000000
--- a/gcc/java/lex.h
+++ /dev/null
@@ -1,247 +0,0 @@
-/* Language lexer definitions for the GNU compiler for the Java(TM) language.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-   Free Software Foundation, Inc.
-   Contributed by Alexandre Petit-Bianco (apbianco@cygnus.com)
-
-This file is part of GCC.
-
-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.
-
-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 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.
-The Free Software Foundation is independent of Sun Microsystems, Inc.  */
-
-#ifndef GCC_JAVA_LEX_H
-#define GCC_JAVA_LEX_H
-
-#include "input.h"
-
-/* Extern global variables declarations  */
-extern FILE *finput;
-
-/* A Unicode character, as read from the input file  */
-typedef unsigned short unicode_t;
-
-#ifndef HAVE_ICONV_H
-#undef HAVE_ICONV
-#endif
-
-#if defined HAVE_ICONV
-#include <iconv.h>
-#endif /* HAVE_ICONV */
-
-/* Default encoding to use if no encoding is specified.  */
-#define DEFAULT_ENCODING "UTF-8"
-
-typedef struct java_lc_s GTY(()) {
-  int line;		/* line number (1-based) */
-  int col;		/* column number number (1-based) */
-} java_lc;
-
-struct java_lexer
-{
-  /* The file from which we're reading.  */
-  FILE *finput;
-
-  /* Number of consecutive backslashes we've read.  */
-  int bs_count;
-
-  /* Next available Unicode character.
-   * This is post-Unicode-escape-processing. -1 if EOF. */
-  int next_unicode;
-
-  /* True if next_unicode is next available character, or EOF. */
-  bool avail_unicode;
-
-  /* Number of source columns of the previous Unicode character (next_unicode).
-     If next_unicode==-2, then this is the number of columns of the previous
-     Unicode character (most recent result of java_{get,peek}_unicode). */
-  int next_columns;
-
-  /* If nonzero, a value that was pushed back.  This is a unicode character,
-     but (unlike next_unicode) is pre-'\uXXXX'-processing.  It is also used
-     when a '\r' is *not* followed by a '\n'. */
-  unicode_t unget_value;
-
-  /* Name of the character encoding we're using.  */
-  const char *encoding;
-
-  /* Current source position. */
-  java_lc position;
-
-#ifndef USE_MAPPED_LOCATION
-  java_lc token_start;		     /* Error's line column info */
-#endif
-
-#ifdef HAVE_ICONV
-  /* Nonzero if we've read any bytes.  We only recognize the
-     byte-order-marker (BOM) as the first word.  */
-  unsigned int read_anything : 1;
-
-  /* Nonzero if we have to byte swap.  */
-  unsigned int byte_swap : 1;
-
-  /* Nonzero if we're using the fallback decoder.  */
-  unsigned int use_fallback : 1;
-
-  /* The handle for the iconv converter we're using.  */
-  iconv_t handle;
-
-  /* Bytes we've read from the file but have not sent to iconv.  */
-  char buffer[1024];
-
-  /* Index of first valid character in buffer, -1 if no valid
-     characters.  */
-  int first;
-
-  /* Index of last valid character in buffer, plus one.  -1 if no
-     valid characters in buffer.  */
-  int last;
-
-  /* This is a buffer of characters already converted by iconv.  We
-     use `char' here because we're assuming that iconv() converts to
-     UCS-2, and then we convert it ourselves.  */
-  unsigned char out_buffer[1024];
-
-  /* Index of first valid output character.  -1 if no valid
-     characters.  */
-  int out_first;
-
-  /* Index of last valid output character, plus one.  -1 if no valid
-     characters.  */
-  int out_last;
-
-#endif /* HAVE_ICONV */
-};
-typedef struct java_lexer java_lexer;
-
-/* Destroy a lexer object.  */
-extern void java_destroy_lexer (java_lexer *);
-
-#define JAVA_LINE_MAX 80
-
-/* Build a location compound integer */
-#ifdef USE_MAPPED_LOCATION
-#define BUILD_LOCATION() input_location
-#else
-#define BUILD_LOCATION() ((ctxp->lexer->token_start.line << 12) \
-			  | (ctxp->lexer->token_start.col & 0xfff))
-#endif
-
-/* Those macros are defined differently if we compile jc1-lite
-   (JC1_LITE defined) or jc1.  */
-#ifdef JC1_LITE
-
-#define DCONST0 0
-#define REAL_VALUE_TYPE int
-#define GET_IDENTIFIER(S) xstrdup ((S))
-#define REAL_VALUE_ATOF(LIT,MODE) 0
-#define REAL_VALUE_ISINF(VALUE)   0
-#define REAL_VALUE_ISNAN(VALUE)   0
-#define SET_REAL_VALUE_ATOF(TARGET,SOURCE)
-#define FLOAT_TYPE_NODE 0
-#define DOUBLE_TYPE_NODE 0
-#define SET_MODIFIER_CTX(TOKEN) java_lval->value = (TOKEN)
-#define GET_TYPE_PRECISION(NODE) 4
-#define BUILD_OPERATOR(TOKEN)	return TOKEN
-#define BUILD_OPERATOR2(TOKEN)	return ASSIGN_ANY_TK
-#define SET_LVAL_NODE(NODE)
-#define BUILD_ID_WFL(EXP) (EXP)
-#define JAVA_FLOAT_RANGE_ERROR(S) {}
-#define JAVA_RANGE_ERROR(S) do { } while (0)
-
-#else
-
-#define DCONST0 dconst0
-#define GET_IDENTIFIER(S) get_identifier ((S))
-#define SET_REAL_VALUE_ATOF(TARGET,SOURCE) (TARGET) = (SOURCE)
-#define FLOAT_TYPE_NODE float_type_node
-#define DOUBLE_TYPE_NODE double_type_node
-/* Set modifier_ctx according to TOKEN */
-#define SET_MODIFIER_CTX(TOKEN)						   \
-  {									   \
-    ctxp->modifier_ctx [(TOKEN)-PUBLIC_TK] = build_wfl_node (NULL_TREE); \
-    java_lval->value = (TOKEN)-PUBLIC_TK;				   \
-  }
-/* Type precision for long */
-#define GET_TYPE_PRECISION(NODE) TYPE_PRECISION (long_type_node) / 8;
-/* Build an operator tree node and return TOKEN */
-#define BUILD_OPERATOR(TOKEN)				\
-  {							\
-    java_lval->operator.token = (TOKEN);		\
-    java_lval->operator.location = BUILD_LOCATION();	\
-    return (TOKEN);					\
-  }
-
-/* Build an operator tree node but return ASSIGN_ANY_TK */
-#define BUILD_OPERATOR2(TOKEN)				\
-  {							\
-    java_lval->operator.token = (TOKEN);		\
-    java_lval->operator.location = BUILD_LOCATION();	\
-    return ASSIGN_ANY_TK;				\
-  }
-/* Set java_lval->node and TREE_TYPE(java_lval->node) in macros */
-#define SET_LVAL_NODE(NODE) java_lval->node = (NODE)
-/* Wrap identifier around a wfl */
-#define BUILD_ID_WFL(EXP) build_wfl_node ((EXP))
-/* Special ways to report error on numeric literals  */
-#define JAVA_FLOAT_RANGE_ERROR(m)					\
-  {									\
-    char *msg = XNEWVEC (char, 100 + strlen (m));			\
-    sprintf (msg, "Floating point literal exceeds range of `%s'", (m));	\
-    JAVA_RANGE_ERROR(msg);						\
-    free (msg);								\
-  }
-#define JAVA_RANGE_ERROR(msg)						\
-  do {									\
-    int save_col = ctxp->lexer->position.col;				\
-    ctxp->lexer->position.col = number_beginning;			\
-    java_lex_error (msg, 0);						\
-    ctxp->lexer->position.col = save_col;				\
-  } while (0)
-
-#endif /* Definitions for jc1 compilation only */
-
-/* Macros to decode character ranges */
-#define RANGE(c, l, h)           (((c) >= l && (c) <= h))
-#define JAVA_WHITE_SPACE_P(c) (c == ' ' || c == '\t' || c == '\f')
-#define JAVA_START_CHAR_P(c) ((c < 128					      \
-			       && (ISIDST (c) || c == '$'))		      \
-                              || (c >= 128 && java_start_char_p (c)))
-#define JAVA_PART_CHAR_P(c) ((c < 128					      \
-			       && (ISIDNUM (c)				      \
-				   || c == '$'				      \
-				   || c == 0x0000			      \
-				   || RANGE (c, 0x01, 0x08)		      \
-				   || RANGE (c, 0x0e, 0x1b)		      \
-				   || c == 0x7f))			      \
-                              || (c >= 128 && java_part_char_p (c)))
-#define JAVA_ASCII_DIGIT(c)    ISDIGIT (c)
-#define JAVA_ASCII_OCTDIGIT(c) RANGE (c, '0', '7')
-#define JAVA_ASCII_HEXDIGIT(c) ISXDIGIT (c)
-#define JAVA_ASCII_FPCHAR(c)   (RANGE (c, 'd', 'f') || RANGE (c, 'D', 'F') || \
-				c == '.' || JAVA_ASCII_DIGIT (c))
-#define JAVA_FP_SUFFIX(c)      (c == 'D' || c == 'd' || c == 'f' || c == 'F')
-#define JAVA_FP_EXP(c)         (c == 'E' || c == 'F')
-#define JAVA_FP_PM(c)          (c == '-' || c == '+')
-#define JAVA_ASCII_LETTER(c)   ISALPHA (c)
-
-/* Constants  */
-#define JAVA_READ_BUFFER 256
-#define JAVA_CHAR_ERROR -2
-#define UEOF -1
-
-#endif /* ! GCC_JAVA_LEX_H */
diff --git a/gcc/java/mangle.c b/gcc/java/mangle.c
index 0fe5220..69a0898 100644
--- a/gcc/java/mangle.c
+++ b/gcc/java/mangle.c
@@ -1,6 +1,6 @@
 /* Functions related to mangling class names for the GNU compiler
    for the Java(TM) language.
-   Copyright (C) 1998, 1999, 2001, 2002, 2003
+   Copyright (C) 1998, 1999, 2001, 2002, 2003, 2006, 2007
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -73,6 +73,167 @@ struct obstack *mangle_obstack;
 /* atms: array template mangled string. */
 static GTY(()) tree atms;
 
+static int
+utf8_cmp (const unsigned char *str, int length, const char *name)
+{
+  const unsigned char *limit = str + length;
+  int i;
+
+  for (i = 0; name[i]; ++i)
+    {
+      int ch = UTF8_GET (str, limit);
+      if (ch != name[i])
+	return ch - name[i];
+    }
+
+  return str == limit ? 0 : 1;
+}
+
+/* A sorted list of all C++ keywords.  */
+static const char *const cxx_keywords[] =
+{
+  "_Complex",
+  "__alignof",
+  "__alignof__",
+  "__asm",
+  "__asm__",
+  "__attribute",
+  "__attribute__",
+  "__builtin_va_arg",
+  "__complex",
+  "__complex__",
+  "__const",
+  "__const__",
+  "__extension__",
+  "__imag",
+  "__imag__",
+  "__inline",
+  "__inline__",
+  "__label__",
+  "__null",
+  "__real",
+  "__real__",
+  "__restrict",
+  "__restrict__",
+  "__signed",
+  "__signed__",
+  "__typeof",
+  "__typeof__",
+  "__volatile",
+  "__volatile__",
+  "and",
+  "and_eq",
+  "asm",
+  "auto",
+  "bitand",
+  "bitor",
+  "bool",
+  "break",
+  "case",
+  "catch",
+  "char",
+  "class",
+  "compl",
+  "const",
+  "const_cast",
+  "continue",
+  "default",
+  "delete",
+  "do",
+  "double",
+  "dynamic_cast",
+  "else",
+  "enum",
+  "explicit",
+  "export",
+  "extern",
+  "false",
+  "float",
+  "for",
+  "friend",
+  "goto",
+  "if",
+  "inline",
+  "int",
+  "long",
+  "mutable",
+  "namespace",
+  "new",
+  "not",
+  "not_eq",
+  "operator",
+  "or",
+  "or_eq",
+  "private",
+  "protected",
+  "public",
+  "register",
+  "reinterpret_cast",
+  "return",
+  "short",
+  "signed",
+  "sizeof",
+  "static",
+  "static_cast",
+  "struct",
+  "switch",
+  "template",
+  "this",      
+  "throw",
+  "true",
+  "try",
+  "typedef",
+  "typeid",
+  "typename",
+  "typeof",
+  "union",
+  "unsigned",
+  "using",
+  "virtual",
+  "void",
+  "volatile",
+  "wchar_t",
+  "while",
+  "xor",
+  "xor_eq"
+};
+
+/* Return true if NAME is a C++ keyword.  */
+static int
+cxx_keyword_p (const char *name, int length)
+{
+  int last = ARRAY_SIZE (cxx_keywords);
+  int first = 0;
+  int mid = (last + first) / 2;
+  int old = -1;
+
+  for (mid = (last + first) / 2;
+       mid != old;
+       old = mid, mid = (last + first) / 2)
+    {
+      int kwl = strlen (cxx_keywords[mid]);
+      int min_length = kwl > length ? length : kwl;
+      int r = utf8_cmp ((const unsigned char *) name, min_length, cxx_keywords[mid]);
+
+      if (r == 0)
+	{
+	  int i;
+	  /* We've found a match if all the remaining characters are `$'.  */
+	  for (i = min_length; i < length && name[i] == '$'; ++i)
+	    ;
+	  if (i == length)
+	    return 1;
+	  r = 1;
+	}
+
+      if (r < 0)
+	last = mid;
+      else
+	first = mid;
+    }
+  return 0;
+}
+
 /* This is the mangling interface: a decl, a class field (.class) and
    the vtable. */
 
diff --git a/gcc/java/parse-scan.y b/gcc/java/parse-scan.y
deleted file mode 100644
index cedba9e..0000000
--- a/gcc/java/parse-scan.y
+++ /dev/null
@@ -1,1377 +0,0 @@
-/* Parser grammar for quick source code scan of Java(TM) language programs.
-   Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, 2005
-   Free Software Foundation, Inc.
-   Contributed by Alexandre Petit-Bianco (apbianco@cygnus.com)
-
-This file is part of GCC.
-
-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.
-
-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 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.
-The Free Software Foundation is independent of Sun Microsystems, Inc.  */
-
-/* This file parses Java source code. Action can be further completed
-to achieve a desired behavior. This file isn't part of the Java
-language gcc front end.
-
-The grammar conforms to the Java grammar described in "The Java(TM)
-Language Specification. J. Gosling, B. Joy, G. Steele. Addison Wesley
-1996, ISBN 0-201-63451-1"
-
-Some rules have been modified to support JDK1.1 inner classes
-definitions and other extensions.  */
-
-%{
-#define JC1_LITE
-
-#include "config.h"
-#include "system.h"
-#include "coretypes.h"
-#include "tm.h"
-#include "obstack.h"
-#include "toplev.h"
-
-extern FILE *finput, *out;
- 
- const char *main_input_filename;
-
-/* Obstack for the lexer.  */
-struct obstack temporary_obstack;
-
-/* The current parser context.  */
-struct parser_ctxt *ctxp;
-
-/* Error and warning counts, because they're used elsewhere  */
-int java_error_count;
-int java_warning_count;
-
-/* Tweak default rules when necessary.  */
-static int absorber;
-#define USE_ABSORBER absorber = 0
-
-/* Keep track of the current package name.  */
-static const char *package_name;
-
-/* Keep track of whether things have be listed before.  */
-static int previous_output;
-
-/* Record modifier uses  */
-static int modifier_value;
-
-/* Record (almost) cyclomatic complexity.  */
-static int complexity; 
-
-/* Keeps track of number of bracket pairs after a variable declarator
-   id.  */
-static int bracket_count; 
-
-/* Numbers anonymous classes */
-static int anonymous_count;
-
-/* This is used to record the current class context.  */
-struct class_context
-{
-  char *name;
-  struct class_context *next;
-};
-
-/* The global class context.  */
-static struct class_context *current_class_context;
-
-/* A special constant used to represent an anonymous context.  */
-static const char *anonymous_context = "ANONYMOUS";
-
-/* Count of method depth.  */
-static int method_depth; 
-
-/* Record a method declaration  */
-struct method_declarator {
-  const char *method_name;
-  const char *args;
-};
-#define NEW_METHOD_DECLARATOR(D,N,A)					     \
-{									     \
-  (D) = XNEW (struct method_declarator);				     \
-  (D)->method_name = (N);						     \
-  (D)->args = (A);							     \
-}
-
-/* Two actions for this grammar */
-static int make_class_name_recursive (struct obstack *stack,
-				      struct class_context *ctx);
-static char *get_class_name (void);
-static void report_class_declaration (const char *);
-static void report_main_declaration (struct method_declarator *);
-static void push_class_context (const char *);
-static void pop_class_context (void);
-
-void report (void); 
-
-#include "lex.h"
-#include "parse.h"
-%}
-
-%union {
-  char *node;
-  struct method_declarator *declarator;
-  int value;			/* For modifiers */
-}
-
-%{
-extern int flag_assert;
-
-#include "lex.c"
-%}
-
-%pure_parser
-
-/* Things defined here have to match the order of what's in the
-   binop_lookup table.  */
-
-%token   PLUS_TK         MINUS_TK        MULT_TK         DIV_TK    REM_TK
-%token   LS_TK           SRS_TK          ZRS_TK
-%token   AND_TK          XOR_TK          OR_TK
-%token   BOOL_AND_TK BOOL_OR_TK 
-%token   EQ_TK NEQ_TK GT_TK GTE_TK LT_TK LTE_TK
-
-/* This maps to the same binop_lookup entry than the token above */
-
-%token   PLUS_ASSIGN_TK  MINUS_ASSIGN_TK MULT_ASSIGN_TK DIV_ASSIGN_TK
-%token   REM_ASSIGN_TK   
-%token   LS_ASSIGN_TK    SRS_ASSIGN_TK   ZRS_ASSIGN_TK
-%token   AND_ASSIGN_TK   XOR_ASSIGN_TK   OR_ASSIGN_TK
-
-
-/* Modifier TOKEN have to be kept in this order. Don't scramble it */
-
-%token   PUBLIC_TK       PRIVATE_TK         PROTECTED_TK
-%token   STATIC_TK       FINAL_TK           SYNCHRONIZED_TK
-%token   VOLATILE_TK     TRANSIENT_TK       NATIVE_TK
-%token   PAD_TK          ABSTRACT_TK        MODIFIER_TK
-%token   STRICT_TK
-
-/* Keep those two in order, too */
-%token   DECR_TK INCR_TK
-
-/* From now one, things can be in any order */
-
-%token   DEFAULT_TK      IF_TK              THROW_TK
-%token   BOOLEAN_TK      DO_TK              IMPLEMENTS_TK
-%token   THROWS_TK       BREAK_TK           IMPORT_TK       
-%token   ELSE_TK         INSTANCEOF_TK      RETURN_TK
-%token   VOID_TK         CATCH_TK           INTERFACE_TK
-%token   CASE_TK         EXTENDS_TK         FINALLY_TK
-%token   SUPER_TK        WHILE_TK           CLASS_TK
-%token   SWITCH_TK       CONST_TK           TRY_TK
-%token   FOR_TK          NEW_TK             CONTINUE_TK
-%token   GOTO_TK         PACKAGE_TK         THIS_TK
-%token   ASSERT_TK
-
-%token   BYTE_TK         SHORT_TK           INT_TK            LONG_TK
-%token   CHAR_TK         INTEGRAL_TK
-
-%token   FLOAT_TK        DOUBLE_TK          FP_TK
-
-%token   ID_TK
-
-%token   REL_QM_TK         REL_CL_TK NOT_TK  NEG_TK
-
-%token   ASSIGN_ANY_TK   ASSIGN_TK
-%token   OP_TK  CP_TK  OCB_TK  CCB_TK  OSB_TK  CSB_TK  SC_TK  C_TK DOT_TK
-
-%token   STRING_LIT_TK   CHAR_LIT_TK        INT_LIT_TK        FP_LIT_TK
-%token   TRUE_TK         FALSE_TK           BOOL_LIT_TK       NULL_TK
-
-%type <node> ID_TK identifier name simple_name qualified_name type
- 	     primitive_type reference_type array_type formal_parameter_list
-	     formal_parameter class_or_interface_type class_type interface_type
-%type <declarator> method_declarator
-%type <value>      MODIFIER_TK
-
-%%
-/* 19.2 Production from 2.3: The Syntactic Grammar  */
-goal:
-	compilation_unit
-;
-
-/* 19.3 Productions from 3: Lexical structure  */
-literal:
-	INT_LIT_TK
-|	FP_LIT_TK
-|	BOOL_LIT_TK
-|	CHAR_LIT_TK
-|       STRING_LIT_TK
-|       NULL_TK
-;
-
-/* 19.4 Productions from 4: Types, Values and Variables  */
-type:
-	primitive_type
-|	reference_type
-;
-
-primitive_type:
-	INTEGRAL_TK
-		{
-		  /* use preset global here. FIXME */
-		  $$ = xstrdup ("int");
-		}
-|	FP_TK
-		{
-		  /* use preset global here. FIXME */
-		  $$ = xstrdup ("double");
-		}
-|	BOOLEAN_TK
-		{
-		  /* use preset global here. FIXME */
-		  $$ = xstrdup ("boolean");
-		}
-;
-
-reference_type:
-	class_or_interface_type
-|	array_type
-;
-
-class_or_interface_type:
-	name
-;
-
-class_type:
-	class_or_interface_type	/* Default rule */
-;
-
-interface_type:
-	 class_or_interface_type
-;
-
-array_type:
-	primitive_type dims
-		{
-	          while (bracket_count-- > 0) 
-		    $$ = concat ("[", $1, NULL);
-		}
-|	name dims
-		{
-	          while (bracket_count-- > 0) 
-		    $$ = concat ("[", $1, NULL);
-		}
-;
-
-/* 19.5 Productions from 6: Names  */
-name:
-	simple_name		/* Default rule */
-|	qualified_name		/* Default rule */
-;
-
-simple_name:
-	identifier		/* Default rule */
-;
-
-qualified_name:
-	name DOT_TK identifier
-		{ 
-		  $$ = concat ($1, ".", $3, NULL);
-		}
-;
-
-identifier:
-	ID_TK
-;
-
-/* 19.6: Production from 7: Packages  */
-compilation_unit:
-|	package_declaration
-|	import_declarations
-|	type_declarations
-|       package_declaration import_declarations
-|       package_declaration type_declarations
-|       import_declarations type_declarations
-|       package_declaration import_declarations type_declarations
-;
-
-import_declarations:
-	import_declaration
-|	import_declarations import_declaration
-;
-
-type_declarations:
-	type_declaration
-| 	type_declarations type_declaration
-;
-
-package_declaration:
-	PACKAGE_TK name SC_TK
-		{ package_name = $2; }
-;
-
-import_declaration:
-	single_type_import_declaration
-|	type_import_on_demand_declaration
-;
-
-single_type_import_declaration:
-	IMPORT_TK name SC_TK
-;
-
-type_import_on_demand_declaration:
-	IMPORT_TK name DOT_TK MULT_TK SC_TK
-;
-
-type_declaration:
-	class_declaration
-|	interface_declaration
-|	empty_statement
-;
-
-/* 19.7 Shortened from the original:
-   modifiers: modifier | modifiers modifier
-   modifier: any of public...  */
-modifiers:
-	MODIFIER_TK
-		{ 
-		  if ($1 == PUBLIC_TK)
-		    modifier_value++;
-                  if ($1 == STATIC_TK)
-                    modifier_value++;
-	          USE_ABSORBER;
-		}	
-|	modifiers MODIFIER_TK
-		{ 
-		  if ($2 == PUBLIC_TK)
-		    modifier_value++;
-                  if ($2 == STATIC_TK)
-                    modifier_value++;
-		  USE_ABSORBER;
-		}	
-;
-
-/* 19.8.1 Production from $8.1: Class Declaration */
-class_declaration:
-	modifiers CLASS_TK identifier super interfaces 
-		{ 
-		  report_class_declaration($3);
-		  modifier_value = 0;
-                }
-	class_body
-|	CLASS_TK identifier super interfaces 
-		{ report_class_declaration($2); }
-	class_body
-;
-
-super:
-|	EXTENDS_TK class_type
-;
-
-interfaces:
-|	IMPLEMENTS_TK interface_type_list
-;
-
-interface_type_list:
-	interface_type
-		{ USE_ABSORBER; }
-|	interface_type_list C_TK interface_type
-		{ USE_ABSORBER; }
-;
-
-class_body:
-	OCB_TK CCB_TK
-		{ pop_class_context (); }
-|	OCB_TK class_body_declarations CCB_TK
-		{ pop_class_context (); }
-;
-
-class_body_declarations:
-	class_body_declaration
-|	class_body_declarations class_body_declaration
-;
-
-class_body_declaration:
-	class_member_declaration
-|	static_initializer
-|	constructor_declaration
-|	block			/* Added, JDK1.1, instance initializer */
-;
-
-class_member_declaration:
-	field_declaration
-|	method_declaration
-|	class_declaration	/* Added, JDK1.1 inner classes */
-|	interface_declaration	/* Added, JDK1.1 inner classes */
-|	empty_statement
-;
-
-/* 19.8.2 Productions from 8.3: Field Declarations  */
-field_declaration:
-	type variable_declarators SC_TK
-		{ USE_ABSORBER; }
-|	modifiers type variable_declarators SC_TK
-		{ modifier_value = 0; }
-;
-
-variable_declarators:
-	/* Should we use build_decl_list () instead ? FIXME */
-	variable_declarator	/* Default rule */
-|	variable_declarators C_TK variable_declarator
-;
-
-variable_declarator:
-	variable_declarator_id
-|	variable_declarator_id ASSIGN_TK variable_initializer
-;
-
-variable_declarator_id:
-	identifier
-		{ bracket_count = 0; USE_ABSORBER; }
-|	variable_declarator_id OSB_TK CSB_TK
-		{ ++bracket_count; }
-;
-
-variable_initializer:
-	expression
-|	array_initializer
-;
-
-/* 19.8.3 Productions from 8.4: Method Declarations  */
-method_declaration:
-	method_header
-		{ ++method_depth; }
-	method_body
-		{ --method_depth; }
-;
-
-method_header:	
-	type method_declarator throws
-		{ USE_ABSORBER; }
-|	VOID_TK method_declarator throws
-|	modifiers type method_declarator throws
-		{ modifier_value = 0; }
-|	modifiers VOID_TK method_declarator throws
-		{ 
-                  report_main_declaration ($3);
-		  modifier_value = 0;
-		}
-;
-
-method_declarator:
-	identifier OP_TK CP_TK
-		{ 
-		  struct method_declarator *d;
-		  NEW_METHOD_DECLARATOR (d, $1, NULL);
-		  $$ = d;
-		}
-|	identifier OP_TK formal_parameter_list CP_TK
-		{ 
-		  struct method_declarator *d;
-		  NEW_METHOD_DECLARATOR (d, $1, $3);
-		  $$ = d;
-		}
-|	method_declarator OSB_TK CSB_TK
-;
-
-formal_parameter_list:
-	formal_parameter
-|	formal_parameter_list C_TK formal_parameter
-		{
-		  $$ = concat ($1, ",", $3, NULL);
-		}
-;
-
-formal_parameter:
-	type variable_declarator_id
-		{ 
-		  USE_ABSORBER;
-		  if (bracket_count)
-		    {
-		      int i;
-		      char *n = XNEWVEC (char, bracket_count + 1 + strlen ($$));
-		      for (i = 0; i < bracket_count; ++i)
-			n[i] = '[';
-		      strcpy (n + bracket_count, $$);
-		      $$ = n;
-		    }
-		  else
-		    $$ = $1;
-		}
-|	modifiers type variable_declarator_id /* Added, JDK1.1 final locals */
-		{
-		  if (bracket_count)
-		    {
-		      int i;
-		      char *n = XNEWVEC (char, bracket_count + 1 + strlen ($2));
-		      for (i = 0; i < bracket_count; ++i)
-			n[i] = '[';
-		      strcpy (n + bracket_count, $2);
-		      $$ = n;
-		    }
-		  else
-		    $$ = $2;
-		}
-;
-
-throws:
-|	THROWS_TK class_type_list
-;
-
-class_type_list:
-	class_type
-		{ USE_ABSORBER; }
-|	class_type_list C_TK class_type
-		{ USE_ABSORBER; }
-;
-
-method_body:
-	block
-|	SC_TK
-;
-
-/* 19.8.4 Productions from 8.5: Static Initializers  */
-static_initializer:
-	static block
-;
-
-static:				/* Test lval.sub_token here */
-	MODIFIER_TK
-		{ USE_ABSORBER; }
-;
-
-/* 19.8.5 Productions from 8.6: Constructor Declarations  */
-/* NOTE FOR FURTHER WORK ON CONSTRUCTORS:
-   - If a forbidden modifier is found, the error is either the use of
-     a forbidden modifier for a constructor OR bogus attempt to declare a
-     method without having specified the return type. FIXME */
-constructor_declaration:
-	constructor_declarator throws constructor_body
-|	modifiers constructor_declarator throws constructor_body
-		{ modifier_value = 0; }
-/* extra SC_TK, FIXME */
-|	constructor_declarator throws constructor_body SC_TK
-/* extra SC_TK, FIXME */
-|	modifiers constructor_declarator throws constructor_body SC_TK
-		{ modifier_value = 0; }
-/* I'm not happy with the SC_TK addition. It isn't in the grammar and should
-   probably be matched by and empty statement. But it doesn't work. FIXME */
-;
-
-constructor_declarator:
-	simple_name OP_TK CP_TK
-		{ USE_ABSORBER; }
-|	simple_name OP_TK formal_parameter_list CP_TK
-		{ USE_ABSORBER; }
-;
-
-constructor_body:
-	OCB_TK CCB_TK
-|	OCB_TK explicit_constructor_invocation CCB_TK
-|	OCB_TK block_statements CCB_TK
-|       OCB_TK explicit_constructor_invocation block_statements CCB_TK
-;
-
-/* Error recovery for that rule moved down expression_statement: rule.  */
-explicit_constructor_invocation:
-	this_or_super OP_TK CP_TK SC_TK
-|	this_or_super OP_TK argument_list CP_TK SC_TK
-        /* Added, JDK1.1 inner classes. Modified because the rule
-	   'primary' couldn't work.  */
-|	name DOT_TK SUPER_TK OP_TK argument_list CP_TK SC_TK
-		{ USE_ABSORBER; }
-|	name DOT_TK SUPER_TK OP_TK CP_TK SC_TK
-		{ USE_ABSORBER; }
-;
-
-this_or_super:			/* Added, simplifies error diagnostics */
-	THIS_TK
-|	SUPER_TK
-;
-
-/* 19.9 Productions from 9: Interfaces  */
-/* 19.9.1 Productions from 9.1: Interfaces Declarations  */
-interface_declaration:
-	INTERFACE_TK identifier
-		{ report_class_declaration ($2); modifier_value = 0; }
-	interface_body
-|	modifiers INTERFACE_TK identifier
-		{ report_class_declaration ($3); modifier_value = 0; }
-	interface_body
-|	INTERFACE_TK identifier extends_interfaces
-		{ report_class_declaration ($2); modifier_value = 0; }
-	interface_body
-|	modifiers INTERFACE_TK identifier extends_interfaces
-		{ report_class_declaration ($3); modifier_value = 0; }
-	interface_body
-;
-
-extends_interfaces:
-	EXTENDS_TK interface_type
-|	extends_interfaces C_TK interface_type
-;
-
-interface_body:
-	OCB_TK CCB_TK
-		{ pop_class_context (); }
-|	OCB_TK interface_member_declarations CCB_TK
-		{ pop_class_context (); }
-;
-
-interface_member_declarations:
-	interface_member_declaration
-|	interface_member_declarations interface_member_declaration
-;
-
-interface_member_declaration:
-	constant_declaration
-|	abstract_method_declaration
-|	class_declaration	/* Added, JDK1.1 inner classes */
-|	interface_declaration	/* Added, JDK1.1 inner classes */
-|	empty_statement
-;
-
-constant_declaration:
-	field_declaration
-;
-
-abstract_method_declaration:
-	method_header SC_TK
-;
-
-/* 19.10 Productions from 10: Arrays  */
-array_initializer:
-	OCB_TK CCB_TK
-|	OCB_TK variable_initializers CCB_TK
-|	OCB_TK C_TK CCB_TK
-|	OCB_TK variable_initializers C_TK CCB_TK
-;
-
-variable_initializers:
-	variable_initializer
-|	variable_initializers C_TK variable_initializer
-;
-
-/* 19.11 Production from 14: Blocks and Statements  */
-block:
-	OCB_TK CCB_TK
-|	OCB_TK block_statements CCB_TK
-;
-
-block_statements:
-	block_statement
-|	block_statements block_statement
-;
-
-block_statement:
-	local_variable_declaration_statement
-|	statement
-|	class_declaration	/* Added, JDK1.1 inner classes */
-;
-
-local_variable_declaration_statement:
-	local_variable_declaration SC_TK /* Can't catch missing ';' here */
-;
-
-local_variable_declaration:
-	type variable_declarators
-		{ USE_ABSORBER; }
-|	modifiers type variable_declarators /* Added, JDK1.1 final locals */
-		{ modifier_value = 0; }
-;
-
-statement:
-	statement_without_trailing_substatement
-|	labeled_statement
-|	if_then_statement
-|	if_then_else_statement
-|	while_statement
-|	for_statement
-;
-
-statement_nsi:
-	statement_without_trailing_substatement
-|	labeled_statement_nsi
-|	if_then_else_statement_nsi
-|	while_statement_nsi
-|	for_statement_nsi
-;
-
-statement_without_trailing_substatement:
-	block
-|	empty_statement
-|	expression_statement
-|	switch_statement
-|	do_statement
-|	break_statement
-|	continue_statement
-|	return_statement
-|	synchronized_statement
-|	throw_statement
-|	try_statement
-|	assert_statement
-;
-
-empty_statement:
-	SC_TK
-;
-
-label_decl:
-	identifier REL_CL_TK
-		{ USE_ABSORBER; }
-;
-
-labeled_statement:
-	label_decl statement
-;
-
-labeled_statement_nsi:
-	label_decl statement_nsi
-;
-
-/* We concentrate here a bunch of error handling rules that we couldn't write
-   earlier, because expression_statement catches a missing ';'.  */
-expression_statement:
-	statement_expression SC_TK
-;
-
-statement_expression: 
-	assignment
-|	pre_increment_expression
-|	pre_decrement_expression
-|	post_increment_expression
-|	post_decrement_expression
-|	method_invocation
-|	class_instance_creation_expression
-;
-
-if_then_statement:
-	IF_TK OP_TK expression CP_TK statement { ++complexity; }
-;
-
-if_then_else_statement:
-	IF_TK OP_TK expression CP_TK statement_nsi ELSE_TK statement
-	{ ++complexity; }
-;
-
-if_then_else_statement_nsi:
-	IF_TK OP_TK expression CP_TK statement_nsi ELSE_TK statement_nsi
-	{ ++complexity; }
-;
-
-switch_statement:
-	SWITCH_TK OP_TK expression CP_TK switch_block
-;
-
-switch_block:
-	OCB_TK CCB_TK
-|	OCB_TK switch_labels CCB_TK
-|	OCB_TK switch_block_statement_groups CCB_TK
-|	OCB_TK switch_block_statement_groups switch_labels CCB_TK
-;
-
-switch_block_statement_groups: 
-	switch_block_statement_group
-|	switch_block_statement_groups switch_block_statement_group
-;
-
-switch_block_statement_group:
-	switch_labels block_statements { ++complexity; }
-;
-
-
-switch_labels:
-	switch_label
-|	switch_labels switch_label
-;
-
-switch_label:
-	CASE_TK constant_expression REL_CL_TK
-|	DEFAULT_TK REL_CL_TK
-;
-
-while_expression:
-	WHILE_TK OP_TK expression CP_TK { ++complexity; }
-;
-
-while_statement:
-	while_expression statement
-;
-
-while_statement_nsi:
-	while_expression statement_nsi
-;
-
-do_statement_begin:
-	DO_TK
-;
-
-do_statement: 
-	do_statement_begin statement WHILE_TK OP_TK expression CP_TK SC_TK
-	{ ++complexity; }
-;
-
-for_statement:
-	for_begin SC_TK expression SC_TK for_update CP_TK statement
-|	for_begin SC_TK SC_TK for_update CP_TK statement
-;
-
-for_statement_nsi:
-	for_begin SC_TK expression SC_TK for_update CP_TK statement_nsi
-|	for_begin SC_TK SC_TK for_update CP_TK statement_nsi
-;
-
-for_header:
-	FOR_TK OP_TK
-;
-
-for_begin:
-	for_header for_init { ++complexity; }
-;
-for_init:			/* Can be empty */
-|	statement_expression_list
-|	local_variable_declaration
-;
-
-for_update:			/* Can be empty */
-|	statement_expression_list
-;
-
-statement_expression_list:
-	statement_expression
-|	statement_expression_list C_TK statement_expression
-;
-
-break_statement:
-	BREAK_TK SC_TK
-|	BREAK_TK identifier SC_TK
-;
-
-/* `continue' with a label is considered for complexity but ordinary
-   continue is not.  */
-continue_statement:
-	CONTINUE_TK SC_TK
-	|       CONTINUE_TK identifier SC_TK { ++complexity; }
-;
-
-return_statement:
-	RETURN_TK SC_TK
-|	RETURN_TK expression SC_TK
-;
-
-throw_statement:
-	THROW_TK expression SC_TK { ++complexity; }
-;
-
-assert_statement:
-	ASSERT_TK expression REL_CL_TK expression SC_TK
-|	ASSERT_TK expression SC_TK
-|	ASSERT_TK error
-		{yyerror ("Missing term"); RECOVER;}
-|	ASSERT_TK expression error
-		{yyerror ("';' expected"); RECOVER;}
-;
-synchronized_statement:
-	synchronized OP_TK expression CP_TK block
-|	synchronized OP_TK expression CP_TK error
-;
-
-synchronized:			/* Test lval.sub_token here */
-	MODIFIER_TK
-		{ USE_ABSORBER; }
-;
-
-try_statement:
-	TRY_TK block catches
-|	TRY_TK block finally
-|	TRY_TK block catches finally
-;
-
-catches:
-	catch_clause
-|	catches catch_clause
-;
-
-catch_clause:
-	CATCH_TK OP_TK formal_parameter CP_TK block { ++complexity; }
-;
-
-finally:
-	FINALLY_TK block { ++complexity; }
-;
-
-/* 19.12 Production from 15: Expressions  */
-primary:
-	primary_no_new_array
-|	array_creation_expression
-;
-
-primary_no_new_array:
-	literal
-|	THIS_TK
-|	OP_TK expression CP_TK
-|	class_instance_creation_expression
-|	field_access
-|	method_invocation
-|	array_access
-|	type_literals
-        /* Added, JDK1.1 inner classes. Documentation is wrong
-           referring to a 'ClassName' (class_name) rule that doesn't
-           exist. Used name instead.  */
-|	name DOT_TK THIS_TK
-		{ USE_ABSORBER; }
-;
-
-type_literals:
-	name DOT_TK CLASS_TK
-		{ USE_ABSORBER; }
-|	array_type DOT_TK CLASS_TK
-		{ USE_ABSORBER; }
-|	primitive_type DOT_TK CLASS_TK
-		{ USE_ABSORBER; }
-|	VOID_TK DOT_TK CLASS_TK
-		{ USE_ABSORBER; }
-;
-
-class_instance_creation_expression:
-	NEW_TK class_type OP_TK argument_list CP_TK
-|	NEW_TK class_type OP_TK CP_TK
-|	anonymous_class_creation
-|	something_dot_new identifier OP_TK CP_TK
-|	something_dot_new identifier OP_TK CP_TK class_body
-|	something_dot_new identifier OP_TK argument_list CP_TK
-|	something_dot_new identifier OP_TK argument_list CP_TK class_body
-;
-
-anonymous_class_creation:
-	NEW_TK class_type OP_TK CP_TK
-		{ report_class_declaration (anonymous_context); }
-	class_body         
-|	NEW_TK class_type OP_TK argument_list CP_TK
-		{ report_class_declaration (anonymous_context); }
-	class_body
-;
-
-something_dot_new:		/* Added, not part of the specs. */
-	name DOT_TK NEW_TK
-		{ USE_ABSORBER; }
-|	primary DOT_TK NEW_TK
-;
-
-argument_list:
-	expression
-|	argument_list C_TK expression
-|	argument_list C_TK error
-;
-
-array_creation_expression:
-	NEW_TK primitive_type dim_exprs
-|	NEW_TK class_or_interface_type dim_exprs
-|	NEW_TK primitive_type dim_exprs dims
-|	NEW_TK class_or_interface_type dim_exprs dims
-        /* Added, JDK1.1 anonymous array. Initial documentation rule
-           modified */
-|	NEW_TK class_or_interface_type dims array_initializer
-|	NEW_TK primitive_type dims array_initializer
-;
-
-dim_exprs:
-	dim_expr
-|	dim_exprs dim_expr
-;
-
-dim_expr:
-	OSB_TK expression CSB_TK
-;
-
-dims:				
-	OSB_TK CSB_TK
-		{ bracket_count = 1; }
-|	dims OSB_TK CSB_TK
-		{ bracket_count++; }
-;
-
-field_access:
-	primary DOT_TK identifier
-|	SUPER_TK DOT_TK identifier
-;
-
-/* We include method invocation in the complexity measure on the
-   theory that most method calls are virtual and therefore involve a
-   decision point.  */
-method_invocation:
-	name OP_TK CP_TK
-		{ USE_ABSORBER; ++complexity; }
-|	name OP_TK argument_list CP_TK
-		{ USE_ABSORBER; ++complexity; }
-|	primary DOT_TK identifier OP_TK CP_TK { ++complexity; }
-|	primary DOT_TK identifier OP_TK argument_list CP_TK { ++complexity; }
-|	SUPER_TK DOT_TK identifier OP_TK CP_TK { ++complexity; }
-|	SUPER_TK DOT_TK identifier OP_TK argument_list CP_TK { ++complexity; }
-;
-
-array_access:
-	name OSB_TK expression CSB_TK
-		{ USE_ABSORBER; }
-|	primary_no_new_array OSB_TK expression CSB_TK
-;
-
-postfix_expression:
-	primary
-|	name
-		{ USE_ABSORBER; }
-|	post_increment_expression
-|	post_decrement_expression
-;
-
-post_increment_expression:
-	postfix_expression INCR_TK
-;
-
-post_decrement_expression:
-	postfix_expression DECR_TK
-;
-
-unary_expression:
-	pre_increment_expression
-|	pre_decrement_expression
-|	PLUS_TK unary_expression
-|	MINUS_TK unary_expression
-|	unary_expression_not_plus_minus
-;
-
-pre_increment_expression:
-	INCR_TK unary_expression
-;
-
-pre_decrement_expression:
-	DECR_TK unary_expression
-;
-
-unary_expression_not_plus_minus:
-	postfix_expression
-|	NOT_TK unary_expression
-|	NEG_TK unary_expression
-|	cast_expression
-;
-
-cast_expression:		/* Error handling here is potentially weak */
-	OP_TK primitive_type dims CP_TK unary_expression
-|	OP_TK primitive_type CP_TK unary_expression
-|	OP_TK expression CP_TK unary_expression_not_plus_minus
-|	OP_TK name dims CP_TK unary_expression_not_plus_minus
-;
-
-multiplicative_expression:
-	unary_expression
-|	multiplicative_expression MULT_TK unary_expression
-|	multiplicative_expression DIV_TK unary_expression
-|	multiplicative_expression REM_TK unary_expression
-;
-
-additive_expression:
-	multiplicative_expression
-|	additive_expression PLUS_TK multiplicative_expression
-|	additive_expression MINUS_TK multiplicative_expression
-;
-
-shift_expression:
-	additive_expression
-|	shift_expression LS_TK additive_expression
-|	shift_expression SRS_TK additive_expression
-|	shift_expression ZRS_TK additive_expression
-;
-
-relational_expression:
-	shift_expression
-|	relational_expression LT_TK shift_expression
-|	relational_expression GT_TK shift_expression
-|	relational_expression LTE_TK shift_expression
-|	relational_expression GTE_TK shift_expression
-|	relational_expression INSTANCEOF_TK reference_type
-;
-
-equality_expression:
-	relational_expression
-|	equality_expression EQ_TK relational_expression
-|	equality_expression NEQ_TK relational_expression
-;
-
-and_expression:
-	equality_expression
-|	and_expression AND_TK equality_expression
-;
-
-exclusive_or_expression:
-	and_expression
-|	exclusive_or_expression XOR_TK and_expression
-;
-
-inclusive_or_expression:
-	exclusive_or_expression
-|	inclusive_or_expression OR_TK exclusive_or_expression
-;
-
-conditional_and_expression:
-	inclusive_or_expression
-|	conditional_and_expression BOOL_AND_TK inclusive_or_expression
-	{ ++complexity; }
-;
-
-conditional_or_expression:
-	conditional_and_expression
-|	conditional_or_expression BOOL_OR_TK conditional_and_expression
-	{ ++complexity; }
-;
-
-conditional_expression:		/* Error handling here is weak */
-	conditional_or_expression
-|	conditional_or_expression REL_QM_TK expression REL_CL_TK conditional_expression
-	{ ++complexity; }
-;
-
-assignment_expression:
-	conditional_expression
-|	assignment
-;
-
-assignment:
-	left_hand_side assignment_operator assignment_expression
-;
-
-left_hand_side:
-	name
-		{ USE_ABSORBER; }
-|	field_access
-|	array_access
-;
-
-assignment_operator:
-	ASSIGN_ANY_TK
-|	ASSIGN_TK
-;
-
-expression:
-	assignment_expression
-;
-
-constant_expression:
-	expression
-;
-
-%%
-
-/* Create a new parser context */
-
-void
-java_push_parser_context (void)
-{
-  struct parser_ctxt *tmp = XCNEW (struct parser_ctxt);
-
-  tmp->next = ctxp;
-  ctxp = tmp;
-}  
-
-static void
-push_class_context (const char *name)
-{
-  struct class_context *ctx;
-
-  ctx = XNEW (struct class_context);
-  ctx->name = (char *) name;
-  ctx->next = current_class_context;
-  current_class_context = ctx;
-}
-
-static void
-pop_class_context (void)
-{
-  struct class_context *ctx;
-
-  if (current_class_context == NULL)
-    return;
-
-  ctx = current_class_context->next;
-  if (current_class_context->name != anonymous_context)
-    free (current_class_context->name);
-  free (current_class_context);
-
-  current_class_context = ctx;
-  if (current_class_context == NULL)
-    anonymous_count = 0;
-}
-
-/* Recursively construct the class name.  This is just a helper
-   function for get_class_name().  */
-static int
-make_class_name_recursive (struct obstack *stack, struct class_context *ctx)
-{
-  if (! ctx)
-    return 0;
-
-  make_class_name_recursive (stack, ctx->next);
-
-  /* Replace an anonymous context with the appropriate counter value.  */
-  if (ctx->name == anonymous_context)
-    {
-      char buf[50];
-      ++anonymous_count;
-      sprintf (buf, "%d", anonymous_count);
-      ctx->name = xstrdup (buf);
-    }
-
-  obstack_grow (stack, ctx->name, strlen (ctx->name));
-  obstack_1grow (stack, '$');
-
-  return ISDIGIT (ctx->name[0]);
-}
-
-/* Return a newly allocated string holding the name of the class.  */
-static char *
-get_class_name (void)
-{
-  char *result;
-  int last_was_digit;
-  struct obstack name_stack;
-
-  obstack_init (&name_stack);
-
-  /* Duplicate the logic of parse.y:maybe_make_nested_class_name().  */
-  last_was_digit = make_class_name_recursive (&name_stack,
-					      current_class_context->next);
-
-  if (! last_was_digit
-      && method_depth
-      && current_class_context->name != anonymous_context)
-    {
-      char buf[50];
-      ++anonymous_count;
-      sprintf (buf, "%d", anonymous_count);
-      obstack_grow (&name_stack, buf, strlen (buf));
-      obstack_1grow (&name_stack, '$');
-    }
-
-  if (current_class_context->name == anonymous_context)
-    {
-      char buf[50];
-      ++anonymous_count;
-      sprintf (buf, "%d", anonymous_count);
-      current_class_context->name = xstrdup (buf);
-      obstack_grow0 (&name_stack, buf, strlen (buf));
-    }
-  else
-    obstack_grow0 (&name_stack, current_class_context->name,
-		   strlen (current_class_context->name));
-
-  result = xstrdup (obstack_finish (&name_stack));
-  obstack_free (&name_stack, NULL);
-
-  return result;
-}
-
-/* Actions defined here */
-
-static void
-report_class_declaration (const char * name)
-{
-  extern int flag_dump_class, flag_list_filename;
-
-  push_class_context (name);
-  if (flag_dump_class)
-    {
-      char *name = get_class_name ();
-
-      if (!previous_output)
-	{
-	  if (flag_list_filename)
-	    fprintf (out, "%s: ", main_input_filename);
-	  previous_output = 1;
-	}
-
-      if (package_name)
-	fprintf (out, "%s.%s ", package_name, name);
-      else
-	fprintf (out, "%s ", name);
-
-      free (name);
-    }
-}
-
-static void
-report_main_declaration (struct method_declarator *declarator)
-{
-  extern int flag_find_main;
-
-  if (flag_find_main
-      && modifier_value == 2
-      && !strcmp (declarator->method_name, "main") 
-      && declarator->args 
-      && declarator->args [0] == '[' 
-      && (! strcmp (declarator->args+1, "String")
-	  || ! strcmp (declarator->args + 1, "java.lang.String"))
-      && current_class_context)
-    {
-      if (!previous_output)
-	{
-	  char *name = get_class_name ();
-	  if (package_name)
-	    fprintf (out, "%s.%s ", package_name, name);
-	  else
-	    fprintf (out, "%s", name);
-	  free (name);
-	  previous_output = 1;
-	}
-    }
-}
-
-void
-report (void)
-{
-  extern int flag_complexity;
-  if (flag_complexity)
-    fprintf (out, "%s %d\n", main_input_filename, complexity);
-}
-
-/* Reset global status used by the report functions.  */
-
-void
-reset_report (void)
-{
-  previous_output = 0;
-  package_name = NULL;
-  current_class_context = NULL;
-  complexity = 0;
-}
-
-void
-yyerror (const char *msg ATTRIBUTE_UNUSED)
-{
-  fprintf (stderr, "%s: %s\n", main_input_filename, msg);
-  exit (1);
-}
-
-#ifdef __XGETTEXT__
-/* Depending on the version of Bison used to compile this grammar,
-   it may issue generic diagnostics spelled "syntax error" or
-   "parse error".  To prevent this from changing the translation
-   template randomly, we list all the variants of this particular
-   diagnostic here.  Translators: there is no fine distinction
-   between diagnostics with "syntax error" in them, and diagnostics
-   with "parse error" in them.  It's okay to give them both the same
-   translation.  */
-const char d1[] = N_("syntax error");
-const char d2[] = N_("parse error");
-const char d3[] = N_("syntax error; also virtual memory exhausted");
-const char d4[] = N_("parse error; also virtual memory exhausted");
-const char d5[] = N_("syntax error: cannot back up");
-const char d6[] = N_("parse error: cannot back up");
-#endif
diff --git a/gcc/java/parse.h b/gcc/java/parse.h
index 6b14ffe..7483171 100644
--- a/gcc/java/parse.h
+++ b/gcc/java/parse.h
@@ -1,6 +1,6 @@
 /* Language parser definitions for the GNU compiler for the Java(TM) language.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007 Free Software Foundation, Inc.
    Contributed by Alexandre Petit-Bianco (apbianco@cygnus.com)
 
 This file is part of GCC.
@@ -27,26 +27,10 @@ The Free Software Foundation is independent of Sun Microsystems, Inc.  */
 #ifndef GCC_JAVA_PARSE_H
 #define GCC_JAVA_PARSE_H
 
-#include "lex.h"
-
 /* Extern global variable declarations */
-extern int java_error_count;
 extern struct obstack temporary_obstack;
 extern int quiet_flag;
 
-#ifndef JC1_LITE
-/* Function extern to java/ */
-extern int int_fits_type_p (tree, tree);
-extern tree stabilize_reference (tree);
-#endif
-
-/* Macros for verbose debug info  */
-#ifdef  VERBOSE_SKELETON
-#define RULE( rule ) printf ( "jv_yacc:%d: rule %s\n", lineno, rule )
-#else
-#define RULE( rule )
-#endif
-
 #ifdef VERBOSE_SKELETON
 #undef SOURCE_FRONTEND_DEBUG
 #define SOURCE_FRONTEND_DEBUG(X)				\
@@ -55,144 +39,6 @@ extern tree stabilize_reference (tree);
 #define SOURCE_FRONTEND_DEBUG(X)
 #endif
 
-/* Macro for error recovering  */
-#ifdef YYDEBUG
-#define RECOVERED     					\
-  { if (!quiet_flag) {printf ("** Recovered\n");} }
-#define DRECOVERED(s) 						\
-  { if (!quiet_flag) {printf ("** Recovered (%s)\n", #s);}}
-#else
-#define RECOVERED
-#define DRECOVERED(s)
-#endif
-
-#define DRECOVER(s) {yyerrok; DRECOVERED(s);}
-#define RECOVER     {yyerrok; RECOVERED;}
-
-#define YYERROR_NOW ctxp->java_error_flag = 1
-#define YYNOT_TWICE if (ctxp->prevent_ese != input_line)
-
-/* Accepted modifiers */
-#define CLASS_MODIFIERS ACC_PUBLIC|ACC_ABSTRACT|ACC_FINAL|ACC_STRICT
-#define FIELD_MODIFIERS ACC_PUBLIC|ACC_PROTECTED|ACC_PRIVATE|ACC_FINAL| \
-                        ACC_STATIC|ACC_TRANSIENT|ACC_VOLATILE
-#define METHOD_MODIFIERS ACC_PUBLIC|ACC_PROTECTED|ACC_PRIVATE|ACC_ABSTRACT| \
-			 ACC_STATIC|ACC_FINAL|ACC_SYNCHRONIZED|ACC_NATIVE| \
-			 ACC_STRICT
-#define INTERFACE_MODIFIERS ACC_PUBLIC|ACC_ABSTRACT|ACC_STRICT
-#define INTERFACE_INNER_MODIFIERS ACC_PUBLIC|ACC_PROTECTED|ACC_ABSTRACT| \
-				  ACC_STATIC|ACC_PRIVATE
-#define INTERFACE_METHOD_MODIFIERS ACC_PUBLIC|ACC_ABSTRACT
-#define INTERFACE_FIELD_MODIFIERS ACC_PUBLIC|ACC_STATIC|ACC_FINAL
-
-/* Getting a modifier WFL */
-#define MODIFIER_WFL(M)   (ctxp->modifier_ctx [(M) - PUBLIC_TK])
-
-/* Check on modifiers */
-#ifdef USE_MAPPED_LOCATION
-#define THIS_MODIFIER_ONLY(f, m, v, count, l)				\
-  if ((f) & (m))							\
-    {									\
-      tree node = MODIFIER_WFL (v);					\
-      if (!l)								\
-        l = node;							\
-      else								\
-	{								\
-	  expanded_location lloc = expand_location (EXPR_LOCATION (l));	\
-	  expanded_location nloc = expand_location (EXPR_LOCATION (node)); \
-	  if (nloc.column > lloc.column || nloc.line > lloc.line)	\
-	    l = node;							\
-	}								\
-      count++;								\
-    }
-#else
-#define THIS_MODIFIER_ONLY(f, m, v, count, l)				\
-  if ((f) & (m))							\
-    {									\
-      tree node = MODIFIER_WFL (v);					\
-      if ((l)								\
-	  && ((EXPR_WFL_COLNO (node) > EXPR_WFL_COLNO (l))		\
-	      || (EXPR_WFL_LINENO (node) > EXPR_WFL_LINENO (l))))	\
-        l = node;							\
-      else if (!(l))							\
-        l = node;							\
-      count++;								\
-    }
-#endif
-
-#ifdef ATTRIBUTE_GCC_DIAG
-extern void parse_error_context (tree cl, const char *gmsgid, ...) ATTRIBUTE_GCC_DIAG(2,3);
-#endif
-
-#define ABSTRACT_CHECK(FLAG, V, CL, S)				\
-  if ((FLAG) & (V))						\
-    parse_error_context ((CL), "%s method can't be abstract", (S));
-
-#define JCONSTRUCTOR_CHECK(FLAG, V, CL, S)			\
-  if ((FLAG) & (V))						\
-    parse_error_context ((CL), "Constructor can't be %s", (S));	\
-      
-/* Misc. */
-#define exit_java_complete_class()		\
-  {						\
-    return;					\
-  }
-
-#define CLASS_OR_INTERFACE(decl, s1, s2)			\
-   (decl ?							\
-    ((get_access_flags_from_decl (TYPE_NAME (TREE_TYPE (decl)))	\
-      & ACC_INTERFACE) ?					\
-     s2 : s1) : ((s1 [0]=='S'|| s1 [0]=='s') ?			\
-		 (s1 [0]=='S' ? "Supertype" : "supertype") :	\
-		 (s1 [0] > 'A' ? "Type" : "type")))
-
-#define GET_REAL_TYPE(TYPE) 					\
-  (TREE_CODE (TYPE) == TREE_LIST ? TREE_PURPOSE (TYPE) : TYPE)
-
-/* Get TYPE name string, regardless whether TYPE is a class or an
-   array. */
-#define GET_TYPE_NAME(TYPE)				\
-  (TREE_CODE (TYPE_NAME (TYPE)) == IDENTIFIER_NODE ?	\
-   IDENTIFIER_POINTER (TYPE_NAME (TYPE)) :		\
-   IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (TYPE))))
-
-/* Pedantic warning on obsolete modifiers. Note: when cl is NULL,
-   flags was set artificially, such as for an interface method.  */
-#define OBSOLETE_MODIFIER_WARNING(cl, flags, __modifier, arg)                \
-  {                                                                          \
-    if (flag_redundant && (cl) && ((flags) & (__modifier)))		     \
-      parse_warning_context (cl,                                             \
-     "Discouraged redundant use of %qs modifier in declaration of %s",      \
-			     java_accstring_lookup (__modifier), arg);       \
-  }
-#define OBSOLETE_MODIFIER_WARNING2(cl, flags, __modifier, arg1, arg2)        \
-  {                                                                          \
-    if (flag_redundant && (cl) && ((flags) & (__modifier)))		     \
-      parse_warning_context (cl,                                             \
-     "Discouraged redundant use of %qs modifier in declaration of %s %qs", \
-			     java_accstring_lookup (__modifier), arg1, arg2);\
-  }
-
-/* Quickly build a temporary pointer on hypothetical type NAME. */
-#define BUILD_PTR_FROM_NAME(ptr, name)		\
-  do {						\
-    ptr = make_node (POINTER_TYPE);		\
-    TYPE_NAME (ptr) = name;			\
-  } while (0)
-
-#define INCOMPLETE_TYPE_P(NODE)				\
-  ((TREE_CODE (NODE) == POINTER_TYPE)			\
-   && !TREE_TYPE (NODE) 				\
-   && TREE_CODE (TYPE_NAME (NODE)) == IDENTIFIER_NODE)
-
-#ifndef USE_MAPPED_LOCATION
-/* Set the EMIT_LINE_NOTE flag of a EXPR_WLF to 1 if debug information
-   are requested. Works in the context of a parser rule. */
-#define JAVA_MAYBE_GENERATE_DEBUG_INFO(node)		\
-  do {if (debug_info_level != DINFO_LEVEL_NONE)	\
-      EXPR_WFL_EMIT_LINE_NOTE (node) = 1; } while (0)
-#endif
-
 /* Types classification, according to the JLS, section 4.2 */
 #define JFLOAT_TYPE_P(TYPE)      (TYPE && TREE_CODE ((TYPE)) == REAL_TYPE)
 #define JINTEGRAL_TYPE_P(TYPE)   ((TYPE) 				   \
@@ -204,765 +50,24 @@ extern void parse_error_context (tree cl, const char *gmsgid, ...) ATTRIBUTE_GCC
 				  && (JNUMERIC_TYPE_P ((TYPE))		  \
 				  || TREE_CODE ((TYPE)) == BOOLEAN_TYPE))
 
-#define JBSC_TYPE_P(TYPE) ((TYPE) && (((TYPE) == byte_type_node)	\
-				      || ((TYPE) == short_type_node)	\
-				      || ((TYPE) == char_type_node)))
-
 /* Not defined in the LRM */
 #define JSTRING_TYPE_P(TYPE) ((TYPE) 					   \
 			      && ((TYPE) == string_type_node ||		   \
 				  (TREE_CODE (TYPE) == POINTER_TYPE &&	   \
 				   TREE_TYPE (TYPE) == string_type_node)))
-#define JSTRING_P(NODE) ((NODE)						\
-			 && (TREE_CODE (NODE) == STRING_CST		\
-			     || IS_CRAFTED_STRING_BUFFER_P (NODE)	\
-			     || JSTRING_TYPE_P (TREE_TYPE (NODE))))
-
 #define JREFERENCE_TYPE_P(TYPE) ((TYPE)					      \
 				 && (TREE_CODE (TYPE) == RECORD_TYPE 	      \
 				     ||	(TREE_CODE (TYPE) == POINTER_TYPE     \
 					 &&  TREE_CODE (TREE_TYPE (TYPE)) ==  \
 					 RECORD_TYPE)))
-#define JNULLP_TYPE_P(TYPE) ((TYPE) && (TREE_CODE (TYPE) == POINTER_TYPE) \
-			     && (TYPE) == TREE_TYPE (null_pointer_node))
-
-/* Other predicates */
-#define JDECL_P(NODE) (NODE && (TREE_CODE (NODE) == PARM_DECL		\
-				|| TREE_CODE (NODE) == VAR_DECL		\
-				|| TREE_CODE (NODE) == FIELD_DECL))
-
-#define TYPE_INTERFACE_P(TYPE) 					\
-  (CLASS_P (TYPE) && CLASS_INTERFACE (TYPE_NAME (TYPE)))
-
-#define TYPE_CLASS_P(TYPE) (CLASS_P (TYPE) 				\
-			    && !CLASS_INTERFACE (TYPE_NAME (TYPE)))
-
-/* Identifier business related to 1.1 language extensions.  */
-
-#define IDENTIFIER_INNER_CLASS_OUTER_FIELD_ACCESS(NODE)	\
-  (TREE_CODE (NODE) == IDENTIFIER_NODE &&		\
-   IDENTIFIER_LENGTH (NODE) >= 8 &&			\
-   IDENTIFIER_POINTER (NODE)[7] != '0')
-
-/* Build the string val$<O> and store it into N. The is used to
-   construct the name of inner class hidden fields used to alias outer
-   scope local variables.  */
-#define MANGLE_OUTER_LOCAL_VARIABLE_NAME(N, O)				\
-  {									\
-    char *mangled_name;							\
-    obstack_grow (&temporary_obstack, "val$", 4);			\
-    obstack_grow (&temporary_obstack,					\
-		  IDENTIFIER_POINTER ((O)), IDENTIFIER_LENGTH ((O)));	\
-    obstack_1grow (&temporary_obstack, '\0');				\
-    mangled_name = obstack_finish (&temporary_obstack);			\
-    (N) = get_identifier (mangled_name);				\
-    obstack_free (&temporary_obstack, mangled_name);			\
-  }
-
-/* Build the string parm$<O> and store in into the identifier N. This
-   is used to construct the name of hidden parameters used to
-   initialize outer scope aliases.  */
-#define MANGLE_ALIAS_INITIALIZER_PARAMETER_NAME_ID(N, O)		\
-  {									\
-    char *mangled_name;							\
-    obstack_grow (&temporary_obstack, "parm$", 5);			\
-    obstack_grow (&temporary_obstack, 					\
-		  IDENTIFIER_POINTER ((O)), IDENTIFIER_LENGTH ((O)));	\
-    obstack_1grow (&temporary_obstack, '\0');				\
-    mangled_name = obstack_finish (&temporary_obstack);			\
-    (N) = get_identifier (mangled_name);				\
-    obstack_free (&temporary_obstack, mangled_name);			\
-  }
-
-#define MANGLE_ALIAS_INITIALIZER_PARAMETER_NAME_STR(N, S)	\
-  {								\
-    char *mangled_name;							\
-    obstack_grow (&temporary_obstack, "parm$", 5);		\
-    obstack_grow (&temporary_obstack, (S), strlen ((S)));	\
-    obstack_1grow (&temporary_obstack, '\0');			\
-    mangled_name = obstack_finish (&temporary_obstack);			\
-    (N) = get_identifier (mangled_name);				\
-    obstack_free (&temporary_obstack, mangled_name);			\
-  }
-
-/* Skip THIS and artificial parameters found in function decl M and
-   assign the result to C. We don't do that for $finit$, since it's
-   knowingly called with artificial parms.  */
-#define SKIP_THIS_AND_ARTIFICIAL_PARMS(C,M)			\
-  {								\
-    int i;							\
-    (C) = TYPE_ARG_TYPES (TREE_TYPE ((M)));			\
-    if (!METHOD_STATIC ((M)))					\
-      (C) = TREE_CHAIN (C);					\
-    if (DECL_CONSTRUCTOR_P ((M))				\
-        && PURE_INNER_CLASS_TYPE_P (DECL_CONTEXT ((M))))	\
-      (C) = TREE_CHAIN (C);					\
-    if (!DECL_FINIT_P ((M)))					\
-      for (i = DECL_FUNCTION_NAP ((M)); i; i--)			\
-       (C) = TREE_CHAIN (C);					\
-  }
-
-/* Mark final parameters in method M, by comparison of the argument
-   list L. This macro is used to set the flag once the method has been
-   build.  */
-#define MARK_FINAL_PARMS(M, L)						\
-  {									\
-    tree current = TYPE_ARG_TYPES (TREE_TYPE ((M)));			\
-    tree list = (L);							\
-    if (!METHOD_STATIC ((M)))						\
-      current = TREE_CHAIN (current);					\
-    for (; current !=  end_params_node;					\
-	 current = TREE_CHAIN (current), list = TREE_CHAIN (list))	\
-      ARG_FINAL_P (current) = ARG_FINAL_P (list);			\
-    if (current != list)						\
-      abort ();								\
-  }
-
-/* Reset the ARG_FINAL_P that might have been set in method M args.  */
-#define UNMARK_FINAL_PARMS(M)						\
-  {									\
-    tree current;							\
-    for (current = TYPE_ARG_TYPES (TREE_TYPE ((M))); 			\
-	 current != end_params_node; current = TREE_CHAIN (current))	\
-      ARG_FINAL_P (current) = 0;					\
-  }
-
-/* Reverse a crafted parameter list as required.  */
-#define CRAFTED_PARAM_LIST_FIXUP(P)		\
-  {						\
-    if ((P))					\
-      {						\
-	tree last = (P);			\
-	(P) = nreverse (P);			\
-	TREE_CHAIN (last) = end_params_node;	\
-      }						\
-    else					\
-      (P) = end_params_node;			\
-  }
-
-/* Modes governing the creation of a alias initializer parameter
-   lists. AIPL stands for Alias Initializer Parameter List.  */
-enum {
-  AIPL_FUNCTION_CREATION,	  /* Suitable for artificial method creation */
-  AIPL_FUNCTION_DECLARATION,	  /* Suitable for declared methods */
-  AIPL_FUNCTION_CTOR_INVOCATION,  /* Invocation of constructors */
-  AIPL_FUNCTION_FINIT_INVOCATION  /* Invocation of $finit$ */
-};
-
-/* Standard error messages */
-#define ERROR_CANT_CONVERT_TO_BOOLEAN(OPERATOR, NODE, TYPE)		\
-  parse_error_context ((OPERATOR),					\
-    "Incompatible type for %qs. Can't convert %qs to boolean",	\
-    operator_string ((NODE)), lang_printable_name ((TYPE),0))
-
-#define ERROR_CANT_CONVERT_TO_NUMERIC(OPERATOR, NODE, TYPE)		\
-  parse_error_context ((OPERATOR),					\
-      "Incompatible type for %qs. Can't convert %qs to numeric type",	\
-      operator_string ((NODE)), lang_printable_name ((TYPE), 0))
-
-#define ERROR_CAST_NEEDED_TO_INTEGRAL(OPERATOR, NODE, TYPE)		\
-do {									\
-  tree _operator = (OPERATOR), _node = (NODE), _type = (TYPE);		\
-  if (JPRIMITIVE_TYPE_P (_type))					\
-    parse_error_context (_operator,					\
-"Incompatible type for %qs. Explicit cast needed to convert %qs to integral",\
-			 operator_string(_node),			\
-			 lang_printable_name (_type, 0));		\
-  else									\
-    parse_error_context (_operator,					\
-      "Incompatible type for %qs. Can't convert %qs to integral",	\
-			 operator_string(_node),			\
-			 lang_printable_name (_type, 0));		\
-} while (0)
-
-#define ERROR_VARIABLE_NOT_INITIALIZED(WFL, V)			\
-  parse_error_context						\
-    ((WFL), "Variable %qs may not have been initialized",	\
-     IDENTIFIER_POINTER (V))
-
-/* Definition for loop handling. This is Java's own definition of a
-   loop body. See parse.y for documentation. It's valid once you hold
-   a loop's body (LOOP_EXPR_BODY) */
-
-/* The loop main block is the one hold the condition and the loop body */
-#define LOOP_EXPR_BODY_MAIN_BLOCK(NODE) TREE_OPERAND (NODE, 0)
-/* And then there is the loop update block */
-#define LOOP_EXPR_BODY_UPDATE_BLOCK(NODE) TREE_OPERAND (NODE, 1)
-
-/* Inside the loop main block, there is the loop condition and the
-   loop body. They may be reversed if the loop being described is a
-   do-while loop. NOTE: if you use a WFL around the EXIT_EXPR so you
-   can issue debug info for it, the EXIT_EXPR will be one operand
-   further. */
-#define LOOP_EXPR_BODY_CONDITION_EXPR(NODE, R) 			\
-  TREE_OPERAND (LOOP_EXPR_BODY_MAIN_BLOCK (NODE), (R ? 1 : 0))
-
-/* Here is the labeled block the loop real body is encapsulated in */
-#define LOOP_EXPR_BODY_LABELED_BODY(NODE, R)			\
-  TREE_OPERAND (LOOP_EXPR_BODY_MAIN_BLOCK (NODE), (R ? 0 : 1))
-/* And here is the loop's real body */
-#define LOOP_EXPR_BODY_BODY_EXPR(NODE, R)			\
-  LABELED_BLOCK_BODY (LOOP_EXPR_BODY_LABELED_BODY(NODE, R))
-
-#define PUSH_LABELED_BLOCK(B)				\
-  {							\
-    TREE_CHAIN (B) = ctxp->current_labeled_block;	\
-    ctxp->current_labeled_block = (B);			\
-  }
-#define POP_LABELED_BLOCK() 						\
-  ctxp->current_labeled_block = TREE_CHAIN (ctxp->current_labeled_block)
-
-#define PUSH_LOOP(L)				\
-  {						\
-    TREE_CHAIN (L) = ctxp->current_loop;	\
-    ctxp->current_loop = (L);			\
-  }
-#define POP_LOOP() ctxp->current_loop = TREE_CHAIN (ctxp->current_loop)
-
-#define PUSH_EXCEPTIONS(E)					\
-  currently_caught_type_list =					\
-    tree_cons (NULL_TREE, (E), currently_caught_type_list);
-
-#define POP_EXCEPTIONS()						\
-  currently_caught_type_list = TREE_CHAIN (currently_caught_type_list)
-
-/* Check that we're inside a try block.  */
-#define IN_TRY_BLOCK_P()				\
-  (currently_caught_type_list 				\
-   && ((TREE_VALUE (currently_caught_type_list) !=	\
-	DECL_FUNCTION_THROWS (current_function_decl))	\
-       || TREE_CHAIN (currently_caught_type_list)))
-
-/* Check that we have exceptions in E.  */
-#define EXCEPTIONS_P(E) ((E) ? TREE_VALUE (E) : NULL_TREE)
-
-/* Anonymous array access */
-#define ANONYMOUS_ARRAY_BASE_TYPE(N)   TREE_OPERAND ((N), 0)
-#define ANONYMOUS_ARRAY_DIMS_SIG(N)    TREE_OPERAND ((N), 1)
-#define ANONYMOUS_ARRAY_INITIALIZER(N) TREE_OPERAND ((N), 2)
-
-/* Invocation modes, as returned by invocation_mode (). */
-enum {
-  INVOKE_STATIC,
-  INVOKE_NONVIRTUAL,
-  INVOKE_SUPER,
-  INVOKE_INTERFACE,
-  INVOKE_VIRTUAL
-};
-
-/* Unresolved type identifiers handling. When we process the source
-   code, we blindly accept an unknown type identifier and try to
-   resolve it later. When an unknown type identifier is encountered
-   and used, we record in a struct jdep element what the incomplete
-   type is and what it should patch. Later, java_complete_class will
-   process all classes known to have unresolved type
-   dependencies. Within each of these classes, this routine will
-   process unresolved type dependencies (JDEP_TO_RESOLVE), patch what
-   needs to be patched in the dependent tree node (JDEP_GET_PATCH,
-   JDEP_APPLY_PATCH) and perform other actions dictated by the context
-   of the patch (JDEP_KIND). The ideas are: we patch only what needs
-   to be patched, and with java_complete_class called at the right
-   time, we will start processing incomplete function bodies tree
-   nodes with everything external to function's bodies already
-   completed, it makes things much simpler. */
-
-enum jdep_code {
-  JDEP_NO_PATCH,		/* Must be first */
-  JDEP_SUPER,			/* Patch the type of one type
-				   supertype. Requires some check
-				   before it's done */
-  JDEP_FIELD,			/* Patch the type of a class field */
-
-  /* JDEP_{METHOD,METHOD_RETURN,METHOD_END} to be kept in order */
-  JDEP_METHOD,			/* Mark the beginning of the patching
-				   of a method declaration, including
-				   it's arguments */
-  JDEP_METHOD_RETURN,		/* Mark the beginning of the patching
-				   of a method declaration. Arguments
-				   aren't patched, only the returned
-				   type is */
-  JDEP_METHOD_END,		/* Mark the end of the patching of a
-				   method declaration. It indicates
-				   that it's time to compute and
-				   install a new signature */
-
-  JDEP_INTERFACE,		/* Patch the type of a Class/interface
-				   extension */
-  JDEP_VARIABLE,		/* Patch the type of a variable declaration */
-  JDEP_PARM,			/* Patch the type of a parm declaration */
-  JDEP_TYPE,			/* Patch a random tree node type,
-                                   without the need for any specific
-                                   actions */
-  JDEP_EXCEPTION,		/* Patch exceptions specified by `throws' */
-  JDEP_ANONYMOUS		/* Patch anonymous classes
-				   (implementation or extension.) */
-
-};
-
-typedef struct _jdep {
-  ENUM_BITFIELD(jdep_code) kind : 8; /* Type of patch */
 
-  unsigned int  flag0 : 1;	/* Some flags */
-  tree decl;			/* Tied decl/or WFL */
-  tree solv;			/* What to solve */
-  tree wfl;			/* Where thing to resolve where found */
-  tree misc;			/* Miscellaneous info (optional). */
-  tree enclosing;		/* The enclosing (current) class */
-  tree *patch;			/* Address of a location to patch */
-  struct _jdep *next;		/* Linked list */
-} jdep;
-
-
-#define JDEP_DECL(J)          ((J)->decl)
-#define JDEP_DECL_WFL(J)      ((J)->decl)
-#define JDEP_KIND(J)          ((J)->kind)
-#define JDEP_WFL(J)           ((J)->wfl)
-#define JDEP_MISC(J)          ((J)->misc)
-#define JDEP_ENCLOSING(J)     ((J)->enclosing)
-#define JDEP_CLASS(J)         ((J)->class)
-#define JDEP_APPLY_PATCH(J,P) (*(J)->patch = (P))
-#define JDEP_GET_PATCH(J)     ((J)->patch)
-#define JDEP_CHAIN(J)         ((J)->next)
-#define JDEP_TO_RESOLVE(J)    ((J)->solv)
-#define JDEP_RESOLVED_DECL(J) ((J)->solv)
-#define JDEP_RESOLVED(J, D)   ((J)->solv = D)
-#define JDEP_RESOLVED_P(J)    \
-	(!(J)->solv || TREE_CODE ((J)->solv) != POINTER_TYPE)
-
-struct jdeplist_s {
-  jdep *first;
-  jdep *last;
-  struct jdeplist_s *next;
-};
-typedef struct jdeplist_s jdeplist;
-
-#define CLASSD_FIRST(CD) ((CD)->first)
-#define CLASSD_LAST(CD)  ((CD)->last)
-#define CLASSD_CHAIN(CD) ((CD)->next)
-
-#define JDEP_INSERT(L,J)			\
-  {						\
-    if (!(L)->first)				\
-      (L)->last = (L)->first = (J);		\
-    else					\
-      {						\
-	JDEP_CHAIN ((L)->last) = (J);		\
-	(L)->last = (J);			\
-      }						\
-  }
-
-/* if TYPE can't be resolved, obtain something suitable for its
-   resolution (TYPE is saved in SAVE before being changed). and set
-   CHAIN to 1. Otherwise, type is set to something usable. CHAIN is
-   usually used to determine that a new DEP must be installed on TYPE.
-   Note that when compiling java.lang.Object, references to Object are
-   java.lang.Object.  */
-#define SET_TYPE_FOR_RESOLUTION(TYPE, SAVE, CHAIN)			\
-  {									\
-    tree _returned_type;						\
-    (CHAIN) = 0;							\
-    if (TREE_TYPE (GET_CPC ()) == object_type_node			\
-	&& TREE_CODE (TYPE) == EXPR_WITH_FILE_LOCATION			\
-	&& EXPR_WFL_NODE (TYPE) == unqualified_object_id_node)		\
-      (TYPE) = object_type_node;					\
-    else								\
-      {									\
-	if (unresolved_type_p (type, &_returned_type))			\
-	  {								\
-	    if (_returned_type)						\
-	      (TYPE) = _returned_type;					\
-	    else							\
-	      {								\
-	        tree _type;						\
-                WFL_STRIP_BRACKET (_type, TYPE);			\
-		(SAVE) = (_type);					\
-		(TYPE) = obtain_incomplete_type (TYPE);			\
-		CHAIN = 1;						\
-	      }								\
-	  }								\
-      }									\
-  }
-
-#define WFL_STRIP_BRACKET(TARGET, TYPE)					  \
-{									  \
-  tree __type = (TYPE);							  \
-  if (TYPE && TREE_CODE (TYPE) == EXPR_WITH_FILE_LOCATION)		  \
-    {									  \
-      tree _node;							  \
-      if (build_type_name_from_array_name (EXPR_WFL_NODE (TYPE), &_node)) \
-        {								  \
-          tree _new = copy_node (TYPE);					  \
-          EXPR_WFL_NODE (_new) = _node;				  	  \
-          __type = _new;						  \
-        }								  \
-    }									  \
-  (TARGET) = __type;							  \
-}
-
-/* If NAME contains one or more trailing []s, NAMELEN will be the
-   adjusted to be the index of the last non bracket character in
-   NAME. ARRAY_DIMS will contain the number of []s found.  */
-
-#define STRING_STRIP_BRACKETS(NAME, NAMELEN, ARRAY_DIMS)                  \
-{									  \
-  ARRAY_DIMS = 0;							  \
-  while (NAMELEN >= 2 && (NAME)[NAMELEN - 1] == ']')			  \
-    {									  \
-      NAMELEN -= 2;							  \
-      (ARRAY_DIMS)++;							  \
-    }									  \
-}
-
-/* Promote a type if it won't be registered as a patch */
-#define PROMOTE_RECORD_IF_COMPLETE(TYPE, IS_INCOMPLETE)		\
-  {								\
-    if (!(IS_INCOMPLETE) && TREE_CODE (TYPE) == RECORD_TYPE)	\
-      (TYPE) = promote_type (TYPE);				\
-  }
-
-/* Insert a DECL in the current block */
-#define BLOCK_CHAIN_DECL(NODE)						    \
-  {		 							    \
-    TREE_CHAIN ((NODE)) = 						    \
-      BLOCK_EXPR_DECLS (GET_CURRENT_BLOCK (current_function_decl));         \
-    BLOCK_EXPR_DECLS (GET_CURRENT_BLOCK (current_function_decl)) = (NODE);  \
-  }
-
-/* Return the current block, either found in the body of the currently
-   declared function or in the current static block being defined. */
-#define GET_CURRENT_BLOCK(F) ((F) ? DECL_FUNCTION_BODY ((F)) :	\
-			     current_static_block)
-
-#ifndef USE_MAPPED_LOCATION
-/* Retrieve line/column from a WFL. */
-#define EXPR_WFL_GET_LINECOL(V,LINE,COL)	\
-  {						\
-     (LINE) = (V) >> 12;			\
-     (COL) = (V) & 0xfff;			\
-   }
-#endif
-
-#define EXPR_WFL_QUALIFICATION(WFL) TREE_OPERAND ((WFL), 1)
-#define QUAL_WFL(NODE) TREE_PURPOSE (NODE)
-#define QUAL_RESOLUTION(NODE) TREE_VALUE (NODE)
-#define QUAL_DECL_TYPE(NODE) GET_SKIP_TYPE (NODE)
-
-#define GET_SKIP_TYPE(NODE)				\
-  (TREE_CODE (TREE_TYPE (NODE)) == POINTER_TYPE ?	\
-   TREE_TYPE (TREE_TYPE (NODE)): TREE_TYPE (NODE))
-
-/* Handy macros for the walk operation */
-#define COMPLETE_CHECK_OP(NODE, N)			\
-{							\
-  TREE_OPERAND ((NODE), (N)) = 				\
-    java_complete_tree (TREE_OPERAND ((NODE), (N)));	\
-  if (TREE_OPERAND ((NODE), (N)) == error_mark_node)	\
-    return error_mark_node;				\
-}
-#define COMPLETE_CHECK_OP_0(NODE) COMPLETE_CHECK_OP(NODE, 0)
-#define COMPLETE_CHECK_OP_1(NODE) COMPLETE_CHECK_OP(NODE, 1)
-#define COMPLETE_CHECK_OP_2(NODE) COMPLETE_CHECK_OP(NODE, 2)
-
-/* Building invocations: append(ARG) and StringBuffer(ARG) */
-#define BUILD_APPEND(ARG)						      \
-  ((JSTRING_TYPE_P (TREE_TYPE (ARG)) || JPRIMITIVE_TYPE_P (TREE_TYPE (ARG)))  \
-   ? build_method_invocation (wfl_append,                                     \
-			      ARG ? build_tree_list (NULL, (ARG)) : NULL_TREE)\
-   : build_method_invocation (wfl_append,                                     \
-			      ARG ? build_tree_list (NULL,                    \
-						     build1 (CONVERT_EXPR,    \
-							     object_type_node,\
-							     (ARG)))          \
-			      : NULL_TREE))
-#define BUILD_STRING_BUFFER(ARG)					      \
-  build_new_invocation (wfl_string_buffer, 				      \
-			(ARG ? build_tree_list (NULL, (ARG)) : NULL_TREE))
-
-#define BUILD_THROW(WHERE, WHAT)				\
-  {								\
-    (WHERE) = 							\
-      build3 (CALL_EXPR, void_type_node,			\
-	      build_address_of (throw_node),			\
-	      build_tree_list (NULL_TREE, (WHAT)), NULL_TREE);	\
-    TREE_SIDE_EFFECTS ((WHERE)) = 1;				\
-  }
-
-/* Set wfl_operator for the most accurate error location */
-#ifdef USE_MAPPED_LOCATION
-#define SET_WFL_OPERATOR(WHICH, NODE, WFL)		\
-  SET_EXPR_LOCATION (WHICH,				\
-    (TREE_CODE (WFL) == EXPR_WITH_FILE_LOCATION ?	\
-     EXPR_LOCATION (WFL) : EXPR_LOCATION (NODE)))
-#else
-#define SET_WFL_OPERATOR(WHICH, NODE, WFL)		\
-  EXPR_WFL_LINECOL (WHICH) =				\
-    (TREE_CODE (WFL) == EXPR_WITH_FILE_LOCATION ?	\
-     EXPR_WFL_LINECOL (WFL) : EXPR_WFL_LINECOL (NODE))
-#endif
-
-#define PATCH_METHOD_RETURN_ERROR()		\
-  {						\
-    if (ret_decl)				\
-      *ret_decl = NULL_TREE;			\
-    return error_mark_node;			\
-  }
-
-/* Convenient macro to check. Assumes that CLASS is a CLASS_DECL.  */
-#define CHECK_METHODS(CLASS)			\
-  {						\
-    if (CLASS_INTERFACE ((CLASS)))		\
-      java_check_abstract_methods ((CLASS));	\
-    else					\
-      java_check_regular_methods ((CLASS));	\
-  }
-
-#define CLEAR_DEPRECATED  ctxp->deprecated = 0
-
-#define CHECK_DEPRECATED_NO_RESET(DECL)		\
-  {						\
-    if (ctxp->deprecated)			\
-      DECL_DEPRECATED (DECL) = 1;		\
-  }
-
-/* Using and reseting the @deprecated tag flag */
-#define CHECK_DEPRECATED(DECL)			\
-  {						\
-    if (ctxp->deprecated)			\
-      DECL_DEPRECATED (DECL) = 1;		\
-    ctxp->deprecated = 0;			\
-  }
-
-/* Register an import */
-#define REGISTER_IMPORT(WHOLE, NAME)					\
-{									\
-  IS_A_SINGLE_IMPORT_CLASSFILE_NAME_P ((NAME)) = 1;			\
-  ctxp->import_list = tree_cons ((WHOLE), (NAME), ctxp->import_list);	\
-}
-
-/* Macro to access the osb (opening square bracket) count */
-#define CURRENT_OSB(C) (C)->osb_number [(C)->osb_depth]
-
-/* Parser context data structure. */
-struct parser_ctxt GTY(()) {
-  const char *filename;		     /* Current filename */
-  location_t file_start_location;
-  location_t save_location;
-  struct parser_ctxt *next;
-
-  java_lexer * GTY((skip)) lexer; /* Current lexer state */
-  char marker_begining;		     /* Marker. Should be a sub-struct */
-  int ccb_indent;		     /* Number of unmatched { seen. */
-  /* The next two fields are only source_location if USE_MAPPED_LOCATION.
-     Otherwise, they are integer line number, but we can't have #ifdefs
-     in GTY structures. */
-  source_location first_ccb_indent1; /* First { at ident level 1 */
-  source_location last_ccb_indent1;  /* Last } at ident level 1 */
-  int parser_ccb_indent;	     /* Keep track of {} indent, parser */
-  int osb_depth;		     /* Current depth of [ in an expression */
-  int osb_limit;		     /* Limit of this depth */
-  int * GTY ((skip)) osb_number; /* Keep track of ['s */
-  char marker_end;		     /* End marker. Should be a sub-struct */
-
-  /* The flags section */
-
-  /* Indicates a context used for saving the parser status. The
-     context must be popped when the status is restored. */
-  unsigned saved_data_ctx:1;	
-  /* Indicates that a context already contains saved data and that the
-     next save operation will require a new context to be created. */
-  unsigned saved_data:1;
-  /* Report error when true */
-  unsigned java_error_flag:1;
-  /* @deprecated tag seen */
-  unsigned deprecated:1;
-  /* Flag to report certain errors (fix this documentation. FIXME) */
-  unsigned class_err:1;
-
-  /* This section is used only if we compile jc1 */
-  tree modifier_ctx [12];	    /* WFL of modifiers */
-  tree class_type;		    /* Current class */
-  tree function_decl;	            /* Current function decl, save/restore */
-
-  int prevent_ese;	            /* Prevent expression statement error */
-
-  int formal_parameter_number;	    /* Number of parameters found */
-  int interface_number;		    /* # itfs declared to extend an itf def */
-
-  tree package;			    /* Defined package ID */
-
-  /* These two lists won't survive file traversal */
-  tree  class_list;		    /* List of classes in a CU */
-  jdeplist * GTY((skip)) classd_list; /* Classe dependencies in a CU */
-  
-  tree  current_parsed_class;	    /* Class currently parsed */
-  tree  current_parsed_class_un;    /* Curr. parsed class unqualified name */
-
-  tree non_static_initialized;	    /* List of non static initialized fields */
-  tree static_initialized;	    /* List of static non final initialized */
-  tree instance_initializers;	    /* List of instance initializers stmts */
-
-  tree import_list;		    /* List of import */
-  tree import_demand_list;	    /* List of import on demand */
-
-  tree current_loop;		    /* List of the currently nested 
-				       loops/switches */
-  tree current_labeled_block;	    /* List of currently nested
-				       labeled blocks. */
-
-  int pending_block;		    /* Pending block to close */
-
-  int explicit_constructor_p;	    /* >0 when processing an explicit
-				       constructor. This flag is used to trap
-				       illegal argument usage during an
-				       explicit constructor invocation. */
-};
-
-/* A set of macros to push/pop/access the currently parsed class.  */
-#define GET_CPC_LIST()     ctxp->current_parsed_class
-
-/* Currently class being parsed is an inner class if an enclosing
-   class has been already pushed. This truth value is only valid prior
-   an inner class is pushed. After, use FIXME. */
-#define CPC_INNER_P() GET_CPC_LIST ()
-
-/* The TYPE_DECL node of the class currently being parsed.  */
-#define GET_CPC() TREE_VALUE (GET_CPC_LIST ())
-
-/* Get the currently parsed class unqualified IDENTIFIER_NODE.  */
-#define GET_CPC_UN() TREE_PURPOSE (GET_CPC_LIST ())
-
-/* Get a parsed class unqualified IDENTIFIER_NODE from its CPC node.  */
-#define GET_CPC_UN_NODE(N) TREE_PURPOSE (N)
-
-/* Get the currently parsed class DECL_TYPE from its CPC node.  */
-#define GET_CPC_DECL_NODE(N) TREE_VALUE (N)
-
-/* The currently parsed enclosing currently parsed TREE_LIST node.  */
-#define GET_ENCLOSING_CPC() TREE_CHAIN (GET_CPC_LIST ())
-
-/* Get the next enclosing context.  */
-#define GET_NEXT_ENCLOSING_CPC(C) TREE_CHAIN (C)
-
-/* The DECL_TYPE node of the enclosing currently parsed
-   class. NULL_TREE if the currently parsed class isn't an inner
-   class.  */
-#define GET_ENCLOSING_CPC_CONTEXT() (GET_ENCLOSING_CPC () ?		      \
-                                     TREE_VALUE (GET_ENCLOSING_CPC ()) :      \
-				     NULL_TREE)
-
-/* Make sure that innerclass T sits in an appropriate enclosing
-   context.  */
-#define INNER_ENCLOSING_SCOPE_CHECK(T)					      \
-  (INNER_CLASS_TYPE_P ((T)) && !ANONYMOUS_CLASS_P ((T))			      \
-   && ((current_this							      \
-	/* We have a this and it's not the right one */			      \
-	&& (DECL_CONTEXT (TYPE_NAME ((T)))				      \
-	    != TYPE_NAME (TREE_TYPE (TREE_TYPE (current_this))))	      \
-	&& !inherits_from_p (TREE_TYPE (TREE_TYPE (current_this)),	      \
-			     TREE_TYPE (DECL_CONTEXT (TYPE_NAME (T))))	      \
-        && !common_enclosing_instance_p (TREE_TYPE (TREE_TYPE (current_this)),\
-					(T))                                  \
-	&& INNER_CLASS_TYPE_P (TREE_TYPE (TREE_TYPE (current_this)))          \
-	&& !inherits_from_p                                                   \
-	      (TREE_TYPE (DECL_CONTEXT                                        \
-			  (TYPE_NAME (TREE_TYPE (TREE_TYPE (current_this))))),\
-	       TREE_TYPE (DECL_CONTEXT (TYPE_NAME (T)))))                     \
-       /* We don't have a this, which is OK if the current function is        \
-	  static. */                                                          \
-       || (!current_this						      \
-	   && current_function_decl                                           \
-           && ! METHOD_STATIC (current_function_decl))))
-
-/* Push macro. First argument to PUSH_CPC is a DECL_TYPE, second
-   argument is the unqualified currently parsed class name.  */
-#define PUSH_CPC(C,R) { 					\
-                        ctxp->current_parsed_class =		\
-		        tree_cons ((R), (C), GET_CPC_LIST ()); 	\
-		      }
-
-/* In case of an error, push an error.  */
-#define PUSH_ERROR() PUSH_CPC (error_mark_node, error_mark_node)
-
-/* Pop macro. Before we pop, we link the current inner class decl (if any)
-   to its enclosing class.  */
-#define POP_CPC() {					\
-		    link_nested_class_to_enclosing ();	\
-		    ctxp->current_parsed_class =	\
-		      TREE_CHAIN (GET_CPC_LIST ());	\
-		  }
-
-#define DEBUG_CPC()						\
-  do								\
-    {								\
-      tree tmp =  ctxp->current_parsed_class;			\
-      while (tmp)						\
-	{							\
-	  fprintf (stderr, "%s ",				\
-		   IDENTIFIER_POINTER (TREE_PURPOSE (tmp)));	\
-	  tmp = TREE_CHAIN (tmp);				\
-	}							\
-    } 								\
-  while (0);
-
-/* Access to the various initializer statement lists */
-#define CPC_INITIALIZER_LIST(C)          ((C)->non_static_initialized)
-#define CPC_STATIC_INITIALIZER_LIST(C)   ((C)->static_initialized)
-#define CPC_INSTANCE_INITIALIZER_LIST(C) ((C)->instance_initializers)
-
-/* Access to the various initializer statements */
-#define CPC_INITIALIZER_STMT(C) (TREE_PURPOSE (CPC_INITIALIZER_LIST (C)))
-#define CPC_STATIC_INITIALIZER_STMT(C) \
-  (TREE_PURPOSE (CPC_STATIC_INITIALIZER_LIST (C)))
-#define CPC_INSTANCE_INITIALIZER_STMT(C) \
-  (TREE_PURPOSE (CPC_INSTANCE_INITIALIZER_LIST (C)))
-
-/* Set various initializer statements */
-#define SET_CPC_INITIALIZER_STMT(C,S)			\
-  if (CPC_INITIALIZER_LIST (C))				\
-    TREE_PURPOSE (CPC_INITIALIZER_LIST (C)) = (S);
-#define SET_CPC_STATIC_INITIALIZER_STMT(C,S)			\
-  if (CPC_STATIC_INITIALIZER_LIST (C))				\
-    TREE_PURPOSE (CPC_STATIC_INITIALIZER_LIST (C)) = (S);
-#define SET_CPC_INSTANCE_INITIALIZER_STMT(C,S)			\
-  if (CPC_INSTANCE_INITIALIZER_LIST(C))				\
-    TREE_PURPOSE (CPC_INSTANCE_INITIALIZER_LIST (C)) = (S);
-
-/* This is used by the lexer to communicate with the parser.  It is
-   set on an integer constant if the radix is NOT 10, so that the parser
-   can correctly diagnose a numeric overflow.  */
-#define JAVA_NOT_RADIX10_FLAG(NODE) TREE_LANG_FLAG_0(NODE)
-
-#ifndef JC1_LITE
-void java_complete_class (void);
-void java_check_circular_reference (void);
-void java_fix_constructors (void);
-void java_layout_classes (void);
-void java_reorder_fields (void);
-tree java_method_add_stmt (tree, tree);
 int java_report_errors (void);
 extern tree do_resolve_class (tree, tree, tree, tree, tree);
-#endif
-char *java_get_line_col (const char *, int, int);
-extern void reset_report (void);
 
 /* Always in use, no matter what you compile */
 void java_push_parser_context (void);
 void java_pop_parser_context (int);
-void java_init_lex (FILE *, const char *);
 extern void java_parser_context_save_global (void);
 extern void java_parser_context_restore_global (void);
-int yyparse (void);
-extern int java_parse (void);
-extern void yyerror (const char *)
-#ifdef JC1_LITE
-ATTRIBUTE_NORETURN
-#endif
-;
-extern void java_expand_classes (void);
-extern void java_finish_classes (void);
-
-extern GTY(()) struct parser_ctxt *ctxp;
-extern GTY(()) struct parser_ctxt *ctxp_for_generation;
-extern GTY(()) struct parser_ctxt *ctxp_for_generation_last;
 
 #endif /* ! GCC_JAVA_PARSE_H */
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
deleted file mode 100644
index 4b6521c..0000000
--- a/gcc/java/parse.y
+++ /dev/null
@@ -1,16552 +0,0 @@
-/* Source code parsing and tree node generation for the GNU compiler
-   for the Java(TM) language.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-   Contributed by Alexandre Petit-Bianco (apbianco@cygnus.com)
-
-This file is part of GCC.
-
-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.
-
-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 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.
-The Free Software Foundation is independent of Sun Microsystems, Inc.  */
-
-/* This file parses java source code and issues a tree node image
-suitable for code generation (byte code and targeted CPU assembly
-language).
-
-The grammar conforms to the Java grammar described in "The Java(TM)
-Language Specification. J. Gosling, B. Joy, G. Steele. Addison Wesley
-1996, ISBN 0-201-63451-1"
-
-The following modifications were brought to the original grammar:
-
-method_body: added the rule '| block SC_TK'
-static_initializer: added the rule 'static block SC_TK'.
-
-Note: All the extra rules described above should go away when the
-      empty_statement rule will work.
-
-statement_nsi: 'nsi' should be read no_short_if.
-
-Some rules have been modified to support JDK1.1 inner classes
-definitions and other extensions.  */
-
-%{
-#include "config.h"
-#include "system.h"
-#include "coretypes.h"
-#include "tm.h"
-#include <dirent.h>
-#include "tree.h"
-#include "rtl.h"
-#include "real.h"
-#include "obstack.h"
-#include "toplev.h"
-#include "pretty-print.h"
-#include "diagnostic.h"
-#include "flags.h"
-#include "java-tree.h"
-#include "jcf.h"
-#include "lex.h"
-#include "parse.h"
-#include "zipfile.h"
-#include "convert.h"
-#include "buffer.h"
-#include "function.h"
-#include "except.h"
-#include "ggc.h"
-#include "debug.h"
-#include "tree-inline.h"
-#include "tree-dump.h"
-#include "cgraph.h"
-#include "target.h"
-
-/* Local function prototypes */
-static char *java_accstring_lookup (int);
-static const char *accessibility_string (int);
-static void  classitf_redefinition_error (const char *,tree, tree, tree);
-static void  variable_redefinition_error (tree, tree, tree, int);
-static tree  create_class (int, tree, tree, tree);
-static tree  create_interface (int, tree, tree);
-static void  end_class_declaration (int);
-static tree  find_field (tree, tree);
-static tree lookup_field_wrapper (tree, tree);
-static int   duplicate_declaration_error_p (tree, tree, tree);
-static void  register_fields (int, tree, tree);
-static tree parser_qualified_classname (tree);
-static int  parser_check_super (tree, tree, tree);
-static int  parser_check_super_interface (tree, tree, tree);
-static void check_modifiers_consistency (int);
-static tree lookup_cl (tree);
-static tree lookup_java_method2 (tree, tree, int);
-static tree method_header (int, tree, tree, tree);
-static void fix_method_argument_names (tree ,tree);
-static tree method_declarator (tree, tree);
-static void parse_warning_context (tree cl, const char *gmsgid, ...) ATTRIBUTE_GCC_DIAG(2,3);
-#ifdef USE_MAPPED_LOCATION
-static void issue_warning_error_from_context
-  (source_location, const char *gmsgid, va_list *);
-#else
-static void issue_warning_error_from_context
-  (tree, const char *gmsgid, va_list *);
-#endif
-static void parse_ctor_invocation_error (void);
-static tree parse_jdk1_1_error (const char *);
-static void complete_class_report_errors (jdep *);
-static int process_imports (void);
-static void read_import_dir (tree);
-static int find_in_imports_on_demand (tree, tree);
-static void find_in_imports (tree, tree);
-static bool inner_class_accessible (tree, tree);
-static void check_inner_class_access (tree, tree, tree);
-static int check_pkg_class_access (tree, tree, bool, tree);
-static tree resolve_package (tree, tree *, tree *);
-static tree resolve_class (tree, tree, tree, tree);
-static void declare_local_variables (int, tree, tree);
-static void dump_java_tree (enum tree_dump_index, tree);
-static void source_start_java_method (tree);
-static void source_end_java_method (void);
-static tree find_name_in_single_imports (tree);
-static void check_abstract_method_header (tree);
-static tree lookup_java_interface_method2 (tree, tree);
-static tree resolve_expression_name (tree, tree *);
-static tree maybe_create_class_interface_decl (tree, tree, tree, tree);
-static int check_class_interface_creation (int, int, tree, tree, tree, tree);
-static tree patch_method_invocation (tree, tree, tree, int, int *, tree *);
-static tree resolve_and_layout (tree, tree);
-static tree qualify_and_find (tree, tree, tree);
-static tree resolve_no_layout (tree, tree);
-static int invocation_mode (tree, int);
-static tree find_applicable_accessible_methods_list (int, tree, tree, tree);
-static void search_applicable_methods_list (int, tree, tree, tree, tree *, tree *);
-static tree find_most_specific_methods_list (tree, tree);
-static int argument_types_convertible (tree, tree);
-static tree patch_invoke (tree, tree, tree);
-static int maybe_use_access_method (int, tree *, tree *);
-static tree lookup_method_invoke (int, tree, tree, tree, tree);
-static tree register_incomplete_type (int, tree, tree, tree);
-static tree check_inner_circular_reference (tree, tree);
-static tree check_circular_reference (tree);
-static tree obtain_incomplete_type (tree);
-static tree java_complete_lhs (tree);
-static tree java_complete_tree (tree);
-static tree maybe_generate_pre_expand_clinit (tree);
-static int analyze_clinit_body (tree, tree);
-static int maybe_yank_clinit (tree);
-static void start_complete_expand_method (tree);
-static void java_complete_expand_method (tree);
-static void java_expand_method_bodies (tree);
-static int  unresolved_type_p (tree, tree *);
-static void create_jdep_list (struct parser_ctxt *);
-static tree build_expr_block (tree, tree);
-static tree enter_block (void);
-static tree exit_block (void);
-static tree lookup_name_in_blocks (tree);
-static void maybe_absorb_scoping_blocks (void);
-static tree build_method_invocation (tree, tree);
-static tree build_new_invocation (tree, tree);
-static tree build_assignment (int, int, tree, tree);
-static tree build_binop (enum tree_code, int, tree, tree);
-static tree patch_assignment (tree, tree);
-static tree patch_binop (tree, tree, tree, int);
-static tree build_unaryop (int, int, tree);
-static tree build_incdec (int, int, tree, int);
-static tree patch_unaryop (tree, tree);
-static tree build_cast (int, tree, tree);
-static tree build_null_of_type (tree);
-static tree patch_cast (tree, tree);
-static int valid_ref_assignconv_cast_p (tree, tree, int);
-static int valid_builtin_assignconv_identity_widening_p (tree, tree);
-static int valid_cast_to_p (tree, tree);
-static int valid_method_invocation_conversion_p (tree, tree);
-static tree try_builtin_assignconv (tree, tree, tree);
-static tree try_reference_assignconv (tree, tree);
-static tree build_unresolved_array_type (tree);
-static int build_type_name_from_array_name (tree, tree *);
-static tree build_array_from_name (tree, tree, tree, tree *);
-static tree build_array_ref (int, tree, tree);
-static tree patch_array_ref (tree);
-#ifdef USE_MAPPED_LOCATION
-static tree make_qualified_name (tree, tree, source_location);
-#else
-static tree make_qualified_name (tree, tree, int);
-#endif
-static tree merge_qualified_name (tree, tree);
-static tree make_qualified_primary (tree, tree, int);
-static int resolve_qualified_expression_name (tree, tree *, tree *, tree *);
-static void qualify_ambiguous_name (tree);
-static tree resolve_field_access (tree, tree *, tree *);
-static tree build_newarray_node (tree, tree, int);
-static tree patch_newarray (tree);
-static tree resolve_type_during_patch (tree);
-static tree build_this (int);
-static tree build_wfl_wrap (tree, int);
-static tree build_return (int, tree);
-static tree patch_return (tree);
-static tree maybe_access_field (tree, tree, tree);
-static int complete_function_arguments (tree);
-static int check_for_static_method_reference (tree, tree, tree, tree, tree);
-static int not_accessible_p (tree, tree, tree, int);
-static void check_deprecation (tree, tree);
-static int class_in_current_package (tree);
-static tree build_if_else_statement (int, tree, tree, tree);
-static tree patch_if_else_statement (tree);
-static tree add_stmt_to_block (tree, tree, tree);
-static tree patch_exit_expr (tree);
-static tree build_labeled_block (int, tree);
-static tree finish_labeled_statement (tree, tree);
-static tree build_bc_statement (int, int, tree);
-static tree patch_bc_statement (tree);
-static tree patch_loop_statement (tree);
-static tree build_new_loop (tree);
-static tree build_loop_body (int, tree, int);
-static tree finish_loop_body (int, tree, tree, int);
-static tree build_debugable_stmt (int, tree);
-static tree finish_for_loop (int, tree, tree, tree);
-static tree patch_switch_statement (tree);
-static tree string_constant_concatenation (tree, tree);
-static tree build_string_concatenation (tree, tree);
-static tree patch_string_cst (tree);
-static tree patch_string (tree);
-static tree encapsulate_with_try_catch (int, tree, tree, tree);
-#ifdef USE_MAPPED_LOCATION
-static tree build_assertion (source_location, tree, tree);
-#else
-static tree build_assertion (int, tree, tree);
-#endif
-static tree build_try_statement (int, tree, tree);
-static tree build_try_finally_statement (int, tree, tree);
-static tree patch_try_statement (tree);
-static tree patch_synchronized_statement (tree, tree);
-static tree patch_throw_statement (tree, tree);
-static void add_exception_to_throws (tree, tree);
-#ifdef USE_MAPPED_LOCATION
-static void check_thrown_exceptions (source_location, tree, tree);
-#else
-static void check_thrown_exceptions (int, tree, tree);
-#endif
-static int check_thrown_exceptions_do (tree);
-static bool ctors_unchecked_throws_clause_p (tree);
-static void check_concrete_throws_clauses (tree, tree, tree, tree);
-static void check_throws_clauses (tree, tree, tree);
-static void finish_method_declaration (tree);
-static tree build_super_invocation (tree);
-static int verify_constructor_circularity (tree, tree);
-static char *constructor_circularity_msg (tree, tree);
-static tree build_this_super_qualified_invocation (int, tree, tree, int, int);
-static const char *get_printable_method_name (tree);
-static tree patch_conditional_expr (tree, tree, tree);
-static tree generate_finit (tree);
-static tree generate_instinit (tree);
-static tree build_instinit_invocation (tree);
-static void fix_constructors (tree);
-static tree build_alias_initializer_parameter_list (int, tree, tree, int *);
-static tree craft_constructor (tree, tree);
-static tree get_constructor_super (tree);
-static tree create_artificial_method (tree, int, tree, tree, tree);
-static void start_artificial_method_body (tree);
-static void end_artificial_method_body (tree);
-static int check_method_redefinition (tree, tree);
-static int check_method_types_complete (tree);
-static bool hack_is_accessible_p (tree, tree);
-static void java_check_regular_methods (tree);
-static void check_interface_throws_clauses (tree, tree);
-static void java_check_abstract_methods (tree);
-static void unreachable_stmt_error (tree);
-static int not_accessible_field_error (tree, tree);
-static tree find_expr_with_wfl (tree);
-static void missing_return_error (tree);
-static tree build_new_array_init (int, tree);
-static tree patch_new_array_init (tree, tree);
-static tree maybe_build_array_element_wfl (tree);
-static int array_constructor_check_entry (tree, constructor_elt *);
-static const char *purify_type_name (const char *);
-static tree fold_constant_for_init (tree, tree);
-static jdeplist *reverse_jdep_list (struct parser_ctxt *);
-static void static_ref_err (tree, tree, tree);
-static void parser_add_interface (tree, tree, tree);
-static void add_superinterfaces (tree, tree);
-static tree jdep_resolve_class (jdep *);
-static int note_possible_classname (const char *, int);
-static void java_complete_expand_classes (void);
-static void java_complete_expand_class (tree);
-static void java_complete_expand_methods (tree);
-static tree cut_identifier_in_qualified (tree);
-static tree java_stabilize_reference (tree);
-static tree do_unary_numeric_promotion (tree);
-static char * operator_string (tree);
-static tree do_merge_string_cste (tree, const char *, int, int);
-static tree merge_string_cste (tree, tree, int);
-static tree java_refold (tree);
-static int java_decl_equiv (tree, tree);
-static int binop_compound_p (enum tree_code);
-static tree search_loop (tree);
-static int labeled_block_contains_loop_p (tree, tree);
-static int check_abstract_method_definitions (int, tree, tree);
-static void java_check_abstract_method_definitions (tree);
-static void java_debug_context_do (int);
-static void java_parser_context_push_initialized_field (void);
-static void java_parser_context_pop_initialized_field (void);
-static tree reorder_static_initialized (tree);
-static void java_parser_context_suspend (void);
-static void java_parser_context_resume (void);
-static int pop_current_osb (struct parser_ctxt *);
-
-/* JDK 1.1 work. FIXME */
-
-static tree maybe_make_nested_class_name (tree);
-static int make_nested_class_name (tree);
-static void link_nested_class_to_enclosing (void);
-static tree resolve_inner_class (tree, tree, tree, tree);
-static tree find_as_inner_class (tree, tree, tree);
-static tree find_as_inner_class_do (tree, tree);
-static int check_inner_class_redefinition (tree, tree);
-
-static tree build_thisn_assign (void);
-static tree build_current_thisn (tree);
-static tree build_access_to_thisn (tree, tree, int);
-static tree maybe_build_thisn_access_method (tree);
-
-static tree build_nested_field_access (tree, tree);
-static tree build_nested_field_access_methods (tree);
-static tree build_nested_field_access_method (tree, tree, tree, tree, tree);
-static tree build_nested_field_access_expr (int, tree, tree, tree, tree);
-static tree build_nested_method_access_method (tree);
-static tree build_new_access_id (void);
-
-static int nested_member_access_p (tree, tree);
-static int nested_field_expanded_access_p (tree, tree *, tree *, tree *);
-static tree nested_field_access_fix (tree, tree, tree);
-
-static tree build_incomplete_class_ref (int, tree);
-static tree patch_incomplete_class_ref (tree);
-static tree create_anonymous_class (tree);
-static void patch_anonymous_class (tree, tree, tree);
-static void add_inner_class_fields (tree, tree);
-
-static tree build_dot_class_method (tree);
-static tree build_dot_class_method_invocation (tree, tree);
-static void create_new_parser_context (int);
-static tree maybe_build_class_init_for_field (tree, tree);
-
-static int emit_test_initialization (void **, void *);
-
-static char *string_convert_int_cst (tree);
-
-/* Number of error found so far. */
-int java_error_count;
-/* Number of warning found so far. */
-int java_warning_count;
-/* Cyclic inheritance report, as it can be set by layout_class */
-const char *cyclic_inheritance_report;
-
-/* The current parser context */
-struct parser_ctxt *ctxp;
-
-/* List of things that were analyzed for which code will be generated */
-struct parser_ctxt *ctxp_for_generation = NULL;
-struct parser_ctxt *ctxp_for_generation_last = NULL;
-
-/* binop_lookup maps token to tree_code. It is used where binary
-   operations are involved and required by the parser. RDIV_EXPR
-   covers both integral/floating point division. The code is changed
-   once the type of both operator is worked out.  */
-
-static const enum tree_code binop_lookup[19] =
-  {
-    PLUS_EXPR, MINUS_EXPR, MULT_EXPR, RDIV_EXPR, TRUNC_MOD_EXPR,
-    LSHIFT_EXPR, RSHIFT_EXPR, URSHIFT_EXPR,
-    BIT_AND_EXPR, BIT_XOR_EXPR, BIT_IOR_EXPR,
-    TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR,
-    EQ_EXPR, NE_EXPR, GT_EXPR, GE_EXPR, LT_EXPR, LE_EXPR,
-   };
-#define BINOP_LOOKUP(VALUE) 						\
-  binop_lookup [((VALUE) - PLUS_TK) % ARRAY_SIZE (binop_lookup)]
-
-/* This is the end index for binary operators that can also be used
-   in compound assignments. */
-#define BINOP_COMPOUND_CANDIDATES 11
-
-/* The "$L" identifier we use to create labels.  */
-static GTY(()) tree label_id;
-
-/* The "StringBuffer" identifier used for the String `+' operator. */
-static GTY(()) tree wfl_string_buffer;
-
-/* The "append" identifier used for String `+' operator.  */
-static GTY(()) tree wfl_append;
-
-/* The "toString" identifier used for String `+' operator. */
-static GTY(()) tree wfl_to_string;
-
-/* The "java.lang" import qualified name.  */
-static GTY(()) tree java_lang_id;
-
-/* The generated `inst$' identifier used for generated enclosing
-   instance/field access functions.  */
-static GTY(()) tree inst_id;
-
-/* Context and flag for static blocks */
-static GTY(()) tree current_static_block;
-
-/* The generated `write_parm_value$' identifier.  */
-static GTY(()) tree wpv_id;
-
-/* Hold THIS for the scope of the current method decl.  */
-static GTY(()) tree current_this;
-
-/* Hold a list of catch clauses list. The first element of this list is
-   the list of the catch clauses of the currently analyzed try block. */
-static GTY(()) tree currently_caught_type_list;
-
-/* This holds a linked list of all the case labels for the current
-   switch statement.  It is only used when checking to see if there
-   are duplicate labels.  FIXME: probably this should just be attached
-   to the switch itself; then it could be referenced via
-   `ctxp->current_loop'.  */
-static GTY(()) tree case_label_list;
-
-/* Anonymous class counter. Will be reset to 1 every time a non
-   anonymous class gets created. */
-static int anonymous_class_counter = 1;
-
-static GTY(()) tree src_parse_roots[1];
-
-/* All classes seen from source code */
-#define gclass_list src_parse_roots[0]
-
-/* Check modifiers. If one doesn't fit, retrieve it in its declaration
-   line and point it out.  */
-/* Should point out the one that don't fit. ASCII/unicode, going
-   backward. FIXME */
-
-#define check_modifiers(__message, __value, __mask) do {	\
-  if ((__value) & ~(__mask))					\
-    {								\
-      size_t i, remainder = (__value) & ~(__mask);	       	\
-      for (i = 0; i < ARRAY_SIZE (ctxp->modifier_ctx); i++)	\
-        if ((1 << i) & remainder)				\
-	  parse_error_context (ctxp->modifier_ctx [i], (__message), \
-			       java_accstring_lookup (1 << i)); \
-    }								\
-} while (0)
-
-%}
-
-%union {
-  tree node;
-  int sub_token;
-  struct {
-    int token;
-#ifdef USE_MAPPED_LOCATION
-    source_location location;
-#else
-    int location;
-#endif
-  } operator;
-  int value;
-}
-
-%{
-#ifdef USE_MAPPED_LOCATION
-#define SET_EXPR_LOCATION_FROM_TOKEN(EXPR, TOKEN) \
-  SET_EXPR_LOCATION(EXPR, (TOKEN).location)
-#else
-#define SET_EXPR_LOCATION_FROM_TOKEN(EXPR, TOKEN) \
-  (EXPR_WFL_LINECOL (EXPR) = (TOKEN).location)
-#endif
-
-#include "lex.c"
-%}
-
-%pure_parser
-
-/* Things defined here have to match the order of what's in the
-   binop_lookup table.  */
-
-%token   PLUS_TK         MINUS_TK        MULT_TK         DIV_TK    REM_TK
-%token   LS_TK           SRS_TK          ZRS_TK
-%token   AND_TK          XOR_TK          OR_TK
-%token   BOOL_AND_TK BOOL_OR_TK
-%token   EQ_TK NEQ_TK GT_TK GTE_TK LT_TK LTE_TK
-
-/* This maps to the same binop_lookup entry than the token above */
-
-%token   PLUS_ASSIGN_TK  MINUS_ASSIGN_TK MULT_ASSIGN_TK DIV_ASSIGN_TK
-%token   REM_ASSIGN_TK
-%token   LS_ASSIGN_TK    SRS_ASSIGN_TK   ZRS_ASSIGN_TK
-%token   AND_ASSIGN_TK   XOR_ASSIGN_TK   OR_ASSIGN_TK
-
-
-/* Modifier TOKEN have to be kept in this order. Don't scramble it */
-
-%token   PUBLIC_TK       PRIVATE_TK         PROTECTED_TK
-%token   STATIC_TK       FINAL_TK           SYNCHRONIZED_TK
-%token   VOLATILE_TK     TRANSIENT_TK       NATIVE_TK
-%token   PAD_TK          ABSTRACT_TK        STRICT_TK
-%token   MODIFIER_TK
-
-/* Keep those two in order, too */
-%token   DECR_TK INCR_TK
-
-/* From now one, things can be in any order */
-
-%token   DEFAULT_TK      IF_TK              THROW_TK
-%token   BOOLEAN_TK      DO_TK              IMPLEMENTS_TK
-%token   THROWS_TK       BREAK_TK           IMPORT_TK
-%token   ELSE_TK         INSTANCEOF_TK      RETURN_TK
-%token   VOID_TK         CATCH_TK           INTERFACE_TK
-%token   CASE_TK         EXTENDS_TK         FINALLY_TK
-%token   SUPER_TK        WHILE_TK           CLASS_TK
-%token   SWITCH_TK       CONST_TK           TRY_TK
-%token   FOR_TK          NEW_TK             CONTINUE_TK
-%token   GOTO_TK         PACKAGE_TK         THIS_TK
-%token   ASSERT_TK
-
-%token   BYTE_TK         SHORT_TK           INT_TK            LONG_TK
-%token   CHAR_TK         INTEGRAL_TK
-
-%token   FLOAT_TK        DOUBLE_TK          FP_TK
-
-%token   ID_TK
-
-%token   REL_QM_TK         REL_CL_TK NOT_TK  NEG_TK
-
-%token   ASSIGN_ANY_TK   ASSIGN_TK
-%token   OP_TK  CP_TK  OCB_TK  CCB_TK  OSB_TK  CSB_TK  SC_TK  C_TK DOT_TK
-
-%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 final synchronized
-
-%type    <node>		super ID_TK identifier
-%type    <node>		name simple_name qualified_name
-%type	 <node>		type_declaration compilation_unit
-			field_declaration method_declaration extends_interfaces
-                        interfaces interface_type_list
-                        import_declarations package_declaration
-                        type_declarations interface_body
-			interface_member_declaration constant_declaration
-			interface_member_declarations interface_type
-			abstract_method_declaration
-%type	 <node>		class_body_declaration class_member_declaration
-			static_initializer constructor_declaration block
-%type	 <node>		class_body_declarations constructor_header
-%type    <node>		class_or_interface_type class_type class_type_list
-			constructor_declarator explicit_constructor_invocation
-%type    <node>         dim_expr dim_exprs this_or_super throws
-
-%type	 <node>		variable_declarator_id variable_declarator
-			variable_declarators variable_initializer
-			variable_initializers constructor_body
-			array_initializer
-
-%type	 <node>		class_body block_end constructor_block_end
-%type	 <node>		statement statement_without_trailing_substatement
-			labeled_statement if_then_statement label_decl
-			if_then_else_statement while_statement for_statement
-			statement_nsi labeled_statement_nsi do_statement
-			if_then_else_statement_nsi while_statement_nsi
-			for_statement_nsi statement_expression_list for_init
-			for_update statement_expression expression_statement
-			primary_no_new_array expression primary array_type
-			array_creation_initialized array_creation_uninitialized
-			class_instance_creation_expression field_access
-			method_invocation array_access something_dot_new
-			argument_list postfix_expression while_expression
-			post_increment_expression post_decrement_expression
-			unary_expression_not_plus_minus unary_expression
-			pre_increment_expression pre_decrement_expression
-			cast_expression
-			multiplicative_expression additive_expression
-			shift_expression relational_expression
-			equality_expression and_expression
-			exclusive_or_expression inclusive_or_expression
-			conditional_and_expression conditional_or_expression
-			conditional_expression assignment_expression
-			left_hand_side assignment for_header for_begin
-			constant_expression do_statement_begin empty_statement
-			switch_statement synchronized_statement throw_statement
-			try_statement assert_statement
-			switch_expression switch_block
-			catches catch_clause catch_clause_parameter finally
-			anonymous_class_creation trap_overflow_corner_case
-%type    <node>         return_statement break_statement continue_statement
-
-%type    <operator>     ASSIGN_TK      MULT_ASSIGN_TK  DIV_ASSIGN_TK
-%type    <operator>     REM_ASSIGN_TK  PLUS_ASSIGN_TK  MINUS_ASSIGN_TK
-%type    <operator>     LS_ASSIGN_TK   SRS_ASSIGN_TK   ZRS_ASSIGN_TK
-%type    <operator>     AND_ASSIGN_TK  XOR_ASSIGN_TK   OR_ASSIGN_TK
-%type    <operator>     ASSIGN_ANY_TK  assignment_operator
-%token   <operator>     EQ_TK GTE_TK ZRS_TK SRS_TK GT_TK LTE_TK LS_TK
-%token   <operator>     BOOL_AND_TK AND_TK BOOL_OR_TK OR_TK INCR_TK PLUS_TK
-%token   <operator>     DECR_TK MINUS_TK MULT_TK DIV_TK XOR_TK REM_TK NEQ_TK
-%token   <operator>     NEG_TK REL_QM_TK REL_CL_TK NOT_TK LT_TK OCB_TK CCB_TK
-%token   <operator>     OP_TK OSB_TK DOT_TK THROW_TK INSTANCEOF_TK
-%type    <operator>	THIS_TK SUPER_TK RETURN_TK BREAK_TK CONTINUE_TK
-%type	 <operator>     CASE_TK DEFAULT_TK TRY_TK CATCH_TK SYNCHRONIZED_TK
-%type	 <operator>     NEW_TK ASSERT_TK
-
-%type	 <node>		method_body
-
-%type    <node>		literal INT_LIT_TK FP_LIT_TK BOOL_LIT_TK CHAR_LIT_TK
-			STRING_LIT_TK NULL_TK VOID_TK
-
-%type	 <node>		IF_TK WHILE_TK FOR_TK
-
-%type    <node>         formal_parameter_list formal_parameter
-                        method_declarator method_header
-
-%type	 <node>		primitive_type reference_type type
-			BOOLEAN_TK INTEGRAL_TK FP_TK
-
-/* Added or modified JDK 1.1 rule types  */
-%type	 <node>		type_literals
-
-%%
-/* 19.2 Production from 2.3: The Syntactic Grammar  */
-goal:  compilation_unit
-		{}
-;
-
-/* 19.3 Productions from 3: Lexical structure  */
-literal:
-	INT_LIT_TK
-|	FP_LIT_TK
-|	BOOL_LIT_TK
-|	CHAR_LIT_TK
-|       STRING_LIT_TK
-|       NULL_TK
-;
-
-/* 19.4 Productions from 4: Types, Values and Variables  */
-type:
-	primitive_type
-|	reference_type
-;
-
-primitive_type:
-	INTEGRAL_TK
-|	FP_TK
-|	BOOLEAN_TK
-;
-
-reference_type:
-	class_or_interface_type
-|	array_type
-;
-
-class_or_interface_type:
-	name
-;
-
-class_type:
-	class_or_interface_type	/* Default rule */
-;
-
-interface_type:
-	 class_or_interface_type
-;
-
-array_type:
-	primitive_type dims
-		{
-		  int osb = pop_current_osb (ctxp);
-		  tree t = build_java_array_type (($1), -1);
-		  while (--osb)
-		    t = build_unresolved_array_type (t);
-		  $$ = t;
-		}
-|	name dims
-		{
-		  int osb = pop_current_osb (ctxp);
-		  tree t = $1;
-		  while (osb--)
-		    t = build_unresolved_array_type (t);
-		  $$ = t;
-		}
-;
-
-/* 19.5 Productions from 6: Names  */
-name:
-	simple_name		/* Default rule */
-|	qualified_name		/* Default rule */
-;
-
-simple_name:
-	identifier		/* Default rule */
-;
-
-qualified_name:
-	name DOT_TK identifier
-		{ $$ = make_qualified_name ($1, $3, $2.location); }
-;
-
-identifier:
-	ID_TK
-;
-
-/* 19.6: Production from 7: Packages  */
-compilation_unit:
-		{$$ = NULL;}
-|	package_declaration
-|	import_declarations
-|	type_declarations
-|       package_declaration import_declarations
-|       package_declaration type_declarations
-|       import_declarations type_declarations
-|       package_declaration import_declarations type_declarations
-;
-
-import_declarations:
-	import_declaration
-		{
-		  $$ = NULL;
-		}
-|	import_declarations import_declaration
-		{
-		  $$ = NULL;
-		}
-;
-
-type_declarations:
-	type_declaration
-| 	type_declarations type_declaration
-;
-
-package_declaration:
-	PACKAGE_TK name SC_TK
-		{
-		  ctxp->package = EXPR_WFL_NODE ($2);
-		}
-|	PACKAGE_TK error
-		{yyerror ("Missing name"); RECOVER;}
-|	PACKAGE_TK name error
-		{yyerror ("';' expected"); RECOVER;}
-;
-
-import_declaration:
-	single_type_import_declaration
-|	type_import_on_demand_declaration
-;
-
-single_type_import_declaration:
-	IMPORT_TK name SC_TK
-		{
-		  tree name = EXPR_WFL_NODE ($2), last_name;
-		  int   i = IDENTIFIER_LENGTH (name)-1;
-		  const char *last = &IDENTIFIER_POINTER (name)[i];
-		  while (last != IDENTIFIER_POINTER (name))
-		    {
-		      if (last [0] == '.')
-			break;
-		      last--;
-		    }
-		  last_name = get_identifier (++last);
-		  if (IS_A_SINGLE_IMPORT_CLASSFILE_NAME_P (last_name))
-		    {
-		      tree err = find_name_in_single_imports (last_name);
-		      if (err && err != name)
-			parse_error_context
-			  ($2, "Ambiguous class: %qs and %qs",
-			   IDENTIFIER_POINTER (name),
-			   IDENTIFIER_POINTER (err));
-		      else
-			REGISTER_IMPORT ($2, last_name);
-		    }
-		  else
-		    REGISTER_IMPORT ($2, last_name);
-		}
-|	IMPORT_TK error
-		{yyerror ("Missing name"); RECOVER;}
-|	IMPORT_TK name error
-		{yyerror ("';' expected"); RECOVER;}
-;
-
-type_import_on_demand_declaration:
-	IMPORT_TK name DOT_TK MULT_TK SC_TK
-		{
-		  tree name = EXPR_WFL_NODE ($2);
-		  tree it;
-		  /* Search for duplicates. */
-		  for (it = ctxp->import_demand_list; it; it = TREE_CHAIN (it))
-		    if (EXPR_WFL_NODE (TREE_PURPOSE (it)) == name)
-		      break;
-		  /* Don't import the same thing more than once, just ignore
-		     duplicates (7.5.2) */
-		  if (! it)
-		    {
-		      read_import_dir ($2);
-		      ctxp->import_demand_list =
-			chainon (ctxp->import_demand_list,
-				 build_tree_list ($2, NULL_TREE));
-		    }
-		}
-|	IMPORT_TK name DOT_TK error
-		{yyerror ("'*' expected"); RECOVER;}
-|	IMPORT_TK name DOT_TK MULT_TK error
-		{yyerror ("';' expected"); RECOVER;}
-;
-
-type_declaration:
-	class_declaration
-		{ end_class_declaration (0); }
-|	interface_declaration
-		{ end_class_declaration (0); }
-|	empty_statement
-|	error
-		{
-		  YYERROR_NOW;
-		  yyerror ("Class or interface declaration expected");
-		}
-;
-
-/* 19.7 Shortened from the original:
-   modifiers: modifier | modifiers modifier
-   modifier: any of public...  */
-modifiers:
-	MODIFIER_TK
-		{
-		  $$ = (1 << $1);
-		}
-|	modifiers MODIFIER_TK
-		{
-		  int acc = (1 << $2);
-		  if ($$ & acc)
-		    parse_error_context
-		      (ctxp->modifier_ctx [$2], "Modifier %qs declared twice",
-		       java_accstring_lookup (acc));
-		  else
-		    {
-		      $$ |= acc;
-		    }
-		}
-;
-
-/* 19.8.1 Production from $8.1: Class Declaration */
-class_declaration:
-	modifiers CLASS_TK identifier super interfaces
-		{ create_class ($1, $3, $4, $5); }
-	class_body
-		{;}
-|	CLASS_TK identifier super interfaces
-		{ create_class (0, $2, $3, $4); }
-	class_body
-		{;}
-|	modifiers CLASS_TK error
-		{ yyerror ("Missing class name"); RECOVER; }
-|	CLASS_TK error
-		{ yyerror ("Missing class name"); RECOVER; }
-|       CLASS_TK identifier error
-		{
-		  if (!ctxp->class_err) yyerror ("'{' expected");
-		  DRECOVER(class1);
-		}
-|       modifiers CLASS_TK identifier error
-		{ if (!ctxp->class_err) yyerror ("'{' expected"); RECOVER; }
-;
-
-super:
-		{ $$ = NULL; }
-|	EXTENDS_TK class_type
-		{ $$ = $2; }
-|	EXTENDS_TK class_type error
-		{yyerror ("'{' expected"); ctxp->class_err=1;}
-|	EXTENDS_TK error
-		{yyerror ("Missing super class name"); ctxp->class_err=1;}
-;
-
-interfaces:
-		{ $$ = NULL_TREE; }
-|	IMPLEMENTS_TK interface_type_list
-		{ $$ = $2; }
-|	IMPLEMENTS_TK error
-		{
-		  ctxp->class_err=1;
-		  yyerror ("Missing interface name");
-		}
-;
-
-interface_type_list:
-	interface_type
-		{
-		  ctxp->interface_number = 1;
-		  $$ = build_tree_list ($1, NULL_TREE);
-		}
-|	interface_type_list C_TK interface_type
-		{
-		  ctxp->interface_number++;
-		  $$ = chainon ($1, build_tree_list ($3, NULL_TREE));
-		}
-|	interface_type_list C_TK error
-		{yyerror ("Missing interface name"); RECOVER;}
-;
-
-class_body:
-	OCB_TK CCB_TK
-		{
-		  $$ = GET_CPC ();
-		}
-|	OCB_TK class_body_declarations CCB_TK
-		{
-		  $$ = GET_CPC ();
-		}
-;
-
-class_body_declarations:
-	class_body_declaration
-|	class_body_declarations class_body_declaration
-;
-
-class_body_declaration:
-	class_member_declaration
-|	static_initializer
-|	constructor_declaration
-|	block			/* Added, JDK1.1, instance initializer */
-		{
-		  if (!IS_EMPTY_STMT ($1))
-		    {
-		      TREE_CHAIN ($1) = CPC_INSTANCE_INITIALIZER_STMT (ctxp);
-		      SET_CPC_INSTANCE_INITIALIZER_STMT (ctxp, $1);
-		    }
-		}
-;
-
-class_member_declaration:
-	field_declaration
-|	method_declaration
-|	class_declaration	/* Added, JDK1.1 inner classes */
-		{ end_class_declaration (1); }
-|	interface_declaration	/* Added, JDK1.1 inner interfaces */
-		{ end_class_declaration (1); }
-|	empty_statement
-;
-
-/* 19.8.2 Productions from 8.3: Field Declarations  */
-field_declaration:
-	type variable_declarators SC_TK
-		{ register_fields (0, $1, $2); }
-|	modifiers type variable_declarators SC_TK
-		{
-		  check_modifiers
-		    ("Illegal modifier %qs for field declaration",
-		     $1, FIELD_MODIFIERS);
-		  check_modifiers_consistency ($1);
-		  register_fields ($1, $2, $3);
-		}
-;
-
-variable_declarators:
-	/* Should we use build_decl_list () instead ? FIXME */
-	variable_declarator	/* Default rule */
-|	variable_declarators C_TK variable_declarator
-		{ $$ = chainon ($1, $3); }
-|	variable_declarators C_TK error
-		{yyerror ("Missing term"); RECOVER;}
-;
-
-variable_declarator:
-	variable_declarator_id
-		{ $$ = build_tree_list ($1, NULL_TREE); }
-|	variable_declarator_id ASSIGN_TK variable_initializer
-		{
-		  if (java_error_count)
-		    $3 = NULL_TREE;
-		  $$ = build_tree_list
-		    ($1, build_assignment ($2.token, $2.location, $1, $3));
-		}
-|	variable_declarator_id ASSIGN_TK error
-		{
-		  yyerror ("Missing variable initializer");
-		  $$ = build_tree_list ($1, NULL_TREE);
-		  RECOVER;
-		}
-|	variable_declarator_id ASSIGN_TK variable_initializer error
-		{
-		  yyerror ("';' expected");
-		  $$ = build_tree_list ($1, NULL_TREE);
-		  RECOVER;
-		}
-;
-
-variable_declarator_id:
-	identifier
-|	variable_declarator_id OSB_TK CSB_TK
-		{ $$ = build_unresolved_array_type ($1); }
-|	identifier error
-		{yyerror ("Invalid declaration"); DRECOVER(vdi);}
-|	variable_declarator_id OSB_TK error
-		{
-		  yyerror ("']' expected");
-		  DRECOVER(vdi);
-		}
-|	variable_declarator_id CSB_TK error
-		{yyerror ("Unbalanced ']'"); DRECOVER(vdi);}
-;
-
-variable_initializer:
-	expression
-|	array_initializer
-;
-
-/* 19.8.3 Productions from 8.4: Method Declarations  */
-method_declaration:
-	method_header
-		{
-		  current_function_decl = $1;
-		  if (current_function_decl
-		      && TREE_CODE (current_function_decl) == FUNCTION_DECL)
-		    source_start_java_method (current_function_decl);
-		  else
-		    current_function_decl = NULL_TREE;
-		}
-	method_body
-		{ finish_method_declaration ($3); }
-|	method_header error
-		{YYNOT_TWICE yyerror ("'{' expected"); RECOVER;}
-;
-
-method_header:
-	type method_declarator throws
-		{ $$ = method_header (0, $1, $2, $3); }
-|	VOID_TK method_declarator throws
-		{ $$ = method_header (0, void_type_node, $2, $3); }
-|	modifiers type method_declarator throws
-		{ $$ = method_header ($1, $2, $3, $4); }
-|	modifiers VOID_TK method_declarator throws
-		{ $$ = method_header ($1, void_type_node, $3, $4); }
-|	type error
-		{
-		  yyerror ("Invalid method declaration, method name required");
-		  $$ = NULL_TREE;
-		  RECOVER;
-		}
-|	modifiers type error
-		{
-		  yyerror ("Identifier expected");
-		  $$ = NULL_TREE;
-		  RECOVER;
-		}
-|	VOID_TK error
-		{
-		  yyerror ("Identifier expected");
-		  $$ = NULL_TREE;
-		  RECOVER;
-		}
-|	modifiers VOID_TK error
-		{
-		  yyerror ("Identifier expected");
-		  $$ = NULL_TREE;
-		  RECOVER;
-		}
-|	modifiers error
-		{
-		  yyerror ("Invalid method declaration, return type required");
-		  $$ = NULL_TREE;
-		  RECOVER;
-		}
-;
-
-method_declarator:
-	identifier OP_TK CP_TK
-		{
-		  ctxp->formal_parameter_number = 0;
-		  $$ = method_declarator ($1, NULL_TREE);
-		}
-|	identifier OP_TK formal_parameter_list CP_TK
-		{ $$ = method_declarator ($1, $3); }
-|	method_declarator OSB_TK CSB_TK
-		{
-		  SET_EXPR_LOCATION_FROM_TOKEN (wfl_operator, $2);
-		  TREE_PURPOSE ($1) =
-		    build_unresolved_array_type (TREE_PURPOSE ($1));
-		  parse_warning_context
-		    (wfl_operator,
-		     "Discouraged form of returned type specification");
-		}
-|	identifier OP_TK error
-		{yyerror ("')' expected"); DRECOVER(method_declarator);}
-|	method_declarator OSB_TK error
-		{yyerror ("']' expected"); RECOVER;}
-;
-
-formal_parameter_list:
-	formal_parameter
-		{
-		  ctxp->formal_parameter_number = 1;
-		}
-|	formal_parameter_list C_TK formal_parameter
-		{
-		  ctxp->formal_parameter_number += 1;
-		  $$ = chainon ($1, $3);
-		}
-|	formal_parameter_list C_TK error
-		{ yyerror ("Missing formal parameter term"); RECOVER; }
-;
-
-formal_parameter:
-	type variable_declarator_id
-		{
-		  $$ = build_tree_list ($2, $1);
-		}
-|	final type variable_declarator_id /* Added, JDK1.1 final parms */
-		{
-		  $$ = build_tree_list ($3, $2);
-		  ARG_FINAL_P ($$) = 1;
-		}
-|	type error
-		{
-		  yyerror ("Missing identifier"); RECOVER;
-		  $$ = NULL_TREE;
-		}
-|	final type error
-		{
-		  yyerror ("Missing identifier"); RECOVER;
-		  $$ = NULL_TREE;
-		}
-;
-
-final:
-	modifiers
-		{
-		  check_modifiers ("Illegal modifier %qs. Only %<final%> was expected here",
-				   $1, ACC_FINAL);
-		  if ($1 != ACC_FINAL)
-		    MODIFIER_WFL (FINAL_TK) = build_wfl_node (NULL_TREE);
-		}
-;
-
-throws:
-		{ $$ = NULL_TREE; }
-|	THROWS_TK class_type_list
-		{ $$ = $2; }
-|	THROWS_TK error
-		{yyerror ("Missing class type term"); RECOVER;}
-;
-
-class_type_list:
-	class_type
-		{ $$ = build_tree_list ($1, $1); }
-|	class_type_list C_TK class_type
-		{ $$ = tree_cons ($3, $3, $1); }
-|	class_type_list C_TK error
-		{yyerror ("Missing class type term"); RECOVER;}
-;
-
-method_body:
-	block
-|	SC_TK { $$ = NULL_TREE; }
-;
-
-/* 19.8.4 Productions from 8.5: Static Initializers  */
-static_initializer:
-	static block
-		{
-		  TREE_CHAIN ($2) = CPC_STATIC_INITIALIZER_STMT (ctxp);
-		  SET_CPC_STATIC_INITIALIZER_STMT (ctxp, $2);
-		  current_static_block = NULL_TREE;
-		}
-;
-
-static:				/* Test lval.sub_token here */
-	modifiers
-		{
-		  check_modifiers ("Illegal modifier %qs for static initializer", $1, ACC_STATIC);
-		  /* Can't have a static initializer in an innerclass */
-		  if ($1 | ACC_STATIC &&
-		      GET_CPC_LIST () && !TOPLEVEL_CLASS_DECL_P (GET_CPC ()))
-		    parse_error_context
-		      (MODIFIER_WFL (STATIC_TK),
-		       "Can't define static initializer in class %qs. Static initializer can only be defined in top-level classes",
-		       IDENTIFIER_POINTER (DECL_NAME (GET_CPC ())));
-		  SOURCE_FRONTEND_DEBUG (("Modifiers: %d", $1));
-		}
-;
-
-/* 19.8.5 Productions from 8.6: Constructor Declarations  */
-constructor_declaration:
-	constructor_header
-		{
-		  current_function_decl = $1;
-		  source_start_java_method (current_function_decl);
-		}
-	constructor_body
-		{ finish_method_declaration ($3); }
-;
-
-constructor_header:
-	constructor_declarator throws
-		{ $$ = method_header (0, NULL_TREE, $1, $2); }
-|	modifiers constructor_declarator throws
-		{ $$ = method_header ($1, NULL_TREE, $2, $3); }
-;
-
-constructor_declarator:
-	simple_name OP_TK CP_TK
-		{
-		  ctxp->formal_parameter_number = 0;
-		  $$ = method_declarator ($1, NULL_TREE);
-		}
-|	simple_name OP_TK formal_parameter_list CP_TK
-		{ $$ = method_declarator ($1, $3); }
-;
-
-constructor_body:
-	/* Unlike regular method, we always need a complete (empty)
-	   body so we can safely perform all the required code
-	   addition (super invocation and field initialization) */
-	block_begin constructor_block_end
-		{
-		  BLOCK_EXPR_BODY ($2) = build_java_empty_stmt ();
-		  $$ = $2;
-		}
-|	block_begin explicit_constructor_invocation constructor_block_end
-		{ $$ = $3; }
-|	block_begin block_statements constructor_block_end
-		{ $$ = $3; }
-|       block_begin explicit_constructor_invocation block_statements constructor_block_end
-		{ $$ = $4; }
-;
-
-constructor_block_end:
-	block_end
-;
-
-/* Error recovery for that rule moved down expression_statement: rule.  */
-explicit_constructor_invocation:
-	this_or_super OP_TK CP_TK SC_TK
-		{
-		  $$ = build_method_invocation ($1, NULL_TREE);
-		  $$ = build_debugable_stmt (EXPR_WFL_LINECOL ($1), $$);
-		  $$ = java_method_add_stmt (current_function_decl, $$);
-		}
-|	this_or_super OP_TK argument_list CP_TK SC_TK
-		{
-		  $$ = build_method_invocation ($1, $3);
-		  $$ = build_debugable_stmt (EXPR_WFL_LINECOL ($1), $$);
-		  $$ = java_method_add_stmt (current_function_decl, $$);
-		}
-        /* Added, JDK1.1 inner classes. Modified because the rule
-	   'primary' couldn't work.  */
-|	name DOT_TK SUPER_TK OP_TK argument_list CP_TK SC_TK
-		{$$ = parse_jdk1_1_error ("explicit constructor invocation"); }
-|	name DOT_TK SUPER_TK OP_TK CP_TK SC_TK
-		{$$ = parse_jdk1_1_error ("explicit constructor invocation"); }
-;
-
-this_or_super:			/* Added, simplifies error diagnostics */
-	THIS_TK
-		{
-		  tree wfl = build_wfl_node (this_identifier_node);
-		  SET_EXPR_LOCATION_FROM_TOKEN (wfl, $1);
-		  $$ = wfl;
-		}
-|	SUPER_TK
-		{
-		  tree wfl = build_wfl_node (super_identifier_node);
-		  SET_EXPR_LOCATION_FROM_TOKEN (wfl, $1);
-		  $$ = wfl;
-		}
-;
-
-/* 19.9 Productions from 9: Interfaces  */
-/* 19.9.1 Productions from 9.1: Interfaces Declarations  */
-interface_declaration:
-	INTERFACE_TK identifier
-		{ create_interface (0, $2, NULL_TREE); }
-	interface_body
-		{ ; }
-|	modifiers INTERFACE_TK identifier
-		{ create_interface ($1, $3, NULL_TREE); }
-	interface_body
-		{ ; }
-|	INTERFACE_TK identifier extends_interfaces
-		{ create_interface (0, $2, $3);	}
-	interface_body
-		{ ; }
-|	modifiers INTERFACE_TK identifier extends_interfaces
-		{ create_interface ($1, $3, $4); }
-	interface_body
-		{ ; }
-|	INTERFACE_TK identifier error
-		{ yyerror ("'{' expected"); RECOVER; }
-|	modifiers INTERFACE_TK identifier error
-		{ yyerror ("'{' expected"); RECOVER; }
-;
-
-extends_interfaces:
-	EXTENDS_TK interface_type
-		{
-		  ctxp->interface_number = 1;
-		  $$ = build_tree_list ($2, NULL_TREE);
-		}
-|	extends_interfaces C_TK interface_type
-		{
-		  ctxp->interface_number++;
-		  $$ = chainon ($1, build_tree_list ($3, NULL_TREE));
-		}
-|	EXTENDS_TK error
-		{yyerror ("Invalid interface type"); RECOVER;}
-|	extends_interfaces C_TK error
-		{yyerror ("Missing term"); RECOVER;}
-;
-
-interface_body:
-	OCB_TK CCB_TK
-		{ $$ = NULL_TREE; }
-|	OCB_TK interface_member_declarations CCB_TK
-		{ $$ = NULL_TREE; }
-;
-
-interface_member_declarations:
-	interface_member_declaration
-|	interface_member_declarations interface_member_declaration
-;
-
-interface_member_declaration:
-	constant_declaration
-|	abstract_method_declaration
-|	class_declaration	/* Added, JDK1.1 inner classes */
-		{ end_class_declaration (1); }
-|	interface_declaration	/* Added, JDK1.1 inner interfaces */
-		{ end_class_declaration (1); }
-|	empty_statement
-;
-
-constant_declaration:
-	field_declaration
-;
-
-abstract_method_declaration:
-	method_header SC_TK
-		{
-		  check_abstract_method_header ($1);
-		  current_function_decl = NULL_TREE; /* FIXME ? */
-		}
-|	method_header error
-		{yyerror ("';' expected"); RECOVER;}
-;
-
-/* 19.10 Productions from 10: Arrays  */
-array_initializer:
-	OCB_TK CCB_TK
-		{ $$ = build_new_array_init ($1.location, NULL_TREE); }
-|	OCB_TK C_TK CCB_TK
-		{ $$ = build_new_array_init ($1.location, NULL_TREE); }
-|	OCB_TK variable_initializers CCB_TK
-		{ $$ = build_new_array_init ($1.location, $2); }
-|	OCB_TK variable_initializers C_TK CCB_TK
-		{ $$ = build_new_array_init ($1.location, $2); }
-;
-
-variable_initializers:
-	variable_initializer
-		{
-		  $$ = tree_cons (maybe_build_array_element_wfl ($1),
-				  $1, NULL_TREE);
-		}
-|	variable_initializers C_TK variable_initializer
-		{
-		  $$ = tree_cons (maybe_build_array_element_wfl ($3), $3, $1);
-		}
-|	variable_initializers C_TK error
-		{yyerror ("Missing term"); RECOVER;}
-;
-
-/* 19.11 Production from 14: Blocks and Statements  */
-block:
-	block_begin block_end
-		{ $$ = $2; }
-|	block_begin block_statements block_end
-		{ $$ = $3; }
-;
-
-block_begin:
-	OCB_TK
-		{ enter_block (); }
-;
-
-block_end:
-	CCB_TK
-		{
-		  maybe_absorb_scoping_blocks ();
-		  $$ = exit_block ();
-		  if (!BLOCK_SUBBLOCKS ($$))
-		    BLOCK_SUBBLOCKS ($$) = build_java_empty_stmt ();
-		}
-;
-
-block_statements:
-	block_statement
-|	block_statements block_statement
-;
-
-block_statement:
-	local_variable_declaration_statement
-|	statement
-		{ java_method_add_stmt (current_function_decl, $1); }
-|	class_declaration	/* Added, JDK1.1 local classes */
-		{
-		  LOCAL_CLASS_P (TREE_TYPE (GET_CPC ())) = 1;
-		  end_class_declaration (1);
-		}
-;
-
-local_variable_declaration_statement:
-	local_variable_declaration SC_TK /* Can't catch missing ';' here */
-;
-
-local_variable_declaration:
-	type variable_declarators
-		{ declare_local_variables (0, $1, $2); }
-|	final type variable_declarators /* Added, JDK1.1 final locals */
-		{ declare_local_variables ($1, $2, $3); }
-;
-
-statement:
-	statement_without_trailing_substatement
-|	labeled_statement
-|	if_then_statement
-|	if_then_else_statement
-|	while_statement
-|	for_statement
-		{ $$ = exit_block (); }
-;
-
-statement_nsi:
-	statement_without_trailing_substatement
-|	labeled_statement_nsi
-|	if_then_else_statement_nsi
-|	while_statement_nsi
-|	for_statement_nsi
-		{ $$ = exit_block (); }
-;
-
-statement_without_trailing_substatement:
-	block
-|	empty_statement
-|	expression_statement
-|	switch_statement
-|	do_statement
-|	break_statement
-|	continue_statement
-|	return_statement
-|	synchronized_statement
-|	throw_statement
-|	try_statement
-|	assert_statement
-;
-
-empty_statement:
-	SC_TK
-		{
-		  if (flag_extraneous_semicolon
-		      && ! current_static_block
-		      && (! current_function_decl ||
-			  /* Verify we're not in a inner class declaration */
-			  (GET_CPC () != TYPE_NAME
-			   (DECL_CONTEXT (current_function_decl)))))
-
-		    {
-#ifdef USE_MAPPED_LOCATION
-		      SET_EXPR_LOCATION (wfl_operator, input_location);
-#else
-		      EXPR_WFL_SET_LINECOL (wfl_operator, input_line, -1);
-#endif
-		      parse_warning_context (wfl_operator, "An empty declaration is a deprecated feature that should not be used");
-		    }
-		  $$ = build_java_empty_stmt ();
-		}
-;
-
-label_decl:
-	identifier REL_CL_TK
-		{
-		  $$ = build_labeled_block (EXPR_WFL_LINECOL ($1),
-					    EXPR_WFL_NODE ($1));
-		  pushlevel (2);
-		  push_labeled_block ($$);
-		  PUSH_LABELED_BLOCK ($$);
-		}
-;
-
-labeled_statement:
-	label_decl statement
-		{ $$ = finish_labeled_statement ($1, $2); }
-|	identifier error
-		{yyerror ("':' expected"); RECOVER;}
-;
-
-labeled_statement_nsi:
-	label_decl statement_nsi
-		{ $$ = finish_labeled_statement ($1, $2); }
-;
-
-/* We concentrate here a bunch of error handling rules that we couldn't write
-   earlier, because expression_statement catches a missing ';'.  */
-expression_statement:
-	statement_expression SC_TK
-		{
-		  /* We have a statement. Generate a WFL around it so
-		     we can debug it */
-#ifdef USE_MAPPED_LOCATION
-		  $$ = expr_add_location ($1, input_location, 1);
-#else
-		  $$ = build_expr_wfl ($1, input_filename, input_line, 0);
-		  JAVA_MAYBE_GENERATE_DEBUG_INFO ($$);
-#endif
-		  /* We know we have a statement, so set the debug
-                     info to be eventually generate here. */
-		}
-|	error SC_TK
-		{
-		  YYNOT_TWICE yyerror ("Invalid expression statement");
-		  DRECOVER (expr_stmt);
-		}
-|	error OCB_TK
-		{
-		  YYNOT_TWICE yyerror ("Invalid expression statement");
-		  DRECOVER (expr_stmt);
-		}
-|	error CCB_TK
-		{
-		  YYNOT_TWICE yyerror ("Invalid expression statement");
-		  DRECOVER (expr_stmt);
-		}
-|       this_or_super OP_TK error
-		{yyerror ("')' expected"); RECOVER;}
-|       this_or_super OP_TK CP_TK error
-		{
-		  parse_ctor_invocation_error ();
-		  RECOVER;
-		}
-|       this_or_super OP_TK argument_list error
-		{yyerror ("')' expected"); RECOVER;}
-|       this_or_super OP_TK argument_list CP_TK error
-		{
-		  parse_ctor_invocation_error ();
-		  RECOVER;
-		}
-|	name DOT_TK SUPER_TK error
-		{yyerror ("'(' expected"); RECOVER;}
-|	name DOT_TK SUPER_TK OP_TK error
-		{yyerror ("')' expected"); RECOVER;}
-|	name DOT_TK SUPER_TK OP_TK argument_list error
-		{yyerror ("')' expected"); RECOVER;}
-|	name DOT_TK SUPER_TK OP_TK argument_list CP_TK error
-		{yyerror ("';' expected"); RECOVER;}
-|	name DOT_TK SUPER_TK OP_TK CP_TK error
-		{yyerror ("';' expected"); RECOVER;}
-;
-
-statement_expression:
-	assignment
-|	pre_increment_expression
-|	pre_decrement_expression
-|	post_increment_expression
-|	post_decrement_expression
-|	method_invocation
-|	class_instance_creation_expression
-;
-
-if_then_statement:
-	IF_TK OP_TK expression CP_TK statement
-		{
-		  $$ = build_if_else_statement ($2.location, $3,
-						$5, NULL_TREE);
-		}
-|	IF_TK error
-		{yyerror ("'(' expected"); RECOVER;}
-|	IF_TK OP_TK error
-		{yyerror ("Missing term"); RECOVER;}
-|	IF_TK OP_TK expression error
-		{yyerror ("')' expected"); RECOVER;}
-;
-
-if_then_else_statement:
-	IF_TK OP_TK expression CP_TK statement_nsi ELSE_TK statement
-		{ $$ = build_if_else_statement ($2.location, $3, $5, $7); }
-;
-
-if_then_else_statement_nsi:
-	IF_TK OP_TK expression CP_TK statement_nsi ELSE_TK statement_nsi
-		{ $$ = build_if_else_statement ($2.location, $3, $5, $7); }
-;
-
-switch_statement:
-	switch_expression
-		{
-		  enter_block ();
-		}
-	switch_block
-		{
-		  /* Make into "proper list" of COMPOUND_EXPRs.
-		     I.e. make the last statement also have its own
-		     COMPOUND_EXPR. */
-		  maybe_absorb_scoping_blocks ();
-		  TREE_OPERAND ($1, 1) = exit_block ();
-		  $$ = build_debugable_stmt (EXPR_WFL_LINECOL ($1), $1);
-		}
-;
-
-switch_expression:
-	SWITCH_TK OP_TK expression CP_TK
-		{
-		  $$ = build3 (SWITCH_EXPR, NULL_TREE, $3,
-			       NULL_TREE, NULL_TREE);
-		  SET_EXPR_LOCATION_FROM_TOKEN ($$, $2);
-		}
-|	SWITCH_TK error
-		{yyerror ("'(' expected"); RECOVER;}
-|	SWITCH_TK OP_TK error
-		{yyerror ("Missing term or ')'"); DRECOVER(switch_statement);}
-|	SWITCH_TK OP_TK expression CP_TK error
-		{yyerror ("'{' expected"); RECOVER;}
-;
-
-/* Default assignment is there to avoid type node on switch_block
-   node. */
-
-switch_block:
-	OCB_TK CCB_TK
-		{ $$ = NULL_TREE; }
-|	OCB_TK switch_labels CCB_TK
-		{ $$ = NULL_TREE; }
-|	OCB_TK switch_block_statement_groups CCB_TK
-		{ $$ = NULL_TREE; }
-|	OCB_TK switch_block_statement_groups switch_labels CCB_TK
-		{ $$ = NULL_TREE; }
-;
-
-switch_block_statement_groups:
-	switch_block_statement_group
-|	switch_block_statement_groups switch_block_statement_group
-;
-
-switch_block_statement_group:
-	switch_labels block_statements
-;
-
-switch_labels:
-	switch_label
-|	switch_labels switch_label
-;
-
-switch_label:
-	CASE_TK constant_expression REL_CL_TK
-		{
-		  tree lab = build1 (CASE_EXPR, NULL_TREE, $2);
-		  SET_EXPR_LOCATION_FROM_TOKEN (lab, $1);
-		  java_method_add_stmt (current_function_decl, lab);
-		}
-|	DEFAULT_TK REL_CL_TK
-		{
-		  tree lab = make_node (DEFAULT_EXPR);
-		  SET_EXPR_LOCATION_FROM_TOKEN (lab, $1);
-		  java_method_add_stmt (current_function_decl, lab);
-		}
-|	CASE_TK error
-		{yyerror ("Missing or invalid constant expression"); RECOVER;}
-|	CASE_TK constant_expression error
-		{yyerror ("':' expected"); RECOVER;}
-|	DEFAULT_TK error
-		{yyerror ("':' expected"); RECOVER;}
-;
-
-while_expression:
-	WHILE_TK OP_TK expression CP_TK
-		{
-		  tree body = build_loop_body ($2.location, $3, 0);
-		  $$ = build_new_loop (body);
-		}
-;
-
-while_statement:
-	while_expression statement
-		{ $$ = finish_loop_body (0, NULL_TREE, $2, 0); }
-|	WHILE_TK error
-		{YYERROR_NOW; yyerror ("'(' expected"); RECOVER;}
-|	WHILE_TK OP_TK error
-		{yyerror ("Missing term and ')' expected"); RECOVER;}
-|	WHILE_TK OP_TK expression error
-		{yyerror ("')' expected"); RECOVER;}
-;
-
-while_statement_nsi:
-	while_expression statement_nsi
-		{ $$ = finish_loop_body (0, NULL_TREE, $2, 0); }
-;
-
-do_statement_begin:
-	DO_TK
-		{
-		  tree body = build_loop_body (0, NULL_TREE, 1);
-		  $$ = build_new_loop (body);
-		}
-	/* Need error handing here. FIXME */
-;
-
-do_statement:
-	do_statement_begin statement WHILE_TK OP_TK expression CP_TK SC_TK
-		{ $$ = finish_loop_body ($4.location, $5, $2, 1); }
-;
-
-for_statement:
-	for_begin SC_TK expression SC_TK for_update CP_TK statement
-		{
-		  if (CONSTANT_CLASS_P ($3))
-		    $3 = build_wfl_node ($3);
-		  $$ = finish_for_loop (EXPR_WFL_LINECOL ($3), $3, $5, $7);
-		}
-|	for_begin SC_TK SC_TK for_update CP_TK statement
-		{
-		  $$ = finish_for_loop (0, NULL_TREE, $4, $6);
-		  /* We have not condition, so we get rid of the EXIT_EXPR */
-		  LOOP_EXPR_BODY_CONDITION_EXPR (LOOP_EXPR_BODY ($$), 0) =
-		    build_java_empty_stmt ();
-		}
-|	for_begin SC_TK error
-		{yyerror ("Invalid control expression"); RECOVER;}
-|	for_begin SC_TK expression SC_TK error
-		{yyerror ("Invalid update expression"); RECOVER;}
-|	for_begin SC_TK SC_TK error
-		{yyerror ("Invalid update expression"); RECOVER;}
-;
-
-for_statement_nsi:
-	for_begin SC_TK expression SC_TK for_update CP_TK statement_nsi
-		{ $$ = finish_for_loop (EXPR_WFL_LINECOL ($3), $3, $5, $7);}
-|	for_begin SC_TK SC_TK for_update CP_TK statement_nsi
-		{
-		  $$ = finish_for_loop (0, NULL_TREE, $4, $6);
-		  /* We have not condition, so we get rid of the EXIT_EXPR */
-		  LOOP_EXPR_BODY_CONDITION_EXPR (LOOP_EXPR_BODY ($$), 0) =
-		    build_java_empty_stmt ();
-		}
-;
-
-for_header:
-	FOR_TK OP_TK
-		{
-		  /* This scope defined for local variable that may be
-                     defined within the scope of the for loop */
-		  enter_block ();
-		}
-|	FOR_TK error
-		{yyerror ("'(' expected"); DRECOVER(for_1);}
-|	FOR_TK OP_TK error
-		{yyerror ("Invalid init statement"); RECOVER;}
-;
-
-for_begin:
-	for_header for_init
-		{
-		  /* We now declare the loop body. The loop is
-                     declared as a for loop. */
-		  tree body = build_loop_body (0, NULL_TREE, 0);
-		  $$ =  build_new_loop (body);
-		  FOR_LOOP_P ($$) = 1;
-		  /* The loop is added to the current block the for
-                     statement is defined within */
-		  java_method_add_stmt (current_function_decl, $$);
-		}
-;
-for_init:			/* Can be empty */
-		{ $$ = build_java_empty_stmt (); }
-|	statement_expression_list
-		{
-		  /* Init statement recorded within the previously
-                     defined block scope */
-		  $$ = java_method_add_stmt (current_function_decl, $1);
-		}
-|	local_variable_declaration
-		{
-		  /* Local variable are recorded within the previously
-		     defined block scope */
-		  $$ = NULL_TREE;
-		}
-|	statement_expression_list error
-		{yyerror ("';' expected"); DRECOVER(for_init_1);}
-;
-
-for_update:			/* Can be empty */
-		{$$ = build_java_empty_stmt ();}
-|	statement_expression_list
-		{ $$ = build_debugable_stmt (BUILD_LOCATION (), $1); }
-;
-
-statement_expression_list:
-	statement_expression
-		{ $$ = add_stmt_to_compound (NULL_TREE, NULL_TREE, $1); }
-|	statement_expression_list C_TK statement_expression
-		{ $$ = add_stmt_to_compound ($1, NULL_TREE, $3); }
-|	statement_expression_list C_TK error
-		{yyerror ("Missing term"); RECOVER;}
-;
-
-break_statement:
-	BREAK_TK SC_TK
-		{ $$ = build_bc_statement ($1.location, 1, NULL_TREE); }
-|	BREAK_TK identifier SC_TK
-		{ $$ = build_bc_statement ($1.location, 1, $2); }
-|	BREAK_TK error
-		{yyerror ("Missing term"); RECOVER;}
-|	BREAK_TK identifier error
-		{yyerror ("';' expected"); RECOVER;}
-;
-
-continue_statement:
-	CONTINUE_TK SC_TK
-		{ $$ = build_bc_statement ($1.location, 0, NULL_TREE); }
-|       CONTINUE_TK identifier SC_TK
-		{ $$ = build_bc_statement ($1.location, 0, $2); }
-|	CONTINUE_TK error
-		{yyerror ("Missing term"); RECOVER;}
-|	CONTINUE_TK identifier error
-		{yyerror ("';' expected"); RECOVER;}
-;
-
-return_statement:
-	RETURN_TK SC_TK
-		{ $$ = build_return ($1.location, NULL_TREE); }
-|	RETURN_TK expression SC_TK
-		{ $$ = build_return ($1.location, $2); }
-|	RETURN_TK error
-		{yyerror ("Missing term"); RECOVER;}
-|	RETURN_TK expression error
-		{yyerror ("';' expected"); RECOVER;}
-;
-
-throw_statement:
-	THROW_TK expression SC_TK
-		{
-		  $$ = build1 (THROW_EXPR, NULL_TREE, $2);
-		  SET_EXPR_LOCATION_FROM_TOKEN ($$, $1);
-		}
-|	THROW_TK error
-		{yyerror ("Missing term"); RECOVER;}
-|	THROW_TK expression error
-		{yyerror ("';' expected"); RECOVER;}
-;
-
-assert_statement:
-	ASSERT_TK expression REL_CL_TK expression SC_TK
-		{
-		  $$ = build_assertion ($1.location, $2, $4);
-		}
-|	ASSERT_TK expression SC_TK
-		{
-		  $$ = build_assertion ($1.location, $2, NULL_TREE);
-		}
-|	ASSERT_TK error
-		{yyerror ("Missing term"); RECOVER;}
-|	ASSERT_TK expression error
-		{yyerror ("';' expected"); RECOVER;}
-;
-
-synchronized_statement:
-	synchronized OP_TK expression CP_TK block
-		{
-		  $$ = build2 (SYNCHRONIZED_EXPR, NULL_TREE, $3, $5);
-		  EXPR_WFL_LINECOL ($$) =
-		    EXPR_WFL_LINECOL (MODIFIER_WFL (SYNCHRONIZED_TK));
-		}
-|	synchronized OP_TK expression CP_TK error
-		{yyerror ("'{' expected"); RECOVER;}
-|	synchronized error
-		{yyerror ("'(' expected"); RECOVER;}
-|	synchronized OP_TK error CP_TK
-		{yyerror ("Missing term"); RECOVER;}
-|	synchronized OP_TK error
-		{yyerror ("Missing term"); RECOVER;}
-;
-
-synchronized:
-	modifiers
-		{
-		  check_modifiers (
-             "Illegal modifier %qs. Only %<synchronized%> was expected here",
-				   $1, ACC_SYNCHRONIZED);
-		  if ($1 != ACC_SYNCHRONIZED)
-		    MODIFIER_WFL (SYNCHRONIZED_TK) =
-		      build_wfl_node (NULL_TREE);
-		}
-;
-
-try_statement:
-	TRY_TK block catches
-		{ $$ = build_try_statement ($1.location, $2, $3); }
-|	TRY_TK block finally
-		{ $$ = build_try_finally_statement ($1.location, $2, $3); }
-|	TRY_TK block catches finally
-		{ $$ = build_try_finally_statement
-		    ($1.location, build_try_statement ($1.location,
-						       $2, $3), $4);
-		}
-|	TRY_TK error
-		{yyerror ("'{' expected"); DRECOVER (try_statement);}
-;
-
-catches:
-	catch_clause
-|	catches catch_clause
-		{
-		  TREE_CHAIN ($2) = $1;
-		  $$ = $2;
-		}
-;
-
-catch_clause:
-	catch_clause_parameter block
-		{
-		  java_method_add_stmt (current_function_decl, $2);
-		  exit_block ();
-		  $$ = $1;
-		}
-;
-
-catch_clause_parameter:
-	CATCH_TK OP_TK formal_parameter CP_TK
-		{
-		  /* We add a block to define a scope for
-		     formal_parameter (CCBP). The formal parameter is
-		     declared initialized by the appropriate function
-		     call */
-                  tree ccpb;
-                  tree init;
-                  if ($3)
-                    {
-                      ccpb = enter_block ();
-                      init = build_assignment
-                        (ASSIGN_TK, $2.location, TREE_PURPOSE ($3),
-                         build0 (JAVA_EXC_OBJ_EXPR, ptr_type_node));
-                      declare_local_variables (0, TREE_VALUE ($3),
-                                               build_tree_list 
-					       (TREE_PURPOSE ($3), init));
-                      $$ = build1 (JAVA_CATCH_EXPR, NULL_TREE, ccpb);
-                      SET_EXPR_LOCATION_FROM_TOKEN ($$, $1);
-                    }
-                  else
-                    {
-                      $$ = error_mark_node;
-                    }
-		}
-|	CATCH_TK error
-		{yyerror ("'(' expected"); RECOVER; $$ = NULL_TREE;}
-|	CATCH_TK OP_TK error
-		{
-		  yyerror ("Missing term or ')' expected");
-		  RECOVER; $$ = NULL_TREE;
-		}
-|	CATCH_TK OP_TK error CP_TK /* That's for () */
-		{yyerror ("Missing term"); RECOVER; $$ = NULL_TREE;}
-;
-
-finally:
-	FINALLY_TK block
-		{ $$ = $2; }
-|	FINALLY_TK error
-		{yyerror ("'{' expected"); RECOVER; }
-;
-
-/* 19.12 Production from 15: Expressions  */
-primary:
-	primary_no_new_array
-|	array_creation_uninitialized
-|	array_creation_initialized
-;
-
-primary_no_new_array:
-	literal
-|	THIS_TK
-		{ $$ = build_this ($1.location); }
-|	OP_TK expression CP_TK
-		{$$ = $2;}
-|	class_instance_creation_expression
-|	field_access
-|	method_invocation
-|	array_access
-|	type_literals
-        /* Added, JDK1.1 inner classes. Documentation is wrong
-           referring to a 'ClassName' (class_name) rule that doesn't
-           exist. Used name: instead.  */
-|	name DOT_TK THIS_TK
-		{
-		  tree wfl = build_wfl_node (this_identifier_node);
-		  $$ = make_qualified_primary ($1, wfl, EXPR_WFL_LINECOL ($1));
-		}
-|	OP_TK expression error
-		{yyerror ("')' expected"); RECOVER;}
-|	name DOT_TK error
-		{yyerror ("'class' or 'this' expected" ); RECOVER;}
-|	primitive_type DOT_TK error
-		{yyerror ("'class' expected" ); RECOVER;}
-|	VOID_TK DOT_TK error
-		{yyerror ("'class' expected" ); RECOVER;}
-;
-
-type_literals:
-	name DOT_TK CLASS_TK
-		{ $$ = build_incomplete_class_ref ($2.location, $1); }
-|	array_type DOT_TK CLASS_TK
-		{ $$ = build_incomplete_class_ref ($2.location, $1); }
-|	primitive_type DOT_TK CLASS_TK
-                { $$ = build_incomplete_class_ref ($2.location, $1); }
-|	VOID_TK DOT_TK CLASS_TK
-                {
-                   $$ = build_incomplete_class_ref ($2.location,
-                                                   void_type_node);
-                }
-;
-
-class_instance_creation_expression:
-	NEW_TK class_type OP_TK argument_list CP_TK
-		{ $$ = build_new_invocation ($2, $4); }
-|	NEW_TK class_type OP_TK CP_TK
-		{ $$ = build_new_invocation ($2, NULL_TREE); }
-|	anonymous_class_creation
-        /* Added, JDK1.1 inner classes, modified to use name or
-	   primary instead of primary solely which couldn't work in
-	   all situations.  */
-|	something_dot_new identifier OP_TK CP_TK
-		{
-		  tree ctor = build_new_invocation ($2, NULL_TREE);
-		  $$ = make_qualified_primary ($1, ctor,
-					       EXPR_WFL_LINECOL ($1));
-		}
-|	something_dot_new identifier OP_TK CP_TK class_body
-|	something_dot_new identifier OP_TK argument_list CP_TK
-		{
-		  tree ctor = build_new_invocation ($2, $4);
-		  $$ = make_qualified_primary ($1, ctor,
-					       EXPR_WFL_LINECOL ($1));
-		}
-|	something_dot_new identifier OP_TK argument_list CP_TK class_body
-|	NEW_TK error SC_TK
-		{$$ = NULL_TREE; yyerror ("'(' expected"); DRECOVER(new_1);}
-|	NEW_TK class_type error
-		{$$ = NULL_TREE; yyerror ("'(' expected"); RECOVER;}
-|	NEW_TK class_type OP_TK error
-		{$$ = NULL_TREE; yyerror ("')' or term expected"); RECOVER;}
-|	NEW_TK class_type OP_TK argument_list error
-		{$$ = NULL_TREE; yyerror ("')' expected"); RECOVER;}
-|	something_dot_new error
-		{
-		  $$ = NULL_TREE;
-		  YYERROR_NOW;
-		  yyerror ("Identifier expected");
-		  RECOVER;
-		}
-|	something_dot_new identifier error
-		{$$ = NULL_TREE; yyerror ("'(' expected"); RECOVER;}
-;
-
-/* Created after JDK1.1 rules originally added to
-   class_instance_creation_expression, but modified to use
-   'class_type' instead of 'TypeName' (type_name) which is mentioned
-   in the documentation but doesn't exist. */
-
-anonymous_class_creation:
-	NEW_TK class_type OP_TK argument_list CP_TK
-		{ create_anonymous_class ($2); }
-        class_body
-		{
-		  tree id = build_wfl_node (DECL_NAME (GET_CPC ()));
-		  EXPR_WFL_LINECOL (id) = EXPR_WFL_LINECOL ($2);
-
-		  end_class_declaration (1);
-
-		  /* Now we can craft the new expression */
-		  $$ = build_new_invocation (id, $4);
-
-		  /* Note that we can't possibly be here if
-		     `class_type' is an interface (in which case the
-		     anonymous class extends Object and implements
-		     `class_type', hence its constructor can't have
-		     arguments.) */
-
-		  /* Otherwise, the innerclass must feature a
-		     constructor matching `argument_list'. Anonymous
-		     classes are a bit special: it's impossible to
-		     define constructor for them, hence constructors
-		     must be generated following the hints provided by
-		     the `new' expression. Whether a super constructor
-		     of that nature exists or not is to be verified
-		     later on in get_constructor_super.
-
-		     It's during the expansion of a `new' statement
-		     referring to an anonymous class that a ctor will
-		     be generated for the anonymous class, with the
-		     right arguments. */
-
-		}
-|	NEW_TK class_type OP_TK CP_TK
-		{ create_anonymous_class ($2); }
-        class_body
-		{
-		  tree id = build_wfl_node (DECL_NAME (GET_CPC ()));
-		  EXPR_WFL_LINECOL (id) = EXPR_WFL_LINECOL ($2);
-
-		  end_class_declaration (1);
-
-		  /* Now we can craft the new expression. The
-                     statement doesn't need to be remember so that a
-                     constructor can be generated, since its signature
-                     is already known. */
-		  $$ = build_new_invocation (id, NULL_TREE);
-		}
-;
-
-something_dot_new:		/* Added, not part of the specs. */
-	name DOT_TK NEW_TK
-		{ $$ = $1; }
-|	primary DOT_TK NEW_TK
-		{ $$ = $1; }
-;
-
-argument_list:
-	expression
-		{
-		  $$ = tree_cons (NULL_TREE, $1, NULL_TREE);
-		  ctxp->formal_parameter_number = 1;
-		}
-|	argument_list C_TK expression
-		{
-		  ctxp->formal_parameter_number += 1;
-		  $$ = tree_cons (NULL_TREE, $3, $1);
-		}
-|	argument_list C_TK error
-		{yyerror ("Missing term"); RECOVER;}
-;
-
-array_creation_uninitialized:
-	NEW_TK primitive_type dim_exprs
-		{ $$ = build_newarray_node ($2, $3, 0); }
-|	NEW_TK class_or_interface_type dim_exprs
-		{ $$ = build_newarray_node ($2, $3, 0); }
-|	NEW_TK primitive_type dim_exprs dims
-		{ $$ = build_newarray_node ($2, $3, pop_current_osb (ctxp));}
-|	NEW_TK class_or_interface_type dim_exprs dims
-		{ $$ = build_newarray_node ($2, $3, pop_current_osb (ctxp));}
-|	NEW_TK error CSB_TK
-		{yyerror ("'[' expected"); DRECOVER ("]");}
-|	NEW_TK error OSB_TK
-		{yyerror ("']' expected"); RECOVER;}
-;
-
-array_creation_initialized:
-        /* Added, JDK1.1 anonymous array. Initial documentation rule
-           modified */
-	NEW_TK class_or_interface_type dims array_initializer
-		{
-		  char *sig;
-		  int osb = pop_current_osb (ctxp);
-		  while (osb--)
-		    obstack_grow (&temporary_obstack, "[]", 2);
-		  obstack_1grow (&temporary_obstack, '\0');
-		  sig = obstack_finish (&temporary_obstack);
-		  $$ = build3 (NEW_ANONYMOUS_ARRAY_EXPR, NULL_TREE,
-			       $2, get_identifier (sig), $4);
-		}
-|	NEW_TK primitive_type dims array_initializer
-		{
-		  int osb = pop_current_osb (ctxp);
-		  tree type = $2;
-		  while (osb--)
-		    type = build_java_array_type (type, -1);
-		  $$ = build3 (NEW_ANONYMOUS_ARRAY_EXPR, NULL_TREE,
-			       build_pointer_type (type), NULL_TREE, $4);
-		}
-|	NEW_TK error CSB_TK
-		{yyerror ("'[' expected"); DRECOVER ("]");}
-|	NEW_TK error OSB_TK
-		{yyerror ("']' expected"); RECOVER;}
-;
-
-dim_exprs:
-	dim_expr
-		{ $$ = build_tree_list (NULL_TREE, $1); }
-|	dim_exprs dim_expr
-		{ $$ = tree_cons (NULL_TREE, $2, $$); }
-;
-
-dim_expr:
-	OSB_TK expression CSB_TK
-		{
-		  if (JNUMERIC_TYPE_P (TREE_TYPE ($2)))
-		    {
-		      $2 = build_wfl_node ($2);
-		      TREE_TYPE ($2) = NULL_TREE;
-		    }
-		  EXPR_WFL_LINECOL ($2) = $1.location;
-		  $$ = $2;
-		}
-|	OSB_TK expression error
-		{yyerror ("']' expected"); RECOVER;}
-|	OSB_TK error
-		{
-		  yyerror ("Missing term");
-		  yyerror ("']' expected");
-		  RECOVER;
-		}
-;
-
-dims:
-	OSB_TK CSB_TK
-		{
-		  int allocate = 0;
-		  /* If not initialized, allocate memory for the osb
-                     numbers stack */
-		  if (!ctxp->osb_limit)
-		    {
-		      allocate = ctxp->osb_limit = 32;
-		      ctxp->osb_depth = -1;
-		    }
-		  /* If capacity overflown, reallocate a bigger chunk */
-		  else if (ctxp->osb_depth+1 == ctxp->osb_limit)
-		    allocate = ctxp->osb_limit << 1;
-
-		  if (allocate)
-		    {
-		      allocate *= sizeof (int);
-		      if (ctxp->osb_number)
-			ctxp->osb_number = xrealloc (ctxp->osb_number,
-						     allocate);
-		      else
-			ctxp->osb_number = xmalloc (allocate);
-		    }
-		  ctxp->osb_depth++;
-		  CURRENT_OSB (ctxp) = 1;
-		}
-|	dims OSB_TK CSB_TK
-		{ CURRENT_OSB (ctxp)++; }
-|	dims OSB_TK error
-		{ yyerror ("']' expected"); RECOVER;}
-;
-
-field_access:
-	primary DOT_TK identifier
-		{ $$ = make_qualified_primary ($1, $3, $2.location); }
-		/*  FIXME - REWRITE TO:
-		{ $$ = build_binop (COMPONENT_REF, $2.location, $1, $3); } */
-|	SUPER_TK DOT_TK identifier
-		{
-		  tree super_wfl = build_wfl_node (super_identifier_node);
-		  SET_EXPR_LOCATION_FROM_TOKEN (super_wfl, $1);
-		  $$ = make_qualified_name (super_wfl, $3, $2.location);
-		}
-|	SUPER_TK error
-		{yyerror ("Field expected"); DRECOVER (super_field_acces);}
-;
-
-method_invocation:
-	name OP_TK CP_TK
-		{ $$ = build_method_invocation ($1, NULL_TREE); }
-|	name OP_TK argument_list CP_TK
-		{ $$ = build_method_invocation ($1, $3); }
-|	primary DOT_TK identifier OP_TK CP_TK
-		{
-		  if (TREE_CODE ($1) == THIS_EXPR)
-		    $$ = build_this_super_qualified_invocation
-		      (1, $3, NULL_TREE, 0, $2.location);
-		  else
-		    {
-		      tree invok = build_method_invocation ($3, NULL_TREE);
-		      $$ = make_qualified_primary ($1, invok, $2.location);
-		    }
-		}
-|	primary DOT_TK identifier OP_TK argument_list CP_TK
-		{
-		  if (TREE_CODE ($1) == THIS_EXPR)
-		    $$ = build_this_super_qualified_invocation
-		      (1, $3, $5, 0, $2.location);
-		  else
-		    {
-		      tree invok = build_method_invocation ($3, $5);
-		      $$ = make_qualified_primary ($1, invok, $2.location);
-		    }
-		}
-|	SUPER_TK DOT_TK identifier OP_TK CP_TK
-		{
-		  $$ = build_this_super_qualified_invocation
-		    (0, $3, NULL_TREE, $1.location, $2.location);
-		}
-|	SUPER_TK DOT_TK identifier OP_TK argument_list CP_TK
-		{
-		  $$ = build_this_super_qualified_invocation
-		    (0, $3, $5, $1.location, $2.location);
-		}
-        /* Screws up thing. I let it here until I'm convinced it can
-           be removed. FIXME
-|	primary DOT_TK error
-		{yyerror ("'(' expected"); DRECOVER(bad);} */
-|	SUPER_TK DOT_TK error CP_TK
-		{ yyerror ("'(' expected"); DRECOVER (method_invocation); }
-|	SUPER_TK DOT_TK error DOT_TK
-		{ yyerror ("'(' expected"); DRECOVER (method_invocation); }
-;
-
-array_access:
-	name OSB_TK expression CSB_TK
-		{ $$ = build_array_ref ($2.location, $1, $3); }
-|	primary_no_new_array OSB_TK expression CSB_TK
-		{ $$ = build_array_ref ($2.location, $1, $3); }
-|	array_creation_initialized OSB_TK expression CSB_TK
-		{ $$ = build_array_ref ($2.location, $1, $3); }
-|	name OSB_TK error
-		{
-		  yyerror ("Missing term and ']' expected");
-		  DRECOVER(array_access);
-		}
-|	name OSB_TK expression error
-		{
-		  yyerror ("']' expected");
-		  DRECOVER(array_access);
-		}
-|	primary_no_new_array OSB_TK error
-		{
-		  yyerror ("Missing term and ']' expected");
-		  DRECOVER(array_access);
-		}
-|	primary_no_new_array OSB_TK expression error
-		{
-		  yyerror ("']' expected");
-		  DRECOVER(array_access);
-		}
-|	array_creation_initialized OSB_TK error
-		{
-		  yyerror ("Missing term and ']' expected");
-		  DRECOVER(array_access);
-		}
-|	array_creation_initialized OSB_TK expression error
-		{
-		  yyerror ("']' expected");
-		  DRECOVER(array_access);
-		}
-;
-
-postfix_expression:
-	primary
-|	name
-|	post_increment_expression
-|	post_decrement_expression
-;
-
-post_increment_expression:
-	postfix_expression INCR_TK
-		{ $$ = build_incdec ($2.token, $2.location, $1, 1); }
-;
-
-post_decrement_expression:
-	postfix_expression DECR_TK
-		{ $$ = build_incdec ($2.token, $2.location, $1, 1); }
-;
-
-trap_overflow_corner_case:
-	pre_increment_expression
-|	pre_decrement_expression
-|	PLUS_TK unary_expression
-		{$$ = build_unaryop ($1.token, $1.location, $2); }
-|	unary_expression_not_plus_minus
-|	PLUS_TK error
-		{yyerror ("Missing term"); RECOVER}
-;
-
-unary_expression:
-	trap_overflow_corner_case
-		{
-		  if ($1)
-		    error_if_numeric_overflow ($1);
-		  $$ = $1;
-		}
-|	MINUS_TK trap_overflow_corner_case
-		{$$ = build_unaryop ($1.token, $1.location, $2); }
-|	MINUS_TK error
-		{yyerror ("Missing term"); RECOVER}
-;
-
-pre_increment_expression:
-	INCR_TK unary_expression
-		{$$ = build_incdec ($1.token, $1.location, $2, 0); }
-|	INCR_TK error
-		{yyerror ("Missing term"); RECOVER}
-;
-
-pre_decrement_expression:
-	DECR_TK unary_expression
-		{$$ = build_incdec ($1.token, $1.location, $2, 0); }
-|	DECR_TK error
-		{yyerror ("Missing term"); RECOVER}
-;
-
-unary_expression_not_plus_minus:
-	postfix_expression
-|	NOT_TK unary_expression
-		{$$ = build_unaryop ($1.token, $1.location, $2); }
-|	NEG_TK unary_expression
- 		{$$ = build_unaryop ($1.token, $1.location, $2); }
-|	cast_expression
-|       NOT_TK error
-		{yyerror ("Missing term"); RECOVER}
-|       NEG_TK error
-		{yyerror ("Missing term"); RECOVER}
-;
-
-cast_expression:		/* Error handling here is potentially weak */
-	OP_TK primitive_type dims CP_TK unary_expression
-		{
-		  tree type = $2;
-		  int osb = pop_current_osb (ctxp);
-		  while (osb--)
-		    type = build_java_array_type (type, -1);
-		  $$ = build_cast ($1.location, type, $5);
-		}
-|	OP_TK primitive_type CP_TK unary_expression
-		{ $$ = build_cast ($1.location, $2, $4); }
-|	OP_TK expression CP_TK unary_expression_not_plus_minus
-		{ $$ = build_cast ($1.location, $2, $4); }
-|	OP_TK name dims CP_TK unary_expression_not_plus_minus
-		{
-		  const char *ptr;
-		  int osb = pop_current_osb (ctxp);
-		  obstack_grow (&temporary_obstack,
-				IDENTIFIER_POINTER (EXPR_WFL_NODE ($2)),
-				IDENTIFIER_LENGTH (EXPR_WFL_NODE ($2)));
-		  while (osb--)
-		    obstack_grow (&temporary_obstack, "[]", 2);
-		  obstack_1grow (&temporary_obstack, '\0');
-		  ptr = obstack_finish (&temporary_obstack);
-		  EXPR_WFL_NODE ($2) = get_identifier (ptr);
-		  $$ = build_cast ($1.location, $2, $5);
-		}
-|	OP_TK primitive_type OSB_TK error
-		{yyerror ("']' expected, invalid type expression");}
-|       OP_TK error
-		{
-	          YYNOT_TWICE yyerror ("Invalid type expression"); RECOVER;
-		  RECOVER;
-		}
-|	OP_TK primitive_type dims CP_TK error
-		{yyerror ("Missing term"); RECOVER;}
-|	OP_TK primitive_type CP_TK error
-		{yyerror ("Missing term"); RECOVER;}
-|	OP_TK name dims CP_TK error
-		{yyerror ("Missing term"); RECOVER;}
-;
-
-multiplicative_expression:
-	unary_expression
-|	multiplicative_expression MULT_TK unary_expression
-		{
-		  $$ = build_binop (BINOP_LOOKUP ($2.token),
-				    $2.location, $1, $3);
-		}
-|	multiplicative_expression DIV_TK unary_expression
-		{
-		  $$ = build_binop (BINOP_LOOKUP ($2.token), $2.location,
-				    $1, $3);
-		}
-|	multiplicative_expression REM_TK unary_expression
-		{
-		  $$ = build_binop (BINOP_LOOKUP ($2.token), $2.location,
-				    $1, $3);
-		}
-|	multiplicative_expression MULT_TK error
-		{yyerror ("Missing term"); RECOVER;}
-|	multiplicative_expression DIV_TK error
-		{yyerror ("Missing term"); RECOVER;}
-|	multiplicative_expression REM_TK error
-		{yyerror ("Missing term"); RECOVER;}
-;
-
-additive_expression:
-	multiplicative_expression
-|	additive_expression PLUS_TK multiplicative_expression
-		{
-		  $$ = build_binop (BINOP_LOOKUP ($2.token), $2.location,
-				    $1, $3);
-		}
-|	additive_expression MINUS_TK multiplicative_expression
-		{
-		  $$ = build_binop (BINOP_LOOKUP ($2.token), $2.location,
-				    $1, $3);
-		}
-|	additive_expression PLUS_TK error
-		{yyerror ("Missing term"); RECOVER;}
-|	additive_expression MINUS_TK error
-		{yyerror ("Missing term"); RECOVER;}
-;
-
-shift_expression:
-	additive_expression
-|	shift_expression LS_TK additive_expression
-		{
-		  $$ = build_binop (BINOP_LOOKUP ($2.token), $2.location,
-				    $1, $3);
-		}
-|	shift_expression SRS_TK additive_expression
-		{
-		  $$ = build_binop (BINOP_LOOKUP ($2.token), $2.location,
-				    $1, $3);
-		}
-|	shift_expression ZRS_TK additive_expression
-		{
-		  $$ = build_binop (BINOP_LOOKUP ($2.token), $2.location,
-				    $1, $3);
-		}
-|	shift_expression LS_TK error
-		{yyerror ("Missing term"); RECOVER;}
-|	shift_expression SRS_TK error
-		{yyerror ("Missing term"); RECOVER;}
-|	shift_expression ZRS_TK error
-		{yyerror ("Missing term"); RECOVER;}
-;
-
-relational_expression:
-	shift_expression
-|	relational_expression LT_TK shift_expression
-		{
-		  $$ = build_binop (BINOP_LOOKUP ($2.token), $2.location,
-				    $1, $3);
-		}
-|	relational_expression GT_TK shift_expression
-		{
-		  $$ = build_binop (BINOP_LOOKUP ($2.token), $2.location,
-				    $1, $3);
-		}
-|	relational_expression LTE_TK shift_expression
-		{
-		  $$ = build_binop (BINOP_LOOKUP ($2.token), $2.location,
-				    $1, $3);
-		}
-|	relational_expression GTE_TK shift_expression
-		{
-		  $$ = build_binop (BINOP_LOOKUP ($2.token), $2.location,
-				    $1, $3);
-		}
-|	relational_expression INSTANCEOF_TK reference_type
-		{ $$ = build_binop (INSTANCEOF_EXPR, $2.location, $1, $3); }
-|	relational_expression LT_TK error
-		{yyerror ("Missing term"); RECOVER;}
-|	relational_expression GT_TK error
-		{yyerror ("Missing term"); RECOVER;}
-|	relational_expression LTE_TK error
-		{yyerror ("Missing term"); RECOVER;}
-|	relational_expression GTE_TK error
-		{yyerror ("Missing term"); RECOVER;}
-|	relational_expression INSTANCEOF_TK error
-		{yyerror ("Invalid reference type"); RECOVER;}
-;
-
-equality_expression:
-	relational_expression
-|	equality_expression EQ_TK relational_expression
-		{
-		  $$ = build_binop (BINOP_LOOKUP ($2.token), $2.location,
-				    $1, $3);
-		}
-|	equality_expression NEQ_TK relational_expression
-		{
-		  $$ = build_binop (BINOP_LOOKUP ($2.token), $2.location,
-				    $1, $3);
-		}
-|	equality_expression EQ_TK error
-		{yyerror ("Missing term"); RECOVER;}
-|	equality_expression NEQ_TK error
-		{yyerror ("Missing term"); RECOVER;}
-;
-
-and_expression:
-	equality_expression
-|	and_expression AND_TK equality_expression
-		{
-		  $$ = build_binop (BINOP_LOOKUP ($2.token), $2.location,
-				    $1, $3);
-		}
-|	and_expression AND_TK error
-		{yyerror ("Missing term"); RECOVER;}
-;
-
-exclusive_or_expression:
-	and_expression
-|	exclusive_or_expression XOR_TK and_expression
-		{
-		  $$ = build_binop (BINOP_LOOKUP ($2.token), $2.location,
-				    $1, $3);
-		}
-|	exclusive_or_expression XOR_TK error
-		{yyerror ("Missing term"); RECOVER;}
-;
-
-inclusive_or_expression:
-	exclusive_or_expression
-|	inclusive_or_expression OR_TK exclusive_or_expression
-		{
-		  $$ = build_binop (BINOP_LOOKUP ($2.token), $2.location,
-				    $1, $3);
-		}
-|	inclusive_or_expression OR_TK error
-		{yyerror ("Missing term"); RECOVER;}
-;
-
-conditional_and_expression:
-	inclusive_or_expression
-|	conditional_and_expression BOOL_AND_TK inclusive_or_expression
-		{
-		  $$ = build_binop (BINOP_LOOKUP ($2.token), $2.location,
-				    $1, $3);
-		}
-|	conditional_and_expression BOOL_AND_TK error
-		{yyerror ("Missing term"); RECOVER;}
-;
-
-conditional_or_expression:
-	conditional_and_expression
-|	conditional_or_expression BOOL_OR_TK conditional_and_expression
-		{
-		  $$ = build_binop (BINOP_LOOKUP ($2.token), $2.location,
-				    $1, $3);
-		}
-|	conditional_or_expression BOOL_OR_TK error
-		{yyerror ("Missing term"); RECOVER;}
-;
-
-conditional_expression:		/* Error handling here is weak */
-	conditional_or_expression
-|	conditional_or_expression REL_QM_TK expression REL_CL_TK conditional_expression
-		{
-		  $$ = build3 (CONDITIONAL_EXPR, NULL_TREE, $1, $3, $5);
-		  SET_EXPR_LOCATION_FROM_TOKEN ($$, $2);
-		}
-|	conditional_or_expression REL_QM_TK REL_CL_TK error
-		{
-		  YYERROR_NOW;
-		  yyerror ("Missing term");
-		  DRECOVER (1);
-		}
-|	conditional_or_expression REL_QM_TK error
-		{yyerror ("Missing term"); DRECOVER (2);}
-|	conditional_or_expression REL_QM_TK expression REL_CL_TK error
-		{yyerror ("Missing term"); DRECOVER (3);}
-;
-
-assignment_expression:
-	conditional_expression
-|	assignment
-;
-
-assignment:
-	left_hand_side assignment_operator assignment_expression
-		{ $$ = build_assignment ($2.token, $2.location, $1, $3); }
-|	left_hand_side assignment_operator error
-		{
-		  YYNOT_TWICE yyerror ("Missing term");
-		  DRECOVER (assign);
-		}
-;
-
-left_hand_side:
-	name
-|	field_access
-|	array_access
-;
-
-assignment_operator:
-	ASSIGN_ANY_TK
-|	ASSIGN_TK
-;
-
-expression:
-	assignment_expression
-;
-
-constant_expression:
-	expression
-;
-
-%%
-
-/* Helper function to retrieve an OSB count. Should be used when the
-   `dims:' rule is being used.  */
-
-static int
-pop_current_osb (struct parser_ctxt *ctxp)
-{
-  int to_return;
-
-  if (ctxp->osb_depth < 0)
-    abort ();
-
-  to_return = CURRENT_OSB (ctxp);
-  ctxp->osb_depth--;
-
-  return to_return;
-}
-
-
-
-/* This section of the code deal with save/restoring parser contexts.
-   Add mode documentation here. FIXME */
-
-/* Helper function. Create a new parser context. With
-   COPY_FROM_PREVIOUS set to a nonzero value, content of the previous
-   context is copied, otherwise, the new context is zeroed. The newly
-   created context becomes the current one.  */
-
-static void
-create_new_parser_context (int copy_from_previous)
-{
-  struct parser_ctxt *new;
-
-  new = ggc_alloc (sizeof (struct parser_ctxt));
-  if (copy_from_previous)
-    {
-      memcpy (new, ctxp, sizeof (struct parser_ctxt));
-      /* This flag, indicating the context saves global values,
-	 should only be set by java_parser_context_save_global.  */
-      new->saved_data_ctx = 0;
-    }
-  else
-    memset (new, 0, sizeof (struct parser_ctxt));
-
-  new->next = ctxp;
-  ctxp = new;
-}
-
-/* Create a new parser context and make it the current one. */
-
-void
-java_push_parser_context (void)
-{
-  create_new_parser_context (0);
-}
-
-void
-java_pop_parser_context (int generate)
-{
-  tree current;
-  struct parser_ctxt *next;
-
-  if (!ctxp)
-    return;
-
-  next = ctxp->next;
-  if (next)
-    {
-      input_location = ctxp->save_location;
-      current_class = ctxp->class_type;
-    }
-
-  /* If the old and new lexers differ, then free the old one.  */
-  if (ctxp->lexer && next && ctxp->lexer != next->lexer)
-    java_destroy_lexer (ctxp->lexer);
-
-  /* Set the single import class file flag to 0 for the current list
-     of imported things */
-  for (current = ctxp->import_list; current; current = TREE_CHAIN (current))
-    IS_A_SINGLE_IMPORT_CLASSFILE_NAME_P (TREE_VALUE (current)) = 0;
-
-  /* If we pushed a context to parse a class intended to be generated,
-     we keep it so we can remember the class. What we could actually
-     do is to just update a list of class names.  */
-  if (generate)
-    {
-      if (ctxp_for_generation_last == NULL)
-        ctxp_for_generation = ctxp;
-      else
-        ctxp_for_generation_last->next = ctxp;
-      ctxp->next = NULL;
-      ctxp_for_generation_last = ctxp;
-    }
-
-  /* And restore those of the previous context */
-  if ((ctxp = next))		/* Assignment is really meant here */
-    for (current = ctxp->import_list; current; current = TREE_CHAIN (current))
-      IS_A_SINGLE_IMPORT_CLASSFILE_NAME_P (TREE_VALUE (current)) = 1;
-}
-
-/* Create a parser context for the use of saving some global
-   variables.  */
-
-void
-java_parser_context_save_global (void)
-{
-  if (!ctxp)
-    {
-      java_push_parser_context ();
-      ctxp->saved_data_ctx = 1;
-    }
-
-  /* If this context already stores data, create a new one suitable
-     for data storage. */
-  else if (ctxp->saved_data)
-    {
-      create_new_parser_context (1);
-      ctxp->saved_data_ctx = 1;
-    }
-
-  ctxp->save_location = input_location;
-  ctxp->class_type = current_class;
-  ctxp->function_decl = current_function_decl;
-  ctxp->saved_data = 1;
-}
-
-/* Restore some global variables from the previous context. Make the
-   previous context the current one.  */
-
-void
-java_parser_context_restore_global (void)
-{
-  input_location = ctxp->save_location;
-  current_class = ctxp->class_type;
-  if (wfl_operator)
-#ifdef USE_MAPPED_LOCATION
-    SET_EXPR_LOCATION (wfl_operator, ctxp->save_location);
-#else
-    EXPR_WFL_FILENAME_NODE (wfl_operator) = get_identifier (input_filename);
-#endif
-  current_function_decl = ctxp->function_decl;
-  ctxp->saved_data = 0;
-  if (ctxp->saved_data_ctx)
-    java_pop_parser_context (0);
-}
-
-/* Suspend vital data for the current class/function being parsed so
-   that an other class can be parsed. Used to let local/anonymous
-   classes be parsed.  */
-
-static void
-java_parser_context_suspend (void)
-{
-  /* This makes debugging through java_debug_context easier */
-  static const char *const name = "<inner buffer context>";
-
-  /* Duplicate the previous context, use it to save the globals we're
-     interested in */
-  create_new_parser_context (1);
-  ctxp->function_decl = current_function_decl;
-  ctxp->class_type = current_class;
-
-  /* Then create a new context which inherits all data from the
-     previous one. This will be the new current context  */
-  create_new_parser_context (1);
-
-  /* Help debugging */
-  ctxp->next->filename = name;
-}
-
-/* Resume vital data for the current class/function being parsed so
-   that an other class can be parsed. Used to let local/anonymous
-   classes be parsed.  The trick is the data storing file position
-   informations must be restored to their current value, so parsing
-   can resume as if no context was ever saved. */
-
-static void
-java_parser_context_resume (void)
-{
-  struct parser_ctxt *old = ctxp;             /* This one is to be discarded */
-  struct parser_ctxt *saver = old->next;      /* This one contain saved info */
-  struct parser_ctxt *restored = saver->next; /* This one is the old current */
-
-  /* We need to inherit the list of classes to complete/generate */
-  restored->classd_list = old->classd_list;
-  restored->class_list = old->class_list;
-
-  /* Restore the current class and function from the saver */
-  current_class = saver->class_type;
-  current_function_decl = saver->function_decl;
-
-  /* Retrieve the restored context */
-  ctxp = restored;
-
-  /* Re-installed the data for the parsing to carry on */
-  memcpy (&ctxp->marker_begining, &old->marker_begining,
-	  (size_t)(&ctxp->marker_end - &ctxp->marker_begining));
-}
-
-/* Add a new anchor node to which all statement(s) initializing static
-   and non static initialized upon declaration field(s) will be
-   linked.  */
-
-static void
-java_parser_context_push_initialized_field (void)
-{
-  tree node;
-
-  node = build_tree_list (NULL_TREE, NULL_TREE);
-  TREE_CHAIN (node) = CPC_STATIC_INITIALIZER_LIST (ctxp);
-  CPC_STATIC_INITIALIZER_LIST (ctxp) = node;
-
-  node = build_tree_list (NULL_TREE, NULL_TREE);
-  TREE_CHAIN (node) = CPC_INITIALIZER_LIST (ctxp);
-  CPC_INITIALIZER_LIST (ctxp) = node;
-
-  node = build_tree_list (NULL_TREE, NULL_TREE);
-  TREE_CHAIN (node) = CPC_INSTANCE_INITIALIZER_LIST (ctxp);
-  CPC_INSTANCE_INITIALIZER_LIST (ctxp) = node;
-}
-
-/* Pop the lists of initialized field. If this lists aren't empty,
-   remember them so we can use it to create and populate the finit$
-   or <clinit> functions. */
-
-static void
-java_parser_context_pop_initialized_field (void)
-{
-  tree stmts;
-  tree class_type = TREE_TYPE (GET_CPC ());
-
-  if (CPC_INITIALIZER_LIST (ctxp))
-    {
-      stmts = CPC_INITIALIZER_STMT (ctxp);
-      CPC_INITIALIZER_LIST (ctxp) = TREE_CHAIN (CPC_INITIALIZER_LIST (ctxp));
-      if (stmts && !java_error_count)
-	TYPE_FINIT_STMT_LIST (class_type) = reorder_static_initialized (stmts);
-    }
-
-  if (CPC_STATIC_INITIALIZER_LIST (ctxp))
-    {
-      stmts = CPC_STATIC_INITIALIZER_STMT (ctxp);
-      CPC_STATIC_INITIALIZER_LIST (ctxp) =
-	TREE_CHAIN (CPC_STATIC_INITIALIZER_LIST (ctxp));
-      /* Keep initialization in order to enforce 8.5 */
-      if (stmts && !java_error_count)
-	TYPE_CLINIT_STMT_LIST (class_type) = nreverse (stmts);
-    }
-
-  /* JDK 1.1 instance initializers */
-  if (CPC_INSTANCE_INITIALIZER_LIST (ctxp))
-    {
-      stmts = CPC_INSTANCE_INITIALIZER_STMT (ctxp);
-      CPC_INSTANCE_INITIALIZER_LIST (ctxp) =
-	TREE_CHAIN (CPC_INSTANCE_INITIALIZER_LIST (ctxp));
-      if (stmts && !java_error_count)
-	TYPE_II_STMT_LIST (class_type) = nreverse (stmts);
-    }
-}
-
-static tree
-reorder_static_initialized (tree list)
-{
-  /* We have to keep things in order. The alias initializer have to
-     come first, then the initialized regular field, in reverse to
-     keep them in lexical order. */
-  tree marker, previous = NULL_TREE;
-  for (marker = list; marker; previous = marker, marker = TREE_CHAIN (marker))
-    if (TREE_CODE (marker) == TREE_LIST
-	&& !TREE_VALUE (marker) && !TREE_PURPOSE (marker))
-      break;
-
-  /* No static initialized, the list is fine as is */
-  if (!previous)
-    list = TREE_CHAIN (marker);
-
-  /* No marker? reverse the whole list */
-  else if (!marker)
-    list = nreverse (list);
-
-  /* Otherwise, reverse what's after the marker and the new reordered
-     sublist will replace the marker. */
-  else
-    {
-      TREE_CHAIN (previous) = NULL_TREE;
-      list = nreverse (list);
-      list = chainon (TREE_CHAIN (marker), list);
-    }
-  return list;
-}
-
-/* Helper functions to dump the parser context stack.  */
-
-#define TAB_CONTEXT(C) \
-  {int i; for (i = 0; i < (C); i++) fputc (' ', stderr);}
-
-static void
-java_debug_context_do (int tab)
-{
-  struct parser_ctxt *copy = ctxp;
-  while (copy)
-    {
-      TAB_CONTEXT (tab);
-      fprintf (stderr, "ctxt: 0x%0lX\n", (unsigned long)copy);
-      TAB_CONTEXT (tab);
-      fprintf (stderr, "filename: %s\n", copy->filename);
-      TAB_CONTEXT (tab);
-      fprintf (stderr, "package: %s\n",
-	       (copy->package ?
-		IDENTIFIER_POINTER (copy->package) : "<none>"));
-      TAB_CONTEXT (tab);
-      fprintf (stderr, "context for saving: %d\n", copy->saved_data_ctx);
-      TAB_CONTEXT (tab);
-      fprintf (stderr, "saved data: %d\n", copy->saved_data);
-      copy = copy->next;
-      tab += 2;
-    }
-}
-
-/* Dump the stacked up parser contexts. Intended to be called from a
-   debugger.  */
-
-void
-java_debug_context (void)
-{
-  java_debug_context_do (0);
-}
-
-
-
-/* Flag for the error report routine to issue the error the first time
-   it's called (overriding the default behavior which is to drop the
-   first invocation and honor the second one, taking advantage of a
-   richer context.  */
-static int force_error = 0;
-
-/* Reporting an constructor invocation error.  */
-static void
-parse_ctor_invocation_error (void)
-{
-  if (DECL_CONSTRUCTOR_P (current_function_decl))
-    yyerror ("Constructor invocation must be first thing in a constructor");
-  else
-    yyerror ("Only constructors can invoke constructors");
-}
-
-/* Reporting JDK1.1 features not implemented.  */
-
-static tree
-parse_jdk1_1_error (const char *msg)
-{
-  sorry (": %qs JDK1.1(TM) feature", msg);
-  java_error_count++;
-  return build_java_empty_stmt ();
-}
-
-static int do_warning = 0;
-
-void
-yyerror (const char *msgid)
-{
-#ifdef USE_MAPPED_LOCATION
-  static source_location elc;
-  expanded_location xloc = expand_location (input_location);
-  int current_line = xloc.line;
-#else
-  static java_lc elc;
-  int save_lineno;
-  int current_line = input_line;
-#endif
-  static int prev_lineno;
-  static const char *prev_msg;
-
-  char *remainder, *code_from_source;
-
-  if (!force_error && prev_lineno == current_line)
-    return;
-#ifndef USE_MAPPED_LOCATION
-  current_line = ctxp->lexer->token_start.line;
-#endif
-
-  /* Save current error location but report latter, when the context is
-     richer.  */
-  if (ctxp->java_error_flag == 0)
-    {
-      ctxp->java_error_flag = 1;
-#ifdef USE_MAPPED_LOCATION
-      elc = input_location;
-#else
-      elc = ctxp->lexer->token_start;
-#endif
-      /* Do something to use the previous line if we're reaching the
-	 end of the file... */
-#ifdef VERBOSE_SKELETON
-      printf ("* Error detected (%s)\n", (msgid ? msgid : "(null)"));
-#endif
-      return;
-    }
-
-  /* Ignore duplicate message on the same line. BTW, this is dubious. FIXME */
-  if (!force_error && msgid == prev_msg && prev_lineno == current_line)
-    return;
-
-  ctxp->java_error_flag = 0;
-  if (do_warning)
-    java_warning_count++;
-  else
-    java_error_count++;
-
-#if 0 /* FIXME */
-  if (elc.col == 0 && msgid && msgid[1] == ';')
-    elc = ctxp->prev_line_end;
-#endif
-
-  prev_msg = msgid;
-
-#ifdef USE_MAPPED_LOCATION
-  prev_lineno = current_line;
-  code_from_source = java_get_line_col (xloc.file, current_line, xloc.column);
-#else
-  save_lineno = input_line;
-  prev_lineno = input_line = current_line;
-  code_from_source = java_get_line_col (input_filename, current_line,
-					ctxp->lexer->token_start.col);
-#endif
-
-
-  obstack_grow0 (&temporary_obstack,
-		 code_from_source, strlen (code_from_source));
-  remainder = obstack_finish (&temporary_obstack);
-  if (do_warning)
-    warning (0, "%s.\n%s", msgid, remainder);
-  else
-    error ("%s.\n%s", msgid, remainder);
-
-  /* This allow us to cheaply avoid an extra 'Invalid expression
-     statement' error report when errors have been already reported on
-     the same line. This occurs when we report an error but don't have
-     a synchronization point other than ';', which
-     expression_statement is the only one to take care of.  */
-#ifndef USE_MAPPED_LOCATION
-  input_line = save_lineno;
-#endif
-  ctxp->prevent_ese = input_line;
-}
-
-static void
-issue_warning_error_from_context (
-#ifdef USE_MAPPED_LOCATION
-				  source_location cl,
-#else
-				  tree cl,
-#endif
-				  const char *gmsgid, va_list *ap)
-{
-#ifdef USE_MAPPED_LOCATION
-  source_location saved_location = input_location;
-  expanded_location xloc = expand_location (cl);
-#else
-  java_lc save_lc = ctxp->lexer->token_start;
-  const char *saved = ctxp->filename, *saved_input_filename;
-#endif
-  char buffer [4096];
-  text_info text;
-
-  text.err_no = errno;
-  text.args_ptr = ap;
-  text.format_spec = gmsgid;
-  pp_format (global_dc->printer, &text);
-  pp_output_formatted_text (global_dc->printer);
-  strncpy (buffer, pp_formatted_text (global_dc->printer), sizeof (buffer) - 1);
-  buffer[sizeof (buffer) - 1] = '\0';
-  pp_clear_output_area (global_dc->printer);
-
-  force_error = 1;
-
-#ifdef USE_MAPPED_LOCATION
-  if (xloc.file != NULL)
-    {
-      ctxp->filename = xloc.file;
-      input_location = cl;
-    }
-#else
-  ctxp->lexer->token_start.line = EXPR_WFL_LINENO (cl);
-  ctxp->lexer->token_start.col  = (EXPR_WFL_COLNO (cl) == 0xfff ? -1
-				   : EXPR_WFL_COLNO (cl) == 0xffe ? -2
-				   : EXPR_WFL_COLNO (cl));
-
-  /* We have a CL, that's a good reason for using it if it contains data */
-  if (TREE_CODE (cl) == EXPR_WITH_FILE_LOCATION && EXPR_WFL_FILENAME_NODE (cl))
-    ctxp->filename = EXPR_WFL_FILENAME (cl);
-  saved_input_filename = input_filename;
-  input_filename = ctxp->filename;
-#endif
-  java_error (NULL);
-  java_error (buffer);
-#ifdef USE_MAPPED_LOCATION
-  input_location = saved_location;
-#else
-  ctxp->filename = saved;
-  input_filename = saved_input_filename;
-  ctxp->lexer->token_start = save_lc;
-#endif
-  force_error = 0;
-}
-
-/* Issue an error message at a current source line CL.
-   FUTURE/FIXME:  change cl to be a source_location. */
-
-void
-parse_error_context (tree cl, const char *gmsgid, ...)
-{
-  va_list ap;
-  va_start (ap, gmsgid);
-#ifdef USE_MAPPED_LOCATION
-  issue_warning_error_from_context (EXPR_LOCATION (cl), gmsgid, &ap);
-#else
-  issue_warning_error_from_context (cl, gmsgid, &ap);
-#endif
-  va_end (ap);
-}
-
-/* Issue a warning at a current source line CL.
-   FUTURE/FIXME:  change cl to be a source_location. */
-
-static void
-parse_warning_context (tree cl, const char *gmsgid, ...)
-{
-  va_list ap;
-  va_start (ap, gmsgid);
-
-  do_warning = 1;
-#ifdef USE_MAPPED_LOCATION
-  issue_warning_error_from_context (EXPR_LOCATION (cl), gmsgid, &ap);
-#else
-  issue_warning_error_from_context (cl, gmsgid, &ap);
-#endif
-  do_warning = 0;
-  va_end (ap);
-}
-
-static tree
-find_expr_with_wfl (tree node)
-{
-  while (node)
-    {
-      enum tree_code_class code;
-      tree to_return;
-
-      switch (TREE_CODE (node))
-	{
-	case BLOCK:
-	  node = BLOCK_EXPR_BODY (node);
-	  continue;
-
-	case COMPOUND_EXPR:
-	  to_return = find_expr_with_wfl (TREE_OPERAND (node, 0));
-	  if (to_return)
-	    return to_return;
-	  node = TREE_OPERAND (node, 1);
-	  continue;
-
-	case LOOP_EXPR:
-	  node = TREE_OPERAND (node, 0);
-	  continue;
-
-	case LABELED_BLOCK_EXPR:
-	  node = LABELED_BLOCK_BODY (node);
-	  continue;
-
-	default:
-	  code = TREE_CODE_CLASS (TREE_CODE (node));
-	  if (((code == tcc_unary) || (code == tcc_binary)
-	       || (code == tcc_expression))
-	      && EXPR_WFL_LINECOL (node))
-	    return node;
-	  return NULL_TREE;
-	}
-    }
-  return NULL_TREE;
-}
-
-/* Issue a missing return statement error. Uses METHOD to figure the
-   last line of the method the error occurs in.  */
-
-static void
-missing_return_error (tree method)
-{
-#ifdef USE_MAPPED_LOCATION
-  SET_EXPR_LOCATION (wfl_operator, DECL_FUNCTION_LAST_LINE (method));
-#else
-  EXPR_WFL_SET_LINECOL (wfl_operator, DECL_FUNCTION_LAST_LINE (method), -2);
-#endif
-  parse_error_context (wfl_operator, "Missing return statement");
-}
-
-/* Issue an unreachable statement error. From NODE, find the next
-   statement to report appropriately.  */
-static void
-unreachable_stmt_error (tree node)
-{
-  /* Browse node to find the next expression node that has a WFL. Use
-     the location to report the error */
-  if (TREE_CODE (node) == COMPOUND_EXPR)
-    node = find_expr_with_wfl (TREE_OPERAND (node, 1));
-  else
-    node = find_expr_with_wfl (node);
-
-  if (node)
-    {
-#ifdef USE_MAPPED_LOCATION
-      SET_EXPR_LOCATION (wfl_operator, EXPR_LOCATION (node));
-#else
-      EXPR_WFL_SET_LINECOL (wfl_operator, EXPR_WFL_LINENO (node), -2);
-#endif
-      parse_error_context (wfl_operator, "Unreachable statement");
-    }
-  else
-    abort ();
-}
-
-static int
-not_accessible_field_error (tree wfl, tree decl)
-{
-  parse_error_context 
-    (wfl, "Can't access %s field %<%s.%s%> from %qs",
-     accessibility_string (get_access_flags_from_decl (decl)),
-     GET_TYPE_NAME (DECL_CONTEXT (decl)),
-     IDENTIFIER_POINTER (DECL_NAME (decl)),
-     IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (current_class))));
-  return 1;
-}
-
-int
-java_report_errors (void)
-{
-  if (java_error_count)
-    fprintf (stderr, "%d error%s",
-	     java_error_count, (java_error_count == 1 ? "" : "s"));
-  if (java_warning_count)
-    fprintf (stderr, "%s%d warning%s", (java_error_count ? ", " : ""),
-	     java_warning_count, (java_warning_count == 1 ? "" : "s"));
-  if (java_error_count || java_warning_count)
-    putc ('\n', stderr);
-  return java_error_count;
-}
-
-static char *
-java_accstring_lookup (int flags)
-{
-  static char buffer [80];
-#define COPY_RETURN(S) {strcpy (buffer, S); return buffer;}
-
-  /* Access modifier looked-up first for easier report on forbidden
-     access. */
-  if (flags & ACC_PUBLIC) COPY_RETURN ("public");
-  if (flags & ACC_PRIVATE) COPY_RETURN ("private");
-  if (flags & ACC_PROTECTED) COPY_RETURN ("protected");
-  if (flags & ACC_STATIC) COPY_RETURN ("static");
-  if (flags & ACC_FINAL) COPY_RETURN ("final");
-  if (flags & ACC_SYNCHRONIZED) COPY_RETURN ("synchronized");
-  if (flags & ACC_VOLATILE) COPY_RETURN ("volatile");
-  if (flags & ACC_TRANSIENT) COPY_RETURN ("transient");
-  if (flags & ACC_NATIVE) COPY_RETURN ("native");
-  if (flags & ACC_INTERFACE) COPY_RETURN ("interface");
-  if (flags & ACC_ABSTRACT) COPY_RETURN ("abstract");
-
-  buffer [0] = '\0';
-  return buffer;
-#undef COPY_RETURN
-}
-
-/* Returns a string denoting the accessibility of a class or a member as
-   indicated by FLAGS.  We need a separate function from
-   java_accstring_lookup, as the latter can return spurious "static", etc.
-   if package-private access is defined (in which case none of the
-   relevant access control bits in FLAGS is set).  */
-
-static const char *
-accessibility_string (int flags)
-{
-  if (flags & ACC_PRIVATE) return "private";
-  if (flags & ACC_PROTECTED) return "protected";
-  if (flags & ACC_PUBLIC) return "public";
-
-  return "package-private";
-}
-
-/* Issuing error messages upon redefinition of classes, interfaces or
-   variables. */
-
-static void
-classitf_redefinition_error (const char *context, tree id, tree decl, tree cl)
-{
-  parse_error_context (cl, "%s %qs already defined in %s:%d",
-		       context, IDENTIFIER_POINTER (id),
-		       DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl));
-  /* Here we should point out where its redefined. It's a unicode. FIXME */
-}
-
-static void
-variable_redefinition_error (tree context, tree name, tree type, int line)
-{
-  const char *type_name;
-
-  /* Figure a proper name for type. We might haven't resolved it */
-  if (TREE_CODE (type) == POINTER_TYPE && !TREE_TYPE (type))
-    type_name = IDENTIFIER_POINTER (TYPE_NAME (type));
-  else
-    type_name = lang_printable_name (type, 0);
-
-  parse_error_context (context,
-		       "Variable %qs is already defined in this method and was declared %<%s %s%> at line %d",
-		       IDENTIFIER_POINTER (name),
-		       type_name, IDENTIFIER_POINTER (name), line);
-}
-
-/* If ANAME is terminated with `[]', it indicates an array. This
-   function returns the number of `[]' found and if this number is
-   greater than zero, it extracts the array type name and places it in
-   the node pointed to by TRIMMED unless TRIMMED is null.  */
-
-static int
-build_type_name_from_array_name (tree aname, tree *trimmed)
-{
-  const char *name = IDENTIFIER_POINTER (aname);
-  int len = IDENTIFIER_LENGTH (aname);
-  int array_dims;
-
-  STRING_STRIP_BRACKETS (name, len, array_dims);
-
-  if (array_dims && trimmed)
-    *trimmed = get_identifier_with_length (name, len);
-
-  return array_dims;
-}
-
-static tree
-build_array_from_name (tree type, tree type_wfl, tree name, tree *ret_name)
-{
-  int more_dims = 0;
-
-  /* Eventually get more dims */
-  more_dims = build_type_name_from_array_name (name, &name);
-
-  /* If we have, then craft a new type for this variable */
-  if (more_dims)
-    {
-      tree save = type;
-
-      /* If we have a pointer, use its type */
-      if (TREE_CODE (type) == POINTER_TYPE)
-        type = TREE_TYPE (type);
-
-      /* Building the first dimension of a primitive type uses this
-         function */
-      if (JPRIMITIVE_TYPE_P (type))
-	{
-	  type = build_java_array_type (type, -1);
-	  more_dims--;
-	}
-      /* Otherwise, if we have a WFL for this type, use it (the type
-         is already an array on an unresolved type, and we just keep
-         on adding dimensions) */
-      else if (type_wfl)
-	{
-	  type = type_wfl;
-	  more_dims += build_type_name_from_array_name (TYPE_NAME (save),
-							NULL);
-	}
-
-      /* Add all the dimensions */
-      while (more_dims--)
-	type = build_unresolved_array_type (type);
-
-      /* The type may have been incomplete in the first place */
-      if (type_wfl)
-	type = obtain_incomplete_type (type);
-    }
-
-  if (ret_name)
-    *ret_name = name;
-  return type;
-}
-
-/* Build something that the type identifier resolver will identify as
-   being an array to an unresolved type. TYPE_WFL is a WFL on a
-   identifier. */
-
-static tree
-build_unresolved_array_type (tree type_or_wfl)
-{
-  const char *ptr;
-  tree wfl;
-
-  /* TYPE_OR_WFL might be an array on a resolved type. In this case,
-     just create a array type */
-  if (TREE_CODE (type_or_wfl) == RECORD_TYPE)
-    return build_java_array_type (type_or_wfl, -1);
-
-  obstack_grow (&temporary_obstack,
-		 IDENTIFIER_POINTER (EXPR_WFL_NODE (type_or_wfl)),
-		 IDENTIFIER_LENGTH (EXPR_WFL_NODE (type_or_wfl)));
-  obstack_grow0 (&temporary_obstack, "[]", 2);
-  ptr = obstack_finish (&temporary_obstack);
-#ifdef USE_MAPPED_LOCATION
-  wfl = build_expr_wfl (get_identifier (ptr), EXPR_LOCATION (type_or_wfl));
-#else
-  wfl = build_expr_wfl (get_identifier (ptr),
-			EXPR_WFL_FILENAME (type_or_wfl),
-			EXPR_WFL_LINENO (type_or_wfl),
-			EXPR_WFL_COLNO (type_or_wfl));
-#endif
-  /* Re-install the existing qualifications so that the type can be
-     resolved properly. */
-  EXPR_WFL_QUALIFICATION (wfl) = EXPR_WFL_QUALIFICATION (type_or_wfl);
-  return wfl;
-}
-
-static void
-parser_add_interface (tree class_decl, tree interface_decl, tree wfl)
-{
-  if (maybe_add_interface (TREE_TYPE (class_decl), TREE_TYPE (interface_decl)))
-    parse_error_context (wfl, "Interface %qs repeated",
-			 IDENTIFIER_POINTER (DECL_NAME (interface_decl)));
-}
-
-/* Bulk of common class/interface checks. Return 1 if an error was
-   encountered. TAG is 0 for a class, 1 for an interface.  */
-
-static int
-check_class_interface_creation (int is_interface, int flags, tree raw_name,
-				tree qualified_name, tree decl, tree cl)
-{
-  tree node;
-  int sca = 0;			/* Static class allowed */
-  int icaf = 0;			/* Inner class allowed flags */
-  int uaaf = CLASS_MODIFIERS;	/* Usually allowed access flags */
-
-  if (!quiet_flag)
-    fprintf (stderr, " %s%s %s",
-	     (CPC_INNER_P () ? "inner" : ""),
-	     (is_interface ? "interface" : "class"),
-	     IDENTIFIER_POINTER (qualified_name));
-
-  /* Scope of an interface/class type name:
-       - Can't be imported by a single type import
-       - Can't already exists in the package */
-  if (IS_A_SINGLE_IMPORT_CLASSFILE_NAME_P (raw_name)
-      && (node = find_name_in_single_imports (raw_name))
-      && !CPC_INNER_P ())
-    {
-      parse_error_context
-	(cl, "%s name %qs clashes with imported type %qs",
-	 (is_interface ? "Interface" : "Class"),
-	 IDENTIFIER_POINTER (raw_name), IDENTIFIER_POINTER (node));
-      return 1;
-    }
-  if (decl && CLASS_COMPLETE_P (decl))
-    {
-      classitf_redefinition_error ((is_interface ? "Interface" : "Class"),
-				   qualified_name, decl, cl);
-      return 1;
-    }
-
-  if (check_inner_class_redefinition (raw_name, cl))
-    return 1;
-
-  /* If public, file name should match class/interface name, except
-     when dealing with an inner class */
-  if (!CPC_INNER_P () && (flags & ACC_PUBLIC ))
-    {
-      const char *fname = input_filename;
-      const char *f;
-
-      for (f = fname + strlen (fname);
-	   f != fname && ! IS_DIR_SEPARATOR (*f);
-	   f--)
-	;
-      if (IS_DIR_SEPARATOR (*f))
-	f++;
-      if (strncmp (IDENTIFIER_POINTER (raw_name),
-		   f , IDENTIFIER_LENGTH (raw_name)) ||
-	  f [IDENTIFIER_LENGTH (raw_name)] != '.')
-	parse_error_context
-	  (cl, "Public %s %qs must be defined in a file called %<%s.java%>",
-			     (is_interface ? "interface" : "class"),
-			     IDENTIFIER_POINTER (qualified_name),
-			     IDENTIFIER_POINTER (raw_name));
-    }
-
-  /* Static classes can be declared only in top level classes. Note:
-     once static, a inner class is a top level class. */
-  if (flags & ACC_STATIC)
-    {
-      /* Catch the specific error of declaring an class inner class
-	 with no toplevel enclosing class. Prevent check_modifiers from
-	 complaining a second time */
-      if (CPC_INNER_P () && !TOPLEVEL_CLASS_DECL_P (GET_CPC()))
-	{
-	  parse_error_context (cl, "Inner class %qs can't be static. Static classes can only occur in interfaces and top-level classes",
-			       IDENTIFIER_POINTER (qualified_name));
-	  sca = ACC_STATIC;
-	}
-      /* Else, in the context of a top-level class declaration, let
-         `check_modifiers' do its job, otherwise, give it a go */
-      else
-	sca = (GET_CPC_LIST () ? ACC_STATIC : 0);
-    }
-
-  /* Inner classes can be declared private or protected
-     within their enclosing classes. */
-  if (CPC_INNER_P ())
-    {
-      /* A class which is local to a block can't be public, private,
-	 protected or static. But it is created final, so allow this
-	 one. */
-      if (current_function_decl)
-	icaf = sca = uaaf = ACC_FINAL;
-      else
-	{
-	  check_modifiers_consistency (flags);
-	  icaf = ACC_PROTECTED;
-	  if (! CLASS_INTERFACE (GET_CPC ()))
-	    icaf |= ACC_PRIVATE;
-	}
-    }
-
-  if (is_interface)
-    {
-      if (CPC_INNER_P ())
-	uaaf = INTERFACE_INNER_MODIFIERS;
-      else
-	uaaf = INTERFACE_MODIFIERS;
-
-      check_modifiers ("Illegal modifier %qs for interface declaration",
-		       flags, uaaf);
-    }
-  else
-    check_modifiers ((current_function_decl ?
-		      "Illegal modifier %qs for local class declaration" :
-		      "Illegal modifier %qs for class declaration"),
-		     flags, uaaf|sca|icaf);
-  return 0;
-}
-
-/* Construct a nested class name.  If the final component starts with
-   a digit, return true.  Otherwise return false.  */
-static int
-make_nested_class_name (tree cpc_list)
-{
-  tree name;
-
-  if (!cpc_list)
-    return 0;
-
-  make_nested_class_name (TREE_CHAIN (cpc_list));
-
-  /* Pick the qualified name when dealing with the first upmost
-     enclosing class */
-  name = (TREE_CHAIN (cpc_list)
-	  ? TREE_PURPOSE (cpc_list) : DECL_NAME (TREE_VALUE (cpc_list)));
-  obstack_grow (&temporary_obstack,
-		IDENTIFIER_POINTER (name), IDENTIFIER_LENGTH (name));
-  obstack_1grow (&temporary_obstack, '$');
-
-  return ISDIGIT (IDENTIFIER_POINTER (name)[0]);
-}
-
-/* Can't redefine a class already defined in an earlier scope. */
-
-static int
-check_inner_class_redefinition (tree raw_name, tree cl)
-{
-  tree scope_list;
-
-  for (scope_list = GET_CPC_LIST (); scope_list;
-       scope_list = GET_NEXT_ENCLOSING_CPC (scope_list))
-    if (raw_name == GET_CPC_UN_NODE (scope_list))
-      {
-	parse_error_context
-	  (cl, "The class name %qs is already defined in this scope. An inner class may not have the same simple name as any of its enclosing classes",
-	   IDENTIFIER_POINTER (raw_name));
-	return 1;
-      }
-  return 0;
-}
-
-/* Tries to find a decl for CLASS_TYPE within ENCLOSING.  May return an
-   invisible/non-accessible matching decl when an accessible one could not be 
-   found, in order to give a better error message when accessibility is 
-   checked later.  */
-
-static tree
-resolve_inner_class (tree context, tree cl, tree enclosing, tree class_type)
-{
-  tree local_super = NULL_TREE;
-  tree candidate = NULL_TREE;
-
-  /* This hash table is used to register the classes we're going
-     through when searching the current class as an inner class, in
-     order to detect circular references.  */
-  htab_t circularity_hash = htab_create (20, htab_hash_pointer, htab_eq_pointer,
-					 NULL);
-
-  while (enclosing)
-    {
-      tree decl;
-
-      *htab_find_slot (circularity_hash, enclosing, INSERT) = enclosing;
-
-      if ((decl = find_as_inner_class (enclosing, class_type, cl)))
-        {
-	  if (inner_class_accessible (decl, context))
-	    {
-	      candidate = decl;
-	      break;
-	    }
-	  else
-	    if (candidate == NULL_TREE)
-	      candidate = decl;
-	}	
-
-      /* Now go to the upper classes, bail out if necessary.  We will
-	 analyze the returned SUPER and act accordingly (see
-	 do_resolve_class).  */
-      if (JPRIMITIVE_TYPE_P (TREE_TYPE (enclosing))
-	  || TREE_TYPE (enclosing) == void_type_node)
-	{
-	  parse_error_context (cl, "Qualifier must be a reference");
-	  enclosing = NULL_TREE;
-	  break;
-	}
-      local_super = CLASSTYPE_SUPER (TREE_TYPE (enclosing));
-      if (!local_super || local_super == object_type_node)
-        break;
-
-      if (TREE_CODE (local_super) == POINTER_TYPE)
-        local_super = do_resolve_class (NULL, NULL, local_super, NULL, NULL);
-      else
-	local_super = TYPE_NAME (local_super);
-
-      /* We may not have checked for circular inheritance yet, so do so
-         here to prevent an infinite loop. */
-      if (htab_find (circularity_hash, local_super) != NULL)
-        {
-          if (!cl)
-            cl = lookup_cl (enclosing);
-
-          parse_error_context
-            (cl, "Cyclic inheritance involving %s",
-	     IDENTIFIER_POINTER (DECL_NAME (enclosing)));
-	  enclosing = NULL_TREE;
-        }
-      else
-	enclosing = local_super;
-    }
-
-  htab_delete (circularity_hash);
-
-  /* We failed, but we might have found a matching class that wasn't 
-     accessible.  Return that to get a better error message.  */
-  return candidate;
-}
-
-/* Within ENCLOSING, find a decl for NAME and return it. NAME can be
-   qualified. */
-
-static tree
-find_as_inner_class (tree enclosing, tree name, tree cl)
-{
-  tree qual, to_return;
-  if (!enclosing)
-    return NULL_TREE;
-
-  name = TYPE_NAME (name);
-
-  /* First search: within the scope of `enclosing', search for name */
-  if (QUALIFIED_P (name) && cl && EXPR_WFL_NODE (cl) == name)
-    qual = EXPR_WFL_QUALIFICATION (cl);
-  else if (cl)
-    qual = build_tree_list (cl, NULL_TREE);
-  else
-    qual = build_tree_list (build_unknown_wfl (name), NULL_TREE);
-
-  if ((to_return = find_as_inner_class_do (qual, enclosing)))
-    return to_return;
-
-  /* We're dealing with a qualified name. Try to resolve thing until
-     we get something that is an enclosing class. */
-  if (QUALIFIED_P (name) && cl && EXPR_WFL_NODE (cl) == name)
-    {
-      tree acc = NULL_TREE, decl = NULL_TREE, ptr;
-
-      for (qual = EXPR_WFL_QUALIFICATION (cl); qual && !decl;
-	   qual = TREE_CHAIN (qual))
-	{
-	  acc = merge_qualified_name (acc,
-				      EXPR_WFL_NODE (TREE_PURPOSE (qual)));
-	  BUILD_PTR_FROM_NAME (ptr, acc);
-	  decl = do_resolve_class (NULL_TREE, NULL_TREE, ptr, NULL_TREE, cl);
-	}
-
-      /* A NULL qual and a decl means that the search ended
-         successfully?!? We have to do something then. FIXME */
-
-      if (decl)
-	enclosing = decl;
-      else
-	qual = EXPR_WFL_QUALIFICATION (cl);
-    }
-  /* Otherwise, create a qual for the other part of the resolution. */
-  else
-    qual = build_tree_list (build_unknown_wfl (name), NULL_TREE);
-
-  return find_as_inner_class_do (qual, enclosing);
-}
-
-/* We go inside the list of sub classes and try to find a way
-   through. */
-
-static tree
-find_as_inner_class_do (tree qual, tree enclosing)
-{
-  if (!qual)
-    return NULL_TREE;
-
-  for (; qual && enclosing; qual = TREE_CHAIN (qual))
-    {
-      tree name_to_match = EXPR_WFL_NODE (TREE_PURPOSE (qual));
-      tree next_enclosing = NULL_TREE;
-      tree inner_list;
-
-      for (inner_list = DECL_INNER_CLASS_LIST (enclosing);
-           inner_list; inner_list = TREE_CHAIN (inner_list))
-	{
-	  if (TREE_VALUE (inner_list) == name_to_match)
-	    {
-	      next_enclosing = TREE_PURPOSE (inner_list);
-	      break;
-	    }
-	}
-      enclosing = next_enclosing;
-    }
-
-  return (!qual && enclosing ? enclosing : NULL_TREE);
-}
-
-static void
-link_nested_class_to_enclosing (void)
-{
-  if (GET_ENCLOSING_CPC ())
-    {
-      tree enclosing = GET_ENCLOSING_CPC_CONTEXT ();
-      DECL_INNER_CLASS_LIST (enclosing) =
-	tree_cons (GET_CPC (), GET_CPC_UN (),
-		   DECL_INNER_CLASS_LIST (enclosing));
-    }
-}
-
-static tree
-maybe_make_nested_class_name (tree name)
-{
-  tree id = NULL_TREE;
-
-  if (CPC_INNER_P ())
-    {
-      /* If we're in a function, we must append a number to create the
-	 nested class name.  However, we don't do this if the class we
-	 are constructing is anonymous, because in that case we'll
-	 already have a number as the class name.  */
-      if (! make_nested_class_name (GET_CPC_LIST ())
-	  && current_function_decl != NULL_TREE
-	  && ! ISDIGIT (IDENTIFIER_POINTER (name)[0]))
-	{
-	  char buf[10];
-	  sprintf (buf, "%d", anonymous_class_counter);
-	  ++anonymous_class_counter;
-	  obstack_grow (&temporary_obstack, buf, strlen (buf));
-	  obstack_1grow (&temporary_obstack, '$');
-	}
-      obstack_grow0 (&temporary_obstack,
-		     IDENTIFIER_POINTER (name),
-		     IDENTIFIER_LENGTH (name));
-      id = get_identifier (obstack_finish (&temporary_obstack));
-      if (ctxp->package)
-	QUALIFIED_P (id) = 1;
-    }
-  return id;
-}
-
-/* If DECL is NULL, create and push a new DECL, record the current
-   line CL and do other maintenance things.  */
-
-static tree
-maybe_create_class_interface_decl (tree decl, tree raw_name,
-				   tree qualified_name, tree cl)
-{
-  if (!decl)
-    decl = push_class (make_class (), qualified_name);
-
-  /* Take care of the file and line business */
-#ifdef USE_MAPPED_LOCATION
-  DECL_SOURCE_LOCATION (decl) = EXPR_LOCATION (cl);
-#else
-  DECL_SOURCE_FILE (decl) = EXPR_WFL_FILENAME (cl);
-  DECL_SOURCE_LINE (decl) = EXPR_WFL_LINENO (cl);
-#endif
-  CLASS_FROM_SOURCE_P (TREE_TYPE (decl)) = 1;
-  CLASS_PARSED_P (TREE_TYPE (decl)) = 1;
-#ifdef USE_MAPPED_LOCATION
-  {
-    tree tmp = maybe_get_identifier (EXPR_FILENAME (cl));
-    CLASS_FROM_CURRENTLY_COMPILED_P (TREE_TYPE (decl)) =
-      tmp && IS_A_COMMAND_LINE_FILENAME_P (tmp);
-  }
-#else
-  CLASS_FROM_CURRENTLY_COMPILED_P (TREE_TYPE (decl)) =
-    IS_A_COMMAND_LINE_FILENAME_P (EXPR_WFL_FILENAME_NODE (cl));
-#endif
-
-  PUSH_CPC (decl, raw_name);
-  DECL_CONTEXT (decl) = GET_ENCLOSING_CPC_CONTEXT ();
-
-  /* Link the declaration to the already seen ones */
-  TREE_CHAIN (decl) = ctxp->class_list;
-  ctxp->class_list = decl;
-
-  /* Create a new nodes in the global lists */
-  gclass_list = tree_cons (NULL_TREE, decl, gclass_list);
-  all_class_list = tree_cons (NULL_TREE, decl, all_class_list);
-
-  /* Install a new dependency list element */
-  create_jdep_list (ctxp);
-
-  /* We keep the compilation unit imports in the class so that
-     they can be used later to resolve type dependencies that
-     aren't necessary to solve now. */
-  TYPE_IMPORT_LIST (TREE_TYPE (decl)) = ctxp->import_list;
-  TYPE_IMPORT_DEMAND_LIST (TREE_TYPE (decl)) = ctxp->import_demand_list;
-
-  TYPE_PACKAGE (TREE_TYPE (decl)) = ctxp->package;
-
-  SOURCE_FRONTEND_DEBUG (("Defining class/interface %s",
-			  IDENTIFIER_POINTER (qualified_name)));
-  return decl;
-}
-
-static void
-add_superinterfaces (tree decl, tree interface_list)
-{
-  tree node;
-  /* Superinterface(s): if present and defined, parser_check_super_interface ()
-     takes care of ensuring that:
-       - This is an accessible interface type,
-       - Circularity detection.
-   parser_add_interface is then called. If present but not defined,
-   the check operation is delayed until the super interface gets
-   defined.  */
-  for (node = interface_list; node; node = TREE_CHAIN (node))
-    {
-      tree current = TREE_PURPOSE (node);
-      tree idecl = IDENTIFIER_CLASS_VALUE (EXPR_WFL_NODE (current));
-      if (idecl && CLASS_LOADED_P (TREE_TYPE (idecl)))
-	{
-	  if (!parser_check_super_interface (idecl, decl, current))
-	    parser_add_interface (decl, idecl, current);
-	}
-      else
-	register_incomplete_type (JDEP_INTERFACE,
-				  current, decl, NULL_TREE);
-    }
-}
-
-/* Create an interface in pass1 and return its decl. Return the
-   interface's decl in pass 2.  */
-
-static tree
-create_interface (int flags, tree id, tree super)
-{
-  tree raw_name = EXPR_WFL_NODE (id);
-  tree q_name = parser_qualified_classname (raw_name);
-  tree decl = IDENTIFIER_CLASS_VALUE (q_name);
-
-  /* Certain syntax errors are making SUPER be like ID. Avoid this
-     case. */
-  if (ctxp->class_err && id == super)
-    super = NULL;
-
-  EXPR_WFL_NODE (id) = q_name;	/* Keep source location, even if refined. */
-
-  /* Basic checks: scope, redefinition, modifiers */
-  if (check_class_interface_creation (1, flags, raw_name, q_name, decl, id))
-    {
-      PUSH_ERROR ();
-      return NULL_TREE;
-    }
-
-  /* Suspend the current parsing context if we're parsing an inner
-     interface */
-  if (CPC_INNER_P ())
-    {
-      java_parser_context_suspend ();
-      /* Interface members are public. */
-      if (CLASS_INTERFACE (GET_CPC ()))
-	flags |= ACC_PUBLIC;
-    }
-
-  /* Push a new context for (static) initialized upon declaration fields */
-  java_parser_context_push_initialized_field ();
-
-  /* Interface modifiers check
-       - public/abstract allowed (already done at that point)
-       - abstract is obsolete (comes first, it's a warning, or should be)
-       - Can't use twice the same (checked in the modifier rule) */
-  if ((flags & ACC_ABSTRACT) && flag_redundant)
-    parse_warning_context
-      (MODIFIER_WFL (ABSTRACT_TK),
-       "Redundant use of %<abstract%> modifier. Interface %qs is implicitly abstract", IDENTIFIER_POINTER (raw_name));
-
-  /* Create a new decl if DECL is NULL, otherwise fix it */
-  decl = maybe_create_class_interface_decl (decl, raw_name, q_name, id);
-
-  /* Interfaces are always abstract. */
-  flags |= ACC_ABSTRACT;
-
-  /* Inner interfaces are always static.  */
-  if (INNER_CLASS_DECL_P (decl))
-    flags |= ACC_STATIC;
-
-  /* Set super info and mark the class a complete */
-  set_super_info (ACC_INTERFACE | flags, TREE_TYPE (decl),
-		  object_type_node, ctxp->interface_number);
-  ctxp->interface_number = 0;
-  CLASS_COMPLETE_P (decl) = 1;
-  add_superinterfaces (decl, super);
-
-  /* Eventually sets the @deprecated tag flag */
-  CHECK_DEPRECATED (decl);
-
-  return decl;
-}
-
-/* Patch anonymous class CLASS, by either extending or implementing
-   DEP.  */
-
-static void
-patch_anonymous_class (tree type_decl, tree class_decl, tree wfl)
-{
-  tree class = TREE_TYPE (class_decl);
-  tree type =  TREE_TYPE (type_decl);
-  tree binfo = TYPE_BINFO (class);
-
-  /* If it's an interface, implement it */
-  if (CLASS_INTERFACE (type_decl))
-    {
-      if (parser_check_super_interface (type_decl, class_decl, wfl))
-	return;
-
-      if (!VEC_space (tree, BINFO_BASE_BINFOS (binfo), 1))
-	{
-	   /* Extend the binfo - by reallocating and copying it. */
-	  tree new_binfo;
-	  tree base_binfo;
-	  int i;
-	  
-	  new_binfo = make_tree_binfo ((BINFO_N_BASE_BINFOS (binfo) + 1) * 2);
-	  for (i = 0; BINFO_BASE_ITERATE (binfo, i, base_binfo); i++)
-	    BINFO_BASE_APPEND (new_binfo, base_binfo);
-	  CLASS_HAS_SUPER_FLAG (new_binfo) = CLASS_HAS_SUPER_FLAG (binfo);
-	  BINFO_VTABLE (new_binfo) = BINFO_VTABLE (binfo);
-	  TYPE_BINFO (class) = new_binfo;
-	}
-      
-      /* And add the interface */
-      parser_add_interface (class_decl, type_decl, wfl);
-    }
-  /* Otherwise, it's a type we want to extend */
-  else
-    {
-      if (parser_check_super (type_decl, class_decl, wfl))
-	return;
-      BINFO_TYPE (BINFO_BASE_BINFO (binfo, 0)) = type;
-    }
-}
-
-/* Create an anonymous class which extends/implements TYPE_NAME, and return
-   its decl.  */
-
-static tree
-create_anonymous_class (tree type_name)
-{
-  char buffer [80];
-  tree super = NULL_TREE, itf = NULL_TREE;
-  tree id, type_decl, class;
-
-  /* The unqualified name of the anonymous class. It's just a number. */
-  sprintf (buffer, "%d", anonymous_class_counter++);
-  id = build_wfl_node (get_identifier (buffer));
-  EXPR_WFL_LINECOL (id) = EXPR_WFL_LINECOL (type_name);
-
-  /* We know about the type to extend/implement. We go ahead */
-  if ((type_decl = IDENTIFIER_CLASS_VALUE (EXPR_WFL_NODE (type_name))))
-    {
-      /* Create a class which either implements on extends the designated
-	 class. The class bears an inaccessible name. */
-      if (CLASS_INTERFACE (type_decl))
-	{
-	  /* It's OK to modify it here. It's been already used and
-             shouldn't be reused */
-	  ctxp->interface_number = 1;
-	  /* Interfaces should presented as a list of WFLs */
-	  itf = build_tree_list (type_name, NULL_TREE);
-	}
-      else
-	super = type_name;
-    }
-
-  class = create_class (ACC_FINAL, id, super, itf);
-
-  /* We didn't know anything about the stuff. We register a dependence. */
-  if (!type_decl)
-    register_incomplete_type (JDEP_ANONYMOUS, type_name, class, NULL_TREE);
-
-  ANONYMOUS_CLASS_P (TREE_TYPE (class)) = 1;
-  return class;
-}
-
-/* Create a class in pass1 and return its decl. Return class
-   interface's decl in pass 2.  */
-
-static tree
-create_class (int flags, tree id, tree super, tree interfaces)
-{
-  tree raw_name = EXPR_WFL_NODE (id);
-  tree class_id, decl;
-  tree super_decl_type;
-
-  /* Certain syntax errors are making SUPER be like ID. Avoid this
-     case. */
-  if (ctxp->class_err && id == super)
-    super = NULL;
-
-  class_id = parser_qualified_classname (raw_name);
-  decl = IDENTIFIER_CLASS_VALUE (class_id);
-  EXPR_WFL_NODE (id) = class_id;
-
-  /* Basic check: scope, redefinition, modifiers */
-  if (check_class_interface_creation (0, flags, raw_name, class_id, decl, id))
-    {
-      PUSH_ERROR ();
-      return NULL_TREE;
-    }
-
-  /* Suspend the current parsing context if we're parsing an inner
-     class or an anonymous class. */
-  if (CPC_INNER_P ())
-    {
-      java_parser_context_suspend ();
-      /* Interface members are public. */
-      if (CLASS_INTERFACE (GET_CPC ()))
-	flags |= ACC_PUBLIC;
-    }
-
-  /* Push a new context for (static) initialized upon declaration fields */
-  java_parser_context_push_initialized_field ();
-
-  /* Class modifier check:
-       - Allowed modifier (already done at that point)
-       - abstract AND final forbidden
-       - Public classes defined in the correct file */
-  if ((flags & ACC_ABSTRACT) && (flags & ACC_FINAL))
-    parse_error_context
-      (id, "Class %qs can't be declared both abstract and final",
-       IDENTIFIER_POINTER (raw_name));
-
-  /* Create a new decl if DECL is NULL, otherwise fix it */
-  decl = maybe_create_class_interface_decl (decl, raw_name, class_id, id);
-
-  /* If SUPER exists, use it, otherwise use Object */
-  if (super)
-    {
-      /* java.lang.Object can't extend anything.  */
-      if (TREE_TYPE (IDENTIFIER_CLASS_VALUE (class_id)) == object_type_node)
-	{
-	  parse_error_context (id, "%<java.lang.Object%> can't extend anything");
-	  return NULL_TREE;
-	}
-
-      super_decl_type =
-	register_incomplete_type (JDEP_SUPER, super, decl, NULL_TREE);
-    }
-  else if (TREE_TYPE (decl) != object_type_node)
-    super_decl_type = object_type_node;
-  /* We're defining java.lang.Object */
-  else
-    super_decl_type = NULL_TREE;
-
-  /* A class nested in an interface is implicitly static. */
-  if (INNER_CLASS_DECL_P (decl)
-      && CLASS_INTERFACE (TYPE_NAME (TREE_TYPE (DECL_CONTEXT (decl)))))
-    {
-      flags |= ACC_STATIC;
-    }
-
-  /* Set super info and mark the class as complete. */
-  set_super_info (flags, TREE_TYPE (decl), super_decl_type,
-		  ctxp->interface_number);
-  ctxp->interface_number = 0;
-  CLASS_COMPLETE_P (decl) = 1;
-  add_superinterfaces (decl, interfaces);
-
-  /* TYPE_VFIELD' is a compiler-generated field used to point to
-     virtual function tables.  In gcj, every class has a common base
-     virtual function table in java.lang.object.  */
-  TYPE_VFIELD (TREE_TYPE (decl)) = TYPE_VFIELD (object_type_node);
-
-  /* Add the private this$<n> field, Replicate final locals still in
-     scope as private final fields mangled like val$<local_name>.
-     This does not occur for top level (static) inner classes. */
-  if (PURE_INNER_CLASS_DECL_P (decl))
-    add_inner_class_fields (decl, current_function_decl);
-
-  /* Eventually sets the @deprecated tag flag */
-  CHECK_DEPRECATED (decl);
-
-  /* Reset the anonymous class counter when declaring non inner classes */
-  if (!INNER_CLASS_DECL_P (decl))
-    anonymous_class_counter = 1;
-
-  return decl;
-}
-
-/* End a class declaration: register the statements used to create
-   finit$ and <clinit>, pop the current class and resume the prior
-   parser context if necessary.  */
-
-static void
-end_class_declaration (int resume)
-{
-  /* If an error occurred, context weren't pushed and won't need to be
-     popped by a resume. */
-  int no_error_occurred = ctxp->next && GET_CPC () != error_mark_node;
-
-  if (GET_CPC () != error_mark_node)
-    dump_java_tree (TDI_class, GET_CPC ());
-
-  java_parser_context_pop_initialized_field ();
-  POP_CPC ();
-  if (resume && no_error_occurred)
-    java_parser_context_resume ();
-
-  /* We're ending a class declaration, this is a good time to reset
-     the interface cout. Note that might have been already done in
-     create_interface, but if at that time an inner class was being
-     dealt with, the interface count was reset in a context created
-     for the sake of handling inner classes declaration. */
-  ctxp->interface_number = 0;
-}
-
-static void
-add_inner_class_fields (tree class_decl, tree fct_decl)
-{
-  tree block, marker, f;
-
-  f = add_field (TREE_TYPE (class_decl),
-		 build_current_thisn (TREE_TYPE (class_decl)),
-		 build_pointer_type (TREE_TYPE (DECL_CONTEXT (class_decl))),
-		 ACC_PRIVATE);
-  FIELD_THISN (f) = 1;
-
-  if (!fct_decl)
-    return;
-
-  for (block = GET_CURRENT_BLOCK (fct_decl);
-       block && TREE_CODE (block) == BLOCK; block = BLOCK_SUPERCONTEXT (block))
-    {
-      tree decl;
-      for (decl = BLOCK_EXPR_DECLS (block); decl; decl = TREE_CHAIN (decl))
-	{
-	  tree name, pname;
-	  tree wfl, init, list;
-
-	  /* Avoid non final arguments. */
-	  if (!LOCAL_FINAL_P (decl))
-	    continue;
-
-	  MANGLE_OUTER_LOCAL_VARIABLE_NAME (name, DECL_NAME (decl));
-	  MANGLE_ALIAS_INITIALIZER_PARAMETER_NAME_ID (pname, DECL_NAME (decl));
-	  wfl = build_wfl_node (name);
-	  init = build_wfl_node (pname);
-	  /* Build an initialization for the field: it will be
-	     initialized by a parameter added to finit$, bearing a
-	     mangled name of the field itself (param$<n>.) The
-	     parameter is provided to finit$ by the constructor
-	     invoking it (hence the constructor will also feature a
-	     hidden parameter, set to the value of the outer context
-	     local at the time the inner class is created.)
-
-	     Note: we take into account all possible locals that can
-	     be accessed by the inner class. It's actually not trivial
-	     to minimize these aliases down to the ones really
-	     used. One way to do that would be to expand all regular
-	     methods first, then finit$ to get a picture of what's
-	     used.  It works with the exception that we would have to
-	     go back on all constructor invoked in regular methods to
-	     have their invocation reworked (to include the right amount
-	     of alias initializer parameters.)
-
-	     The only real way around, I think, is a first pass to
-	     identify locals really used in the inner class. We leave
-	     the flag FIELD_LOCAL_ALIAS_USED around for that future
-	     use.
-
-	     On the other hand, it only affect local inner classes,
-	     whose constructors (and finit$ call) will be featuring
-	     unnecessary arguments. It's easy for a developer to keep
-	     this number of parameter down by using the `final'
-	     keyword only when necessary. For the time being, we can
-	     issue a warning on unnecessary finals. FIXME */
-	  init = build_assignment (ASSIGN_TK, EXPR_WFL_LINECOL (wfl),
-				   wfl, init);
-
-	  /* Register the field. The TREE_LIST holding the part
-	     initialized/initializer will be marked ARG_FINAL_P so
-	     that the created field can be marked
-	     FIELD_LOCAL_ALIAS. */
-	  list = build_tree_list (wfl, init);
-	  ARG_FINAL_P (list) = 1;
-	  register_fields (ACC_PRIVATE | ACC_FINAL, TREE_TYPE (decl), list);
-	}
-    }
-
-  if (!CPC_INITIALIZER_STMT (ctxp))
-    return;
-
-  /* If we ever registered an alias field, insert and marker to
-     remember where the list ends. The second part of the list (the one
-     featuring initialized fields) so it can be later reversed to
-     enforce 8.5. The marker will be removed during that operation. */
-  marker = build_tree_list (NULL_TREE, NULL_TREE);
-  TREE_CHAIN (marker) = CPC_INITIALIZER_STMT (ctxp);
-  SET_CPC_INITIALIZER_STMT (ctxp, marker);
-}
-
-/* Can't use lookup_field () since we don't want to load the class and
-   can't set the CLASS_LOADED_P flag */
-
-static tree
-find_field (tree class, tree name)
-{
-  tree decl;
-  for (decl = TYPE_FIELDS (class); decl; decl = TREE_CHAIN (decl))
-    {
-      if (DECL_NAME (decl) == name)
-	return decl;
-    }
-  return NULL_TREE;
-}
-
-/* Wrap around lookup_field that doesn't potentially upset the value
-   of CLASS */
-
-static tree
-lookup_field_wrapper (tree class, tree name)
-{
-  tree type = class;
-  tree decl = NULL_TREE;
-  java_parser_context_save_global ();
-
-  /* Last chance: if we're within the context of an inner class, we
-     might be trying to access a local variable defined in an outer
-     context. We try to look for it now. */
-  if (INNER_CLASS_TYPE_P (class) && TREE_CODE (name) == IDENTIFIER_NODE)
-    {
-      tree new_name;
-      MANGLE_OUTER_LOCAL_VARIABLE_NAME (new_name, name);
-      decl = lookup_field (&type, new_name);
-      if (decl && decl != error_mark_node)
-	FIELD_LOCAL_ALIAS_USED (decl) = 1;
-    }
-  if (!decl || decl == error_mark_node)
-    {
-      type = class;
-      decl = lookup_field (&type, name);
-    }
-
-  /* If the field still hasn't been found, try the next enclosing context. */
-  if (!decl && INNER_CLASS_TYPE_P (class))
-    {
-      tree outer_type = TREE_TYPE (DECL_CONTEXT (TYPE_NAME (class)));
-      decl = lookup_field_wrapper (outer_type, name);
-    }
-
-  java_parser_context_restore_global ();
-  return decl == error_mark_node ? NULL : decl;
-}
-
-/* Find duplicate field within the same class declarations and report
-   the error. Returns 1 if a duplicated field was found, 0
-   otherwise.  */
-
-static int
-duplicate_declaration_error_p (tree new_field_name, tree new_type, tree cl)
-{
-  /* This might be modified to work with method decl as well */
-  tree decl = find_field (TREE_TYPE (GET_CPC ()), new_field_name);
-  if (decl)
-    {
-      char *t1 = xstrdup (purify_type_name
-			 ((TREE_CODE (new_type) == POINTER_TYPE
-			   && TREE_TYPE (new_type) == NULL_TREE) ?
-			  IDENTIFIER_POINTER (TYPE_NAME (new_type)) :
-			  lang_printable_name (new_type, 1)));
-      /* The type may not have been completed by the time we report
-	 the error */
-      char *t2 = xstrdup (purify_type_name
-			 ((TREE_CODE (TREE_TYPE (decl)) == POINTER_TYPE
-			   && TREE_TYPE (TREE_TYPE (decl)) == NULL_TREE) ?
-			  IDENTIFIER_POINTER (TYPE_NAME (TREE_TYPE (decl))) :
-			  lang_printable_name (TREE_TYPE (decl), 1)));
-      parse_error_context
-	(cl, "Duplicate variable declaration: %<%s %s%> was %<%s %s%> (%s:%d)",
-	 t1, IDENTIFIER_POINTER (new_field_name),
-	 t2, IDENTIFIER_POINTER (DECL_NAME (decl)),
-	 DECL_SOURCE_FILE (decl), DECL_SOURCE_LINE (decl));
-      free (t1);
-      free (t2);
-      return 1;
-    }
-  return 0;
-}
-
-/* Field registration routine. If TYPE doesn't exist, field
-   declarations are linked to the undefined TYPE dependency list, to
-   be later resolved in java_complete_class () */
-
-static void
-register_fields (int flags, tree type, tree variable_list)
-{
-  tree current, saved_type;
-  tree class_type = NULL_TREE;
-  location_t saved_location = input_location;
-  int must_chain = 0;
-  tree wfl = NULL_TREE;
-
-  if (GET_CPC ())
-    class_type = TREE_TYPE (GET_CPC ());
-
-  if (!class_type || class_type == error_mark_node)
-    return;
-
-  /* If we're adding fields to interfaces, those fields are public,
-     static, final */
-  if (CLASS_INTERFACE (TYPE_NAME (class_type)))
-    {
-      OBSOLETE_MODIFIER_WARNING (MODIFIER_WFL (PUBLIC_TK),
-				 flags, ACC_PUBLIC, "interface field(s)");
-      OBSOLETE_MODIFIER_WARNING (MODIFIER_WFL (STATIC_TK),
-				 flags, ACC_STATIC, "interface field(s)");
-      OBSOLETE_MODIFIER_WARNING (MODIFIER_WFL (FINAL_TK),
-				 flags, ACC_FINAL, "interface field(s)");
-      check_modifiers ("Illegal interface member modifier %qs", flags,
-		       INTERFACE_FIELD_MODIFIERS);
-      flags |= (ACC_PUBLIC | ACC_STATIC | ACC_FINAL);
-    }
-
-  /* Obtain a suitable type for resolution, if necessary */
-  SET_TYPE_FOR_RESOLUTION (type, wfl, must_chain);
-
-  /* If TYPE is fully resolved and we don't have a reference, make one */
-  PROMOTE_RECORD_IF_COMPLETE (type, must_chain);
-
-  for (current = variable_list, saved_type = type; current;
-       current = TREE_CHAIN (current), type = saved_type)
-    {
-      tree real_type;
-      tree field_decl;
-      tree cl = TREE_PURPOSE (current);
-      tree init = TREE_VALUE (current);
-      tree current_name = EXPR_WFL_NODE (cl);
-
-      /* Can't declare non-final static fields in inner classes */
-      if ((flags & ACC_STATIC) && !TOPLEVEL_CLASS_TYPE_P (class_type)
-          && !(flags & ACC_FINAL))
-	parse_error_context
-          (cl, "Field %qs can't be static in inner class %qs unless it is final",
-	   IDENTIFIER_POINTER (EXPR_WFL_NODE (cl)),
-	   lang_printable_name (class_type, 0));
-
-      /* Process NAME, as it may specify extra dimension(s) for it */
-      type = build_array_from_name (type, wfl, current_name, &current_name);
-
-      /* Type adjustment. We may have just readjusted TYPE because
-	 the variable specified more dimensions. Make sure we have
-	 a reference if we can and don't have one already. Also
-	 change the name if we have an init. */
-      if (type != saved_type)
-	{
-	  PROMOTE_RECORD_IF_COMPLETE (type, must_chain);
-	  if (init)
-	    EXPR_WFL_NODE (TREE_OPERAND (init, 0)) = current_name;
-	}
-
-      real_type = GET_REAL_TYPE (type);
-      /* Check for redeclarations */
-      if (duplicate_declaration_error_p (current_name, real_type, cl))
-	continue;
-
-      /* Set input_line to the line the field was found and create a
-         declaration for it. Eventually sets the @deprecated tag flag. */
-#ifdef USE_MAPPED_LOCATION
-      input_location = EXPR_LOCATION (cl);
-#else
-      input_line = EXPR_WFL_LINENO (cl);
-#endif
-      field_decl = add_field (class_type, current_name, real_type, flags);
-      CHECK_DEPRECATED_NO_RESET (field_decl);
-
-      /* If the field denotes a final instance variable, then we
-	 allocate a LANG_DECL_SPECIFIC part to keep track of its
-	 initialization. We also mark whether the field was
-	 initialized upon its declaration. We don't do that if the
-	 created field is an alias to a final local. */
-      if (!ARG_FINAL_P (current) && (flags & ACC_FINAL))
-	{
-	  MAYBE_CREATE_VAR_LANG_DECL_SPECIFIC (field_decl);
-	  DECL_FIELD_FINAL_WFL (field_decl) = cl;
-	}
-
-      /* If the couple initializer/initialized is marked ARG_FINAL_P,
-	 we mark the created field FIELD_LOCAL_ALIAS, so that we can
-	 hide parameters to this inner class finit$ and
-	 constructors. It also means that the field isn't final per
-	 say. */
-      if (ARG_FINAL_P (current))
-	{
-	  FIELD_LOCAL_ALIAS (field_decl) = 1;
-	  FIELD_FINAL (field_decl) = 0;
-	}
-
-      /* Check if we must chain. */
-      if (must_chain)
-	register_incomplete_type (JDEP_FIELD, wfl, field_decl, type);
-
-      /* If we have an initialization value tied to the field */
-      if (init)
-	{
-	  /* The field is declared static */
-	  if (flags & ACC_STATIC)
-	    {
-	      /* We include the field and its initialization part into
-		 a list used to generate <clinit>. After <clinit> is
-		 walked, field initializations will be processed and
-		 fields initialized with known constants will be taken
-		 out of <clinit> and have their DECL_INITIAL set
-		 appropriately. */
-	      TREE_CHAIN (init) = CPC_STATIC_INITIALIZER_STMT (ctxp);
-	      SET_CPC_STATIC_INITIALIZER_STMT (ctxp, init);
-	      if (TREE_OPERAND (init, 1)
-		  && TREE_CODE (TREE_OPERAND (init, 1)) == NEW_ARRAY_INIT)
-		TREE_STATIC (TREE_OPERAND (init, 1)) = 1;
-	    }
-	  /* A non-static field declared with an immediate initialization is
-	     to be initialized in <init>, if any.  This field is remembered
-	     to be processed at the time of the generation of <init>. */
-	  else
-	    {
-	      TREE_CHAIN (init) = CPC_INITIALIZER_STMT (ctxp);
-	      SET_CPC_INITIALIZER_STMT (ctxp, init);
-	    }
-	  MODIFY_EXPR_FROM_INITIALIZATION_P (init) = 1;
-	  DECL_INITIAL (field_decl) = TREE_OPERAND (init, 1);
-	}
-    }
-
-  CLEAR_DEPRECATED;
-  input_location = saved_location;
-}
-
-/* Generate finit$, using the list of initialized fields to populate
-   its body. finit$'s parameter(s) list is adjusted to include the
-   one(s) used to initialized the field(s) caching outer context
-   local(s).  */
-
-static tree
-generate_finit (tree class_type)
-{
-  int count = 0;
-  tree list = TYPE_FINIT_STMT_LIST (class_type);
-  tree mdecl, current, parms;
-
-  parms = build_alias_initializer_parameter_list (AIPL_FUNCTION_CREATION,
-						  class_type, NULL_TREE,
-						  &count);
-  CRAFTED_PARAM_LIST_FIXUP (parms);
-  mdecl = create_artificial_method (class_type, ACC_PRIVATE, void_type_node,
-				    finit_identifier_node, parms);
-  fix_method_argument_names (parms, mdecl);
-  layout_class_method (class_type, CLASSTYPE_SUPER (class_type),
-		       mdecl, NULL_TREE);
-  DECL_FUNCTION_NAP (mdecl) = count;
-  start_artificial_method_body (mdecl);
-
-  for (current = list; current; current = TREE_CHAIN (current))
-    java_method_add_stmt (mdecl,
-			  build_debugable_stmt (EXPR_WFL_LINECOL (current),
-						current));
-  end_artificial_method_body (mdecl);
-  return mdecl;
-}
-
-/* Generate a function to run the instance initialization code. The
-   private method is called `instinit$'. Unless we're dealing with an
-   anonymous class, we determine whether all ctors of CLASS_TYPE
-   declare a checked exception in their `throws' clause in order to
-   see whether it's necessary to encapsulate the instance initializer
-   statements in a try/catch/rethrow sequence.  */
-
-static tree
-generate_instinit (tree class_type)
-{
-  tree current;
-  tree compound = NULL_TREE;
-  tree parms = tree_cons (this_identifier_node,
-			  build_pointer_type (class_type), end_params_node);
-  tree mdecl = create_artificial_method (class_type, ACC_PRIVATE,
-					 void_type_node,
-					 instinit_identifier_node, parms);
-
-  layout_class_method (class_type, CLASSTYPE_SUPER (class_type),
-		       mdecl, NULL_TREE);
-
-  /* Gather all the statements in a compound */
-  for (current = TYPE_II_STMT_LIST (class_type);
-       current; current = TREE_CHAIN (current))
-    compound = add_stmt_to_compound (compound, NULL_TREE, current);
-
-  /* We need to encapsulate COMPOUND by a try/catch statement to
-     rethrow exceptions that might occur in the instance initializer.
-     We do that only if all ctors of CLASS_TYPE are set to catch a
-     checked exception. This doesn't apply to anonymous classes (since
-     they don't have declared ctors.) */
-  if (!ANONYMOUS_CLASS_P (class_type) &&
-      ctors_unchecked_throws_clause_p (class_type))
-    {
-      compound = encapsulate_with_try_catch (0, exception_type_node, compound,
-					     build1 (THROW_EXPR, NULL_TREE,
-						     build_wfl_node (wpv_id)));
-      DECL_FUNCTION_THROWS (mdecl) = build_tree_list (NULL_TREE,
-						      exception_type_node);
-    }
-
-  start_artificial_method_body (mdecl);
-  java_method_add_stmt (mdecl, compound);
-  end_artificial_method_body (mdecl);
-
-  return mdecl;
-}
-
-/* FIXME */
-static tree
-build_instinit_invocation (tree class_type)
-{
-  tree to_return = NULL_TREE;
-
-  if (TYPE_II_STMT_LIST (class_type))
-    {
-      tree parm = build_tree_list (NULL_TREE,
-				   build_wfl_node (this_identifier_node));
-      to_return =
-	build_method_invocation (build_wfl_node (instinit_identifier_node),
-				 parm);
-    }
-  return to_return;
-}
-
-/* Shared across method_declarator and method_header to remember the
-   patch stage that was reached during the declaration of the method.
-   A method DECL is built differently is there is no patch
-   (JDEP_NO_PATCH) or a patch (JDEP_METHOD or JDEP_METHOD_RETURN)
-   pending on the currently defined method.  */
-
-static int patch_stage;
-
-/* Check the method declaration and add the method to its current
-   class.  If the argument list is known to contain incomplete types,
-   the method is partially added and the registration will be resume
-   once the method arguments resolved. If TYPE is NULL, we're dealing
-   with a constructor.  */
-
-static tree
-method_header (int flags, tree type, tree mdecl, tree throws)
-{
-  tree type_wfl = NULL_TREE;
-  tree meth_name = NULL_TREE;
-  tree current, orig_arg, this_class = NULL;
-  tree id, meth;
-  location_t saved_location;
-  int constructor_ok = 0, must_chain;
-  int count;
-
-  if (mdecl == error_mark_node)
-    return error_mark_node;
-  meth = TREE_VALUE (mdecl);
-  id = TREE_PURPOSE (mdecl);
-
-  check_modifiers_consistency (flags);
-
-  if (GET_CPC ())
-    this_class = TREE_TYPE (GET_CPC ());
-
-  if (!this_class || this_class == error_mark_node)
-    return NULL_TREE;
-
-  /* There are some forbidden modifiers for an abstract method and its
-     class must be abstract as well.  */
-  if (type && (flags & ACC_ABSTRACT))
-    {
-      ABSTRACT_CHECK (flags, ACC_PRIVATE, id, "Private");
-      ABSTRACT_CHECK (flags, ACC_STATIC, id, "Static");
-      ABSTRACT_CHECK (flags, ACC_FINAL, id, "Final");
-      ABSTRACT_CHECK (flags, ACC_NATIVE, id, "Native");
-      ABSTRACT_CHECK (flags, ACC_SYNCHRONIZED, id, "Synchronized");
-      ABSTRACT_CHECK (flags, ACC_STRICT, id, "Strictfp");
-      if (!CLASS_ABSTRACT (TYPE_NAME (this_class))
-	  && !CLASS_INTERFACE (TYPE_NAME (this_class)))
-	parse_error_context
-	  (id,
-           "Class %qs must be declared abstract to define abstract method %qs",
-	   IDENTIFIER_POINTER (DECL_NAME (GET_CPC ())),
-	   IDENTIFIER_POINTER (EXPR_WFL_NODE (id)));
-    }
-
-  /* A native method can't be strictfp.  */
-  if ((flags & ACC_NATIVE) && (flags & ACC_STRICT))
-    parse_error_context (id, "native method %qs can't be strictfp",
-			 IDENTIFIER_POINTER (EXPR_WFL_NODE (id)));
-  /* No such thing as a transient or volatile method.  */
-  if ((flags & ACC_TRANSIENT))
-    parse_error_context (id, "method %qs can't be transient",
-			 IDENTIFIER_POINTER (EXPR_WFL_NODE (id)));
-  if ((flags & ACC_VOLATILE))
-    parse_error_context (id, "method %qs can't be volatile",
-			 IDENTIFIER_POINTER (EXPR_WFL_NODE (id)));
-
-  /* Things to be checked when declaring a constructor */
-  if (!type)
-    {
-      int ec = java_error_count;
-      /* 8.6: Constructor declarations: we might be trying to define a
-         method without specifying a return type. */
-      if (EXPR_WFL_NODE (id) != GET_CPC_UN ())
-	parse_error_context
-	  (id, "Invalid method declaration, return type required");
-      /* 8.6.3: Constructor modifiers */
-      else
-	{
-	  JCONSTRUCTOR_CHECK (flags, ACC_ABSTRACT, id, "abstract");
-	  JCONSTRUCTOR_CHECK (flags, ACC_STATIC, id, "static");
-	  JCONSTRUCTOR_CHECK (flags, ACC_FINAL, id, "final");
-	  JCONSTRUCTOR_CHECK (flags, ACC_NATIVE, id, "native");
-	  JCONSTRUCTOR_CHECK (flags, ACC_SYNCHRONIZED, id, "synchronized");
-	  JCONSTRUCTOR_CHECK (flags, ACC_STRICT, id, "strictfp");
-	}
-      /* If we found error here, we don't consider it's OK to tread
-	 the method definition as a constructor, for the rest of this
-	 function */
-      if (ec == java_error_count)
-	constructor_ok = 1;
-    }
-
-  /* Method declared within the scope of an interface are implicitly
-     abstract and public. Conflicts with other erroneously provided
-     modifiers are checked right after. */
-
-  if (CLASS_INTERFACE (TYPE_NAME (this_class)))
-    {
-      /* If FLAGS isn't set because of a modifier, turn the
-	 corresponding modifier WFL to NULL so we issue a warning on
-	 the obsolete use of the modifier */
-      if (!(flags & ACC_PUBLIC))
-        MODIFIER_WFL (PUBLIC_TK) = NULL;
-      if (!(flags & ACC_ABSTRACT))
-        MODIFIER_WFL (ABSTRACT_TK) = NULL;
-      flags |= ACC_PUBLIC;
-      flags |= ACC_ABSTRACT;
-    }
-
-  /* Inner class can't declare static methods */
-  if ((flags & ACC_STATIC) && !TOPLEVEL_CLASS_TYPE_P (this_class))
-    {
-      parse_error_context
-	(id, "Method %qs can't be static in inner class %qs. Only members of interfaces and top-level classes can be static",
-	 IDENTIFIER_POINTER (EXPR_WFL_NODE (id)),
-	 lang_printable_name (this_class, 0));
-    }
-
-  /* Modifiers context reset moved up, so abstract method declaration
-     modifiers can be later checked.  */
-
-  /* Set constructor returned type to void and method name to <init>,
-     unless we found an error identifier the constructor (in which
-     case we retain the original name) */
-  if (!type)
-    {
-      type = void_type_node;
-      if (constructor_ok)
-	meth_name = init_identifier_node;
-    }
-  else
-    meth_name = EXPR_WFL_NODE (id);
-
-  /* Do the returned type resolution and registration if necessary */
-  SET_TYPE_FOR_RESOLUTION (type, type_wfl, must_chain);
-
-  if (meth_name)
-    type = build_array_from_name (type, type_wfl, meth_name, &meth_name);
-  EXPR_WFL_NODE (id) = meth_name;
-  PROMOTE_RECORD_IF_COMPLETE (type, must_chain);
-
-  if (must_chain)
-    {
-      patch_stage = JDEP_METHOD_RETURN;
-      register_incomplete_type (patch_stage, type_wfl, id, type);
-      TREE_TYPE (meth) = GET_REAL_TYPE (type);
-    }
-  else
-    TREE_TYPE (meth) = type;
-
-  saved_location = input_location;
-  /* When defining an abstract or interface method, the curly
-     bracket at level 1 doesn't exist because there is no function
-     body */
-#ifdef USE_MAPPED_LOCATION
-  input_location = (ctxp->first_ccb_indent1 ? ctxp->first_ccb_indent1 :
-		    EXPR_LOCATION (id));
-#else
-  input_line = (ctxp->first_ccb_indent1 ? (int) ctxp->first_ccb_indent1 :
-		EXPR_WFL_LINENO (id));
-#endif
-
-  /* Remember the original argument list */
-  orig_arg = TYPE_ARG_TYPES (meth);
-
-  if (patch_stage)		/* includes ret type and/or all args */
-    {
-      jdep *jdep;
-      meth = add_method_1 (this_class, flags, meth_name, meth);
-      /* Patch for the return type */
-      if (patch_stage == JDEP_METHOD_RETURN)
-	{
-	  jdep = CLASSD_LAST (ctxp->classd_list);
-	  JDEP_GET_PATCH (jdep) = &TREE_TYPE (TREE_TYPE (meth));
-	}
-      /* This is the stop JDEP. METH allows the function's signature
-	 to be computed. */
-      register_incomplete_type (JDEP_METHOD_END, NULL_TREE, meth, NULL_TREE);
-    }
-  else
-    meth = add_method (this_class, flags, meth_name,
-		       build_java_signature (meth));
-
-  /* Remember final parameters */
-  MARK_FINAL_PARMS (meth, orig_arg);
-
-  /* Fix the method argument list so we have the argument name
-     information */
-  fix_method_argument_names (orig_arg, meth);
-
-  /* Register the parameter number and re-install the current line
-     number */
-  DECL_MAX_LOCALS (meth) = ctxp->formal_parameter_number+1;
-  input_location = saved_location;
-
-  /* Register exception specified by the `throws' keyword for
-     resolution and set the method decl appropriate field to the list.
-     Note: the grammar ensures that what we get here are class
-     types. */
-  if (throws)
-    {
-      throws = nreverse (throws);
-      for (current = throws; current; current = TREE_CHAIN (current))
-	{
-	  register_incomplete_type (JDEP_EXCEPTION, TREE_VALUE (current),
-				    NULL_TREE, NULL_TREE);
-	  JDEP_GET_PATCH (CLASSD_LAST (ctxp->classd_list)) =
-	    &TREE_VALUE (current);
-	}
-      DECL_FUNCTION_THROWS (meth) = throws;
-    }
-
-  if (TREE_TYPE (GET_CPC ()) != object_type_node)
-    DECL_FUNCTION_WFL (meth) = id;
-
-  /* Set the flag if we correctly processed a constructor */
-  if (constructor_ok)
-    {
-      DECL_CONSTRUCTOR_P (meth) = 1;
-      /* Compute and store the number of artificial parameters declared
-	 for this constructor */
-      for (count = 0, current = TYPE_FIELDS (this_class); current;
-	   current = TREE_CHAIN (current))
-	if (FIELD_LOCAL_ALIAS (current))
-	  count++;
-      DECL_FUNCTION_NAP (meth) = count;
-    }
-
-  /* Eventually set the @deprecated tag flag */
-  CHECK_DEPRECATED (meth);
-
-  return meth;
-}
-
-static void
-fix_method_argument_names (tree orig_arg, tree meth)
-{
-  tree arg = TYPE_ARG_TYPES (TREE_TYPE (meth));
-  if (TREE_CODE (TREE_TYPE (meth)) == METHOD_TYPE)
-    {
-      TREE_PURPOSE (arg) = this_identifier_node;
-      arg = TREE_CHAIN (arg);
-    }
-  while (orig_arg != end_params_node)
-    {
-      TREE_PURPOSE (arg) = TREE_PURPOSE (orig_arg);
-      orig_arg = TREE_CHAIN (orig_arg);
-      arg = TREE_CHAIN (arg);
-    }
-}
-
-/* Complete the method declaration with METHOD_BODY.  */
-
-static void
-finish_method_declaration (tree method_body)
-{
-  int flags;
-
-  if (!current_function_decl)
-    return;
-
-  flags = get_access_flags_from_decl (current_function_decl);
-
-  /* 8.4.5 Method Body */
-  if ((flags & ACC_ABSTRACT || flags & ACC_NATIVE) && method_body)
-    {
-      tree name = DECL_NAME (current_function_decl);
-      parse_error_context (DECL_FUNCTION_WFL (current_function_decl),
-			   "%s method %qs can't have a body defined",
-			   (METHOD_NATIVE (current_function_decl) ?
-			    "Native" : "Abstract"),
-			   IDENTIFIER_POINTER (name));
-      method_body = NULL_TREE;
-    }
-  else if (!(flags & ACC_ABSTRACT) && !(flags & ACC_NATIVE) && !method_body)
-    {
-      tree name = DECL_NAME (current_function_decl);
-      parse_error_context
-	(DECL_FUNCTION_WFL (current_function_decl),
-	 "Non native and non abstract method %qs must have a body defined",
-	 IDENTIFIER_POINTER (name));
-      method_body = NULL_TREE;
-    }
-
-  if (flag_emit_class_files && method_body
-      && TREE_CODE (method_body) == NOP_EXPR
-      && TREE_TYPE (current_function_decl)
-      && TREE_TYPE (TREE_TYPE (current_function_decl)) == void_type_node)
-    method_body = build1 (RETURN_EXPR, void_type_node, NULL);
-
-  BLOCK_EXPR_BODY (DECL_FUNCTION_BODY (current_function_decl)) = method_body;
-  maybe_absorb_scoping_blocks ();
-  /* Exit function's body */
-  exit_block ();
-  /* Merge last line of the function with first line, directly in the
-     function decl. It will be used to emit correct debug info. */
-  DECL_FUNCTION_LAST_LINE (current_function_decl) = ctxp->last_ccb_indent1;
-
-  /* Since function's argument's list are shared, reset the
-     ARG_FINAL_P parameter that might have been set on some of this
-     function parameters. */
-  UNMARK_FINAL_PARMS (current_function_decl);
-
-  /* So we don't have an irrelevant function declaration context for
-     the next static block we'll see. */
-  current_function_decl = NULL_TREE;
-}
-
-/* Build a an error message for constructor circularity errors.  */
-
-static char *
-constructor_circularity_msg (tree from, tree to)
-{
-  static char string [4096];
-  char *t = xstrdup (lang_printable_name (from, 2));
-  sprintf (string, "'%s' invokes '%s'", t, lang_printable_name (to, 2));
-  free (t);
-  return string;
-}
-
-/* Verify a circular call to METH. Return 1 if an error is found, 0
-   otherwise.  */
-
-static GTY(()) tree vcc_list;
-static int
-verify_constructor_circularity (tree meth, tree current)
-{
-  tree c;
-
-  for (c = DECL_CONSTRUCTOR_CALLS (current); c; c = TREE_CHAIN (c))
-    {
-      if (TREE_VALUE (c) == meth)
-	{
-	  char *t;
-	  if (vcc_list)
-	    {
-	      tree liste;
-	      vcc_list = nreverse (vcc_list);
-	      for (liste = vcc_list; liste; liste = TREE_CHAIN (liste))
-		{
-		  parse_error_context
-		    (TREE_PURPOSE (TREE_PURPOSE (liste)), "%s",
-		     constructor_circularity_msg
-		      (TREE_VALUE (liste), TREE_VALUE (TREE_PURPOSE (liste))));
-		  java_error_count--;
-		}
-	    }
-	  t = xstrdup (lang_printable_name (meth, 2));
-	  parse_error_context (TREE_PURPOSE (c),
-			       "%s: recursive invocation of constructor %qs",
-			       constructor_circularity_msg (current, meth), t);
-	  free (t);
-	  vcc_list = NULL_TREE;
-	  return 1;
-	}
-    }
-  for (c = DECL_CONSTRUCTOR_CALLS (current); c; c = TREE_CHAIN (c))
-    {
-      vcc_list = tree_cons (c, current, vcc_list);
-      if (verify_constructor_circularity (meth, TREE_VALUE (c)))
-	return 1;
-      vcc_list = TREE_CHAIN (vcc_list);
-    }
-  return 0;
-}
-
-/* Check modifiers that can be declared but exclusively */
-
-static void
-check_modifiers_consistency (int flags)
-{
-  int acc_count = 0;
-  tree cl = NULL_TREE;
-
-  THIS_MODIFIER_ONLY (flags, ACC_PUBLIC, PUBLIC_TK, acc_count, cl);
-  THIS_MODIFIER_ONLY (flags, ACC_PRIVATE, PRIVATE_TK, acc_count, cl);
-  THIS_MODIFIER_ONLY (flags, ACC_PROTECTED, PROTECTED_TK, acc_count, cl);
-  if (acc_count > 1)
-    parse_error_context
-      (cl, "Inconsistent member declaration.  At most one of %<public%>, %<private%>, or %<protected%> may be specified");
-
-  acc_count = 0;
-  cl = NULL_TREE;
-  THIS_MODIFIER_ONLY (flags, ACC_FINAL, FINAL_TK, acc_count, cl);
-  THIS_MODIFIER_ONLY (flags, ACC_VOLATILE, VOLATILE_TK, acc_count, cl);
-  if (acc_count > 1)
-    parse_error_context (cl,
-			 "Inconsistent member declaration.  At most one of %<final%> or %<volatile%> may be specified");
-}
-
-/* Check the methode header METH for abstract specifics features */
-
-static void
-check_abstract_method_header (tree meth)
-{
-  int flags = get_access_flags_from_decl (meth);
-
-  OBSOLETE_MODIFIER_WARNING2 (MODIFIER_WFL (ABSTRACT_TK), flags,
-			      ACC_ABSTRACT, "abstract method",
-			      IDENTIFIER_POINTER (DECL_NAME (meth)));
-  OBSOLETE_MODIFIER_WARNING2 (MODIFIER_WFL (PUBLIC_TK), flags,
-			      ACC_PUBLIC, "abstract method",
-			      IDENTIFIER_POINTER (DECL_NAME (meth)));
-
-  check_modifiers ("Illegal modifier %qs for interface method",
-		  flags, INTERFACE_METHOD_MODIFIERS);
-}
-
-/* Create a FUNCTION_TYPE node and start augmenting it with the
-   declared function arguments. Arguments type that can't be resolved
-   are left as they are, but the returned node is marked as containing
-   incomplete types.  */
-
-static tree
-method_declarator (tree id, tree list)
-{
-  tree arg_types = NULL_TREE, current, node;
-  tree meth = make_node (FUNCTION_TYPE);
-  jdep *jdep;
-
-  patch_stage = JDEP_NO_PATCH;
-
-  if (GET_CPC () == error_mark_node)
-    return error_mark_node;
-
-  /* If we're dealing with an inner class constructor, we hide the
-     this$<n> decl in the name field of its parameter declaration.  We
-     also might have to hide the outer context local alias
-     initializers. Not done when the class is a toplevel class. */
-  if (PURE_INNER_CLASS_DECL_P (GET_CPC ())
-      && EXPR_WFL_NODE (id) == GET_CPC_UN ())
-    {
-      tree aliases_list, type, thisn;
-      /* First the aliases, linked to the regular parameters */
-      aliases_list =
-	build_alias_initializer_parameter_list (AIPL_FUNCTION_DECLARATION,
-						TREE_TYPE (GET_CPC ()),
-						NULL_TREE, NULL);
-      list = chainon (nreverse (aliases_list), list);
-
-      /* Then this$<n> */
-      type = TREE_TYPE (DECL_CONTEXT (GET_CPC ()));
-      thisn = build_current_thisn (TREE_TYPE (GET_CPC ()));
-      list = tree_cons (build_wfl_node (thisn), build_pointer_type (type),
-			list);
-    }
-
-  for (current = list; current; current = TREE_CHAIN (current))
-    {
-      int must_chain = 0;
-      tree wfl_name = TREE_PURPOSE (current);
-      tree type = TREE_VALUE (current);
-      tree name = EXPR_WFL_NODE (wfl_name);
-      tree already, arg_node;
-      tree type_wfl = NULL_TREE;
-      tree real_type;
-
-      /* Obtain a suitable type for resolution, if necessary */
-      SET_TYPE_FOR_RESOLUTION (type, type_wfl, must_chain);
-
-      /* Process NAME, as it may specify extra dimension(s) for it */
-      type = build_array_from_name (type, type_wfl, name, &name);
-      EXPR_WFL_NODE (wfl_name) = name;
-
-      real_type = GET_REAL_TYPE (type);
-      if (TREE_CODE (real_type) == RECORD_TYPE)
-	{
-	  real_type = promote_type (real_type);
-	  if (TREE_CODE (type) == TREE_LIST)
-	    TREE_PURPOSE (type) = real_type;
-	}
-
-      /* Check redefinition */
-      for (already = arg_types; already; already = TREE_CHAIN (already))
-	if (TREE_PURPOSE (already) == name)
-	  {
-	    parse_error_context
-	      (wfl_name, "Variable %qs is used more than once in the argument list of method %qs",
-	       IDENTIFIER_POINTER (name),
-	       IDENTIFIER_POINTER (EXPR_WFL_NODE (id)));
-	    break;
-	  }
-
-      /* If we've an incomplete argument type, we know there is a location
-	 to patch when the type get resolved, later.  */
-      jdep = NULL;
-      if (must_chain)
-	{
-	  patch_stage = JDEP_METHOD;
-	  type = register_incomplete_type (patch_stage,
-					   type_wfl, wfl_name, type);
-	  jdep = CLASSD_LAST (ctxp->classd_list);
-	  JDEP_MISC (jdep) = id;
-	}
-
-      /* The argument node: a name and a (possibly) incomplete type.  */
-      arg_node = build_tree_list (name, real_type);
-      /* Remember arguments declared final. */
-      ARG_FINAL_P (arg_node) = ARG_FINAL_P (current);
-
-      if (jdep)
-	JDEP_GET_PATCH (jdep) = &TREE_VALUE (arg_node);
-      TREE_CHAIN (arg_node) = arg_types;
-      arg_types = arg_node;
-    }
-  TYPE_ARG_TYPES (meth) = chainon (nreverse (arg_types), end_params_node);
-  node = build_tree_list (id, meth);
-  return node;
-}
-
-static int
-unresolved_type_p (tree wfl, tree *returned)
-{
-  if (TREE_CODE (wfl) == EXPR_WITH_FILE_LOCATION)
-    {
-      if (returned)
-	{
-	  tree decl = IDENTIFIER_CLASS_VALUE (EXPR_WFL_NODE (wfl));
-	  if (decl && current_class && (decl == TYPE_NAME (current_class)))
-	    *returned = TREE_TYPE (decl);
-	  else if (GET_CPC_UN () == EXPR_WFL_NODE (wfl))
-	    *returned = TREE_TYPE (GET_CPC ());
-	  else
-	    *returned = NULL_TREE;
-	}
-      return 1;
-    }
-  if (returned)
-    *returned = wfl;
-  return 0;
-}
-
-/* From NAME, build a qualified identifier node using the
-   qualification from the current package definition. */
-
-static tree
-parser_qualified_classname (tree name)
-{
-  tree nested_class_name;
-
-  if ((nested_class_name = maybe_make_nested_class_name (name)))
-    return nested_class_name;
-
-  if (ctxp->package)
-    return merge_qualified_name (ctxp->package, name);
-  else
-    return name;
-}
-
-/* Called once the type a interface extends is resolved. Returns 0 if
-   everything is OK.  */
-
-static int
-parser_check_super_interface (tree super_decl, tree this_decl, tree this_wfl)
-{
-  tree super_type = TREE_TYPE (super_decl);
-
-  /* Has to be an interface */
-  if (!CLASS_INTERFACE (super_decl))
-    {
-      parse_error_context
-	(this_wfl, "%s %qs can't implement/extend %s %qs",
-	 (CLASS_INTERFACE (TYPE_NAME (TREE_TYPE (this_decl))) ?
-	  "Interface" : "Class"),
-	 IDENTIFIER_POINTER (DECL_NAME (this_decl)),
-	 (TYPE_ARRAY_P (super_type) ? "array" : "class"),
-	 IDENTIFIER_POINTER (DECL_NAME (super_decl)));
-      return 1;
-    }
-
-  /* Check top-level interface access. Inner classes are subject to member
-     access rules (6.6.1). */
-  if (! INNER_CLASS_P (super_type)
-      && check_pkg_class_access (DECL_NAME (super_decl),
-				 NULL_TREE, true, this_decl))
-    return 1;
-
-  SOURCE_FRONTEND_DEBUG (("Completing interface %s with %s",
-			  IDENTIFIER_POINTER (DECL_NAME (this_decl)),
-			  IDENTIFIER_POINTER (DECL_NAME (super_decl))));
-  return 0;
-}
-
-/* Makes sure that SUPER_DECL is suitable to extend THIS_DECL. Returns
-   0 if everything is OK.  */
-
-static int
-parser_check_super (tree super_decl, tree this_decl, tree wfl)
-{
-  tree super_type = TREE_TYPE (super_decl);
-
-  /* SUPER should be a CLASS (neither an array nor an interface) */
-  if (TYPE_ARRAY_P (super_type) || CLASS_INTERFACE (TYPE_NAME (super_type)))
-    {
-      parse_error_context
-	(wfl, "Class %qs can't subclass %s %qs",
-	 IDENTIFIER_POINTER (DECL_NAME (this_decl)),
-	 (CLASS_INTERFACE (TYPE_NAME (super_type)) ? "interface" : "array"),
-	 IDENTIFIER_POINTER (DECL_NAME (super_decl)));
-      return 1;
-    }
-
-  if (CLASS_FINAL (TYPE_NAME (super_type)))
-    {
-      parse_error_context (wfl, "Can't subclass final classes: %s",
-			   IDENTIFIER_POINTER (DECL_NAME (super_decl)));
-      return 1;
-    }
-
-  /* Check top-level class scope. Inner classes are subject to member access
-     rules (6.6.1). */
-  if (! INNER_CLASS_P (super_type)
-      && (check_pkg_class_access (DECL_NAME (super_decl), wfl, true, NULL_TREE)))
-    return 1;
-
-  SOURCE_FRONTEND_DEBUG (("Completing class %s with %s",
-			  IDENTIFIER_POINTER (DECL_NAME (this_decl)),
-			  IDENTIFIER_POINTER (DECL_NAME (super_decl))));
-  return 0;
-}
-
-/* Create a new dependency list and link it (in a LIFO manner) to the
-   CTXP list of type dependency list.  */
-
-static void
-create_jdep_list (struct parser_ctxt *ctxp)
-{
-  jdeplist *new = xmalloc (sizeof (jdeplist));
-  new->first = new->last = NULL;
-  new->next = ctxp->classd_list;
-  ctxp->classd_list = new;
-}
-
-static jdeplist *
-reverse_jdep_list (struct parser_ctxt *ctxp)
-{
-  jdeplist *prev = NULL, *current, *next;
-  for (current = ctxp->classd_list; current; current = next)
-    {
-      next = current->next;
-      current->next = prev;
-      prev = current;
-    }
-  return prev;
-}
-
-/* Create a fake pointer based on the ID stored in
-   TYPE_NAME. TYPE_NAME can be a WFL or a incomplete type asking to be
-   registered again. */
-
-static tree
-obtain_incomplete_type (tree type_name)
-{
-  tree ptr = NULL_TREE, name;
-
-  if (TREE_CODE (type_name) == EXPR_WITH_FILE_LOCATION)
-    name = EXPR_WFL_NODE (type_name);
-  else if (INCOMPLETE_TYPE_P (type_name))
-    name = TYPE_NAME (type_name);
-  else
-    abort ();
-
-  /* Workaround from build_pointer_type for incomplete types.  */
-  BUILD_PTR_FROM_NAME (ptr, name);
-  TYPE_MODE (ptr) = ptr_mode;
-  layout_type (ptr);
-
-  return ptr;
-}
-
-/* Register a incomplete type whose name is WFL. Reuse PTR if PTR is
-   non NULL instead of computing a new fake type based on WFL. The new
-   dependency is inserted in the current type dependency list, in FIFO
-   manner.  */
-
-static tree
-register_incomplete_type (int kind, tree wfl, tree decl, tree ptr)
-{
-  jdep *new = xmalloc (sizeof (jdep));
-
-  if (!ptr && kind != JDEP_METHOD_END) /* JDEP_METHOD_END is a mere marker */
-    ptr = obtain_incomplete_type (wfl);
-
-  JDEP_KIND (new) = kind;
-  JDEP_DECL (new) = decl;
-  JDEP_TO_RESOLVE (new) = ptr;
-  JDEP_WFL (new) = wfl;
-  JDEP_CHAIN (new) = NULL;
-  JDEP_MISC (new) = NULL_TREE;
-  /* For some dependencies, set the enclosing class of the current
-     class to be the enclosing context */
-  if ((kind == JDEP_INTERFACE || kind == JDEP_ANONYMOUS || kind == JDEP_SUPER)
-      && GET_ENCLOSING_CPC ())
-    JDEP_ENCLOSING (new) = TREE_VALUE (GET_ENCLOSING_CPC ());
-  else
-    JDEP_ENCLOSING (new) = GET_CPC ();
-  JDEP_GET_PATCH (new) = (tree *)NULL;
-
-  JDEP_INSERT (ctxp->classd_list, new);
-
-  return ptr;
-}
-
-/* This checks for circular references with innerclasses. We start
-   from SOURCE and should never reach TARGET. Extended/implemented
-   types in SOURCE have their enclosing context checked not to reach
-   TARGET. When the last enclosing context of SOURCE is reached, its
-   extended/implemented types are also checked not to reach TARGET.
-   In case of error, WFL of the offending type is returned; NULL_TREE
-   otherwise.  */
-
-static tree
-check_inner_circular_reference (tree source, tree target)
-{
-  tree base_binfo;
-  tree ctx, cl;
-  int i;
-
-  for (i = 0; BINFO_BASE_ITERATE (TYPE_BINFO (source), i, base_binfo); i++)
-    {
-      tree su;
-
-      /* We can end up with a NULL_TREE or an incomplete type here if
-	 we encountered previous type resolution errors. It's safe to
-	 simply ignore these cases.  */
-      su = BINFO_TYPE (base_binfo);
-      if (INCOMPLETE_TYPE_P (su))
-	continue;
-
-      if (inherits_from_p (su, target))
-	return lookup_cl (TYPE_NAME (su));
-
-      for (ctx = DECL_CONTEXT (TYPE_NAME (su)); ctx; ctx = DECL_CONTEXT (ctx))
-	{
-	  /* An enclosing context shouldn't be TARGET */
-	  if (ctx == TYPE_NAME (target))
-	    return lookup_cl (TYPE_NAME (su));
-
-	  /* When we reach the enclosing last context, start a check
-	     on it, with the same target */
-	  if (! DECL_CONTEXT (ctx) &&
-	      (cl = check_inner_circular_reference (TREE_TYPE (ctx), target)))
-	    return cl;
-	}
-    }
-  return NULL_TREE;
-}
-
-/* Explore TYPE's `extends' clause member(s) and return the WFL of the
-   offending type if a circularity is detected. NULL_TREE is returned
-   otherwise. TYPE can be an interface or a class.   */
-
-static tree
-check_circular_reference (tree type)
-{
-  tree base_binfo;
-  int i;
-
-  if (!BINFO_N_BASE_BINFOS (TYPE_BINFO (type)))
-    return NULL_TREE;
-
-  if (! CLASS_INTERFACE (TYPE_NAME (type)))
-    {
-      if (inherits_from_p (CLASSTYPE_SUPER (type), type))
-	return lookup_cl (TYPE_NAME (type));
-      return NULL_TREE;
-    }
-
-  for (i = 0; BINFO_BASE_ITERATE (TYPE_BINFO (type), i, base_binfo); i++)
-    {
-      if (BINFO_TYPE (base_binfo) != object_type_node
-	  && interface_of_p (type, BINFO_TYPE (base_binfo)))
-	return lookup_cl (TYPE_NAME (BINFO_TYPE (base_binfo)));
-    }
-  return NULL_TREE;
-}
-
-void
-java_check_circular_reference (void)
-{
-  tree current;
-  for (current = ctxp->class_list; current; current = TREE_CHAIN (current))
-    {
-      tree type = TREE_TYPE (current);
-      tree cl;
-
-      cl = check_circular_reference (type);
-      if (! cl)
-	cl = check_inner_circular_reference (type, type);
-      if (cl)
-	parse_error_context (cl, "Cyclic class inheritance%s",
-			     (cyclic_inheritance_report ?
-			      cyclic_inheritance_report : ""));
-    }
-}
-
-/* Augment the parameter list PARM with parameters crafted to
-   initialize outer context locals aliases. Through ARTIFICIAL, a
-   count is kept of the number of crafted parameters. MODE governs
-   what eventually gets created: something suitable for a function
-   creation or a function invocation, either the constructor or
-   finit$.  */
-
-static tree
-build_alias_initializer_parameter_list (int mode, tree class_type, tree parm,
-					int *artificial)
-{
-  tree field;
-  tree additional_parms = NULL_TREE;
-
-  for (field = TYPE_FIELDS (class_type); field; field = TREE_CHAIN (field))
-    if (FIELD_LOCAL_ALIAS (field))
-      {
-	const char *buffer = IDENTIFIER_POINTER (DECL_NAME (field));
-	tree purpose = NULL_TREE, value = NULL_TREE, name = NULL_TREE;
-	tree mangled_id;
-
-	switch (mode)
-	  {
-	  case AIPL_FUNCTION_DECLARATION:
-	    MANGLE_ALIAS_INITIALIZER_PARAMETER_NAME_STR (mangled_id,
-							 &buffer [4]);
-	    purpose = build_wfl_node (mangled_id);
-	    if (TREE_CODE (TREE_TYPE (field)) == POINTER_TYPE)
-	      value = build_wfl_node (TYPE_NAME (TREE_TYPE (field)));
-	    else
-	      value = TREE_TYPE (field);
-	    break;
-
-	  case AIPL_FUNCTION_CREATION:
-	    MANGLE_ALIAS_INITIALIZER_PARAMETER_NAME_STR (purpose,
-							 &buffer [4]);
-	    value = TREE_TYPE (field);
-	    break;
-
-	  case AIPL_FUNCTION_FINIT_INVOCATION:
-	    MANGLE_ALIAS_INITIALIZER_PARAMETER_NAME_STR (mangled_id,
-							 &buffer [4]);
-	    /* Now, this is wrong. purpose should always be the NAME
-	       of something and value its matching value (decl, type,
-	       etc...) FIXME -- but there is a lot to fix. */
-
-	    /* When invoked for this kind of operation, we already
-	       know whether a field is used or not. */
-	    purpose = TREE_TYPE (field);
-	    value = build_wfl_node (mangled_id);
-	    break;
-
-	  case AIPL_FUNCTION_CTOR_INVOCATION:
-	    /* There are two case: the constructor invocation happens
-	       outside the local inner, in which case, locales from the outer
-	       context are directly used.
-
-	       Otherwise, we fold to using the alias directly. */
-	    if (class_type == current_class)
-	      value = field;
-	    else
-	      {
-		name = get_identifier (&buffer[4]);
-		value = IDENTIFIER_LOCAL_VALUE (name);
-	      }
-	    break;
-	  }
-	additional_parms = tree_cons (purpose, value, additional_parms);
-	if (artificial)
-	  *artificial +=1;
-      }
-  if (additional_parms)
-    {
-      if (ANONYMOUS_CLASS_P (class_type)
-          && mode == AIPL_FUNCTION_CTOR_INVOCATION)
-        additional_parms = nreverse (additional_parms);
-      parm = chainon (additional_parms, parm);
-    }
-
-   return parm;
-}
-
-/* Craft a constructor for CLASS_DECL -- what we should do when none
-   where found. ARGS is non NULL when a special signature must be
-   enforced. This is the case for anonymous classes.  */
-
-static tree
-craft_constructor (tree class_decl, tree args)
-{
-  tree class_type = TREE_TYPE (class_decl);
-  tree parm = NULL_TREE;
-  /* Inherit access flags for the constructor from its enclosing class. */
-  int valid_ctor_flags = ACC_PUBLIC | ACC_PROTECTED | ACC_PRIVATE;
-  int flags = (get_access_flags_from_decl (class_decl) & valid_ctor_flags);
-  int i = 0, artificial = 0;
-  tree decl, ctor_name;
-  char buffer [80];
-
-  ctor_name = init_identifier_node;
-
-  /* If we're dealing with an inner class constructor, we hide the
-     this$<n> decl in the name field of its parameter declaration. */
-  if (PURE_INNER_CLASS_TYPE_P (class_type))
-    {
-      tree type = TREE_TYPE (DECL_CONTEXT (TYPE_NAME (class_type)));
-      parm = tree_cons (build_current_thisn (class_type),
-			build_pointer_type (type), parm);
-
-      /* Some more arguments to be hidden here. The values of the local
-	 variables of the outer context that the inner class needs to see. */
-      parm = build_alias_initializer_parameter_list (AIPL_FUNCTION_CREATION,
-						     class_type, parm,
-						     &artificial);
-    }
-
-  /* Then if there are any args to be enforced, enforce them now */
-  for (; args && args != end_params_node; args = TREE_CHAIN (args))
-    {
-      /* If we see a `void *', we need to change it to Object.  */
-      if (TREE_VALUE (args) == TREE_TYPE (null_pointer_node))
-	TREE_VALUE (args) = object_ptr_type_node;
-
-      sprintf (buffer, "parm%d", i++);
-      parm = tree_cons (get_identifier (buffer), TREE_VALUE (args), parm);
-    }
-
-  CRAFTED_PARAM_LIST_FIXUP (parm);
-  decl = create_artificial_method (class_type, flags, void_type_node,
-				   ctor_name, parm);
-  fix_method_argument_names (parm, decl);
-  /* Now, mark the artificial parameters. */
-  DECL_FUNCTION_NAP (decl) = artificial;
-  DECL_FUNCTION_SYNTHETIC_CTOR (decl) = DECL_CONSTRUCTOR_P (decl) = 1;
-  DECL_INLINE (decl) = 1;
-  return decl;
-}
-
-
-/* Fix the constructors. This will be called right after circular
-   references have been checked. It is necessary to fix constructors
-   early even if no code generation will take place for that class:
-   some generated constructor might be required by the class whose
-   compilation triggered this one to be simply loaded.  */
-
-void
-java_fix_constructors (void)
-{
-  tree current;
-
-  for (current = ctxp->class_list; current; current = TREE_CHAIN (current))
-    {
-      tree class_type = TREE_TYPE (current);
-      int saw_ctor = 0;
-      tree decl;
-
-      if (CLASS_INTERFACE (TYPE_NAME (class_type)))
-	continue;
-
-      output_class = current_class = class_type;
-      for (decl = TYPE_METHODS (class_type); decl; decl = TREE_CHAIN (decl))
-	{
-	  if (DECL_CONSTRUCTOR_P (decl))
-	    {
-	      fix_constructors (decl);
-	      saw_ctor = 1;
-	    }
-	}
-
-      /* Anonymous class constructor can't be generated that early. */
-      if (!saw_ctor && !ANONYMOUS_CLASS_P (class_type))
-	craft_constructor (current, NULL_TREE);
-    }
-}
-
-/* safe_layout_class just makes sure that we can load a class without
-   disrupting the current_class, input_file, input_line, etc, information
-   about the class processed currently.  */
-
-void
-safe_layout_class (tree class)
-{
-  tree save_current_class = current_class;
-  location_t save_location = input_location;
-
-  layout_class (class);
-
-  current_class = save_current_class;
-  input_location = save_location;
-}
-
-static tree
-jdep_resolve_class (jdep *dep)
-{
-  tree decl;
-  
-  /* Set the correct context for class resolution.  */
-  current_class = TREE_TYPE (JDEP_ENCLOSING (dep));
-
-  if (JDEP_RESOLVED_P (dep))
-    decl = JDEP_RESOLVED_DECL (dep);
-  else
-    {
-      decl = resolve_class (JDEP_ENCLOSING (dep), JDEP_TO_RESOLVE (dep),
-			    JDEP_DECL (dep), JDEP_WFL (dep));
-      JDEP_RESOLVED (dep, decl);
-      /* If there is no WFL, that's ok.  We generate this warning
-	 elsewhere.  */
-      if (decl && JDEP_WFL (dep) != NULL_TREE)
-	check_deprecation (JDEP_WFL (dep), decl);
-    }
-
-  if (!decl)
-    complete_class_report_errors (dep);
-  else if (INNER_CLASS_DECL_P (decl))
-    {
-      tree inner = TREE_TYPE (decl);
-      if (! CLASS_LOADED_P (inner))
-	{
-	  safe_layout_class (inner);
-	  if (TYPE_SIZE (inner) == error_mark_node)
-	    TYPE_SIZE (inner) = NULL_TREE;
-	}
-      check_inner_class_access (decl, JDEP_ENCLOSING (dep), JDEP_WFL (dep));
-    }
-  return decl;
-}
-
-/* Complete unsatisfied class declaration and their dependencies */
-
-void
-java_complete_class (void)
-{
-  tree cclass;
-  jdeplist *cclassd;
-  int error_found;
-  tree type;
-
-  /* Process imports */
-  process_imports ();
-
-  /* Reverse things so we have the right order */
-  ctxp->class_list = nreverse (ctxp->class_list);
-  ctxp->classd_list = reverse_jdep_list (ctxp);
-
-  for (cclassd = ctxp->classd_list, cclass = ctxp->class_list;
-       cclass && cclassd;
-       cclass = TREE_CHAIN (cclass), cclassd = CLASSD_CHAIN (cclassd))
-    {
-      jdep *dep;
-
-      for (dep = CLASSD_FIRST (cclassd); dep; dep = JDEP_CHAIN (dep))
-	{
-	  tree decl;
-	  if (!(decl = jdep_resolve_class (dep)))
-	    continue;
-
-	  /* Now it's time to patch */
-	  switch (JDEP_KIND (dep))
-	    {
-	    case JDEP_SUPER:
-	      /* Simply patch super */
-	      if (parser_check_super (decl, JDEP_DECL (dep), JDEP_WFL (dep)))
-		continue;
-	      BINFO_TYPE (BINFO_BASE_BINFO
-			  (TYPE_BINFO (TREE_TYPE (JDEP_DECL (dep))), 0))
-		= TREE_TYPE (decl);
-	      break;
-
-	    case JDEP_FIELD:
-	      {
-		/* We do part of the job done in add_field */
-		tree field_decl = JDEP_DECL (dep);
-		tree field_type = TREE_TYPE (decl);
-		if (TREE_CODE (field_type) == RECORD_TYPE)
-		  field_type = promote_type (field_type);
-		TREE_TYPE (field_decl) = field_type;
-		DECL_ALIGN (field_decl) = 0;
-		DECL_USER_ALIGN (field_decl) = 0;
-		layout_decl (field_decl, 0);
-		SOURCE_FRONTEND_DEBUG
-		  (("Completed field/var decl '%s' with '%s'",
-		    IDENTIFIER_POINTER (DECL_NAME (field_decl)),
-		    IDENTIFIER_POINTER (DECL_NAME (decl))));
-		break;
-	      }
-	    case JDEP_METHOD:	/* We start patching a method */
-	    case JDEP_METHOD_RETURN:
-	      error_found = 0;
-	      while (1)
-		{
-		  if (decl)
-		    {
-		      type = TREE_TYPE(decl);
-		      if (TREE_CODE (type) == RECORD_TYPE)
-			type = promote_type (type);
-		      JDEP_APPLY_PATCH (dep, type);
-		      SOURCE_FRONTEND_DEBUG
-			(((JDEP_KIND (dep) == JDEP_METHOD_RETURN ?
-			   "Completing fct '%s' with ret type '%s'":
-			   "Completing arg '%s' with type '%s'"),
-			  IDENTIFIER_POINTER (EXPR_WFL_NODE
-					      (JDEP_DECL_WFL (dep))),
-			  IDENTIFIER_POINTER (DECL_NAME (decl))));
-		    }
-		  else
-		    error_found = 1;
-		  dep = JDEP_CHAIN (dep);
-		  if (JDEP_KIND (dep) == JDEP_METHOD_END)
-		    break;
-		  else
-		    decl = jdep_resolve_class (dep);
-		}
-	      if (!error_found)
-		{
-		  tree mdecl = JDEP_DECL (dep), signature;
-		  /* Recompute and reset the signature, check first that
-		     all types are now defined. If they're not,
-		     don't build the signature. */
-		  if (check_method_types_complete (mdecl))
-		    {
-		      signature = build_java_signature (TREE_TYPE (mdecl));
-		      set_java_signature (TREE_TYPE (mdecl), signature);
-		    }
-		}
-	      else
-		continue;
-	      break;
-
-	    case JDEP_INTERFACE:
-	      if (parser_check_super_interface (decl, JDEP_DECL (dep),
-						JDEP_WFL (dep)))
-		continue;
-	      parser_add_interface (JDEP_DECL (dep), decl, JDEP_WFL (dep));
-	      break;
-
-	    case JDEP_PARM:
-	    case JDEP_VARIABLE:
-	      type = TREE_TYPE(decl);
-	      if (TREE_CODE (type) == RECORD_TYPE)
-		type = promote_type (type);
-	      JDEP_APPLY_PATCH (dep, type);
-	      break;
-
-	    case JDEP_TYPE:
-	      JDEP_APPLY_PATCH (dep, TREE_TYPE (decl));
-	      SOURCE_FRONTEND_DEBUG
-		(("Completing a random type dependency on a '%s' node",
-		  tree_code_name [TREE_CODE (JDEP_DECL (dep))]));
-	      break;
-
-	    case JDEP_EXCEPTION:
-	      JDEP_APPLY_PATCH (dep, TREE_TYPE (decl));
-	      SOURCE_FRONTEND_DEBUG
-		(("Completing '%s' 'throws' argument node",
-		  IDENTIFIER_POINTER (EXPR_WFL_NODE (JDEP_WFL (dep)))));
-	      break;
-
-	    case JDEP_ANONYMOUS:
-	      patch_anonymous_class (decl, JDEP_DECL (dep), JDEP_WFL (dep));
-	      break;
-
-	    default:
-	      abort ();
-	    }
-	}
-    }
-  return;
-}
-
-/* Resolve class CLASS_TYPE. Handle the case of trying to resolve an
-   array.  */
-
-static tree
-resolve_class (tree enclosing, tree class_type, tree decl, tree cl)
-{
-  tree tname = TYPE_NAME (class_type);
-  tree resolved_type = TREE_TYPE (class_type);
-  int array_dims = 0;
-  tree resolved_type_decl;
-
-  if (resolved_type != NULL_TREE)
-    {
-      tree resolved_type_decl = TYPE_NAME (resolved_type);
-      if (resolved_type_decl == NULL_TREE
-	  || TREE_CODE (resolved_type_decl) == IDENTIFIER_NODE)
-	{
-	  resolved_type_decl = build_decl (TYPE_DECL,
-					   TYPE_NAME (class_type),
-					   resolved_type);
-	}
-      return resolved_type_decl;
-    }
-
-  /* 1- Check to see if we have an array. If true, find what we really
-     want to resolve  */
-  if ((array_dims = build_type_name_from_array_name (tname,
-						     &TYPE_NAME (class_type))))
-    WFL_STRIP_BRACKET (cl, cl);
-
-  /* 2- Resolve the bare type */
-  if (!(resolved_type_decl = do_resolve_class (enclosing, NULL_TREE, class_type,
-					       decl, cl)))
-    return NULL_TREE;
-  resolved_type = TREE_TYPE (resolved_type_decl);
-
-  /* 3- If we have an array, reconstruct the array down to its nesting */
-  if (array_dims)
-    {
-      for (; array_dims; array_dims--)
-	resolved_type = build_java_array_type (resolved_type, -1);
-      resolved_type_decl = TYPE_NAME (resolved_type);
-    }
-  TREE_TYPE (class_type) = resolved_type;
-  return resolved_type_decl;
-}
-
-/* Effectively perform the resolution of class CLASS_TYPE.  DECL or CL
-   are used to report error messages; CL must either be NULL_TREE or a
-   WFL wrapping a class.  Do not try to replace TYPE_NAME (class_type)
-   by a variable, since it is changed by find_in_imports{_on_demand}
-   and (but it doesn't really matter) qualify_and_find.  */
-
-tree
-do_resolve_class (tree enclosing, tree import_type, tree class_type, tree decl,
-		  tree cl)
-{
-  tree new_class_decl = NULL_TREE;
-  tree saved_enclosing_type = enclosing ? TREE_TYPE (enclosing) : NULL_TREE;
-  tree candidate = NULL_TREE;
-  tree decl_result;
-
-  if (QUALIFIED_P (TYPE_NAME (class_type)))
-    {
-      /* If the type name is of the form `Q . Id', then Q is either a
-	 package name or a class name.  First we try to find Q as a
-	 class and then treat Id as a member type.  If we can't find Q
-	 as a class then we fall through.  */
-      tree q, left, left_type, right;
-      if (split_qualified_name (&left, &right, TYPE_NAME (class_type)) == 0)
-	{
-	  BUILD_PTR_FROM_NAME (left_type, left);
-	  q = do_resolve_class (enclosing, import_type, left_type, decl, cl);
-	  if (q)
-	    {
-	      enclosing = q;
-	      saved_enclosing_type = TREE_TYPE (q);
-	      BUILD_PTR_FROM_NAME (class_type, right);
-	    }
-	}
-    }
-
-  if (enclosing)
-    {
-      tree context = enclosing;
-
-      /* 0- Search in the current class as an inner class.
-	 Maybe some code here should be added to load the class or
-	 something, at least if the class isn't an inner class and ended
-	 being loaded from class file. FIXME. */
-      while (enclosing)
-	{
-	  new_class_decl = resolve_inner_class (context, cl, enclosing, class_type);
-	  
-	  if (new_class_decl)
-	    {
-	      if (inner_class_accessible (new_class_decl, context))
-	        break;
-	      else
-	        if (candidate == NULL_TREE)
-		  candidate = new_class_decl;
-		new_class_decl = NULL_TREE;
-	    }
-
-	  /* Now that we've looked through all superclasses, try the enclosing
-	     context. */
-	  enclosing = DECL_CONTEXT (enclosing);
-	}
-
-      if (new_class_decl)
-	return new_class_decl;
-    }
-
-  /* 1- Check for the type in single imports.  Look at enclosing classes and,
-     if we're laying out a superclass, at the import list for the subclass.
-     This will change TYPE_NAME() if something relevant is found. */
-  if (import_type && TYPE_IMPORT_LIST (import_type))
-    find_in_imports (import_type, class_type);
-  find_in_imports (saved_enclosing_type, class_type);
-
-  /* 2- And check for the type in the current compilation unit */
-  if ((new_class_decl = IDENTIFIER_CLASS_VALUE (TYPE_NAME (class_type))))
-    {
-      if (!CLASS_LOADED_P (TREE_TYPE (new_class_decl)))
-	load_class (TYPE_NAME (class_type), 0);
-      return IDENTIFIER_CLASS_VALUE (TYPE_NAME (class_type));
-    }
-
-  /* 3- Search according to the current package definition */
-  if (!QUALIFIED_P (TYPE_NAME (class_type)))
-    {
-      if ((new_class_decl = qualify_and_find (class_type, 
-      		TYPE_PACKAGE (current_class), TYPE_NAME (class_type))))
-	return new_class_decl;
-    }
-
-  /* 4- Check the import on demands. Don't allow bar.baz to be
-     imported from foo.* */
-  if (!QUALIFIED_P (TYPE_NAME (class_type)))
-    {
-      if (import_type
-	  && TYPE_IMPORT_DEMAND_LIST (import_type)
-	  && find_in_imports_on_demand (import_type, class_type))
-        return NULL_TREE;
-      if (find_in_imports_on_demand (saved_enclosing_type, class_type))
-        return NULL_TREE;
-    }
-
-  /* If found in find_in_imports_on_demand, the type has already been
-     loaded. */
-  if ((new_class_decl = IDENTIFIER_CLASS_VALUE (TYPE_NAME (class_type))))
-    return new_class_decl;
-
-  /* 5- Check another compilation unit that bears the name of type */
-  load_class (TYPE_NAME (class_type), 0);
-
-  if (!cl)
-    cl = lookup_cl (decl);
-
-  /* If we don't have a value for CL, then we're being called recursively.
-     We can't check package access just yet, but it will be taken care of
-     by the caller. */
-  if (cl)
-    {
-      if (check_pkg_class_access (TYPE_NAME (class_type), cl, true, NULL_TREE))
-        return NULL_TREE;
-    }
-
-  /* 6- Last call for a resolution */
-  decl_result = IDENTIFIER_CLASS_VALUE (TYPE_NAME (class_type));
-
-  /* The final lookup might have registered a.b.c into a.b$c If we
-     failed at the first lookup, progressively change the name if
-     applicable and use the matching DECL instead. */
-  if (!decl_result && QUALIFIED_P (TYPE_NAME (class_type)))
-    {
-      char *separator;
-      tree name = TYPE_NAME (class_type);
-      char *namebuffer = alloca (IDENTIFIER_LENGTH (name) + 1);
-
-      strcpy (namebuffer, IDENTIFIER_POINTER (name));
-
-      do {
-
-       /* Reach the last '.', and if applicable, replace it by a `$' and
-          see if this exists as a type. */
-       if ((separator = strrchr (namebuffer, '.')))
-         {
-           *separator = '$';
-           name = get_identifier (namebuffer);
-           decl_result = IDENTIFIER_CLASS_VALUE (name);
-         }
-      } while (!decl_result && separator);
-    }
-  if (decl_result)
-    return decl_result;
-  else
-    return candidate;
-}
-
-static tree
-qualify_and_find (tree class_type, tree package, tree name)
-{
-  tree new_qualified = merge_qualified_name (package, name);
-  tree new_class_decl;
-
-  if (!IDENTIFIER_CLASS_VALUE (new_qualified))
-    load_class (new_qualified, 0);
-  if ((new_class_decl = IDENTIFIER_CLASS_VALUE (new_qualified)))
-    {
-      if (!CLASS_LOADED_P (TREE_TYPE (new_class_decl)))
-	load_class (TREE_TYPE (new_class_decl), 0);
-      TYPE_NAME (class_type) = new_qualified;
-      return IDENTIFIER_CLASS_VALUE (new_qualified);
-    }
-  return NULL_TREE;
-}
-
-/* Resolve NAME and lay it out (if not done and if not the current
-   parsed class). Return a decl node. This function is meant to be
-   called when type resolution is necessary during the walk pass.  */
-
-static tree
-resolve_and_layout (tree something, tree cl)
-{
-  tree decl, decl_type;
-
-  /* Don't do that on the current class */
-  if (something == current_class)
-    return TYPE_NAME (current_class);
-
-  /* Don't do anything for void and other primitive types */
-  if (JPRIMITIVE_TYPE_P (something) || something == void_type_node)
-    return NULL_TREE;
-
-  /* Pointer types can be reall pointer types or fake pointers. When
-     finding a real pointer, recheck for primitive types */
-  if (TREE_CODE (something) == POINTER_TYPE)
-    {
-      if (TREE_TYPE (something))
-	{
-	  something = TREE_TYPE (something);
-	  if (JPRIMITIVE_TYPE_P (something) || something == void_type_node)
-	    return NULL_TREE;
-	}
-      else
-	something = TYPE_NAME (something);
-    }
-
-  /* Don't do anything for arrays of primitive types */
-  if (TREE_CODE (something) == RECORD_TYPE && TYPE_ARRAY_P (something)
-      && JPRIMITIVE_TYPE_P (TYPE_ARRAY_ELEMENT (something)))
-    return NULL_TREE;
-
-  /* Something might be a WFL */
-  if (TREE_CODE (something) == EXPR_WITH_FILE_LOCATION)
-    something = EXPR_WFL_NODE (something);
-
-  /* Otherwise, if something is not and IDENTIFIER_NODE, it can be a
-     TYPE_DECL or a real TYPE.  */
-  else if (TREE_CODE (something) != IDENTIFIER_NODE)
-    something = (TREE_CODE (TYPE_NAME (something)) == TYPE_DECL ?
-	    DECL_NAME (TYPE_NAME (something)) : TYPE_NAME (something));
-
-  if (!(decl = resolve_no_layout (something, cl)))
-    return NULL_TREE;
-
-  /* Resolve and layout if necessary */
-  decl_type = TREE_TYPE (decl);
-  layout_class_methods (decl_type);
-  /* Check methods */
-  if (CLASS_FROM_SOURCE_P (decl_type))
-    java_check_methods (decl);
-  /* Layout the type if necessary */
-  if (decl_type != current_class && !CLASS_LOADED_P (decl_type))
-    safe_layout_class (decl_type);
-
-  return decl;
-}
-
-/* Resolve a class, returns its decl but doesn't perform any
-   layout. The current parsing context is saved and restored */
-
-static tree
-resolve_no_layout (tree name, tree cl)
-{
-  tree ptr, decl;
-  BUILD_PTR_FROM_NAME (ptr, name);
-  java_parser_context_save_global ();
-  decl = resolve_class (TYPE_NAME (current_class), ptr, NULL_TREE, cl);
-  java_parser_context_restore_global ();
-
-  return decl;
-}
-
-/* Called when reporting errors. Skip the '[]'s in a complex array
-   type description that failed to be resolved. purify_type_name can't
-   use an identifier tree.  */
-
-static const char *
-purify_type_name (const char *name)
-{
-  int len = strlen (name);
-  int bracket_found;
-
-  STRING_STRIP_BRACKETS (name, len, bracket_found);
-  if (bracket_found)
-    {
-      char *stripped_name = xmemdup (name, len, len+1);
-      stripped_name [len] = '\0';
-      return stripped_name;
-    }
-  return name;
-}
-
-/* The type CURRENT refers to can't be found. We print error messages.  */
-
-static void
-complete_class_report_errors (jdep *dep)
-{
-  const char *name;
-
-  if (!JDEP_WFL (dep))
-    return;
-
-  name = IDENTIFIER_POINTER (EXPR_WFL_NODE (JDEP_WFL (dep)));
-  switch (JDEP_KIND (dep))
-    {
-    case JDEP_SUPER:
-      parse_error_context
-	(JDEP_WFL (dep), "Superclass %qs of class %qs not found",
-	 purify_type_name (name),
-	 IDENTIFIER_POINTER (DECL_NAME (JDEP_DECL (dep))));
-      break;
-    case JDEP_FIELD:
-      parse_error_context
-	(JDEP_WFL (dep), "Type %qs not found in declaration of field %qs",
-	 purify_type_name (name),
-	 IDENTIFIER_POINTER (DECL_NAME (JDEP_DECL (dep))));
-      break;
-    case JDEP_METHOD:		/* Covers arguments */
-      parse_error_context
-	(JDEP_WFL (dep), "Type %qs not found in the declaration of the argument %qs of method %qs",
-	 purify_type_name (name),
-	 IDENTIFIER_POINTER (EXPR_WFL_NODE (JDEP_DECL_WFL (dep))),
-	 IDENTIFIER_POINTER (EXPR_WFL_NODE (JDEP_MISC (dep))));
-      break;
-    case JDEP_METHOD_RETURN:	/* Covers return type */
-      parse_error_context
-	(JDEP_WFL (dep), "Type %qs not found in the declaration of the return type of method %qs",
-	 purify_type_name (name),
-	 IDENTIFIER_POINTER (EXPR_WFL_NODE (JDEP_DECL_WFL (dep))));
-      break;
-    case JDEP_INTERFACE:
-      parse_error_context
-	(JDEP_WFL (dep), "Superinterface %qs of %s %qs not found",
-	 IDENTIFIER_POINTER (EXPR_WFL_NODE (JDEP_WFL (dep))),
-	 (CLASS_OR_INTERFACE (JDEP_DECL (dep), "class", "interface")),
-	 IDENTIFIER_POINTER (DECL_NAME (JDEP_DECL (dep))));
-      break;
-    case JDEP_VARIABLE:
-      parse_error_context
-	(JDEP_WFL (dep), "Type %qs not found in the declaration of the local variable %qs",
-	 purify_type_name (IDENTIFIER_POINTER
-			   (EXPR_WFL_NODE (JDEP_WFL (dep)))),
-	 IDENTIFIER_POINTER (DECL_NAME (JDEP_DECL (dep))));
-      break;
-    case JDEP_EXCEPTION:	/* As specified by `throws' */
-      parse_error_context
-	  (JDEP_WFL (dep), "Class %qs not found in %<throws%>",
-	 IDENTIFIER_POINTER (EXPR_WFL_NODE (JDEP_WFL (dep))));
-      break;
-    default:
-      /* Fix for -Wall. Just break doing nothing. The error will be
-         caught later */
-      break;
-    }
-}
-
-/* Return a static string containing the DECL prototype string. If
-   DECL is a constructor, use the class name instead of the form
-   <init> */
-
-static const char *
-get_printable_method_name (tree decl)
-{
-  const char *to_return;
-  tree name = NULL_TREE;
-
-  if (DECL_CONSTRUCTOR_P (decl))
-    {
-      name = DECL_NAME (decl);
-      DECL_NAME (decl) = DECL_NAME (TYPE_NAME (DECL_CONTEXT (decl)));
-    }
-
-  to_return = lang_printable_name (decl, 2);
-  if (DECL_CONSTRUCTOR_P (decl))
-    DECL_NAME (decl) = name;
-
-  return to_return;
-}
-
-/* Track method being redefined inside the same class. As a side
-   effect, set DECL_NAME to an IDENTIFIER (prior entering this
-   function it's a FWL, so we can track errors more accurately.)  */
-
-static int
-check_method_redefinition (tree class, tree method)
-{
-  tree redef, sig;
-
-  /* There's no need to verify <clinit> and finit$ and instinit$ */
-  if (DECL_CLINIT_P (method)
-      || DECL_FINIT_P (method) || DECL_INSTINIT_P (method))
-    return 0;
-
-  sig = TYPE_ARGUMENT_SIGNATURE (TREE_TYPE (method));
-  for (redef = TYPE_METHODS (class); redef; redef = TREE_CHAIN (redef))
-    {
-      if (redef == method)
-	break;
-      if (DECL_NAME (redef) == DECL_NAME (method)
-	  && sig == TYPE_ARGUMENT_SIGNATURE (TREE_TYPE (redef))
-	  && !DECL_ARTIFICIAL (method))
-	{
-	  parse_error_context
-	    (DECL_FUNCTION_WFL (method), "Duplicate %s declaration %qs",
-	     (DECL_CONSTRUCTOR_P (redef) ? "constructor" : "method"),
-	     get_printable_method_name (redef));
-	  return 1;
-	}
-    }
-  return 0;
-}
-
-/* Return 1 if check went ok, 0 otherwise.  */
-static int
-check_abstract_method_definitions (int do_interface, tree class_decl,
-				   tree type)
-{
-  tree class = TREE_TYPE (class_decl);
-  tree method, end_type;
-  int ok = 1;
-
-  end_type = (do_interface ? object_type_node : type);
-  for (method = TYPE_METHODS (type); method; method = TREE_CHAIN (method))
-    {
-      tree other_super, other_method, method_sig, method_name;
-      int found = 0;
-      int end_type_reached = 0;
-
-      if (!METHOD_ABSTRACT (method) || METHOD_FINAL (method))
-	continue;
-
-      /* Now verify that somewhere in between TYPE and CLASS,
-	 abstract method METHOD gets a non abstract definition
-	 that is inherited by CLASS.  */
-
-      method_sig = build_java_signature (TREE_TYPE (method));
-      method_name = DECL_NAME (method);
-      if (TREE_CODE (method_name) == EXPR_WITH_FILE_LOCATION)
-	method_name = EXPR_WFL_NODE (method_name);
-
-      other_super = class;
-      do {
-	if (other_super == end_type)
-	  end_type_reached = 1;
-
-	/* Method search */
-	for (other_method = TYPE_METHODS (other_super); other_method;
-            other_method = TREE_CHAIN (other_method))
-	  {
-	    tree s = build_java_signature (TREE_TYPE (other_method));
-	    tree other_name = DECL_NAME (other_method);
-
-	    if (TREE_CODE (other_name) == EXPR_WITH_FILE_LOCATION)
-	      other_name = EXPR_WFL_NODE (other_name);
-	    if (!DECL_CLINIT_P (other_method)
-		&& !DECL_CONSTRUCTOR_P (other_method)
-		&& method_name == other_name
-		&& method_sig == s
-		&& !METHOD_ABSTRACT (other_method))
-             {
-               found = 1;
-               break;
-             }
-	  }
-	other_super = CLASSTYPE_SUPER (other_super);
-      } while (!end_type_reached);
-
-      /* Report that abstract METHOD didn't find an implementation
-	 that CLASS can use. */
-      if (!found)
-	{
-	  char *t = xstrdup (lang_printable_name
-			    (TREE_TYPE (TREE_TYPE (method)), 0));
-	  tree ccn = DECL_NAME (TYPE_NAME (DECL_CONTEXT (method)));
-
-	  parse_error_context
-	    (lookup_cl (class_decl),
-	     "Class %qs doesn't define the abstract method %<%s %s%> from %s %<%s%>. This method must be defined or %s %qs must be declared abstract",
-	     IDENTIFIER_POINTER (DECL_NAME (class_decl)),
-	     t, lang_printable_name (method, 2),
-	     (CLASS_INTERFACE (TYPE_NAME (DECL_CONTEXT (method))) ?
-	      "interface" : "class"),
-	     IDENTIFIER_POINTER (ccn),
-	     (CLASS_INTERFACE (class_decl) ? "interface" : "class"),
-	     IDENTIFIER_POINTER (DECL_NAME (class_decl)));
-	  ok = 0;
-	  free (t);
-	}
-    }
-
-  if (ok && do_interface)
-    {
-      /* Check for implemented interfaces. */
-      int i;
-      tree base_binfo;
-      
-      for (i = 1;
-	   ok && BINFO_BASE_ITERATE (TYPE_BINFO (type), i, base_binfo);
-	   i++)
-	ok = check_abstract_method_definitions (1, class_decl,
-						BINFO_TYPE (base_binfo));
-    }
-
-  return ok;
-}
-
-/* Check that CLASS_DECL somehow implements all inherited abstract
-   methods.  */
-
-static void
-java_check_abstract_method_definitions (tree class_decl)
-{
-  tree class = TREE_TYPE (class_decl);
-  tree super, base_binfo;
-  int i;
-
-  if (CLASS_ABSTRACT (class_decl))
-    return;
-
-  /* Check for inherited types */
-  super = class;
-  do {
-    super = CLASSTYPE_SUPER (super);
-    check_abstract_method_definitions (0, class_decl, super);
-  } while (super != object_type_node);
-
-  /* Check for implemented interfaces. */
-  for (i = 1; BINFO_BASE_ITERATE (TYPE_BINFO (class), i, base_binfo); i++)
-    check_abstract_method_definitions (1, class_decl, BINFO_TYPE (base_binfo));
-}
-
-/* Check all the types method DECL uses and return 1 if all of them
-   are now complete, 0 otherwise. This is used to check whether its
-   safe to build a method signature or not.  */
-
-static int
-check_method_types_complete (tree decl)
-{
-  tree type = TREE_TYPE (decl);
-  tree args;
-
-  if (!INCOMPLETE_TYPE_P (TREE_TYPE (type)))
-    return 0;
-
-  args = TYPE_ARG_TYPES (type);
-  if (TREE_CODE (type) == METHOD_TYPE)
-    args = TREE_CHAIN (args);
-  for (; args != end_params_node; args = TREE_CHAIN (args))
-    if (INCOMPLETE_TYPE_P (TREE_VALUE (args)))
-      return 0;
-
-  return 1;
-}
-
-/* Visible interface to check methods contained in CLASS_DECL */
-
-void
-java_check_methods (tree class_decl)
-{
-  if (CLASS_METHOD_CHECKED_P (TREE_TYPE (class_decl)))
-    return;
-
-  if (CLASS_INTERFACE (class_decl))
-    java_check_abstract_methods (class_decl);
-  else
-    java_check_regular_methods (class_decl);
-
-  CLASS_METHOD_CHECKED_P (TREE_TYPE (class_decl)) = 1;
-}
-
-/* Like not_accessible_p, but doesn't refer to the current class at
-   all.  */
-static bool
-hack_is_accessible_p (tree member, tree from_where)
-{
-  int flags = get_access_flags_from_decl (member);
-
-  if (from_where == DECL_CONTEXT (member)
-      || (flags & ACC_PUBLIC))
-    return true;
-
-  if ((flags & ACC_PROTECTED))
-    {
-      if (inherits_from_p (from_where, DECL_CONTEXT (member)))
-	return true;
-    }
-
-  if ((flags & ACC_PRIVATE))
-    return false;
-
-  /* Package private, or protected.  */
-  return in_same_package (TYPE_NAME (from_where),
-			  TYPE_NAME (DECL_CONTEXT (member)));
-}
-
-/* Check all the methods of CLASS_DECL. Methods are first completed
-   then checked according to regular method existence rules.  If no
-   constructor for CLASS_DECL were encountered, then build its
-   declaration.  */
-static void
-java_check_regular_methods (tree class_decl)
-{
-  int saw_constructor = ANONYMOUS_CLASS_P (TREE_TYPE (class_decl));
-  tree method;
-  tree class = TREE_TYPE (class_decl);
-  tree found = NULL_TREE;
-  tree mthrows;
-
-  /* It is not necessary to check methods defined in java.lang.Object */
-  if (class == object_type_node)
-    return;
-
-  if (!TYPE_NVIRTUALS (class))
-    TYPE_METHODS (class) = nreverse (TYPE_METHODS (class));
-
-  /* Should take interfaces into account. FIXME */
-  for (method = TYPE_METHODS (class); method; method = TREE_CHAIN (method))
-    {
-      tree sig;
-      tree method_wfl = DECL_FUNCTION_WFL (method);
-      int aflags;
-
-      /* Check for redefinitions */
-      if (check_method_redefinition (class, method))
-	continue;
-
-      /* We verify things thrown by the method.  They must inherit from
-	 java.lang.Throwable.  */
-      for (mthrows = DECL_FUNCTION_THROWS (method);
-	   mthrows; mthrows = TREE_CHAIN (mthrows))
-	{
-	  if (!inherits_from_p (TREE_VALUE (mthrows), throwable_type_node))
-	    parse_error_context
-	      (TREE_PURPOSE (mthrows), "Class %qs in %<throws%> clause must be a subclass of class %<java.lang.Throwable%>",
-	       IDENTIFIER_POINTER
-	         (DECL_NAME (TYPE_NAME (TREE_VALUE (mthrows)))));
-	}
-
-      /* If we see one constructor a mark so we don't generate the
-	 default one.  Also skip other verifications: constructors
-	 can't be inherited hence hidden or overridden.  */
-      if (DECL_CONSTRUCTOR_P (method))
-	{
-	  saw_constructor = 1;
-	  continue;
-	}
-
-      sig = build_java_argument_signature (TREE_TYPE (method));
-      found = lookup_argument_method_generic (class, DECL_NAME (method), sig,
-					      SEARCH_SUPER | SEARCH_INTERFACE);
-
-      /* Inner class can't declare static methods */
-      if (METHOD_STATIC (method) && !TOPLEVEL_CLASS_DECL_P (class_decl))
-	{
-	  char *t = xstrdup (lang_printable_name (class, 0));
-	  parse_error_context
-	    (method_wfl, "Method %qs can't be static in inner class %qs. Only members of interfaces and top-level classes can be static",
-	     lang_printable_name (method, 2), t);
-	  free (t);
-	}
-
-      /* Nothing overrides or it's a private method. */
-      if (!found)
-	continue;
-      if (METHOD_PRIVATE (found))
-	{
-	  found = NULL_TREE;
-	  continue;
-	}
-
-      /* If `found' is declared in an interface, make sure the
-	 modifier matches. */
-      if (CLASS_INTERFACE (TYPE_NAME (DECL_CONTEXT (found)))
-	  && clinit_identifier_node != DECL_NAME (found)
-	  && !METHOD_PUBLIC (method))
-	{
-	  tree found_decl = TYPE_NAME (DECL_CONTEXT (found));
-	  parse_error_context (method_wfl, "Class %qs must override %qs with a public method in order to implement interface %qs",
-			       IDENTIFIER_POINTER (DECL_NAME (class_decl)),
-			       lang_printable_name (found, 0),
-			       IDENTIFIER_POINTER (DECL_NAME (found_decl)));
-	}
-
-      /* Can't override a method with the same name and different return
-	 types. */
-      if (TREE_TYPE (TREE_TYPE (found)) != TREE_TYPE (TREE_TYPE (method)))
-	{
-	  char *t = xstrdup
-	    (lang_printable_name (TREE_TYPE (TREE_TYPE (found)), 2));
-	  parse_error_context
-	    (method_wfl,
-	     "Method %qs was defined with return type %qs in class %qs",
-	     lang_printable_name (found, 2), t,
-	     IDENTIFIER_POINTER
-	       (DECL_NAME (TYPE_NAME (DECL_CONTEXT (found)))));
-	  free (t);
-	}
-
-      aflags = get_access_flags_from_decl (found);
-
-      /* Can't override final. Can't override static. */
-      if (METHOD_FINAL (found) || METHOD_STATIC (found))
-	{
-	  /* Static *can* override static */
-	  if (METHOD_STATIC (found) && METHOD_STATIC (method))
-	    continue;
-	  parse_error_context
-	    (method_wfl,
-	     "%s methods can't be overridden. Method %qs is %s in class %qs",
-	     (METHOD_FINAL (found) ? "Final" : "Static"),
-	     lang_printable_name (found, 2),
-	     (METHOD_FINAL (found) ? "final" : "static"),
-	     IDENTIFIER_POINTER
-	       (DECL_NAME (TYPE_NAME (DECL_CONTEXT (found)))));
-	  continue;
-	}
-
-      /* Static method can't override instance method. */
-      if (METHOD_STATIC (method))
-	{
-	  parse_error_context
-	    (method_wfl,
-	     "Instance methods can't be overridden by a static method. Method %qs is an instance method in class %qs",
-	     lang_printable_name (found, 2),
-	     IDENTIFIER_POINTER
-	       (DECL_NAME (TYPE_NAME (DECL_CONTEXT (found)))));
-	  continue;
-	}
-
-      /* - Overriding/hiding public must be public
-	 - Overriding/hiding protected must be protected or public
-         - If the overridden or hidden method has default (package)
-           access, then the overriding or hiding method must not be
-           private; otherwise, a compile-time error occurs.  If
-           `found' belongs to an interface, things have been already
-           taken care of.  */
-      if (!CLASS_INTERFACE (TYPE_NAME (DECL_CONTEXT (found)))
-	  && ((METHOD_PUBLIC (found) && !METHOD_PUBLIC (method))
-	      || (METHOD_PROTECTED (found)
-		  && !(METHOD_PUBLIC (method) || METHOD_PROTECTED (method)))
-	      || (!(aflags & (ACC_PUBLIC | ACC_PRIVATE | ACC_STATIC))
-		  && METHOD_PRIVATE (method))))
-	{
-	  parse_error_context
-	    (method_wfl,
-	     "Methods can't be overridden to be more private. Method %qs is not %s in class %qs", lang_printable_name (method, 2),
-	     (METHOD_PUBLIC (method) ? "public" :
-	      (METHOD_PRIVATE (method) ? "private" : "protected")),
-	     IDENTIFIER_POINTER (DECL_NAME
-				 (TYPE_NAME (DECL_CONTEXT (found)))));
-	  continue;
-	}
-
-      /* Check this method against all the other implementations it
-	 overrides.  Here we only check the class hierarchy; the rest
-	 of the checking is done later.  If this method is just a
-	 Miranda method, we can skip the check.  */
-      if (! METHOD_INVISIBLE (method))
-	check_concrete_throws_clauses (class, method, DECL_NAME (method), sig);
-    }
-
-  /* The above throws clause check only looked at superclasses.  Now
-     we must also make sure that all methods declared in interfaces
-     have compatible throws clauses.  FIXME: there are more efficient
-     ways to organize this checking; we should implement one.  */
-  check_interface_throws_clauses (class, class);
-
-  if (!TYPE_NVIRTUALS (class))
-    TYPE_METHODS (class) = nreverse (TYPE_METHODS (class));
-
-  /* Search for inherited abstract method not yet implemented in this
-     class.  */
-  java_check_abstract_method_definitions (class_decl);
-
-  if (!saw_constructor)
-    abort ();
-}
-
-/* Check to make sure that all the methods in all the interfaces
-   implemented by CLASS_DECL are compatible with the concrete
-   implementations available in CHECK_CLASS_DECL.  */
-static void
-check_interface_throws_clauses (tree check_class_decl, tree class_decl)
-{
-  for (; class_decl != NULL_TREE; class_decl = CLASSTYPE_SUPER (class_decl))
-    {
-      int i;
-
-      if (! CLASS_LOADED_P (class_decl))
-	{
-	  if (CLASS_FROM_SOURCE_P (class_decl))
-	    safe_layout_class (class_decl);
-	  else
-	    load_class (class_decl, 1);
-	}
-
-      for (i = BINFO_N_BASE_BINFOS (TYPE_BINFO (class_decl)) - 1; i > 0; --i)
-	{
-	  tree interface
-	    = BINFO_TYPE (BINFO_BASE_BINFO (TYPE_BINFO (class_decl), i));
-	  tree iface_method;
-
-	  for (iface_method = TYPE_METHODS (interface);
-	       iface_method != NULL_TREE;
-	       iface_method = TREE_CHAIN (iface_method))
-	    {
-	      tree sig, method;
-
-	      /* First look for a concrete method implemented or
-		 inherited by this class.  No need to search
-		 interfaces here, since we're already looking through
-		 all of them.  */
-	      sig = build_java_argument_signature (TREE_TYPE (iface_method));
-	      method
-		= lookup_argument_method_generic (check_class_decl,
-						  DECL_NAME (iface_method),
-						  sig, SEARCH_VISIBLE);
-	      /* If we don't find an implementation, that is ok.  Any
-		 potential errors from that are diagnosed elsewhere.
-		 Also, multiple inheritance with conflicting throws
-		 clauses is fine in the absence of a concrete
-		 implementation.  */
-	      if (method != NULL_TREE && !METHOD_ABSTRACT (method)
-		  && !METHOD_INVISIBLE (iface_method))
-		{
-		  tree method_wfl = DECL_FUNCTION_WFL (method);
-		  check_throws_clauses (method, method_wfl, iface_method);
-		}
-	    }
-
-	  /* Now check superinterfaces.  */
-	  check_interface_throws_clauses (check_class_decl, interface);
-	}
-    }
-}
-
-/* Check throws clauses of a method against the clauses of all the
-   methods it overrides.  We do this by searching up the class
-   hierarchy, examining all matching accessible methods.  */
-static void
-check_concrete_throws_clauses (tree class, tree self_method,
-			       tree name, tree signature)
-{
-  tree method = lookup_argument_method_generic (class, name, signature,
-						SEARCH_SUPER | SEARCH_VISIBLE);
-  while (method != NULL_TREE)
-    {
-      if (! METHOD_INVISIBLE (method) && hack_is_accessible_p (method, class))
-	check_throws_clauses (self_method, DECL_FUNCTION_WFL (self_method),
-			      method);
-
-      method = lookup_argument_method_generic (DECL_CONTEXT (method),
-					       name, signature,
-					       SEARCH_SUPER | SEARCH_VISIBLE);
-    }
-}
-
-/* Generate an error if the `throws' clause of METHOD (if any) is
-   incompatible with the `throws' clause of FOUND (if any).  */
-static void
-check_throws_clauses (tree method, tree method_wfl, tree found)
-{
-  tree mthrows;
-
-  for (mthrows = DECL_FUNCTION_THROWS (method);
-       mthrows; mthrows = TREE_CHAIN (mthrows))
-    {
-      tree fthrows;
-
-      /* We don't verify unchecked expressions */
-      if (IS_UNCHECKED_EXCEPTION_P (TREE_VALUE (mthrows)))
-	continue;
-      /* Checked expression must be compatible */
-      for (fthrows = DECL_FUNCTION_THROWS (found);
-	   fthrows; fthrows = TREE_CHAIN (fthrows))
-	{
-	  if (inherits_from_p (TREE_VALUE (mthrows), TREE_VALUE (fthrows)))
-	    break;
-	}
-      if (!fthrows)
-	{
-	  parse_error_context
-	    (method_wfl, "Invalid checked exception class %qs in %<throws%> clause.  The exception must be a subclass of an exception thrown by %qs from class %qs",
-	     IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (TREE_VALUE (mthrows)))),
-	     lang_printable_name (found, 2),
-	     IDENTIFIER_POINTER
-	     (DECL_NAME (TYPE_NAME (DECL_CONTEXT (found)))));
-	}
-    }
-}
-
-/* Check abstract method of interface INTERFACE */
-static void
-java_check_abstract_methods (tree interface_decl)
-{
-  int i;
-  tree method, found;
-  tree interface = TREE_TYPE (interface_decl);
-  tree base_binfo;
-
-  for (method = TYPE_METHODS (interface); method; method = TREE_CHAIN (method))
-    {
-      /* 2- Check for double definition inside the defining interface */
-      if (check_method_redefinition (interface, method))
-	continue;
-
-      /* 3- Overriding is OK as far as we preserve the return type.  */
-      found = lookup_java_interface_method2 (interface, method);
-      if (found)
-	{
-	  char *t;
-	  t = xstrdup (lang_printable_name (TREE_TYPE (TREE_TYPE (found)), 2));
-	  parse_error_context
-	    (DECL_FUNCTION_WFL (found),
-	     "Method %qs was defined with return type %qs in class %qs",
-	     lang_printable_name (found, 2), t,
-	     IDENTIFIER_POINTER
-	       (DECL_NAME (TYPE_NAME (DECL_CONTEXT (found)))));
-	  free (t);
-	  continue;
-	}
-    }
-
-  /* 4- Inherited methods can't differ by their returned types */
-  for (i = 0; BINFO_BASE_ITERATE (TYPE_BINFO (interface), i, base_binfo); i++)
-    {
-      tree sub_interface_method, sub_interface;
-
-      sub_interface = BINFO_TYPE (base_binfo);
-      for (sub_interface_method = TYPE_METHODS (sub_interface);
-	   sub_interface_method;
-	   sub_interface_method = TREE_CHAIN (sub_interface_method))
-	{
-	  found = lookup_java_interface_method2 (interface,
-						 sub_interface_method);
-	  if (found && (found != sub_interface_method))
-	    {
-	      parse_error_context
-		(lookup_cl (sub_interface_method),
-		 "Interface %qs inherits method %qs from interface %qs. This method is redefined with a different return type in interface %qs",
-		 IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (interface))),
-		 lang_printable_name (found, 2),
-		 IDENTIFIER_POINTER
-		   (DECL_NAME (TYPE_NAME
-			       (DECL_CONTEXT (sub_interface_method)))),
-		 IDENTIFIER_POINTER
-	           (DECL_NAME (TYPE_NAME (DECL_CONTEXT (found)))));
-	    }
-	}
-    }
-}
-
-/* Lookup methods in interfaces using their name and partial
-   signature. Return a matching method only if their types differ.  */
-
-static tree
-lookup_java_interface_method2 (tree class, tree method_decl)
-{
-  int i;
-  tree base_binfo;
-  tree to_return;
-
-  for (i = 0; BINFO_BASE_ITERATE (TYPE_BINFO (class), i, base_binfo); i++)
-    {
-      if ((BINFO_TYPE (base_binfo) != object_type_node)
-	  && (to_return =
-	      lookup_java_method2 (BINFO_TYPE (base_binfo), method_decl, 1)))
-	return to_return;
-    }
-  for (i = 0; BINFO_BASE_ITERATE (TYPE_BINFO (class), i, base_binfo); i++)
-    {
-      to_return = lookup_java_interface_method2
-	(BINFO_TYPE (base_binfo), method_decl);
-      if (to_return)
-	return to_return;
-    }
-
-  return NULL_TREE;
-}
-
-/* Lookup method using their name and partial signature. Return a
-   matching method only if their types differ.  */
-
-static tree
-lookup_java_method2 (tree clas, tree method_decl, int do_interface)
-{
-  tree method, method_signature, method_name, method_type, name;
-
-  method_signature = build_java_argument_signature (TREE_TYPE (method_decl));
-  name = DECL_NAME (method_decl);
-  method_name = (TREE_CODE (name) == EXPR_WITH_FILE_LOCATION ?
-		 EXPR_WFL_NODE (name) : name);
-  method_type = TREE_TYPE (TREE_TYPE (method_decl));
-
-  while (clas != NULL_TREE)
-    {
-      for (method = TYPE_METHODS (clas);
-	   method != NULL_TREE;  method = TREE_CHAIN (method))
-	{
-	  tree method_sig = build_java_argument_signature (TREE_TYPE (method));
-	  tree name = DECL_NAME (method);
-	  if ((TREE_CODE (name) == EXPR_WITH_FILE_LOCATION ?
-	       EXPR_WFL_NODE (name) : name) == method_name
-	      && method_sig == method_signature
-	      && TREE_TYPE (TREE_TYPE (method)) != method_type)
-	    return method;
-	}
-      clas = (do_interface ? NULL_TREE : CLASSTYPE_SUPER (clas));
-    }
-  return NULL_TREE;
-}
-
-/* Return the line that matches DECL line number, and try its best to
-   position the column number. Used during error reports.
-   FUTURE/FIXME: return source_location instead of node. */
-
-static GTY(()) tree cl_v;
-static tree
-lookup_cl (tree decl)
-{
-#ifndef USE_MAPPED_LOCATION
-  char *line, *found;
-#endif
-
-  if (!decl)
-    return NULL_TREE;
-
-  if (cl_v == NULL_TREE)
-    {
-      cl_v = build_unknown_wfl (NULL_TREE);
-    }
-
-#ifdef USE_MAPPED_LOCATION
-  SET_EXPR_LOCATION (cl_v, DECL_SOURCE_LOCATION (decl));
-#else
-  EXPR_WFL_FILENAME_NODE (cl_v) = get_identifier (DECL_SOURCE_FILE (decl));
-  EXPR_WFL_SET_LINECOL (cl_v, DECL_SOURCE_LINE (decl), -1);
-
-  line = java_get_line_col (EXPR_WFL_FILENAME (cl_v),
-			    EXPR_WFL_LINENO (cl_v), EXPR_WFL_COLNO (cl_v));
-
-  found = strstr ((const char *)line,
-		  (const char *)IDENTIFIER_POINTER (DECL_NAME (decl)));
-  if (found)
-    EXPR_WFL_SET_LINECOL (cl_v, EXPR_WFL_LINENO (cl_v), found - line);
-#endif
-
-  return cl_v;
-}
-
-/* Look for a simple name in the single-type import list */
-
-static tree
-find_name_in_single_imports (tree name)
-{
-  tree node;
-
-  for (node = ctxp->import_list; node; node = TREE_CHAIN (node))
-    if (TREE_VALUE (node) == name)
-      return (EXPR_WFL_NODE (TREE_PURPOSE (node)));
-
-  return NULL_TREE;
-}
-
-/* Process all single-type import. */
-
-static int
-process_imports (void)
-{
-  tree import;
-  int error_found;
-
-  for (import = ctxp->import_list; import; import = TREE_CHAIN (import))
-    {
-      tree to_be_found = EXPR_WFL_NODE (TREE_PURPOSE (import));
-      char *original_name;
-
-      /* Don't load twice something already defined. */
-      if (IDENTIFIER_CLASS_VALUE (to_be_found))
-	continue;
-
-      original_name = xmemdup (IDENTIFIER_POINTER (to_be_found),
-			       IDENTIFIER_LENGTH (to_be_found),
-			       IDENTIFIER_LENGTH (to_be_found) + 1);
-
-      while (1)
-	{
-	  tree left;
-
-	  QUALIFIED_P (to_be_found) = 1;
-	  load_class (to_be_found, 0);
-	  error_found =
-	    check_pkg_class_access (to_be_found, TREE_PURPOSE (import), true, NULL_TREE);
-
-	  /* We found it, we can bail out */
-	  if (IDENTIFIER_CLASS_VALUE (to_be_found))
-	    {
-	      check_deprecation (TREE_PURPOSE (import),
-				 IDENTIFIER_CLASS_VALUE (to_be_found));
-	      break;
-	    }
-
-	  /* We haven't found it. Maybe we're trying to access an
-	     inner class.  The only way for us to know is to try again
-	     after having dropped a qualifier. If we can't break it further,
-	     we have an error. */
-	  if (split_qualified_name (&left, NULL, to_be_found))
-	    break;
-
-	  to_be_found = left;
-	}
-      if (!IDENTIFIER_CLASS_VALUE (to_be_found))
-	{
-	  parse_error_context (TREE_PURPOSE (import),
-			       "Class or interface %qs not found in import",
-			       original_name);
-	  error_found = 1;
-	}
-
-      free (original_name);
-      if (error_found)
-	return 1;
-    }
-  return 0;
-}
-
-/* Possibly find and mark a class imported by a single-type import
-   statement.  */
-
-static void
-find_in_imports (tree enclosing_type, tree class_type)
-{
-  tree import;
-  if (enclosing_type && TYPE_IMPORT_LIST (enclosing_type))
-    import = TYPE_IMPORT_LIST (enclosing_type);
-  else
-    import = ctxp->import_list;
-
-  while (import)
-    {
-      if (TREE_VALUE (import) == TYPE_NAME (class_type))
-	{
-	  TYPE_NAME (class_type) = EXPR_WFL_NODE (TREE_PURPOSE (import));
-	  QUALIFIED_P (TYPE_NAME (class_type)) = 1;
-	  return;
-	}
-      import = TREE_CHAIN (import);
-    }
-}
-
-static int
-note_possible_classname (const char *name, int len)
-{
-  tree node;
-  if (len > 5 && strncmp (&name [len-5], ".java", 5) == 0)
-    len = len - 5;
-  else if (len > 6 && strncmp (&name [len-6], ".class", 6) == 0)
-    len = len - 6;
-  else
-    return 0;
-  node = ident_subst (name, len, "", '/', '.', "");
-  IS_A_CLASSFILE_NAME (node) = 1; /* Or soon to be */
-  QUALIFIED_P (node) = strchr (name, '/') ? 1 : 0;
-  return 1;
-}
-
-/* Read a import directory, gathering potential match for further type
-   references. Indifferently reads a filesystem or a ZIP archive
-   directory.  */
-
-static void
-read_import_dir (tree wfl)
-{
-  tree package_id = EXPR_WFL_NODE (wfl);
-  const char *package_name = IDENTIFIER_POINTER (package_id);
-  int package_length = IDENTIFIER_LENGTH (package_id);
-  DIR *dirp = NULL;
-  JCF *saved_jcf = current_jcf;
-
-  int found = 0;
-  int k;
-  void *entry;
-  struct buffer filename[1];
-
-  if (IS_AN_IMPORT_ON_DEMAND_P (package_id))
-    return;
-  IS_AN_IMPORT_ON_DEMAND_P (package_id) = 1;
-
-  BUFFER_INIT (filename);
-  buffer_grow (filename, package_length + 100);
-
-  for (entry = jcf_path_start (); entry != NULL; entry = jcf_path_next (entry))
-    {
-      const char *entry_name = jcf_path_name (entry);
-      int entry_length = strlen (entry_name);
-      if (jcf_path_is_zipfile (entry))
-	{
-	  ZipFile *zipf;
-	  buffer_grow (filename, entry_length);
-	  memcpy (filename->data, entry_name, entry_length - 1);
-	  filename->data[entry_length-1] = '\0';
-	  zipf = opendir_in_zip ((const char *) filename->data, jcf_path_is_system (entry));
-	  if (zipf == NULL)
-	    error ("malformed .zip archive in CLASSPATH: %s", entry_name);
-	  else
-	    {
-	      ZipDirectory *zipd = (ZipDirectory *) zipf->central_directory;
-	      BUFFER_RESET (filename);
-	      for (k = 0; k < package_length; k++)
-		{
-		  char ch = package_name[k];
-		  *filename->ptr++ = ch == '.' ? '/' : ch;
-		}
-	      *filename->ptr++ = '/';
-
-	      for (k = 0; k < zipf->count;  k++, zipd = ZIPDIR_NEXT (zipd))
-		{
-		  const char *current_entry = ZIPDIR_FILENAME (zipd);
-		  int current_entry_len = zipd->filename_length;
-
-		  if (current_entry_len >= BUFFER_LENGTH (filename)
-		      && strncmp ((const char *) filename->data, current_entry,
-				  BUFFER_LENGTH (filename)) != 0)
-		    continue;
-		  found |= note_possible_classname (current_entry,
-						    current_entry_len);
-		}
-	    }
-	}
-      else
-	{
-	  BUFFER_RESET (filename);
-	  buffer_grow (filename, entry_length + package_length + 4);
-	  strcpy ((char *) filename->data, entry_name);
-	  filename->ptr = filename->data + entry_length;
-	  for (k = 0; k < package_length; k++)
-	    {
-	      char ch = package_name[k];
-	      *filename->ptr++ = ch == '.' ? '/' : ch;
-	    }
-	  *filename->ptr = '\0';
-
-	  dirp = opendir ((const char *) filename->data);
-	  if (dirp == NULL)
-	    continue;
-	  *filename->ptr++ = '/';
-	  for (;;)
-	    {
-	      int len;
-	      const char *d_name;
-	      struct dirent *direntp = readdir (dirp);
-	      if (!direntp)
-		break;
-	      d_name = direntp->d_name;
-	      len = strlen (direntp->d_name);
-	      buffer_grow (filename, len+1);
-	      strcpy ((char *) filename->ptr, d_name);
-	      found |= note_possible_classname ((const char *) filename->data + entry_length,
-						package_length+len+1);
-	    }
-	  if (dirp)
-	    closedir (dirp);
-	}
-    }
-
-  free (filename->data);
-
-  /* Here we should have a unified way of retrieving an entry, to be
-     indexed. */
-  if (!found)
-    {
-      static int first = 1;
-      if (first)
-	{
-	  error ("Can't find default package %qs. Check the CLASSPATH environment variable and the access to the archives", package_name);
-	  java_error_count++;
-	  first = 0;
-	}
-      else
-	parse_error_context (wfl, "Package %qs not found in import",
-			     package_name);
-      current_jcf = saved_jcf;
-      return;
-    }
-  current_jcf = saved_jcf;
-}
-
-/* Possibly find a type in the import on demands specified
-   types. Returns 1 if an error occurred, 0 otherwise. Run through the
-   entire list, to detected potential double definitions.  */
-
-static int
-find_in_imports_on_demand (tree enclosing_type, tree class_type)
-{
-  tree class_type_name = TYPE_NAME (class_type);
-  tree cl = NULL_TREE;
-  int seen_once = -1;	/* -1 when not set, 1 if seen once, >1 otherwise. */
-  int to_return = -1;	/* -1 when not set, 0 or 1 otherwise */
-  tree node;
-  tree import;
-
-  if (enclosing_type && TYPE_IMPORT_DEMAND_LIST (enclosing_type))
-    import = TYPE_IMPORT_DEMAND_LIST (enclosing_type);
-  else
-    import = ctxp->import_demand_list;
-
-  for (; import; import = TREE_CHAIN (import))
-    {
-      location_t saved_location = input_location;
-      int access_check;
-      const char *id_name;
-      tree decl, type_name_copy;
-
-      obstack_grow (&temporary_obstack,
-		    IDENTIFIER_POINTER (EXPR_WFL_NODE (TREE_PURPOSE (import))),
-		    IDENTIFIER_LENGTH (EXPR_WFL_NODE (TREE_PURPOSE (import))));
-      obstack_1grow (&temporary_obstack, '.');
-      obstack_grow0 (&temporary_obstack,
-		     IDENTIFIER_POINTER (class_type_name),
-		     IDENTIFIER_LENGTH (class_type_name));
-      id_name = obstack_finish (&temporary_obstack);
-
-      if (! (node = maybe_get_identifier (id_name)))
-	continue;
-
-      /* Setup input_line so that it refers to the line of the import (in
-	 case we parse a class file and encounter errors */
-#ifdef USE_MAPPED_LOCATION
-      input_location = EXPR_LOCATION (TREE_PURPOSE (import));
-#else
-      input_line = EXPR_WFL_LINENO (TREE_PURPOSE (import));
-#endif
-
-      type_name_copy = TYPE_NAME (class_type);
-      TYPE_NAME (class_type) = node;
-      QUALIFIED_P (node) = 1;
-      decl = IDENTIFIER_CLASS_VALUE (node);
-      access_check = -1;
-      /* If there is no DECL set for the class or if the class isn't
-	 loaded and not seen in source yet, then load */
-      if (!decl || ! CLASS_LOADED_P (TREE_TYPE (decl)))
-	{
-	  load_class (node, 0);
-	  decl = IDENTIFIER_CLASS_VALUE (node);
-	}
-      if (decl && ! INNER_CLASS_P (TREE_TYPE (decl)))
-	access_check = check_pkg_class_access (node, TREE_PURPOSE (import),
-					       false, NULL_TREE);
-      else
-	/* 6.6.1: Inner classes are subject to member access rules. */
-	access_check = 0;
-
-      input_location = saved_location;
-
-      /* If the loaded class is not accessible or couldn't be loaded,
-	 we restore the original TYPE_NAME and process the next
-	 import. */
-      if (access_check || !decl)
-	{
-	  TYPE_NAME (class_type) = type_name_copy;
-	  continue;
-	}
-
-      /* If the loaded class is accessible, we keep a tab on it to
-	 detect and report multiple inclusions. */
-      if (IS_A_CLASSFILE_NAME (node))
-	{
-	  if (seen_once < 0)
-	    {
-	      cl = TREE_PURPOSE (import);
-	      seen_once = 1;
-	    }
-	  else if (seen_once >= 0)
-	    {
-	      tree location = (cl ? cl : TREE_PURPOSE (import));
-	      tree package = (cl ? EXPR_WFL_NODE (cl) :
-			      EXPR_WFL_NODE (TREE_PURPOSE (import)));
-	      seen_once++;
-	      parse_error_context
-		(location,
-		 "Type %qs also potentially defined in package %qs",
-		 IDENTIFIER_POINTER (TYPE_NAME (class_type)),
-		 IDENTIFIER_POINTER (package));
-	    }
-	}
-      to_return = access_check;
-    }
-
-  if (seen_once == 1)
-    return to_return;
-  else
-    return (seen_once < 0 ? 0 : seen_once); /* It's ok not to have found */
-}
-
-static tree
-resolve_package (tree pkg, tree *next, tree *type_name)
-{
-  tree current;
-  tree decl = NULL_TREE;
-  *type_name = NULL_TREE;
-
-  /* The trick is to determine when the package name stops and were
-     the name of something contained in the package starts. Then we
-     return a fully qualified name of what we want to get. */
-
-  *next = EXPR_WFL_QUALIFICATION (pkg);
-
-  /* Try to progressively construct a type name */
-  if (TREE_CODE (pkg) == EXPR_WITH_FILE_LOCATION)
-    for (current = EXPR_WFL_QUALIFICATION (pkg);
-	 current; current = TREE_CHAIN (current))
-      {
-	/* If we don't have what we're expecting, exit now. TYPE_NAME
-	   will be null and the error caught later. */
-	if (TREE_CODE (QUAL_WFL (current)) != EXPR_WITH_FILE_LOCATION)
-	  break;
-	*type_name =
-	  merge_qualified_name (*type_name, EXPR_WFL_NODE (QUAL_WFL (current)));
-	if ((decl = resolve_no_layout (*type_name, NULL_TREE)))
-	  {
-	    /* resolve_package should be used in a loop, hence we
-	       point at this one to naturally process the next one at
-	       the next iteration. */
-	    *next = current;
-	    break;
-	  }
-      }
-  return decl;
-}
-
-/* Check accessibility of inner class DECL, from the context ENCLOSING_DECL,
-   according to member access rules.  */
-
-static bool
-inner_class_accessible (tree decl, tree enclosing_decl)
-{
-  tree enclosing_decl_type;
-
-  enclosing_decl_type = TREE_TYPE (enclosing_decl);
-
-  if (CLASS_PRIVATE (decl))
-    {
-      /* Access is permitted only within the body of the top-level
-         class in which DECL is declared. */
-      tree top_level = decl;
-      while (DECL_CONTEXT (top_level))
-        top_level = DECL_CONTEXT (top_level);
-      while (DECL_CONTEXT (enclosing_decl))
-        enclosing_decl = DECL_CONTEXT (enclosing_decl);
-      if (top_level == enclosing_decl)
-        return true;
-    }
-  else if (CLASS_PROTECTED (decl))
-    {
-      tree decl_context;
-      /* Access is permitted from within the same package... */
-      if (in_same_package (decl, enclosing_decl))
-        return true;
-
-      /* ... or from within the body of a subtype of the context in which
-         DECL is declared. */
-      decl_context = DECL_CONTEXT (decl);
-      while (enclosing_decl)
-        {
-	  if (CLASS_INTERFACE (decl))
-	    {
-	      if (interface_of_p (TREE_TYPE (decl_context),
-				  enclosing_decl_type))
-		return true;
-	    }
-	  else
-	    {
-	      /* Eww. The order of the arguments is different!! */
-	      if (inherits_from_p (enclosing_decl_type,
-				   TREE_TYPE (decl_context)))
-		return true;
-	    }
-	  enclosing_decl = DECL_CONTEXT (enclosing_decl);
-	}
-    }
-  else if (! CLASS_PUBLIC (decl))
-    {
-      /* Access is permitted only from within the same package as DECL. */
-      if (in_same_package (decl, enclosing_decl))
-        return true;
-    }
-  else
-    /* Class is public. */
-    return true;
-
-  return false;
-}
-
-/* Check accessibility of inner classes according to member access rules.
-   DECL is the inner class, ENCLOSING_DECL is the class from which the
-   access is being attempted. */
-
-static void
-check_inner_class_access (tree decl, tree enclosing_decl, tree cl)
-{
-  const char *access;
-
-  /* We don't issue an error message when CL is null. CL can be null
-     as a result of processing a JDEP crafted by source_start_java_method
-     for the purpose of patching its parm decl. But the error would
-     have been already trapped when fixing the method's signature.
-     DECL can also be NULL in case of earlier errors. */
-  if (!decl || !cl)
-    return;
-
-  if (inner_class_accessible (decl, enclosing_decl))
-    return;
-
-  if (CLASS_PRIVATE (decl))
-      access = "private";
-  else if (CLASS_PROTECTED (decl))
-      access = "protected";
-  else
-      access = "non-public";
-
-  parse_error_context (cl, "Nested %s %s is %s; cannot be accessed from here",
-		       (CLASS_INTERFACE (decl) ? "interface" : "class"),
-		       lang_printable_name (decl, 2), access);
-}
-
-/* Accessibility check for top-level classes. If CLASS_NAME is in a
-   foreign package, it must be PUBLIC. Return 0 if no access
-   violations were found, 1 otherwise. If VERBOSE is true and an error
-   was found, it is reported and accounted for.  If CL is NULL then 
-   look it up with THIS_DECL.  */
-
-static int
-check_pkg_class_access (tree class_name, tree cl, bool verbose, tree this_decl)
-{
-  tree type;
-
-  if (!IDENTIFIER_CLASS_VALUE (class_name))
-    return 0;
-
-  if (!(type = TREE_TYPE (IDENTIFIER_CLASS_VALUE (class_name))))
-    return 0;
-
-  if (!CLASS_PUBLIC (TYPE_NAME (type)))
-    {
-      /* Access to a private class within the same package is
-         allowed. */
-      tree l, r;
-      split_qualified_name (&l, &r, class_name);
-      if (!QUALIFIED_P (class_name) && !ctxp->package)
-	/* Both in the empty package. */
-        return 0;
-      if (l == ctxp->package)
-	/* Both in the same package. */
-	return 0;
-
-      if (verbose)
-	parse_error_context
-	  (cl == NULL ? lookup_cl (this_decl): cl,
-           "Can't access %s %qs. Only public classes and interfaces in other packages can be accessed",
-	   (CLASS_INTERFACE (TYPE_NAME (type)) ? "interface" : "class"),
-	   IDENTIFIER_POINTER (class_name));
-      return 1;
-    }
-  return 0;
-}
-
-/* Local variable declaration. */
-
-static void
-declare_local_variables (int modifier, tree type, tree vlist)
-{
-  tree decl, current, saved_type;
-  tree type_wfl = NULL_TREE;
-  int must_chain = 0;
-  int final_p = 0;
-
-  /* Push a new block if statements were seen between the last time we
-     pushed a block and now. Keep a count of blocks to close */
-  if (BLOCK_EXPR_BODY (GET_CURRENT_BLOCK (current_function_decl)))
-    {
-      tree b = enter_block ();
-      BLOCK_IS_IMPLICIT (b) = 1;
-    }
-
-  if (modifier)
-    {
-      size_t i;
-      for (i = 0; i < ARRAY_SIZE (ctxp->modifier_ctx); i++)
-	if (1 << i & modifier)
-	  break;
-      if (modifier == ACC_FINAL)
-	final_p = 1;
-      else
-	{
-	  parse_error_context
-	    (ctxp->modifier_ctx [i],
-	     "Only %<final%> is allowed as a local variables modifier");
-	  return;
-	}
-    }
-
-  /* Obtain an incomplete type if TYPE is not complete. TYPE_WFL will
-     hold the TYPE value if a new incomplete has to be created (as
-     opposed to being found already existing and reused). */
-  SET_TYPE_FOR_RESOLUTION (type, type_wfl, must_chain);
-
-  /* If TYPE is fully resolved and we don't have a reference, make one */
-  PROMOTE_RECORD_IF_COMPLETE (type, must_chain);
-
-  /* Go through all the declared variables */
-  for (current = vlist, saved_type = type; current;
-       current = TREE_CHAIN (current), type = saved_type)
-    {
-      tree other, real_type;
-      tree wfl  = TREE_PURPOSE (current);
-      tree name = EXPR_WFL_NODE (wfl);
-      tree init = TREE_VALUE (current);
-
-      /* Process NAME, as it may specify extra dimension(s) for it */
-      type = build_array_from_name (type, type_wfl, name, &name);
-
-      /* Variable redefinition check */
-      if ((other = lookup_name_in_blocks (name)))
-	{
-	  variable_redefinition_error (wfl, name, TREE_TYPE (other),
-				       DECL_SOURCE_LINE (other));
-	  continue;
-	}
-
-      /* Type adjustment. We may have just readjusted TYPE because
-	 the variable specified more dimensions. Make sure we have
-	 a reference if we can and don't have one already. */
-      PROMOTE_RECORD_IF_COMPLETE (type, must_chain);
-
-      real_type = GET_REAL_TYPE (type);
-      /* Never layout this decl. This will be done when its scope
-	 will be entered */
-      decl = build_decl (VAR_DECL, name, real_type);
-      MAYBE_CREATE_VAR_LANG_DECL_SPECIFIC (decl);
-      DECL_FINAL (decl) = final_p;
-      BLOCK_CHAIN_DECL (decl);
-
-      /* Don't try to use an INIT statement when an error was found */
-      if (init && java_error_count)
-	init = NULL_TREE;
-
-      /* Remember it if this is an initialized-upon-declaration final
-         variable.  */
-      if (init && final_p)
-        {
-          DECL_LOCAL_FINAL_IUD (decl) = 1;
-        }
-
-      /* Add the initialization function to the current function's code */
-      if (init)
-	{
-	  /* Name might have been readjusted */
-	  EXPR_WFL_NODE (TREE_OPERAND (init, 0)) = name;
-	  MODIFY_EXPR_FROM_INITIALIZATION_P (init) = 1;
-	  java_method_add_stmt (current_function_decl,
-				build_debugable_stmt (EXPR_WFL_LINECOL (init),
-						      init));
-	}
-
-      /* Setup dependency the type of the decl */
-      if (must_chain)
-	{
-	  jdep *dep;
-	  register_incomplete_type (JDEP_VARIABLE, type_wfl, decl, type);
-	  dep = CLASSD_LAST (ctxp->classd_list);
-	  JDEP_GET_PATCH (dep) = &TREE_TYPE (decl);
-	}
-    }
-  SOURCE_FRONTEND_DEBUG (("Defined locals"));
-}
-
-/* Called during parsing. Build decls from argument list.  */
-
-static void
-source_start_java_method (tree fndecl)
-{
-  tree tem;
-  tree parm_decl;
-  int i;
-
-  if (!fndecl)
-    return;
-
-  current_function_decl = fndecl;
-
-  /* New scope for the function */
-  enter_block ();
-  for (tem = TYPE_ARG_TYPES (TREE_TYPE (fndecl)), i = 0;
-       tem != end_params_node; tem = TREE_CHAIN (tem), i++)
-    {
-      tree type = TREE_VALUE (tem);
-      tree name = TREE_PURPOSE (tem);
-
-      /* If type is incomplete. Create an incomplete decl and ask for
-	 the decl to be patched later */
-      if (INCOMPLETE_TYPE_P (type))
-	{
-	  jdep *jdep;
-	  tree real_type = GET_REAL_TYPE (type);
-	  parm_decl = build_decl (PARM_DECL, name, real_type);
-	  type = obtain_incomplete_type (type);
-	  register_incomplete_type (JDEP_PARM, NULL_TREE, NULL_TREE, type);
-	  jdep = CLASSD_LAST (ctxp->classd_list);
-	  JDEP_MISC (jdep) = name;
-	  JDEP_GET_PATCH (jdep) = &TREE_TYPE (parm_decl);
-	}
-      else
-	parm_decl = build_decl (PARM_DECL, name, type);
-
-      /* Remember if a local variable was declared final (via its
-         TREE_LIST of type/name.) Set DECL_FINAL accordingly. */
-      if (ARG_FINAL_P (tem))
-	{
-	  MAYBE_CREATE_VAR_LANG_DECL_SPECIFIC (parm_decl);
-	  DECL_FINAL (parm_decl) = 1;
-	}
-
-      if (name == this_identifier_node)
-	DECL_ARTIFICIAL (parm_decl) = 1;
-
-      BLOCK_CHAIN_DECL (parm_decl);
-    }
-  tem = BLOCK_EXPR_DECLS (DECL_FUNCTION_BODY (current_function_decl));
-  BLOCK_EXPR_DECLS (DECL_FUNCTION_BODY (current_function_decl)) =
-    nreverse (tem);
-  DECL_ARG_SLOT_COUNT (current_function_decl) = i;
-  DECL_MAX_LOCALS (current_function_decl) = i;
-}
-
-/* Called during parsing. Creates an artificial method declaration.  */
-
-static tree
-create_artificial_method (tree class, int flags, tree type,
-			  tree name, tree args)
-{
-  tree mdecl;
-  location_t save_location = input_location;
-
-  input_location = DECL_SOURCE_LOCATION (TYPE_NAME (class));
-  mdecl = make_node (FUNCTION_TYPE);
-  TREE_TYPE (mdecl) = type;
-  TYPE_ARG_TYPES (mdecl) = args;
-  /* We used to compute the signature of MDECL here and then use
-     add_method(), but that failed because our caller might modify
-     the type of the returned method, which trashes the cache in
-     get_type_from_signature().  */
-  mdecl = add_method_1 (class, flags, name, mdecl);
-  input_location = save_location;
-  DECL_ARTIFICIAL (mdecl) = 1;
-  return mdecl;
-}
-
-/* Starts the body if an artificial method.  */
-
-static void
-start_artificial_method_body (tree mdecl)
-{
-#ifdef USE_MAPPED_LOCATION
-  DECL_SOURCE_LOCATION (mdecl) = ctxp->file_start_location;
-  DECL_FUNCTION_LAST_LINE (mdecl) = ctxp->file_start_location;
-#else
-  DECL_SOURCE_LINE (mdecl) = 1;
-  DECL_FUNCTION_LAST_LINE (mdecl) = 1;
-#endif
-  source_start_java_method (mdecl);
-  enter_block ();
-}
-
-static void
-end_artificial_method_body (tree mdecl)
-{
-  /* exit_block modifies DECL_FUNCTION_BODY (current_function_decl).
-     It has to be evaluated first. (if mdecl is current_function_decl,
-     we have an undefined behavior if no temporary variable is used.) */
-  tree b = exit_block ();
-  BLOCK_EXPR_BODY (DECL_FUNCTION_BODY (mdecl)) = b;
-  exit_block ();
-}
-
-/* Dump a tree of some kind.  This is a convenience wrapper for the
-   dump_* functions in tree-dump.c.  */
-static void
-dump_java_tree (enum tree_dump_index phase, tree t)
-{
-  FILE *stream;
-  int flags;
-
-  stream = dump_begin (phase, &flags);
-  flags |= TDF_SLIM;
-  if (stream)
-    {
-      dump_node (t, flags, stream);
-      dump_end (phase, stream);
-    }
-}
-
-/* Terminate a function and expand its body.  */
-
-static void
-source_end_java_method (void)
-{
-  tree fndecl = current_function_decl;
-
-  if (!fndecl)
-    return;
-
-  java_parser_context_save_global ();
-#ifdef USE_MAPPED_LOCATION
-  input_location = ctxp->last_ccb_indent1;
-#else
-  input_line = ctxp->last_ccb_indent1;
-#endif
-
-  /* Turn function bodies with only a NOP expr null, so they don't get
-     generated at all and we won't get warnings when using the -W
-     -Wall flags. */
-  if (IS_EMPTY_STMT (BLOCK_EXPR_BODY (DECL_FUNCTION_BODY (fndecl))))
-    BLOCK_EXPR_BODY (DECL_FUNCTION_BODY (fndecl)) = NULL_TREE;
-
-  if (BLOCK_EXPR_BODY (DECL_FUNCTION_BODY (fndecl))
-      && ! flag_emit_class_files)
-    finish_method (fndecl);
-
-  current_function_decl = NULL_TREE;
-  java_parser_context_restore_global ();
-  current_function_decl = NULL_TREE;
-}
-
-/* Record EXPR in the current function block. Complements compound
-   expression second operand if necessary.  */
-
-tree
-java_method_add_stmt (tree fndecl, tree expr)
-{
-  if (!GET_CURRENT_BLOCK (fndecl))
-    return NULL_TREE;
-  return add_stmt_to_block (GET_CURRENT_BLOCK (fndecl), NULL_TREE, expr);
-}
-
-static tree
-add_stmt_to_block (tree b, tree type, tree stmt)
-{
-  tree body = BLOCK_EXPR_BODY (b), c;
-
-  if (java_error_count)
-    return body;
-
-  if ((c = add_stmt_to_compound (body, type, stmt)) == body)
-    return body;
-
-  BLOCK_EXPR_BODY (b) = c;
-  TREE_SIDE_EFFECTS (c) = 1;
-  return c;
-}
-
-/* Lays out the methods for the classes seen so far.  */
-
-void
-java_layout_seen_class_methods (void)
-{
-  tree previous_list = all_class_list;
-  tree end = NULL_TREE;
-  tree current;
-
-  while (1)
-    {
-      for (current = previous_list;
-	   current != end; current = TREE_CHAIN (current))
-        {
-	  tree decl = TREE_VALUE (current);
-          tree cls = TREE_TYPE (decl);
-
-	  input_location = DECL_SOURCE_LOCATION (decl);
-
-          if (! CLASS_LOADED_P (cls))
-            load_class (cls, 0);
-
-          layout_class_methods (cls);
-        }
-
-      /* Note that new classes might have been added while laying out
-         methods, changing the value of all_class_list.  */
-
-      if (previous_list != all_class_list)
-	{
-	  end = previous_list;
-	  previous_list = all_class_list;
-	}
-      else
-	break;
-    }
-}
-
-static GTY(()) tree stop_reordering;
-void
-java_reorder_fields (void)
-{
-  tree current;
-
-  for (current = gclass_list; current; current = TREE_CHAIN (current))
-    {
-      output_class = current_class = TREE_TYPE (TREE_VALUE (current));
-
-      if (current_class == stop_reordering)
-	break;
-
-      /* Reverse the fields, but leave the dummy field in front.
-	 Fields are already ordered for Object and Class */
-      if (TYPE_FIELDS (current_class) && current_class != object_type_node
-	  && current_class != class_type_node)
-      {
-	/* If the dummy field is there, reverse the right fields and
-	   just layout the type for proper fields offset */
-	if (!DECL_NAME (TYPE_FIELDS (current_class)))
-	  {
-	    tree fields = TYPE_FIELDS (current_class);
-	    /* This works around a problem where on some platforms,
-	       the field might be given its size incorrectly.  */
-	    DECL_SIZE (fields) = NULL_TREE;
-	    DECL_SIZE_UNIT (fields) = NULL_TREE;
-	    TREE_CHAIN (fields) = nreverse (TREE_CHAIN (fields));
-	    TYPE_SIZE (current_class) = NULL_TREE;
-	  }
-	/* We don't have a dummy field, we need to layout the class,
-           after having reversed the fields */
-	else
-	  {
-	    TYPE_FIELDS (current_class) =
-	      nreverse (TYPE_FIELDS (current_class));
-	    TYPE_SIZE (current_class) = NULL_TREE;
-	  }
-      }
-    }
-  /* There are cases were gclass_list will be empty. */
-  if (gclass_list)
-    stop_reordering = TREE_TYPE (TREE_VALUE (gclass_list));
-}
-
-/* Layout the methods of all classes loaded in one way or another.
-   Check methods of source parsed classes. Then reorder the
-   fields and layout the classes or the type of all source parsed
-   classes */
-
-void
-java_layout_classes (void)
-{
-  tree current;
-  int save_error_count = java_error_count;
-
-  /* Layout the methods of all classes seen so far */
-  java_layout_seen_class_methods ();
-  java_parse_abort_on_error ();
-  all_class_list = NULL_TREE;
-
-  /* Then check the methods of all parsed classes */
-  for (current = gclass_list; current; current = TREE_CHAIN (current))
-    if (CLASS_FROM_SOURCE_P (TREE_TYPE (TREE_VALUE (current))))
-      java_check_methods (TREE_VALUE (current));
-  java_parse_abort_on_error ();
-
-  for (current = gclass_list; current; current = TREE_CHAIN (current))
-    {
-      output_class = current_class = TREE_TYPE (TREE_VALUE (current));
-      layout_class (current_class);
-
-      /* Error reported by the caller */
-      if (java_error_count)
-	return;
-    }
-
-  /* We might have reloaded classes durign the process of laying out
-     classes for code generation. We must layout the methods of those
-     late additions, as constructor checks might use them */
-  java_layout_seen_class_methods ();
-  java_parse_abort_on_error ();
-}
-
-/* Expand methods in the current set of classes remembered for
-   generation.  */
-
-static void
-java_complete_expand_classes (void)
-{
-  tree current;
-
-  for (current = ctxp->class_list; current; current = TREE_CHAIN (current))
-    if (!INNER_CLASS_DECL_P (current))
-      java_complete_expand_class (current);
-}
-
-/* Expand the methods found in OUTER, starting first by OUTER's inner
-   classes, if any.  */
-
-static void
-java_complete_expand_class (tree outer)
-{
-  tree inner_list;
-
-  /* We need to go after all inner classes and start expanding them,
-     starting with most nested ones. We have to do that because nested
-     classes might add functions to outer classes */
-
-  for (inner_list = DECL_INNER_CLASS_LIST (outer);
-       inner_list; inner_list = TREE_CHAIN (inner_list))
-    java_complete_expand_class (TREE_PURPOSE (inner_list));
-
-  java_complete_expand_methods (outer);
-}
-
-/* Expand methods registered in CLASS_DECL. The general idea is that
-   we expand regular methods first. This allows us get an estimate on
-   how outer context local alias fields are really used so we can add
-   to the constructor just enough code to initialize them properly (it
-   also lets us generate finit$ correctly.) Then we expand the
-   constructors and then <clinit>.  */
-
-static void
-java_complete_expand_methods (tree class_decl)
-{
-  tree clinit, decl, first_decl;
-
-  output_class = current_class = TREE_TYPE (class_decl);
-
-  /* Pre-expand <clinit> to figure whether we really need it or
-     not. If we do need it, we pre-expand the static fields so they're
-     ready to be used somewhere else. <clinit> will be fully expanded
-     after we processed the constructors. */
-  first_decl = TYPE_METHODS (current_class);
-  clinit = maybe_generate_pre_expand_clinit (current_class);
-
-  /* Then generate finit$ (if we need to) because constructors will
-   try to use it.*/
-  if (TYPE_FINIT_STMT_LIST (current_class))
-    java_complete_expand_method (generate_finit (current_class));
-
-  /* Then generate instinit$ (if we need to) because constructors will
-     try to use it. */
-  if (TYPE_II_STMT_LIST (current_class))
-    java_complete_expand_method (generate_instinit (current_class));
-
-  /* Now do the constructors */
-  for (decl = first_decl ; !java_error_count && decl; decl = TREE_CHAIN (decl))
-    {
-      if (!DECL_CONSTRUCTOR_P (decl))
-	continue;
-      java_complete_expand_method (decl);
-    }
-
-  /* First, do the ordinary methods. */
-  for (decl = first_decl; decl; decl = TREE_CHAIN (decl))
-    {
-      /* Ctors aren't part of this batch. */
-      if (DECL_CONSTRUCTOR_P (decl) || DECL_CLINIT_P (decl))
-	continue;
-
-      /* Skip abstract or native methods -- but do handle native
- 	 methods when generating JNI stubs.  */
-      if (METHOD_ABSTRACT (decl) || (! flag_jni && METHOD_NATIVE (decl)))
-	{
-	  DECL_FUNCTION_BODY (decl) = NULL_TREE;
-	  continue;
-	}
-
-      if (METHOD_NATIVE (decl))
- 	{
- 	  tree body;
-	  current_function_decl = decl;
-	  body = build_jni_stub (decl);
- 	  BLOCK_EXPR_BODY (DECL_FUNCTION_BODY (decl)) = body;
- 	}
-
-      java_complete_expand_method (decl);
-    }
-
-  /* If there is indeed a <clinit>, fully expand it now */
-  if (clinit)
-    {
-      /* Prevent the use of `this' inside <clinit> */
-      ctxp->explicit_constructor_p = 1;
-      java_complete_expand_method (clinit);
-      ctxp->explicit_constructor_p = 0;
-    }
-
-  /* We might have generated a class$ that we now want to expand */
-  if (TYPE_DOT_CLASS (current_class))
-    java_complete_expand_method (TYPE_DOT_CLASS (current_class));
-
-  /* Now verify constructor circularity (stop after the first one we
-     prove wrong.) */
-  if (!CLASS_INTERFACE (class_decl))
-    for (decl = TYPE_METHODS (current_class); decl; decl = TREE_CHAIN (decl))
-      if (DECL_CONSTRUCTOR_P (decl)
-	  && verify_constructor_circularity (decl, decl))
-	break;
-}
-
-/* Attempt to create <clinit>. Pre-expand static fields so they can be
-   safely used in some other methods/constructors.  */
-
-static tree
-maybe_generate_pre_expand_clinit (tree class_type)
-{
-  tree current, mdecl;
-
-  if (!TYPE_CLINIT_STMT_LIST (class_type))
-    return NULL_TREE;
-
-  /* Go through all static fields and pre expand them */
-  for (current = TYPE_FIELDS (class_type); current;
-       current = TREE_CHAIN (current))
-    if (FIELD_STATIC (current))
-      build_field_ref (NULL_TREE, class_type, DECL_NAME (current));
-
-  /* Then build the <clinit> method */
-  mdecl = create_artificial_method (class_type, ACC_STATIC, void_type_node,
-				    clinit_identifier_node, end_params_node);
-  layout_class_method (class_type, CLASSTYPE_SUPER (class_type),
-		       mdecl, NULL_TREE);
-  start_artificial_method_body (mdecl);
-
-  /* We process the list of assignment we produced as the result of
-     the declaration of initialized static field and add them as
-     statement to the <clinit> method. */
-  for (current = TYPE_CLINIT_STMT_LIST (class_type); current;
-       current = TREE_CHAIN (current))
-    {
-      tree stmt = current;
-      /* We build the assignment expression that will initialize the
-	 field to its value. There are strict rules on static
-	 initializers (8.5). FIXME */
-      if (TREE_CODE (stmt) != BLOCK && !IS_EMPTY_STMT (stmt))
-	stmt = build_debugable_stmt (EXPR_WFL_LINECOL (stmt), stmt);
-      java_method_add_stmt (mdecl, stmt);
-    }
-
-  end_artificial_method_body (mdecl);
-
-  /* Now we want to place <clinit> as the last method (because we need
-     it at least for interface so that it doesn't interfere with the
-     dispatch table based lookup. */
-  if (TREE_CHAIN (TYPE_METHODS (class_type)))
-    {
-      current = TREE_CHAIN (TYPE_METHODS (class_type));
-      TYPE_METHODS (class_type) = current;
-
-      while (TREE_CHAIN (current))
-	current = TREE_CHAIN (current);
-
-      TREE_CHAIN (current) = mdecl;
-      TREE_CHAIN (mdecl) = NULL_TREE;
-    }
-
-  return mdecl;
-}
-
-/* Analyzes a method body and look for something that isn't a
-   MODIFY_EXPR with a constant value.  Return true if <clinit> is
-   needed, false otherwise.  */
-
-static int
-analyze_clinit_body (tree this_class, tree bbody)
-{
-  while (bbody)
-    switch (TREE_CODE (bbody))
-      {
-      case BLOCK:
-	bbody = BLOCK_EXPR_BODY (bbody);
-	break;
-
-      case EXPR_WITH_FILE_LOCATION:
-	bbody = EXPR_WFL_NODE (bbody);
-	break;
-
-      case COMPOUND_EXPR:
-	if (analyze_clinit_body (this_class, TREE_OPERAND (bbody, 0)))
-	  return 1;
-	bbody = TREE_OPERAND (bbody, 1);
-	break;
-
-      case MODIFY_EXPR:
-	/* If we're generating to class file and we're dealing with an
-	   array initialization, we return 1 to keep <clinit> */
-	if (TREE_CODE (TREE_OPERAND (bbody, 1)) == NEW_ARRAY_INIT
-	    && flag_emit_class_files)
-	  return 1;
-
-	/* There are a few cases where we're required to keep
-	   <clinit>:
-	   - If this is an assignment whose operand is not constant,
-	   - If this is an assignment to a non-initialized field,
-	   - If this field is not a member of the current class.
-	*/
-	return (! TREE_CONSTANT (TREE_OPERAND (bbody, 1))
-		|| ! DECL_INITIAL (TREE_OPERAND (bbody, 0))
-		|| DECL_CONTEXT (TREE_OPERAND (bbody, 0)) != this_class);
-
-      case NOP_EXPR:
-	/* We might see an empty statement here, which is
-	   ignorable.  */
-	return ! IS_EMPTY_STMT (bbody);
-
-      default:
-	return 1;
-      }
-  return 0;
-}
-
-
-/* See whether we could get rid of <clinit>. Criteria are: all static
-   final fields have constant initial values and the body of <clinit>
-   is empty. Return 1 if <clinit> was discarded, 0 otherwise. */
-
-static int
-maybe_yank_clinit (tree mdecl)
-{
-  tree type, current;
-  tree fbody, bbody;
-
-  if (!DECL_CLINIT_P (mdecl))
-    return 0;
-
-  /* If the body isn't empty, then we keep <clinit>. Note that if
-     we're emitting classfiles, this isn't enough not to rule it
-     out. */
-  fbody = DECL_FUNCTION_BODY (mdecl);
-  bbody = BLOCK_EXPR_BODY (fbody);
-  if (bbody && bbody != error_mark_node)
-    bbody = BLOCK_EXPR_BODY (bbody);
-  else
-    return 0;
-  if (bbody && ! flag_emit_class_files && !IS_EMPTY_STMT (bbody))
-    return 0;
-
-  type = DECL_CONTEXT (mdecl);
-  current = TYPE_FIELDS (type);
-
-  for (current = (current ? TREE_CHAIN (current) : current);
-       current; current = TREE_CHAIN (current))
-    {
-      tree f_init;
-
-      /* We're not interested in non-static fields.  */
-      if (!FIELD_STATIC (current))
-	continue;
-
-      /* Nor in fields without initializers. */
-      f_init = DECL_INITIAL (current);
-      if (f_init == NULL_TREE)
-	continue;
-
-      /* Anything that isn't String or a basic type is ruled out -- or
-	 if we know how to deal with it (when doing things natively) we
-	 should generated an empty <clinit> so that SUID are computed
-	 correctly. */
-      if (! JSTRING_TYPE_P (TREE_TYPE (current))
-	  && ! JNUMERIC_TYPE_P (TREE_TYPE (current)))
-	return 0;
-
-      if (! FIELD_FINAL (current) || ! TREE_CONSTANT (f_init))
-	return 0;
-    }
-
-  /* Now we analyze the method body and look for something that
-     isn't a MODIFY_EXPR */
-  if (bbody && !IS_EMPTY_STMT (bbody) && analyze_clinit_body (type, bbody))
-    return 0;
-
-  /* Get rid of <clinit> in the class' list of methods */
-  if (TYPE_METHODS (type) == mdecl)
-    TYPE_METHODS (type) = TREE_CHAIN (mdecl);
-  else
-    for (current = TYPE_METHODS (type); current;
-	 current = TREE_CHAIN (current))
-      if (TREE_CHAIN (current) == mdecl)
-	{
-	  TREE_CHAIN (current) = TREE_CHAIN (mdecl);
-	  break;
-	}
-
-  return 1;
-}
-
-/* Install the argument from MDECL. Suitable to completion and
-   expansion of mdecl's body.  */
-
-void
-start_complete_expand_method (tree mdecl)
-{
-  tree tem;
-
-  pushlevel (1);		/* Prepare for a parameter push */
-  tem = BLOCK_EXPR_DECLS (DECL_FUNCTION_BODY (current_function_decl));
-  DECL_ARGUMENTS (mdecl) = tem;
-
-  for (; tem; tem = TREE_CHAIN (tem))
-    {
-      /* TREE_CHAIN (tem) will change after pushdecl. */
-      tree next = TREE_CHAIN (tem);
-      tree type = TREE_TYPE (tem);
-      if (targetm.calls.promote_prototypes (type)
-	  && TYPE_PRECISION (type) < TYPE_PRECISION (integer_type_node)
-	  && INTEGRAL_TYPE_P (type))
-	type = integer_type_node;
-      DECL_ARG_TYPE (tem) = type;
-      layout_decl (tem, 0);
-      pushdecl (tem);
-      /* Re-install the next so that the list is kept and the loop
-	 advances. */
-      TREE_CHAIN (tem) = next;
-    }
-  pushdecl_force_head (DECL_ARGUMENTS (mdecl));
-  input_location = DECL_SOURCE_LOCATION (mdecl);
-  build_result_decl (mdecl);
-}
-
-
-/* Complete and expand a method.  */
-
-static void
-java_complete_expand_method (tree mdecl)
-{
-  tree fbody, block_body, exception_copy;
-
-  current_function_decl = mdecl;
-  /* Fix constructors before expanding them */
-  if (DECL_CONSTRUCTOR_P (mdecl))
-    fix_constructors (mdecl);
-
-  /* Expand functions that have a body */
-  if (!DECL_FUNCTION_BODY (mdecl))
-    return;
-
-  fbody = DECL_FUNCTION_BODY (mdecl);
-  block_body = BLOCK_EXPR_BODY (fbody);
-  exception_copy = NULL_TREE;
-
-  current_function_decl = mdecl;
-
-  if (! quiet_flag)
-    fprintf (stderr, " [%s.",
-	     lang_printable_name (DECL_CONTEXT (mdecl), 0));
-  announce_function (mdecl);
-  if (! quiet_flag)
-    fprintf (stderr, "]");
-
-  /* Prepare the function for tree completion */
-  start_complete_expand_method (mdecl);
-
-  /* Install the current this */
-  current_this = (!METHOD_STATIC (mdecl) ?
-		  BLOCK_EXPR_DECLS (DECL_FUNCTION_BODY (mdecl)) : NULL_TREE);
-
-  /* Install exceptions thrown with `throws' */
-  PUSH_EXCEPTIONS (DECL_FUNCTION_THROWS (mdecl));
-
-  if (block_body != NULL_TREE)
-    {
-      block_body = java_complete_tree (block_body);
-
-      /* Before we check initialization, attached all class initialization
-	 variable to the block_body */
-      htab_traverse (DECL_FUNCTION_INIT_TEST_TABLE (mdecl),
-		     attach_init_test_initialization_flags, block_body);
-
-      if (! METHOD_NATIVE (mdecl))
-	{
-	  check_for_initialization (block_body, mdecl);
-
-	  /* Go through all the flags marking the initialization of
-	     static variables and see whether they're definitively
-	     assigned, in which case the type is remembered as
-	     definitively initialized in MDECL. */
-	  if (STATIC_CLASS_INIT_OPT_P ())
-	    {
-	      /* Always register the context as properly initialized in
-		 MDECL. This used with caution helps removing extra
-		 initialization of self. */
-	      if (METHOD_STATIC (mdecl))
-		{
-		  *(htab_find_slot
-		    (DECL_FUNCTION_INITIALIZED_CLASS_TABLE (mdecl),
-		     DECL_CONTEXT (mdecl), INSERT)) = DECL_CONTEXT (mdecl);
-		}
-	    }
-	}
-      ctxp->explicit_constructor_p = 0;
-    }
-
-  BLOCK_EXPR_BODY (fbody) = block_body;
-
-  /* If we saw a return but couldn't evaluate it properly, we'll have
-     an error_mark_node here. */
-  if (block_body != error_mark_node
-      && (block_body == NULL_TREE || CAN_COMPLETE_NORMALLY (block_body))
-      && TREE_CODE (TREE_TYPE (TREE_TYPE (mdecl))) != VOID_TYPE)
-    missing_return_error (current_function_decl);
-
-  /* See if we can get rid of <clinit> if MDECL happens to be <clinit> */
-  maybe_yank_clinit (mdecl);
-
-  /* Pop the current level, with special measures if we found errors. */
-  if (java_error_count)
-    pushdecl_force_head (DECL_ARGUMENTS (mdecl));
-  poplevel (1, 0, 1);
-
-  /* Pop the exceptions and sanity check */
-  POP_EXCEPTIONS();
-  if (currently_caught_type_list)
-    abort ();
-}
-
-/* For with each class for which there's code to generate. */
-
-static void
-java_expand_method_bodies (tree class)
-{
-  tree decl;
-  for (decl = TYPE_METHODS (class); decl; decl = TREE_CHAIN (decl))
-    {
-      tree block;
-
-      if (! DECL_FUNCTION_BODY (decl))
-	continue;
-
-      current_function_decl = decl;
-
-      block = BLOCK_EXPR_BODY (DECL_FUNCTION_BODY (decl));
-
-      /* Save the function body for gimplify and inlining.  */
-      DECL_SAVED_TREE (decl) = block;
-
-      /* It's time to assign the variable flagging static class
-	 initialization based on which classes invoked static methods
-	 are definitely initializing. This should be flagged. */
-      if (STATIC_CLASS_INIT_OPT_P ())
-	{
-	  tree list = DECL_FUNCTION_STATIC_METHOD_INVOCATION_COMPOUND (decl);
-	  for (; list != NULL_TREE;  list = TREE_CHAIN (list))
-	    {
-	      /* Executed for each statement calling a static function.
-		 LIST is a TREE_LIST whose PURPOSE is the called function
-		 and VALUE is a compound whose second operand can be patched
-		 with static class initialization flag assignments.  */
-
-	      tree called_method = TREE_PURPOSE (list);
-	      tree compound = TREE_VALUE (list);
-	      tree assignment_compound_list
-		= build_tree_list (called_method, NULL);
-
-	      /* For each class definitely initialized in
-		 CALLED_METHOD, fill ASSIGNMENT_COMPOUND with
-		 assignment to the class initialization flag. */
-	      htab_traverse (DECL_FUNCTION_INITIALIZED_CLASS_TABLE (called_method),
-			     emit_test_initialization,
-			     assignment_compound_list);
-
-	      if (TREE_VALUE (assignment_compound_list))
-		TREE_OPERAND (compound, 1)
-		  = TREE_VALUE (assignment_compound_list);
-	    }
-	}
-
-      /* Expand the function body.  */
-      source_end_java_method ();
-    }
-}
-
-
-
-/* This section of the code deals with accessing enclosing context
-   fields either directly by using the relevant access to this$<n> or
-   by invoking an access method crafted for that purpose.  */
-
-/* Build the necessary access across nested class boundaries.
-   This routine could be optimized to cache previous result
-   (decl, current_class and returned access).  When an access method
-   needs to be generated, it always takes the form of a read.  It might
-   be later turned into a write by calling nested_field_access_fix.  */
-
-static tree
-build_nested_field_access (tree id, tree decl)
-{
-  tree access = NULL_TREE;
-  tree ctx = NULL_TREE;
-  tree decl_ctx = DECL_CONTEXT (decl);
-  bool is_static = FIELD_STATIC (decl);
-
-  if (DECL_CONTEXT (TYPE_NAME (current_class)))
-    ctx = TREE_TYPE (DECL_CONTEXT (TYPE_NAME (current_class)));
-
-  /* For non-static fields, if the immediate enclosing context of the
-     current class is the field decl's class or inherits from it,
-     build the access as `this$<n>.<field>'.  Note that we will break
-     the `private' barrier if we're not emitting bytecodes.  */
-  if (!is_static
-      && ctx
-      && (ctx == decl_ctx || inherits_from_p (ctx, decl_ctx))
-      && (!FIELD_PRIVATE (decl) || !flag_emit_class_files))
-    {
-      tree thisn = build_current_thisn (current_class);
-      access = make_qualified_primary (build_wfl_node (thisn),
-				       id, EXPR_WFL_LINECOL (id));
-    }
-  /* Otherwise, generate and use accessor methods for the field as
-     needed.  */
-  else
-    {
-      int lc = EXPR_WFL_LINECOL (id);
-
-      /* Now we chain the required number of calls to the access$0 to
-	 get a hold to the enclosing instance we need for a non-static
-         field, and then we build the field access. */
-      if (!is_static)
-        access = build_access_to_thisn (current_class, decl_ctx, lc);
-
-      /* If the field is private and we're generating bytecode, then
-         we generate an access method.  */
-      if (FIELD_PRIVATE (decl) && flag_emit_class_files)
-	{
-	  tree name = build_nested_field_access_methods (decl);
-	  access = build_nested_field_access_expr (lc, decl_ctx,
-						   name, access, NULL_TREE);
-	}
-      /* Otherwise we use `access$(this$<j>). ... access$(this$<i>).<field>'
-         for non-static fields.
-	 Once again we break the `private' access rule from a foreign
-	 class.  */
-      else if (is_static)
-        {
-          tree class_name = DECL_NAME (TYPE_NAME (decl_ctx));
-          access
-            = make_qualified_primary (build_wfl_node (class_name), id, lc);
-        }
-      else
-        access = make_qualified_primary (access, id, lc);
-    }
-
-  return resolve_expression_name (access, NULL);
-}
-
-/* Return a nonzero value if DECL describes a member access across nested
-   class boundaries.  That is, DECL is in a class that either encloses,
-   is enclosed by or shares a common enclosing class with the class
-   TYPE.  */
-
-static int
-nested_member_access_p (tree type, tree decl)
-{
-  bool is_static = false;
-  tree decl_type = DECL_CONTEXT (decl);
-  tree type_root, decl_type_root;
-
-  if (decl_type == type
-      || (TREE_CODE (decl) != FIELD_DECL
-          && TREE_CODE (decl) != VAR_DECL
-          && TREE_CODE (decl) != FUNCTION_DECL))
-    return 0;
-  
-  if (!INNER_CLASS_TYPE_P (type)
-      && !(TREE_CODE (decl_type) == RECORD_TYPE
-           && INNER_CLASS_TYPE_P (decl_type)))
-    return 0;
-
-  is_static = (TREE_CODE (decl) == FUNCTION_DECL)
-              ? METHOD_STATIC (decl)
-              : FIELD_STATIC (decl);
-
-  /* If TYPE extends the declaration context of the non-static
-     member we're trying to access, then this isn't a nested member
-     access we need to worry about.  */
-  if (!is_static && inherits_from_p (type, decl_type))
-    return 0;
-
-  for (type_root = type;
-       DECL_CONTEXT (TYPE_NAME (type_root));
-       type_root = TREE_TYPE (DECL_CONTEXT (TYPE_NAME (type_root))))
-    {
-      if (type_root == decl_type)
-        return 1;
-    }
-
-  if (TREE_CODE (decl_type) == RECORD_TYPE
-      && INNER_CLASS_TYPE_P (decl_type))
-    {
-      for (decl_type_root = decl_type;
-           DECL_CONTEXT (TYPE_NAME (decl_type_root));
-           decl_type_root
-             = TREE_TYPE (DECL_CONTEXT (TYPE_NAME (decl_type_root))))
-        {
-          if (decl_type_root == type)
-            return 1;
-        }
-    }
-  else
-    decl_type_root = decl_type;
-    
-  if (type_root == decl_type_root)
-    return 1;
-
-  /* Before we give up, see whether it is a non-static field
-     inherited from the enclosing context we are considering.  */
-  if (!DECL_CONTEXT (TYPE_NAME (type_root))
-      && !is_static
-      && inherits_from_p (type_root, decl_type))
-    return 1;
-
-  return 0;
-}
-
-/* Return a nonzero value if NODE represents a cross-nested-class 
-   access that has already been expanded.  As a side effect, it returns
-   the name of the field being accessed and the argument passed to the
-   access function, suitable for a regeneration of the access method
-   call if necessary.  */
-
-static int
-nested_field_expanded_access_p (tree node, tree *name, tree *arg_type,
-			        tree *arg)
-{
-  int identified = 0;
-
-  if (TREE_CODE (node) != CALL_EXPR)
-    return 0;
-
-  /* Well, GCJ generates slightly different tree nodes when compiling
-     to native or bytecodes.  It's the case for function calls.  */
-
-  if (flag_emit_class_files
-      && TREE_CODE (node) == CALL_EXPR
-      && NESTED_FIELD_ACCESS_IDENTIFIER_P (DECL_NAME (TREE_OPERAND (node, 0))))
-    identified = 1;
-  else if (!flag_emit_class_files)
-    {
-      node = TREE_OPERAND (node, 0);
-
-      if (node && TREE_OPERAND (node, 0)
-	  && TREE_CODE (TREE_OPERAND (node, 0)) == ADDR_EXPR)
-	{
-	  node = TREE_OPERAND (node, 0);
-	  if (TREE_OPERAND (node, 0)
-	      && TREE_CODE (TREE_OPERAND (node, 0)) == FUNCTION_DECL
-	      && (NESTED_FIELD_ACCESS_IDENTIFIER_P
-		  (DECL_NAME (TREE_OPERAND (node, 0)))))
-	    identified = 1;
-	}
-    }
-
-  if (identified && name && arg_type && arg)
-    {
-      tree argument = TREE_OPERAND (node, 1);
-      *name = DECL_NAME (TREE_OPERAND (node, 0));
-
-      /* The accessors for static fields do not take in a this$<n> argument,
-         so we take the class name from the accessor's context instead.  */
-      if (argument)
-        {
-          *arg_type = TREE_TYPE (TREE_TYPE (TREE_VALUE (argument)));
-          *arg = TREE_VALUE (argument);
-        }
-      else
-        {
-          *arg_type = DECL_CONTEXT (TREE_OPERAND (node, 0));
-          *arg = NULL_TREE;
-        }
-    }
-  return identified;
-}
-
-/* Detect in NODE cross-nested-class field read access and
-   transform it into a write with RHS as an argument.  This function
-   is called from the java_complete_lhs when an assignment to a LHS can
-   be identified.  */
-
-static tree
-nested_field_access_fix (tree wfl, tree node, tree rhs)
-{
-  tree name, arg_type, arg;
-
-  if (nested_field_expanded_access_p (node, &name, &arg_type, &arg))
-    {
-      node = build_nested_field_access_expr (EXPR_WFL_LINECOL (wfl),
-					     arg_type, name, arg, rhs);
-      return java_complete_tree (node);
-    }
-  return NULL_TREE;
-}
-
-/* Construct the expression that calls an access method:
-     <type>.access$<n>(<arg1> [, <arg2>]);
-
-   ARG2 can be NULL and will be omitted in that case. It will denote a
-   read access.  */
-
-static tree
-build_nested_field_access_expr (int lc, tree type, tree access_method_name,
-			        tree arg1, tree arg2)
-{
-  tree args, cn, access;
-
-  if (arg1)
-    args = build_tree_list (NULL_TREE, arg1);
-  else
-    args = NULL_TREE;
-
-  if (arg2)
-    {
-      if (args)
-        args = tree_cons (NULL_TREE, arg2, args);
-      else
-        args = build_tree_list (NULL_TREE, arg2);
-    }
-
-  access
-    = build_method_invocation (build_wfl_node (access_method_name), args);
-  cn = build_wfl_node (DECL_NAME (TYPE_NAME (type)));
-
-  return make_qualified_primary (cn, access, lc);
-}
-
-/* Build the name of a synthetic accessor used to access class members
-   across nested class boundaries.  */
-
-static tree
-build_new_access_id (void)
-{
-  static int access_n_counter = 1;
-  char buffer [128];
-
-  sprintf (buffer, "access$%d", access_n_counter++);
-  return get_identifier (buffer);
-}
-
-/* Create the static access functions for the cross-nested-class field DECL.
-   We define a read:
-     TREE_TYPE (<field>) access$<n> (DECL_CONTEXT (<field>) inst$) {
-       return inst$.field;
-     }
-   and a write access:
-     TREE_TYPE (<field>) access$<n> (DECL_CONTEXT (<field>) inst$,
-                                     TREE_TYPE (<field>) value$) {
-       return inst$.field = value$;
-     }
-   For static fields, these methods are generated without the instance
-   parameter.
-   We should have a usage flag on the DECL so we can lazily turn the ones
-   we're using for code generation.  FIXME.
-*/
-
-static tree
-build_nested_field_access_methods (tree decl)
-{
-  tree id, args, stmt, mdecl, class_name = NULL_TREE;
-  bool is_static = FIELD_STATIC (decl);
-
-  if (FIELD_NESTED_ACCESS_P (decl))
-    return FIELD_NESTED_ACCESS (decl);
-
-  MAYBE_CREATE_VAR_LANG_DECL_SPECIFIC (decl);
-
-  /* Create the identifier and a function named after it.  */
-  id = build_new_access_id ();
-
-  /* The identifier is marked as bearing the name of a generated write
-     access function for outer field accessed from inner classes.  */
-  NESTED_FIELD_ACCESS_IDENTIFIER_P (id) = 1;
-
-  /* Create the read access.  */
-  if (!is_static)
-    {
-      args = build_tree_list (inst_id,
-                              build_pointer_type (DECL_CONTEXT (decl)));
-      TREE_CHAIN (args) = end_params_node;
-      stmt = make_qualified_primary (build_wfl_node (inst_id),
-				     build_wfl_node (DECL_NAME (decl)), 0);
-    }
-  else
-    {
-      args = end_params_node;
-      class_name = DECL_NAME (TYPE_NAME (DECL_CONTEXT (decl)));
-      stmt = make_qualified_primary (build_wfl_node (class_name),
-                                     build_wfl_node (DECL_NAME (decl)), 0);
-    }
-  stmt = build_return (0, stmt);
-  mdecl = build_nested_field_access_method (DECL_CONTEXT (decl),
-					    TREE_TYPE (decl), id, args, stmt);
-  DECL_FUNCTION_ACCESS_DECL (mdecl) = decl;
-
-  /* Create the write access method.  No write access for final variable */
-  if (!FIELD_FINAL (decl))
-    {
-      if (!is_static)
-        {
-          args = build_tree_list (inst_id,
-			          build_pointer_type (DECL_CONTEXT (decl)));
-          TREE_CHAIN (args) = build_tree_list (wpv_id, TREE_TYPE (decl));
-          TREE_CHAIN (TREE_CHAIN (args)) = end_params_node;
-          stmt = make_qualified_primary (build_wfl_node (inst_id),
-				         build_wfl_node (DECL_NAME (decl)),
-                                         0);
-        }
-      else
-        {
-          args = build_tree_list (wpv_id, TREE_TYPE (decl));
-          TREE_CHAIN (args) = end_params_node;
-          stmt = make_qualified_primary (build_wfl_node (class_name),
-                                         build_wfl_node (DECL_NAME (decl)),
-                                         0);
-        }
-      stmt = build_return (0, build_assignment (ASSIGN_TK, 0, stmt,
-						build_wfl_node (wpv_id)));
-      mdecl = build_nested_field_access_method (DECL_CONTEXT (decl),
-					        TREE_TYPE (decl), id,
-					        args, stmt);
-    }
-  DECL_FUNCTION_ACCESS_DECL (mdecl) = decl;
-
-  /* Return the access name */
-  return FIELD_NESTED_ACCESS (decl) = id;
-}
-
-/* Build a field access method NAME.  */
-
-static tree
-build_nested_field_access_method (tree class, tree type, tree name,
-				  tree args, tree body)
-{
-  tree saved_current_function_decl, mdecl;
-
-  /* Create the method */
-  mdecl = create_artificial_method (class, ACC_STATIC, type, name, args);
-  fix_method_argument_names (args, mdecl);
-  layout_class_method (class, NULL_TREE, mdecl, NULL_TREE);
-
-  /* Attach the method body. */
-  saved_current_function_decl = current_function_decl;
-  start_artificial_method_body (mdecl);
-  java_method_add_stmt (mdecl, body);
-  end_artificial_method_body (mdecl);
-  current_function_decl = saved_current_function_decl;
-
-  return mdecl;
-}
-
-
-/* This section deals with building access function necessary for
-   certain kinds of method invocation across nested class boundaries.  */
-
-static tree
-build_nested_method_access_method (tree decl)
-{
-  tree saved_current_function_decl, mdecl;
-  tree args = NULL_TREE, call_args = NULL_TREE;
-  tree carg, id, body, class;
-  char buffer [80];
-  int parm_id_count = 0;
-
-  /* Test this abort with an access to a private field */
-  if (!strcmp (IDENTIFIER_POINTER (DECL_NAME (decl)), "access$"))
-    abort ();
-
-  /* Check the cache first */
-  if (DECL_FUNCTION_INNER_ACCESS (decl))
-    return DECL_FUNCTION_INNER_ACCESS (decl);
-
-  class = DECL_CONTEXT (decl);
-
-  /* Obtain an access identifier and mark it */
-  id = build_new_access_id ();
-  NESTED_FIELD_ACCESS_IDENTIFIER_P (id) = 1;
-
-  carg = TYPE_ARG_TYPES (TREE_TYPE (decl));
-  /* Create the arguments, as much as the original */
-  for (; carg && carg != end_params_node;
-       carg = TREE_CHAIN (carg))
-    {
-      sprintf (buffer, "write_parm_value$%d", parm_id_count++);
-      args = chainon (args, build_tree_list (get_identifier (buffer),
-					     TREE_VALUE (carg)));
-    }
-  args = chainon (args, end_params_node);
-
-  /* Create the method */
-  mdecl = create_artificial_method (class, ACC_STATIC,
-				    TREE_TYPE (TREE_TYPE (decl)), id, args);
-  layout_class_method (class, NULL_TREE, mdecl, NULL_TREE);
-  /* There is a potential bug here. We should be able to use
-     fix_method_argument_names, but then arg names get mixed up and
-     eventually a constructor will have its this$0 altered and the
-     outer context won't be assignment properly. The testcase is
-     stub.java FIXME */
-  TYPE_ARG_TYPES (TREE_TYPE (mdecl)) = args;
-
-  /* Attach the method body. */
-  saved_current_function_decl = current_function_decl;
-  start_artificial_method_body (mdecl);
-
-  /* The actual method invocation uses the same args. When invoking a
-     static methods that way, we don't want to skip the first argument.  */
-  carg = args;
-  if (!METHOD_STATIC (decl))
-    carg = TREE_CHAIN (carg);
-  for (; carg && carg != end_params_node; carg = TREE_CHAIN (carg))
-    call_args = tree_cons (NULL_TREE, build_wfl_node (TREE_PURPOSE (carg)),
-			   call_args);
-
-  body = build_method_invocation (build_wfl_node (DECL_NAME (decl)),
-				  call_args);
-  if (!METHOD_STATIC (decl))
-    body = make_qualified_primary (build_wfl_node (TREE_PURPOSE (args)),
-				   body, 0);
-  if (TREE_TYPE (TREE_TYPE (decl)) != void_type_node)
-    body = build_return (0, body);
-  java_method_add_stmt (mdecl,body);
-  end_artificial_method_body (mdecl);
-  current_function_decl = saved_current_function_decl;
-
-  /* Back tag the access function so it know what it accesses.  */
-  DECL_FUNCTION_ACCESS_DECL (decl) = mdecl;
-
-  /* Tag the current method so it knows it has an access generated.  */
-  return DECL_FUNCTION_INNER_ACCESS (decl) = mdecl;
-}
-
-
-/* This section of the code deals with building expressions to access
-   the enclosing instance of an inner class. The enclosing instance is
-   kept in a generated field called this$<n>, with <n> being the
-   inner class nesting level (starting from 0.)  */
-
-/* Build an access to a given this$<n>, always chaining access call to
-   others. Access methods to this$<n> are build on the fly if
-   necessary. This CAN'T be used to solely access this$<n-1> from
-   this$<n> (which alway yield to special cases and optimization, see
-   for example build_nested_field_access).  */
-
-static tree
-build_access_to_thisn (tree from, tree to, int lc)
-{
-  tree access = NULL_TREE;
-
-  while (from != to && PURE_INNER_CLASS_TYPE_P (from))
-    {
-      if (!access)
-        {
-          access = build_current_thisn (from);
-          access = build_wfl_node (access);
-        }
-      else
-	{
-	  tree access0_wfl, cn;
-
-	  maybe_build_thisn_access_method (from);
-	  access0_wfl = build_wfl_node (access0_identifier_node);
-	  cn = build_wfl_node (DECL_NAME (TYPE_NAME (from)));
-	  EXPR_WFL_LINECOL (access0_wfl) = lc;
-	  access = build_tree_list (NULL_TREE, access);
-	  access = build_method_invocation (access0_wfl, access);
-	  access = make_qualified_primary (cn, access, lc);
-	}
-
-      /* If FROM isn't an inner class, that's fine, we've done enough.
-         What we're looking for can be accessed from there.  */
-      from = DECL_CONTEXT (TYPE_NAME (from));
-      if (!from)
-	break;
-      from = TREE_TYPE (from);
-    }
-  return access;
-}
-
-/* Build an access function to the this$<n> local to TYPE. NULL_TREE
-   is returned if nothing needs to be generated. Otherwise, the method
-   generated and a method decl is returned.
-
-   NOTE: These generated methods should be declared in a class file
-   attribute so that they can't be referred to directly.  */
-
-static tree
-maybe_build_thisn_access_method (tree type)
-{
-  tree mdecl, args, stmt, rtype;
-  tree saved_current_function_decl;
-
-  /* If TYPE is a top-level class, no access method is required.
-     If there already is such an access method, bail out. */
-  if (CLASS_ACCESS0_GENERATED_P (type) || !PURE_INNER_CLASS_TYPE_P (type))
-    return NULL_TREE;
-
-  /* We generate the method. The method looks like:
-     static <outer_of_type> access$0 (<type> inst$) { return inst$.this$<n>; }
-  */
-  args = build_tree_list (inst_id, build_pointer_type (type));
-  TREE_CHAIN (args) = end_params_node;
-  rtype = build_pointer_type (TREE_TYPE (DECL_CONTEXT (TYPE_NAME (type))));
-  mdecl = create_artificial_method (type, ACC_STATIC, rtype,
-				    access0_identifier_node, args);
-  fix_method_argument_names (args, mdecl);
-  layout_class_method (type, NULL_TREE, mdecl, NULL_TREE);
-  stmt = build_current_thisn (type);
-  stmt = make_qualified_primary (build_wfl_node (inst_id),
-				 build_wfl_node (stmt), 0);
-  stmt = build_return (0, stmt);
-
-  saved_current_function_decl = current_function_decl;
-  start_artificial_method_body (mdecl);
-  java_method_add_stmt (mdecl, stmt);
-  end_artificial_method_body (mdecl);
-  current_function_decl = saved_current_function_decl;
-
-  CLASS_ACCESS0_GENERATED_P (type) = 1;
-
-  return mdecl;
-}
-
-/* Craft an correctly numbered `this$<n>'string. this$0 is used for
-   the first level of innerclassing. this$1 for the next one, etc...
-   This function can be invoked with TYPE to NULL, available and then
-   has to count the parser context.  */
-
-static GTY(()) tree saved_thisn;
-static GTY(()) tree saved_type;
-
-static tree
-build_current_thisn (tree type)
-{
-  static int saved_i = -1;
-  static int saved_type_i = 0;
-  tree decl;
-  char buffer [24];
-  int i = 0;
-
-  if (type)
-    {
-      if (type == saved_type)
-	i = saved_type_i;
-      else
-	{
-	  for (i = -1, decl = DECL_CONTEXT (TYPE_NAME (type));
-	       decl; decl = DECL_CONTEXT (decl), i++)
-	    ;
-
-	  saved_type = type;
-	  saved_type_i = i;
-	}
-    }
-  else
-    i = list_length (GET_CPC_LIST ())-2;
-
-  if (i == saved_i)
-    return saved_thisn;
-
-  sprintf (buffer, "this$%d", i);
-  saved_i = i;
-  saved_thisn = get_identifier (buffer);
-  return saved_thisn;
-}
-
-/* Return the assignment to the hidden enclosing context `this$<n>'
-   by the second incoming parameter to the innerclass constructor. The
-   form used is `this.this$<n> = this$<n>;'.  */
-
-static tree
-build_thisn_assign (void)
-{
-  if (current_class && PURE_INNER_CLASS_TYPE_P (current_class))
-    {
-      tree thisn = build_current_thisn (current_class);
-      tree lhs = make_qualified_primary (build_wfl_node (this_identifier_node),
-					 build_wfl_node (thisn), 0);
-      tree rhs = build_wfl_node (thisn);
-#ifdef USE_MAPPED_LOCATION
-      SET_EXPR_LOCATION (lhs, input_location);
-#else
-      EXPR_WFL_SET_LINECOL (lhs, input_line, 0);
-#endif
-      return build_assignment (ASSIGN_TK, EXPR_WFL_LINECOL (lhs), lhs, rhs);
-    }
-  return NULL_TREE;
-}
-
-
-/* Building the synthetic `class$' used to implement the `.class' 1.1
-   extension for non primitive types. This method looks like:
-
-    static Class class$(String type) throws NoClassDefFoundError
-    {
-      try {return (java.lang.Class.forName (String));}
-      catch (ClassNotFoundException e) {
-        throw new NoClassDefFoundError(e.getMessage());}
-    } */
-
-static GTY(()) tree get_message_wfl;
-static GTY(()) tree type_parm_wfl;
-
-static tree
-build_dot_class_method (tree class)
-{
-#define BWF(S) build_wfl_node (get_identifier ((S)))
-#ifdef USE_MAPPED_LOCATION
-#define MQN(X,Y) make_qualified_name ((X), (Y), UNKNOWN_LOCATION)
-#else
-#define MQN(X,Y) make_qualified_name ((X), (Y), 0)
-#endif
-  tree args, tmp, saved_current_function_decl, mdecl, qual_name;
-  tree stmt, throw_stmt;
-
-  if (!get_message_wfl)
-    {
-      get_message_wfl = build_wfl_node (get_identifier ("getMessage"));
-      type_parm_wfl = build_wfl_node (get_identifier ("type$"));
-    }
-
-  /* Build the arguments */
-  args = build_tree_list (get_identifier ("type$"),
-			  build_pointer_type (string_type_node));
-  TREE_CHAIN (args) = end_params_node;
-
-  /* Build the qualified name java.lang.Class.forName */
-  tmp = MQN (MQN (MQN (BWF ("java"),
-		       BWF ("lang")), BWF ("Class")), BWF ("forName"));
-
-  /* Create the "class$" function */
-  mdecl = create_artificial_method (class, ACC_STATIC,
-				    build_pointer_type (class_type_node),
-				    classdollar_identifier_node, args);
-  qual_name = MQN (MQN (BWF ("java"), BWF ("lang")),
-		   BWF ("NoClassDefFoundError"));
-  DECL_FUNCTION_THROWS (mdecl) = build_tree_list (NULL_TREE, qual_name);
-  register_incomplete_type (JDEP_EXCEPTION, qual_name, NULL_TREE, NULL_TREE);
-  JDEP_GET_PATCH (CLASSD_LAST (ctxp->classd_list)) =
-    &TREE_VALUE (DECL_FUNCTION_THROWS (mdecl));
-
-  /* We start by building the try block. We need to build:
-       return (java.lang.Class.forName (type)); */
-  stmt = build_method_invocation (tmp,
-				  build_tree_list (NULL_TREE, type_parm_wfl));
-  stmt = build_return (0, stmt);
-
-  /* Now onto the catch block. We start by building the expression
-     throwing a new exception: throw new NoClassDefFoundError (_.getMessage) */
-#ifdef USE_MAPPED_LOCATION
-  throw_stmt = make_qualified_name (build_wfl_node (wpv_id),
-				    get_message_wfl, UNKNOWN_LOCATION);
-#else
-  throw_stmt = make_qualified_name (build_wfl_node (wpv_id),
-				    get_message_wfl, 0);
-#endif
-  throw_stmt = build_method_invocation (throw_stmt, NULL_TREE);
-
-  /* Build new NoClassDefFoundError (_.getMessage) */
-  throw_stmt = build_new_invocation
-    (build_wfl_node (get_identifier ("NoClassDefFoundError")),
-     build_tree_list (build_pointer_type (string_type_node), throw_stmt));
-
-  /* Build the throw, (it's too early to use BUILD_THROW) */
-  throw_stmt = build1 (THROW_EXPR, NULL_TREE, throw_stmt);
-
-  /* Encapsulate STMT in a try block. The catch clause executes THROW_STMT */
-  qual_name = MQN (MQN (BWF ("java"), BWF ("lang")),
-		   BWF ("ClassNotFoundException"));
-  stmt = encapsulate_with_try_catch (0, qual_name, stmt, throw_stmt);
-
-  fix_method_argument_names (args, mdecl);
-  layout_class_method (class, NULL_TREE, mdecl, NULL_TREE);
-  saved_current_function_decl = current_function_decl;
-  start_artificial_method_body (mdecl);
-  java_method_add_stmt (mdecl, stmt);
-  end_artificial_method_body (mdecl);
-  current_function_decl = saved_current_function_decl;
-  TYPE_DOT_CLASS (class) = mdecl;
-
-  return mdecl;
-}
-
-static tree
-build_dot_class_method_invocation (tree this_class, tree type)
-{
-  tree dot_class_method = TYPE_DOT_CLASS (this_class);
-  tree sig_id, s, t;
-
-  if (TYPE_ARRAY_P (type))
-    sig_id = build_java_signature (type);
-  else
-    sig_id = DECL_NAME (TYPE_NAME (type));
-
-  /* Ensure that the proper name separator is used */
-  sig_id = unmangle_classname (IDENTIFIER_POINTER (sig_id),
-			       IDENTIFIER_LENGTH (sig_id));
-
-  s = build_string (IDENTIFIER_LENGTH (sig_id),
-		    IDENTIFIER_POINTER (sig_id));
-  t = build_method_invocation (build_wfl_node (DECL_NAME (dot_class_method)),
-			       build_tree_list (NULL_TREE, s));
-  if (DECL_CONTEXT (dot_class_method) != this_class)
-    {
-      tree class_name = DECL_NAME (TYPE_NAME (DECL_CONTEXT (dot_class_method)));
-      t = make_qualified_primary (build_wfl_node (class_name), t, 0);
-    }
-  return t;
-}
-
-/* This section of the code deals with constructor.  */
-
-/* Craft a body for default constructor. Patch existing constructor
-   bodies with call to super() and field initialization statements if
-   necessary.  */
-
-static void
-fix_constructors (tree mdecl)
-{
-  tree iii;			/* Instance Initializer Invocation */
-  tree *bodyp = &DECL_FUNCTION_BODY (mdecl);
-  tree thisn_assign, compound = NULL_TREE;
-  tree class_type = DECL_CONTEXT (mdecl);
-
-  if (DECL_FIXED_CONSTRUCTOR_P (mdecl))
-    return;
-  DECL_FIXED_CONSTRUCTOR_P (mdecl) = 1;
-
-  if (!*bodyp)
-    {
-      /* It is an error for the compiler to generate a default
-	 constructor if the superclass doesn't have a constructor that
-	 takes no argument, or the same args for an anonymous class */
-      tree sdecl = get_constructor_super (mdecl);
-      if (sdecl == NULL_TREE)
-	{
-	  tree sclass_decl = TYPE_NAME (CLASSTYPE_SUPER (class_type));
-	  tree save = DECL_NAME (mdecl);
-	  const char *n = IDENTIFIER_POINTER (DECL_NAME (sclass_decl));
-	  DECL_NAME (mdecl) = DECL_NAME (sclass_decl);
-	  parse_error_context
-	    (lookup_cl (TYPE_NAME (class_type)),
-	     "No constructor matching %qs found in class %qs",
-	     lang_printable_name (mdecl, 2), n);
-	  DECL_NAME (mdecl) = save;
-	}
-
-      if (ANONYMOUS_CLASS_P (class_type))
-	{
-	  /* Copy throws clause from the super constructor.  */
-	  tree throws = DECL_FUNCTION_THROWS (sdecl);
-	  DECL_FUNCTION_THROWS (mdecl) = copy_list (throws);
-	}
-
-      /* The constructor body must be crafted by hand. It's the
-	 constructor we defined when we realize we didn't have the
-	 CLASSNAME() constructor */
-      start_artificial_method_body (mdecl);
-
-      /* Insert an assignment to the this$<n> hidden field, if
-         necessary */
-      if ((thisn_assign = build_thisn_assign ()))
-	java_method_add_stmt (mdecl, thisn_assign);
-
-      /* We don't generate a super constructor invocation if we're
-	 compiling java.lang.Object. build_super_invocation takes care
-	 of that. */
-      java_method_add_stmt (mdecl, build_super_invocation (mdecl));
-
-      /* FIXME */
-      if ((iii = build_instinit_invocation (class_type)))
-	java_method_add_stmt (mdecl, iii);
-
-      end_artificial_method_body (mdecl);
-    }
-  /* Search for an explicit constructor invocation */
-  else
-    {
-      int found = 0;
-      int invokes_this = 0;
-      tree main_block = BLOCK_EXPR_BODY (*bodyp);
-
-      while (*bodyp)
-	{
-	  tree body = *bodyp;
-	  switch (TREE_CODE (body))
-	    {
-	    case CALL_EXPR:
-	      found = CALL_EXPLICIT_CONSTRUCTOR_P (body);
-	      if (CALL_THIS_CONSTRUCTOR_P (body))
-		invokes_this = 1;
-	      break;
-	    case COMPOUND_EXPR:
-	    case EXPR_WITH_FILE_LOCATION:
-	      bodyp = &TREE_OPERAND (body, 0);
-	      continue;
-	    case BLOCK:
-	      bodyp = &BLOCK_EXPR_BODY (body);
-	      continue;
-	    default:
-	      break;
-	    }
-	  break;
-	}
-
-      /* Generate the assignment to this$<n>, if necessary */
-      if ((thisn_assign = build_thisn_assign ()))
-        compound = add_stmt_to_compound (compound, NULL_TREE, thisn_assign);
-
-      /* The constructor is missing an invocation of super() */
-      if (!found)
-	compound = add_stmt_to_compound (compound, NULL_TREE,
-                                         build_super_invocation (mdecl));
-      /* Explicit super() invocation should take place before the
-         instance initializer blocks. */
-      else
-	{
-	  compound = add_stmt_to_compound (compound, NULL_TREE, *bodyp);
-	  *bodyp = build_java_empty_stmt ();
-	}
-
-      DECL_INIT_CALLS_THIS (mdecl) = invokes_this;
-
-      /* Insert the instance initializer block right after. */
-      if (!invokes_this && (iii = build_instinit_invocation (class_type)))
-	compound = add_stmt_to_compound (compound, NULL_TREE, iii);
-
-      /* Fix the constructor main block if we're adding extra stmts */
-      if (compound)
-	{
-	  compound = add_stmt_to_compound (compound, NULL_TREE,
-					   BLOCK_EXPR_BODY (main_block));
-	  BLOCK_EXPR_BODY (main_block) = compound;
-	}
-    }
-}
-
-/* Browse constructors in the super class, searching for a constructor
-   that doesn't take any argument. Return the constructor if one is found, 
-   NULL_TREE otherwise.  If the current class is an anonymous inner class, 
-   look for something that has the same signature. */
-static tree
-get_constructor_super (tree mdecl)
-{
-  tree class = CLASSTYPE_SUPER (current_class);
-  int super_inner = PURE_INNER_CLASS_TYPE_P (class);
-  tree sdecl;
-
-  if (!class)
-    return NULL_TREE;
-
-  if (ANONYMOUS_CLASS_P (current_class))
-    {
-      tree mdecl_arg_type;
-      SKIP_THIS_AND_ARTIFICIAL_PARMS (mdecl_arg_type, mdecl);
-      for (sdecl = TYPE_METHODS (class); sdecl; sdecl = TREE_CHAIN (sdecl))
-	if (DECL_CONSTRUCTOR_P (sdecl))
-	  {
-	    tree m_arg_type;
-	    tree arg_type = TREE_CHAIN (TYPE_ARG_TYPES (TREE_TYPE (sdecl)));
-	    if (super_inner)
-	      arg_type = TREE_CHAIN (arg_type);
-	    for (m_arg_type = mdecl_arg_type;
-		 (arg_type != end_params_node
-		  && m_arg_type != end_params_node);
-		 arg_type = TREE_CHAIN (arg_type),
-		   m_arg_type = TREE_CHAIN (m_arg_type))
-	      if (!valid_method_invocation_conversion_p
-		     (TREE_VALUE (arg_type),
-		      TREE_VALUE (m_arg_type)))
-		break;
-
-	    if (arg_type == end_params_node && m_arg_type == end_params_node)
-	      return sdecl;
-	  }
-    }
-  else
-    {
-      for (sdecl = TYPE_METHODS (class); sdecl; sdecl = TREE_CHAIN (sdecl))
-	{
-	  tree arg = TREE_CHAIN (TYPE_ARG_TYPES (TREE_TYPE (sdecl)));
-	  if (super_inner)
-	    arg = TREE_CHAIN (arg);
-	  if (DECL_CONSTRUCTOR_P (sdecl) && arg == end_params_node)
-	    return sdecl;
-	}
-    }
-  return NULL_TREE;
-}
-
-/* Generate code for all context remembered for code generation.  */
-
-static GTY(()) tree reversed_class_list;
-void
-java_expand_classes (void)
-{
-  int save_error_count = 0;
-  static struct parser_ctxt *cur_ctxp = NULL;
-  location_t save_location;
-
-  java_parse_abort_on_error ();
-  if (!(ctxp = ctxp_for_generation))
-    return;
-  java_layout_classes ();
-  java_parse_abort_on_error ();
-  save_location = input_location;
-
-  for (cur_ctxp = ctxp_for_generation; cur_ctxp; cur_ctxp = cur_ctxp->next)
-    {
-      tree current;
-      for (current = cur_ctxp->class_list; 
-	   current; 
-	   current = TREE_CHAIN (current))
-	gen_indirect_dispatch_tables (TREE_TYPE (current));
-    }
-  
-  for (cur_ctxp = ctxp_for_generation; cur_ctxp; cur_ctxp = cur_ctxp->next)
-    {
-      ctxp = cur_ctxp;
-      input_location = ctxp->file_start_location;
-      lang_init_source (2);	       /* Error msgs have method prototypes */
-      java_complete_expand_classes (); /* Complete and expand classes */
-      java_parse_abort_on_error ();
-    }
-  input_location = save_location;
-
-  /* Find anonymous classes and expand their constructor. This extra pass is
-     necessary because the constructor itself is only generated when the
-     method in which it is defined is expanded. */
-  for (cur_ctxp = ctxp_for_generation; cur_ctxp; cur_ctxp = cur_ctxp->next)
-    {
-      tree current;
-      ctxp = cur_ctxp;
-      for (current = ctxp->class_list; current; current = TREE_CHAIN (current))
-	{
-	  output_class = current_class = TREE_TYPE (current);
-	  if (ANONYMOUS_CLASS_P (current_class))
-	    {
-	      tree d;
-	      for (d = TYPE_METHODS (current_class); d; d = TREE_CHAIN (d))
-		{
-		  if (DECL_CONSTRUCTOR_P (d))
-		    {
-		      java_complete_expand_method (d);
-		      break;	/* There is only one constructor. */
-		    }
-		}
-	    }
-	}
-    }
-
-  /* Expanding the constructors of anonymous classes generates access
-     methods.  Scan all the methods looking for null DECL_RESULTs --
-     this will be the case if a method hasn't been expanded.  */
-  for (cur_ctxp = ctxp_for_generation; cur_ctxp; cur_ctxp = cur_ctxp->next)
-    {
-      tree current;
-      ctxp = cur_ctxp;
-      for (current = ctxp->class_list; current; current = TREE_CHAIN (current))
-	{
-	  tree d;
-	  output_class = current_class = TREE_TYPE (current);
-	  for (d = TYPE_METHODS (current_class); d; d = TREE_CHAIN (d))
-	    {
-	      if (DECL_RESULT (d) == NULL_TREE)
-		java_complete_expand_method (d);
-	    }
-	}
-    }
-
-  /* ???  Instead of all this we could iterate around the list of
-     classes until there were no more un-expanded methods.  It would
-     take a little longer -- one pass over the whole list of methods
-     -- but it would be simpler.  Like this:  */
-#if 0
-    {
-      int something_changed;
-    
-      do
-	{
-	  something_changed = 0;
-	  for (cur_ctxp = ctxp_for_generation; cur_ctxp; cur_ctxp = cur_ctxp->next)
-	    {
-	      tree current;
-	      ctxp = cur_ctxp;
-	      for (current = ctxp->class_list; current; current = TREE_CHAIN (current))
-		{
-		  tree d;
-		  output_class = current_class = TREE_TYPE (current);
-		  for (d = TYPE_METHODS (current_class); d; d = TREE_CHAIN (d))
-		    {
-		      if (DECL_RESULT (d) == NULL_TREE)
-			{
-			  something_changed = 1;
-			  java_complete_expand_method (d);
-			}
-		    }
-		}
-	    }
-	}
-      while (something_changed);
-    }
-#endif
-
-  /* If we've found error at that stage, don't try to generate
-     anything, unless we're checking the syntax only
-     (but not using -fsyntax-only for the purpose of generating
-     bytecode).  */
-  if (java_error_count
-      && (!flag_syntax_only && !flag_emit_class_files))
-    return;
-
-  /* Now things are stable, go for generation of the class data. */
-
-  /* We pessimistically marked all methods and fields external until
-     we knew what set of classes we were planning to compile.  Now mark
-     those that will be generated locally as not external.  */
-  for (cur_ctxp = ctxp_for_generation; cur_ctxp; cur_ctxp = cur_ctxp->next)
-    {
-      tree current;
-      ctxp = cur_ctxp;
-      for (current = ctxp->class_list; current; current = TREE_CHAIN (current))
-	java_mark_class_local (TREE_TYPE (current));
-    }
-
-  /* Compile the classes.  */
-  for (cur_ctxp = ctxp_for_generation; cur_ctxp; cur_ctxp = cur_ctxp->next)
-    {
-      tree current;
-      reversed_class_list = NULL;
-
-      ctxp = cur_ctxp;
-
-      /* We write out the classes in reverse order.  This ensures that
-	 inner classes are written before their containing classes,
-	 which is important for parallel builds.  Otherwise, the
-	 class file for the outer class may be found, but the class
-	 file for the inner class may not be present.  In that
-	 situation, the compiler cannot fall back to the original
-	 source, having already read the outer class, so we must
-	 prevent that situation.  */
-      for (current = ctxp->class_list;
-	   current;
-	   current = TREE_CHAIN (current))
-	reversed_class_list
-	  = tree_cons (NULL_TREE, current, reversed_class_list);
-
-      for (current = reversed_class_list;
-	   current;
-	   current = TREE_CHAIN (current))
-	{
-	  output_class = current_class = TREE_TYPE (TREE_VALUE (current));
-	  if (flag_emit_class_files)
-	    write_classfile (current_class);
-	  else if (! flag_syntax_only)
-	    java_expand_method_bodies (current_class);
-	}
-    }
-}
-
-void
-java_finish_classes (void)
-{
-  static struct parser_ctxt *cur_ctxp = NULL;
-  for (cur_ctxp = ctxp_for_generation; cur_ctxp; cur_ctxp = cur_ctxp->next)
-    {
-      tree current;
-      ctxp = cur_ctxp;
-      for (current = ctxp->class_list; current; current = TREE_CHAIN (current))
-	{
-	  output_class = current_class = TREE_TYPE (current);
-	  finish_class ();
-	}
-    }
-}
-
-/* Wrap non WFL PRIMARY around a WFL and set EXPR_WFL_QUALIFICATION to
-   a tree list node containing RIGHT. Fore coming RIGHTs will be
-   chained to this hook. LOCATION contains the location of the
-   separating `.' operator.  */
-
-static tree
-make_qualified_primary (tree primary, tree right, int location)
-{
-  tree wfl;
-
-  if (TREE_CODE (primary) != EXPR_WITH_FILE_LOCATION)
-    wfl = build_wfl_wrap (primary, location);
-  else
-    {
-      wfl = primary;
-      /* If wfl wasn't qualified, we build a first anchor */
-      if (!EXPR_WFL_QUALIFICATION (wfl))
-	EXPR_WFL_QUALIFICATION (wfl) = build_tree_list (wfl, NULL_TREE);
-    }
-
-  /* And chain them */
-  EXPR_WFL_LINECOL (right) = location;
-  chainon (EXPR_WFL_QUALIFICATION (wfl), build_tree_list (right, NULL_TREE));
-  PRIMARY_P (wfl) =  1;
-  return wfl;
-}
-
-/* Simple merge of two name separated by a `.' */
-
-static tree
-merge_qualified_name (tree left, tree right)
-{
-  tree node;
-  if (!left && !right)
-    return NULL_TREE;
-
-  if (!left)
-    return right;
-
-  if (!right)
-    return left;
-
-  obstack_grow (&temporary_obstack, IDENTIFIER_POINTER (left),
-		IDENTIFIER_LENGTH (left));
-  obstack_1grow (&temporary_obstack, '.');
-  obstack_grow0 (&temporary_obstack, IDENTIFIER_POINTER (right),
-		 IDENTIFIER_LENGTH (right));
-  node =  get_identifier (obstack_base (&temporary_obstack));
-  obstack_free (&temporary_obstack, obstack_base (&temporary_obstack));
-  QUALIFIED_P (node) = 1;
-  return node;
-}
-
-/* Merge the two parts of a qualified name into LEFT.  Set the
-   location information of the resulting node to LOCATION, usually
-   inherited from the location information of the `.' operator. */
-
-static tree
-make_qualified_name (tree left, tree right,
-#ifdef USE_MAPPED_LOCATION
-		     source_location location
-#else
-		     int location
-#endif
-		     )
-{
-#ifdef USE_COMPONENT_REF
-  tree node = build3 (COMPONENT_REF, NULL_TREE, left, right, NULL_TREE);
-  SET_EXPR_LOCATION (node, location);
-  return node;
-#else
-  tree left_id = EXPR_WFL_NODE (left);
-  tree right_id = EXPR_WFL_NODE (right);
-  tree wfl, merge;
-
-  merge = merge_qualified_name (left_id, right_id);
-
-  /* Left wasn't qualified and is now qualified */
-#ifdef USE_MAPPED_LOCATION
-  if (!QUALIFIED_P (left_id))
-    {
-      tree wfl = build_expr_wfl (left_id, EXPR_LOCATION (left));
-      EXPR_WFL_QUALIFICATION (left) = build_tree_list (wfl, NULL_TREE);
-    }
-
-  wfl = build_expr_wfl (right_id, location);
-#else
-  if (!QUALIFIED_P (left_id))
-    {
-      tree wfl = build_expr_wfl (left_id, ctxp->filename, 0, 0);
-      EXPR_WFL_LINECOL (wfl) = EXPR_WFL_LINECOL (left);
-      EXPR_WFL_QUALIFICATION (left) = build_tree_list (wfl, NULL_TREE);
-    }
-
-  wfl = build_expr_wfl (right_id, ctxp->filename, 0, 0);
-  EXPR_WFL_LINECOL (wfl) = location;
-#endif
-  chainon (EXPR_WFL_QUALIFICATION (left), build_tree_list (wfl, NULL_TREE));
-  EXPR_WFL_NODE (left) = merge;
-  return left;
-#endif
-}
-
-/* Extract the last identifier component of the qualified in WFL. The
-   last identifier is removed from the linked list */
-
-static tree
-cut_identifier_in_qualified (tree wfl)
-{
-  tree q;
-  tree previous = NULL_TREE;
-  for (q = EXPR_WFL_QUALIFICATION (wfl); ; previous = q, q = TREE_CHAIN (q))
-    if (!TREE_CHAIN (q))
-      {
-	if (!previous)
-	  /* Operating on a non qualified qualified WFL.  */
-	  abort ();
-
-	TREE_CHAIN (previous) = NULL_TREE;
-	return TREE_PURPOSE (q);
-      }
-}
-
-/* Resolve the expression name NAME. Return its decl.  */
-
-static tree
-resolve_expression_name (tree id, tree *orig)
-{
-  tree name = EXPR_WFL_NODE (id);
-  tree decl;
-
-  /* 6.5.5.1: Simple expression names */
-  if (!PRIMARY_P (id) && !QUALIFIED_P (name))
-    {
-      /* 15.13.1: NAME can appear within the scope of a local variable
-         declaration */
-      if ((decl = IDENTIFIER_LOCAL_VALUE (name)))
-        return decl;
-
-      /* 15.13.1: NAME can appear within a class declaration */
-      else
-        {
-	  decl = lookup_field_wrapper (current_class, name);
-	  if (decl)
-	    {
-	      tree access = NULL_TREE;
-	      int fs = FIELD_STATIC (decl);
-
-	      /* If we're accessing an outer scope local alias, make
-		 sure we change the name of the field we're going to
-		 build access to. */
-	      if (FIELD_LOCAL_ALIAS_USED (decl))
-		name = DECL_NAME (decl);
-
-	      check_deprecation (id, decl);
-
-	      /* Instance variable (8.3.1.1) can't appear within
-		 static method, static initializer or initializer for
-		 a static variable. */
-	      if (!fs && METHOD_STATIC (current_function_decl))
-	        {
-		  static_ref_err (id, name, current_class);
-		  return error_mark_node;
-		}
-	      /* Instance variables can't appear as an argument of
-		 an explicit constructor invocation */
-	      if (!fs && ctxp->explicit_constructor_p
-		  && !enclosing_context_p (DECL_CONTEXT (decl), current_class))
-		{
-		  parse_error_context
-		    (id, "Can't reference %qs before the superclass constructor has been called", IDENTIFIER_POINTER (name));
-		  return error_mark_node;
-		}
-
-	      /* If we're processing an inner class and we're trying
-		 to access a field belonging to an outer class, build
-		 the access to the field.
-		 As usual, we have to treat initialized static final
-		 variables as a special case.  */
-              if (nested_member_access_p (current_class, decl)
-                  && ! (JDECL_P (decl) && CLASS_FINAL_VARIABLE_P (decl)
-                        && DECL_INITIAL (decl) != NULL_TREE
-			&& (JSTRING_TYPE_P (TREE_TYPE (decl))
-			    || JNUMERIC_TYPE_P (TREE_TYPE (decl)))
-			&& TREE_CONSTANT (DECL_INITIAL (decl))))
-		{
-		  if (!fs && CLASS_STATIC (TYPE_NAME (current_class)))
-		    {
-		      static_ref_err (id, DECL_NAME (decl), current_class);
-		      return error_mark_node;
-		    }
-		  access = build_nested_field_access (id, decl);
-		  if (orig)
-		    *orig = access;
-		  return access;
-		}
-
-	      /* Otherwise build what it takes to access the field */
-	      access = build_field_ref ((fs ? NULL_TREE : current_this),
-					DECL_CONTEXT (decl), name);
-	      if (fs)
-		access = maybe_build_class_init_for_field (decl, access);
-	      /* We may be asked to save the real field access node */
-	      if (orig)
-		*orig = access;
-	      /* Last check: can we access the field? */
-	      if (not_accessible_p (current_class, decl, NULL_TREE, 0))
-		{
-		  not_accessible_field_error (id, decl);
-		  return error_mark_node;
-		}
-	      /* And we return what we got */
-	      return access;
-	    }
-	  /* Fall down to error report on undefined variable */
-	}
-    }
-  /* 6.5.5.2 Qualified Expression Names */
-  else
-    {
-      if (orig)
-	*orig = NULL_TREE;
-      qualify_ambiguous_name (id);
-      /* 15.10.1 Field Access Using a Primary and/or Expression Name */
-      /* 15.10.2: Accessing Superclass Members using super */
-      return resolve_field_access (id, orig, NULL);
-    }
-
-  /* We've got an error here */
-  if (INNER_CLASS_TYPE_P (current_class))
-    parse_error_context (id,
-			 "Local variable %qs can't be accessed from within the inner class %qs unless it is declared final",
-			 IDENTIFIER_POINTER (name),
-			 IDENTIFIER_POINTER (DECL_NAME
-					     (TYPE_NAME (current_class))));
-  else
-    parse_error_context (id, "Undefined variable %qs",
-			 IDENTIFIER_POINTER (name));
-
-  return error_mark_node;
-}
-
-static void
-static_ref_err (tree wfl, tree field_id, tree class_type)
-{
-  parse_error_context
-    (wfl,
-     "Can't make a static reference to nonstatic variable %qs in class %qs",
-     IDENTIFIER_POINTER (field_id),
-     IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (class_type))));
-}
-
-/* 15.10.1 Field Access Using a Primary and/or Expression Name.
-   We return something suitable to generate the field access. We also
-   return the field decl in FIELD_DECL and its type in FIELD_TYPE.  If
-   recipient's address can be null. */
-
-static tree
-resolve_field_access (tree qual_wfl, tree *field_decl, tree *field_type)
-{
-  int is_static = 0;
-  tree field_ref;
-  tree decl = NULL_TREE, where_found, type_found;
-
-  if (resolve_qualified_expression_name (qual_wfl, &decl,
-					 &where_found, &type_found))
-    return error_mark_node;
-
-  /* Resolve the LENGTH field of an array here */
-  if (DECL_P (decl) && DECL_NAME (decl) == length_identifier_node
-      && type_found && TYPE_ARRAY_P (type_found)
-      && ! flag_emit_class_files)
-    {
-      tree length = build_java_array_length_access (where_found);
-      field_ref = length;
-
-      /* In case we're dealing with a static array, we need to
-	 initialize its class before the array length can be fetched.  */
-      if (TREE_CODE (where_found) == VAR_DECL && FIELD_STATIC (where_found))
-	{
-	  build_static_field_ref (where_found);
-	  field_ref = build_class_init (DECL_CONTEXT (where_found), field_ref);
-	}
-    }
-  /* We might have been trying to resolve field.method(). In which
-     case, the resolution is over and decl is the answer */
-  else if (JDECL_P (decl) && IDENTIFIER_LOCAL_VALUE (DECL_NAME (decl)) == decl)
-    field_ref = decl;
-  else if (JDECL_P (decl))
-    {
-      if (!type_found)
-	type_found = DECL_CONTEXT (decl);
-      is_static = FIELD_STATIC (decl);
-      field_ref = build_field_ref ((is_static ?
-				    NULL_TREE : where_found),
-				   type_found, DECL_NAME (decl));
-      if (field_ref == error_mark_node)
-	return error_mark_node;
-      if (is_static)
-	field_ref = maybe_build_class_init_for_field (decl, field_ref);
-
-      /* If we're looking at a static field, we may need to generate a
-	 class initialization for it.  This can happen when the access
-	 looks like `field.ref', where `field' is a static field in an
-	 interface we implement.  */
-      if (!flag_emit_class_files
-	  && TREE_CODE (where_found) == VAR_DECL
-	  && FIELD_STATIC (where_found))
-	{
-	  build_static_field_ref (where_found);
-	  field_ref = build_class_init (DECL_CONTEXT (where_found), field_ref);
-	}
-    }
-  else
-    field_ref = decl;
-
-  if (field_decl)
-    *field_decl = decl;
-  if (field_type)
-    *field_type = (QUAL_DECL_TYPE (decl) ?
-		   QUAL_DECL_TYPE (decl) : TREE_TYPE (decl));
-  return field_ref;
-}
-
-/* If NODE is an access to a static field, strip out the class
-   initialization part and return the field decl, otherwise, return
-   NODE. */
-
-tree
-extract_field_decl (tree node)
-{
-  if (TREE_CODE (node) == COMPOUND_EXPR)
-    {
-      tree op1 = TREE_OPERAND (node, 1);
-      if (TREE_CODE (op1) == COMPOUND_EXPR)
-	 {
-	   tree call = TREE_OPERAND (op1, 0);
-	   if (TREE_CODE (call) == CALL_EXPR
-	       && TREE_CODE (TREE_OPERAND (call, 0)) == ADDR_EXPR
-	       && (TREE_OPERAND (TREE_OPERAND (call, 0), 0)
-		   == soft_initclass_node))
-	     return TREE_OPERAND (op1, 1);
-	 }
-      else if (JDECL_P (op1))
-	return op1;
-    }
-  return node;
-}
-
-/* 6.5.5.2: Qualified Expression Names */
-
-static int
-resolve_qualified_expression_name (tree wfl, tree *found_decl,
-				   tree *where_found, tree *type_found)
-{
-  int from_type = 0;		/* Field search initiated from a type */
-  int from_super = 0, from_cast = 0, from_qualified_this = 0;
-  int previous_call_static = 0;
-  int is_static;
-  tree decl = NULL_TREE, type = NULL_TREE, q;
-  /* For certain for of inner class instantiation */
-  tree saved_current, saved_this;
-#define RESTORE_THIS_AND_CURRENT_CLASS 				\
-  { current_class = saved_current; current_this = saved_this;}
-
-  *type_found = *where_found = NULL_TREE;
-
-  for (q = EXPR_WFL_QUALIFICATION (wfl); q; q = TREE_CHAIN (q))
-    {
-      tree qual_wfl = QUAL_WFL (q);
-      tree ret_decl;		/* for EH checking */
-#ifdef USE_MAPPED_LOCATION
-      source_location location;  /* for EH checking */
-#else
-      int location;		/* for EH checking */
-#endif
-
-      /* 15.10.1 Field Access Using a Primary */
-      switch (TREE_CODE (qual_wfl))
-	{
-	case CALL_EXPR:
-	case NEW_CLASS_EXPR:
-	  /* If the access to the function call is a non static field,
-	     build the code to access it. */
-	  if (JDECL_P (decl) && !FIELD_STATIC (decl))
-	    {
-	      decl = maybe_access_field (decl, *where_found,
-					 DECL_CONTEXT (decl));
-	      if (decl == error_mark_node)
-		return 1;
-	    }
-
-	  /* And code for the function call */
-	  if (complete_function_arguments (qual_wfl))
-	    return 1;
-
-	  /* We might have to setup a new current class and a new this
-	     for the search of an inner class, relative to the type of
-	     a expression resolved as `decl'. The current values are
-	     saved and restored shortly after */
-	  saved_current = current_class;
-	  saved_this = current_this;
-	  if (decl
-	      && (TREE_CODE (qual_wfl) == NEW_CLASS_EXPR
-		  || from_qualified_this))
-	    {
-	      /* If we still have `from_qualified_this', we have the form
-		 <T>.this.f() and we need to build <T>.this */
-	      if (from_qualified_this)
-		{
-		  decl = build_access_to_thisn (current_class, type, 0);
-		  decl = java_complete_tree (decl);
-		  type = TREE_TYPE (TREE_TYPE (decl));
-		}
-	      current_class = type;
-	      current_this = decl;
-	      from_qualified_this = 0;
-	    }
-
-	  if (from_super && TREE_CODE (qual_wfl) == CALL_EXPR)
-	    CALL_USING_SUPER (qual_wfl) = 1;
-#ifdef USE_MAPPED_LOCATION
-	  location = (TREE_CODE (qual_wfl) == CALL_EXPR
-		      ? EXPR_LOCATION (TREE_OPERAND (qual_wfl, 0))
-		      : UNKNOWN_LOCATION);
-#else
-	  location = (TREE_CODE (qual_wfl) == CALL_EXPR ?
-		      EXPR_WFL_LINECOL (TREE_OPERAND (qual_wfl, 0)) : 0);
-#endif
-	  *where_found = patch_method_invocation (qual_wfl, decl, type,
-						  from_super,
-						  &is_static, &ret_decl);
-	  from_super = 0;
-	  if (*where_found == error_mark_node)
-	    {
-	      RESTORE_THIS_AND_CURRENT_CLASS;
-	      return 1;
-	    }
-	  *type_found = type = QUAL_DECL_TYPE (*where_found);
-
-	  *where_found = force_evaluation_order (*where_found);
-
-	  /* If we're creating an inner class instance, check for that
-	     an enclosing instance is in scope */
-	  if (TREE_CODE (qual_wfl) == NEW_CLASS_EXPR
-	      && INNER_ENCLOSING_SCOPE_CHECK (type))
-	    {
-	      parse_error_context
-		(qual_wfl, "No enclosing instance for inner class %qs is in scope%s",
-		 lang_printable_name (type, 0),
-		 (!current_this ? "" :
-		  "; an explicit one must be provided when creating this inner class"));
-	      RESTORE_THIS_AND_CURRENT_CLASS;
-	      return 1;
-	    }
-
-	  /* In case we had to change then to resolve a inner class
-	     instantiation using a primary qualified by a `new' */
-	  RESTORE_THIS_AND_CURRENT_CLASS;
-
-#ifdef USE_MAPPED_LOCATION
-	  if (location != UNKNOWN_LOCATION)
-#else
-	  if (location)
-#endif
-	    {
-	      tree arguments = NULL_TREE;
-	      if (TREE_CODE (qual_wfl) == CALL_EXPR
-		  && TREE_OPERAND (qual_wfl, 1) != NULL_TREE)
-		arguments = TREE_VALUE (TREE_OPERAND (qual_wfl, 1));
-	      check_thrown_exceptions (location, ret_decl, arguments);
-	    }
-
-	  /* If the previous call was static and this one is too,
-	     build a compound expression to hold the two (because in
-	     that case, previous function calls aren't transported as
-	     forcoming function's argument. */
-	  if (previous_call_static && is_static)
-	    {
-	      /* We must set CAN_COMPLETE_NORMALLY for the first call
-		 since it is done nowhere else.  */
-	      CAN_COMPLETE_NORMALLY (decl) = 1;
-	      decl = build2 (COMPOUND_EXPR, TREE_TYPE (*where_found),
-			     decl, *where_found);
-	      TREE_SIDE_EFFECTS (decl) = 1;
-	    }
-	  else
-	    {
-	      previous_call_static = is_static;
-	      decl = *where_found;
-	    }
-	  from_type = 0;
-	  continue;
-
-	case NEW_ARRAY_EXPR:
-	case NEW_ANONYMOUS_ARRAY_EXPR:
-	  *where_found = decl = java_complete_tree (qual_wfl);
-	  if (decl == error_mark_node)
-	    return 1;
-	  *type_found = type = QUAL_DECL_TYPE (decl);
-	  continue;
-
-	case CONVERT_EXPR:
-	  *where_found = decl = java_complete_tree (qual_wfl);
-	  if (decl == error_mark_node)
-	    return 1;
-	  *type_found = type = QUAL_DECL_TYPE (decl);
-	  from_cast = 1;
-	  continue;
-
-	case CONDITIONAL_EXPR:
-	case STRING_CST:
-	case MODIFY_EXPR:
-	  *where_found = decl = java_complete_tree (qual_wfl);
-	  if (decl == error_mark_node)
-	    return 1;
-	  *type_found = type = QUAL_DECL_TYPE (decl);
-	  continue;
-
-	case ARRAY_REF:
-	  /* If the access to the function call is a non static field,
-	     build the code to access it. */
-	  if (JDECL_P (decl) && !FIELD_STATIC (decl))
-	    {
-	      decl = maybe_access_field (decl, *where_found, type);
-	      if (decl == error_mark_node)
-		return 1;
-	    }
-	  /* And code for the array reference expression */
-	  decl = java_complete_tree (qual_wfl);
-	  if (decl == error_mark_node)
-	    return 1;
-	  type = QUAL_DECL_TYPE (decl);
-	  continue;
-
-	case PLUS_EXPR:
-	  if ((decl = java_complete_tree (qual_wfl)) == error_mark_node)
-	    return 1;
-	  if ((type = patch_string (decl)))
-	    decl = type;
-	  *where_found = QUAL_RESOLUTION (q) = decl;
-	  *type_found = type = TREE_TYPE (decl);
-	  break;
-
-	case CLASS_LITERAL:
-	  if ((decl = java_complete_tree (qual_wfl)) == error_mark_node)
-	    return 1;
-	  *where_found = QUAL_RESOLUTION (q) = decl;
-	  *type_found = type = TREE_TYPE (decl);
-	  break;
-
-	default:
-	  /* Fix for -Wall Just go to the next statement. Don't
-             continue */
-	  break;
-	}
-
-      /* If we fall here, we weren't processing a (static) function call. */
-      previous_call_static = 0;
-
-      /* It can be the keyword THIS */
-      if (TREE_CODE (qual_wfl) == EXPR_WITH_FILE_LOCATION
-	  && EXPR_WFL_NODE (qual_wfl) == this_identifier_node)
-	{
-	  if (!current_this)
-	    {
-	      parse_error_context
-		(wfl, "Keyword %<this%> used outside allowed context");
-	      return 1;
-	    }
-	  if (ctxp->explicit_constructor_p
-	      && type == current_class)
-	    {
-	      parse_error_context (wfl, "Can't reference %<this%> before the superclass constructor has been called");
-	      return 1;
-	    }
-	  /* We have to generate code for intermediate access */
-	  if (!from_type || TREE_TYPE (TREE_TYPE (current_this)) == type)
-	    {
-	      *where_found = decl = current_this;
-	      *type_found = type = QUAL_DECL_TYPE (decl);
-	    }
-	  /* We're trying to access the this from somewhere else. Make sure
-	     it's allowed before doing so. */
-	  else
-	    {
-	      if (!enclosing_context_p (type, current_class))
-		{
-		  char *p  = xstrdup (lang_printable_name (type, 0));
-		  parse_error_context (qual_wfl, "Can't use variable %<%s.this%>: type %qs isn't an outer type of type %qs",
-				       p, p,
-				       lang_printable_name (current_class, 0));
-		  free (p);
-		  return 1;
-		}
-	      from_qualified_this = 1;
-	      /* If there's nothing else after that, we need to
-                 produce something now, otherwise, the section of the
-                 code that needs to produce <T>.this will generate
-                 what is necessary. */
-	      if (!TREE_CHAIN (q))
-		{
-		  decl = build_access_to_thisn (current_class, type, 0);
-		  *where_found = decl = java_complete_tree (decl);
-		  *type_found = type = TREE_TYPE (decl);
-		}
-	    }
-
-	  from_type = 0;
-	  continue;
-	}
-
-      /* 15.10.2 Accessing Superclass Members using SUPER */
-      if (TREE_CODE (qual_wfl) == EXPR_WITH_FILE_LOCATION
-	  && EXPR_WFL_NODE (qual_wfl) == super_identifier_node)
-	{
-	  tree node;
-	  /* Check on the restricted use of SUPER */
-	  if (METHOD_STATIC (current_function_decl)
-	      || current_class == object_type_node)
-	    {
-	      parse_error_context
-		(wfl, "Keyword %<super%> used outside allowed context");
-	      return 1;
-	    }
-	  /* Otherwise, treat SUPER as (SUPER_CLASS)THIS */
-	  node = build_cast (EXPR_WFL_LINECOL (qual_wfl),
-			     CLASSTYPE_SUPER (current_class),
-			     build_this (EXPR_WFL_LINECOL (qual_wfl)));
-	  *where_found = decl = java_complete_tree (node);
-	  if (decl == error_mark_node)
-	    return 1;
-	  *type_found = type = QUAL_DECL_TYPE (decl);
-	  from_super = from_type = 1;
-	  continue;
-	}
-
-      /* 15.13.1: Can't search for field name in packages, so we
-	 assume a variable/class name was meant. */
-      if (RESOLVE_PACKAGE_NAME_P (qual_wfl))
-	{
-	  tree name;
-	  if ((decl = resolve_package (wfl, &q, &name)))
-	    {
-	      tree list;
-	      *where_found = decl;
-
-	      check_pkg_class_access (DECL_NAME (decl), qual_wfl, true, NULL);
-
-	      /* We want to be absolutely sure that the class is laid
-                 out. We're going to search something inside it. */
-	      *type_found = type = TREE_TYPE (decl);
-	      layout_class (type);
-	      from_type = 1;
-
-	      /* Fix them all the way down, if any are left. */
-	      if (q)
-		{
-		  list = TREE_CHAIN (q);
-		  while (list)
-		    {
-		      RESOLVE_PACKAGE_NAME_P (QUAL_WFL (list)) = 0;
-		      list = TREE_CHAIN (list);
-		    }
-		}
-	    }
-	  else
-	    {
-	      if (from_super || from_cast)
-		parse_error_context
-		  ((from_cast ? qual_wfl : wfl),
-		   "No variable %qs defined in class %qs",
-		   IDENTIFIER_POINTER (EXPR_WFL_NODE (qual_wfl)),
-		   lang_printable_name (type, 0));
-	      else
-		parse_error_context
-		  (qual_wfl, "Undefined variable or class name: %qs",
-		   IDENTIFIER_POINTER (name));
-	      return 1;
-	    }
-	}
-
-      /* We have a type name. It's been already resolved when the
-	 expression was qualified. */
-      else if (RESOLVE_TYPE_NAME_P (qual_wfl) && QUAL_RESOLUTION (q))
-	{
-	  decl = QUAL_RESOLUTION (q);
-
-	  /* Sneak preview. If next we see a `new', we're facing a
-	     qualification which resulted in a type being selected
-	     instead of a field.  Report the error.  */
-	  if(TREE_CHAIN (q)
-	     && TREE_CODE (TREE_PURPOSE (TREE_CHAIN (q))) == NEW_CLASS_EXPR)
-	    {
-	      parse_error_context (qual_wfl, "Undefined variable %qs",
-				   IDENTIFIER_POINTER (EXPR_WFL_NODE (wfl)));
-	      return 1;
-	    }
-
-	  check_pkg_class_access (DECL_NAME (decl), qual_wfl, true, NULL);
-          
-	  check_deprecation (qual_wfl, decl);
-
-	  type = TREE_TYPE (decl);
-	  from_type = 1;
-	}
-      /* We resolve an expression name */
-      else
-	{
-	  tree field_decl = NULL_TREE;
-
-	  /* If there exists an early resolution, use it. That occurs
-	     only once and we know that there are more things to
-	     come. Don't do that when processing something after SUPER
-	     (we need more thing to be put in place below */
-	  if (!from_super && QUAL_RESOLUTION (q))
-	    {
-	      decl = QUAL_RESOLUTION (q);
-	      if (!type)
-		{
-		  if (TREE_CODE (decl) == FIELD_DECL
-                      || TREE_CODE (decl) == VAR_DECL)
-		    {
-                      if (TREE_CODE (decl) == FIELD_DECL
-                          && !FIELD_STATIC (decl))
-                        {
-               	          if (current_this)
-                            *where_found = current_this;
-                          else
-                            {
-                              static_ref_err (qual_wfl, DECL_NAME (decl),
-                                              current_class);
-                              return 1;
-                            }
-                        }
-                      else
-                        {
-                          *where_found = TREE_TYPE (decl);
-                          if (TREE_CODE (*where_found) == POINTER_TYPE)
-                            *where_found = TREE_TYPE (*where_found);
-                        }
-                      if (nested_member_access_p (current_class, decl))
-                        decl = build_nested_field_access (qual_wfl, decl);
-		    }
-		  else
-		    {
-		      *where_found = TREE_TYPE (decl);
-		      if (TREE_CODE (*where_found) == POINTER_TYPE)
-			*where_found = TREE_TYPE (*where_found);
-		    }
-		}
-	    }
-
-	  /* Report and error if we're using a numerical literal as a
-             qualifier. It can only be an INTEGER_CST. */
-	  else if (TREE_CODE (qual_wfl) == INTEGER_CST)
-	    {
-	      parse_error_context
-		(wfl, "Can't use type %qs as a qualifier",
-		 lang_printable_name (TREE_TYPE (qual_wfl), 0));
-	      return 1;
-	    }
-
-	  /* We have to search for a field, knowing the type of its
-             container. The flag FROM_TYPE indicates that we resolved
-             the last member of the expression as a type name, which
-             means that for the resolution of this field, we'll look
-             for other errors than if it was resolved as a member of
-             an other field. */
-	  else
-	    {
-	      int is_static;
-	      tree field_decl_type; /* For layout */
-
-	      if (!from_type && !JREFERENCE_TYPE_P (type))
-		{
-		  parse_error_context
-		    (qual_wfl, "Attempt to reference field %qs in %<%s %s%>",
-		     IDENTIFIER_POINTER (EXPR_WFL_NODE (qual_wfl)),
-		     lang_printable_name (type, 0),
-		     IDENTIFIER_POINTER (DECL_NAME (decl)));
-		  return 1;
-		}
-
-	      field_decl = lookup_field_wrapper (type,
-						 EXPR_WFL_NODE (qual_wfl));
-
-	      /* Maybe what we're trying to access to is an inner
-		 class, only if decl is a TYPE_DECL. */
-	      if (!field_decl && TREE_CODE (decl) == TYPE_DECL)
-		{
-		  tree ptr, inner_decl;
-
-		  BUILD_PTR_FROM_NAME (ptr, EXPR_WFL_NODE (qual_wfl));
-		  inner_decl = resolve_class (decl, ptr, NULL_TREE, qual_wfl);
-		  if (inner_decl)
-		    {
-		      check_inner_class_access (inner_decl, decl, qual_wfl);
-		      type = TREE_TYPE (inner_decl);
-		      decl = inner_decl;
-		      from_type = 1;
-		      continue;
-		    }
-		}
-
-	      if (field_decl == NULL_TREE)
-		{
-		  parse_error_context
-		    (qual_wfl, "No variable %qs defined in type %qs",
-		     IDENTIFIER_POINTER (EXPR_WFL_NODE (qual_wfl)),
-		     GET_TYPE_NAME (type));
-		  return 1;
-		}
-	      if (field_decl == error_mark_node)
-		return 1;
-
-	      /* Layout the type of field_decl, since we may need
-                 it. Don't do primitive types or loaded classes. The
-                 situation of non primitive arrays may not handled
-                 properly here. FIXME */
-	      if (TREE_CODE (TREE_TYPE (field_decl)) == POINTER_TYPE)
-		field_decl_type = TREE_TYPE (TREE_TYPE (field_decl));
-	      else
-		field_decl_type = TREE_TYPE (field_decl);
-	      if (!JPRIMITIVE_TYPE_P (field_decl_type)
-		  && !CLASS_LOADED_P (field_decl_type)
-		  && !TYPE_ARRAY_P (field_decl_type))
-		resolve_and_layout (field_decl_type, NULL_TREE);
-
-	      /* Check on accessibility here */
-	      if (not_accessible_p (current_class, field_decl,
-				    *type_found, from_super))
- 		return not_accessible_field_error (qual_wfl,field_decl);    
-	      check_deprecation (qual_wfl, field_decl);
-
-	      /* There are things to check when fields are accessed
-	         from type. There are no restrictions on a static
-	         declaration of the field when it is accessed from an
-	         interface */
-	      is_static = FIELD_STATIC (field_decl);
-	      if (!from_super && from_type
-		  && !TYPE_INTERFACE_P (type)
-		  && !is_static
-		  && (current_function_decl
-		      && METHOD_STATIC (current_function_decl)))
-		{
-		  static_ref_err (qual_wfl, EXPR_WFL_NODE (qual_wfl), type);
-		  return 1;
-		}
-	      from_cast = from_super = 0;
-
-	      /* If it's an access from a type but isn't static, we
-		 make it relative to `this'. */
-	      if (!is_static && from_type)
-		decl = current_this;
-
-	      /* If we need to generate something to get a proper
-		 handle on what this field is accessed from, do it
-		 now. */
-	      if (!is_static)
-		{
-		  decl = maybe_access_field (decl, *where_found, *type_found);
-		  if (decl == error_mark_node)
-		    return 1;
-		}
-
-              /* We want to keep the location where we found it, and the
-                 type we found.  */
-	      *where_found = decl;
-	      *type_found = type;
-
-	      /* Generate the correct expression for field access from
-		 qualified this */
-	      if (from_qualified_this)
-		{
-		  field_decl
-                    = build_nested_field_access (qual_wfl, field_decl);
-		  from_qualified_this = 0;
-		}
-
-              /* If needed, generate accessors for static field access.  */
-              if (is_static
-                  && FIELD_PRIVATE (field_decl)
-                  && flag_emit_class_files
-                  && nested_member_access_p (current_class, field_decl))
-                field_decl = build_nested_field_access (qual_wfl, field_decl);
-
-	      /* This is the decl found and eventually the next one to
-		 search from */
-	      decl = field_decl;
-	    }
-	  from_type = 0;
-	  type = QUAL_DECL_TYPE (decl);
-
-	  /* Sneak preview. If decl is qualified by a `new', report
-             the error here to be accurate on the peculiar construct */
-	  if (TREE_CHAIN (q)
-	      && TREE_CODE (TREE_PURPOSE (TREE_CHAIN (q))) == NEW_CLASS_EXPR
-	      && !JREFERENCE_TYPE_P (type))
-	    {
-	      parse_error_context (qual_wfl, "Attempt to reference field %<new%> in a %qs",
-				   lang_printable_name (type, 0));
-	      return 1;
-	    }
-	}
-      /* `q' might have changed due to a after package resolution
-         re-qualification */
-      if (!q)
-	break;
-    }
-  *found_decl = decl;
-  return 0;
-}
-
-/* 6.6 Qualified name and access control. Returns 1 if MEMBER (a decl)
-   can't be accessed from REFERENCE (a record type). If MEMBER
-   features a protected access, we then use WHERE which, if non null,
-   holds the type of MEMBER's access that is checked against
-   6.6.2.1. This function should be used when decl is a field or a
-   method.  */
-
-static int
-not_accessible_p (tree reference, tree member, tree where, int from_super)
-{
-  int access_flag = get_access_flags_from_decl (member);
-  bool is_static = false;
- 
-  if (TREE_CODE (member) == FIELD_DECL ||
-      TREE_CODE (member) == VAR_DECL)
-    is_static = FIELD_STATIC (member);
-  else
-    is_static = METHOD_STATIC (member);
-
-  /* Access always granted for members declared public */
-  if (access_flag & ACC_PUBLIC)
-    return 0;
-
-  /* Check access on protected members */
-  if (access_flag & ACC_PROTECTED)
-    {
-      /* Access granted if it occurs from within the package
-         containing the class in which the protected member is
-         declared */
-      if (class_in_current_package (DECL_CONTEXT (member)))
-	return 0;
-
-      /* If accessed with the form `super.member', then access is granted */
-      if (from_super)
-	return 0;
-
-      /* If WHERE is active, access was made through a qualifier. For 
-         non-static members, access is granted if the type of the qualifier 
-	 is or is a sublass of the type the access is made from (6.6.2.1.)  */
-      if (where && !is_static)
-        {
-	  while (reference)
-            {
-	      if (inherits_from_p (where, reference))
-	        return 0;
-	      if (INNER_CLASS_TYPE_P (reference))
-		reference = TREE_TYPE (DECL_CONTEXT (TYPE_NAME (reference)));
-	      else
-	        break;
-	    }
-	  return 1;
-	}
-
-      /* Otherwise, access is granted if occurring from within the class
-         where member is declared, or a subclass of it.  */
-      while (reference)
-        {
-          if (inherits_from_p (reference, DECL_CONTEXT (member)))
-            return 0;
-	  if (INNER_CLASS_TYPE_P (reference))
-            reference = TREE_TYPE (DECL_CONTEXT (TYPE_NAME (reference)));
-	  else
-	    break;
-        }
-      return 1;
-    }
-
-  /* Check access on private members. Access is granted only if it
-     occurs from within the class in which it is declared -- that does
-     it for innerclasses too. */
-  if (access_flag & ACC_PRIVATE)
-    {
-      if (reference == DECL_CONTEXT (member) ||
-          common_enclosing_context_p (DECL_CONTEXT (member), reference))
-	return 0;
-      return 1;
-    }
-
-  /* Default access is permitted only when occurring from within the
-     package in which the context (MEMBER) is declared.  */
-  return !class_in_current_package (DECL_CONTEXT (member));
-}
-
-/* Test deprecated decl access.  */
-static void
-check_deprecation (tree wfl, tree decl)
-{
-  const char *file;
-  tree elt;
-
-  if (! warn_deprecated)
-    return;
-
-  /* We want to look at the element type of arrays here, so we strip
-     all surrounding array types.  */
-  if (TYPE_ARRAY_P (TREE_TYPE (decl)))
-    {
-      elt = TREE_TYPE (decl);
-      while (TYPE_ARRAY_P (elt))
-	elt = TYPE_ARRAY_ELEMENT (elt);
-      /* We'll end up with a pointer type, so we use TREE_TYPE to go
-	 to the record.  */
-      decl = TYPE_NAME (TREE_TYPE (elt));
-    }
-  file = DECL_SOURCE_FILE (decl);
-
-  /* Complain if the field is deprecated and the file it was defined
-     in isn't compiled at the same time the file which contains its
-     use is */
-  if (DECL_DEPRECATED (decl)
-      && !IS_A_COMMAND_LINE_FILENAME_P (get_identifier (file)))
-    {
-      const char *the;
-      switch (TREE_CODE (decl))
-	{
-	case FUNCTION_DECL:
-	  the = "method";
-	  break;
-	case FIELD_DECL:
-	case VAR_DECL:
-	  the = "field";
-	  break;
-	case TYPE_DECL:
-	  parse_warning_context (wfl, "The class %qs has been deprecated",
-				 IDENTIFIER_POINTER (DECL_NAME (decl)));
-	  return;
-	default:
-	  abort ();
-	}
-      /* Don't issue a message if the context as been deprecated as a
-         whole. */
-      if (! CLASS_DEPRECATED (TYPE_NAME (DECL_CONTEXT (decl))))
-	parse_warning_context
-	  (wfl, "The %s %qs in class %qs has been deprecated",
-	   the, lang_printable_name (decl, 0),
-	   IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (DECL_CONTEXT (decl)))));
-    }
-}
-
-/* Returns 1 if class was declared in the current package, 0 otherwise */
-
-static int
-class_in_current_package (tree class)
-{
-  if (TYPE_PACKAGE (current_class) == TYPE_PACKAGE (class))
-    return 1;
-  return 0;
-}
-
-/* This function may generate code to access DECL from WHERE. This is
-   done only if certain conditions meet.  */
-
-static tree
-maybe_access_field (tree decl, tree where, tree type)
-{
-  if (TREE_CODE (decl) == FIELD_DECL && decl != current_this
-      && !FIELD_STATIC (decl))
-    decl = build_field_ref (where ? where : current_this,
-			    (type ? type : DECL_CONTEXT (decl)),
-			    DECL_NAME (decl));
-  return decl;
-}
-
-/* Build a method invocation, by patching PATCH. If non NULL
-   and according to the situation, PRIMARY and WHERE may be
-   used. IS_STATIC is set to 1 if the invoked function is static. */
-
-static tree
-patch_method_invocation (tree patch, tree primary, tree where, int from_super,
-			 int *is_static, tree *ret_decl)
-{
-  tree wfl = TREE_OPERAND (patch, 0);
-  tree args = TREE_OPERAND (patch, 1);
-  tree name = EXPR_WFL_NODE (wfl);
-  tree list;
-  int is_static_flag = 0;
-  int is_super_init = 0;
-  tree this_arg = NULL_TREE;
-  int is_array_clone_call = 0;
-
-  /* Should be overridden if everything goes well. Otherwise, if
-     something fails, it should keep this value. It stop the
-     evaluation of a bogus assignment. See java_complete_tree,
-     MODIFY_EXPR: for the reasons why we sometimes want to keep on
-     evaluating an assignment */
-  TREE_TYPE (patch) = error_mark_node;
-
-  /* Since lookup functions are messing with line numbers, save the
-     context now.  */
-  java_parser_context_save_global ();
-
-  /* 15.11.1: Compile-Time Step 1: Determine Class or Interface to Search */
-
-  /* Resolution of qualified name, excluding constructors */
-  if (QUALIFIED_P (name) && !CALL_CONSTRUCTOR_P (patch))
-    {
-      tree identifier, identifier_wfl, type, resolved;
-      /* Extract the last IDENTIFIER of the qualified
-	 expression. This is a wfl and we will use it's location
-	 data during error report. */
-      identifier_wfl = cut_identifier_in_qualified (wfl);
-      identifier = EXPR_WFL_NODE (identifier_wfl);
-
-      /* Given the context, IDENTIFIER is syntactically qualified
-	 as a MethodName. We need to qualify what's before */
-      qualify_ambiguous_name (wfl);
-      resolved = resolve_field_access (wfl, NULL, NULL);
-
-      if (TREE_CODE (resolved) == VAR_DECL && FIELD_STATIC (resolved)
-         && FIELD_FINAL (resolved)
-         && !inherits_from_p (DECL_CONTEXT (resolved), current_class)
-         && !flag_emit_class_files)
-       resolved = build_class_init (DECL_CONTEXT (resolved), resolved);
-
-      if (resolved == error_mark_node)
-	PATCH_METHOD_RETURN_ERROR ();
-
-      type = GET_SKIP_TYPE (resolved);
-      resolve_and_layout (type, NULL_TREE);
-
-      if (JPRIMITIVE_TYPE_P (type))
-        {
-	  parse_error_context
-	    (identifier_wfl,
-	     "Can't invoke a method on primitive type %qs",
-	     IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (type))));
-	  PATCH_METHOD_RETURN_ERROR ();
-	}
-
-      list = lookup_method_invoke (0, identifier_wfl, type, identifier, args);
-      args = nreverse (args);
-
-      /* We're resolving a call from a type */
-      if (TREE_CODE (resolved) == TYPE_DECL)
-	{
-	  if (CLASS_INTERFACE (resolved))
-	    {
-	      parse_error_context
-		(identifier_wfl,
-		"Can't make static reference to method %qs in interface %qs",
-		 IDENTIFIER_POINTER (identifier),
-		 IDENTIFIER_POINTER (name));
-	      PATCH_METHOD_RETURN_ERROR ();
-	    }
-	  if (list)
-	    {
-              if (METHOD_STATIC (list))
-                maybe_use_access_method (0, &list, NULL);
-              else
-                {
-                  char *fct_name = xstrdup (lang_printable_name (list, 2));
-                  parse_error_context
-                    (identifier_wfl,
-                     "Can't make static reference to method %<%s %s%> in class %qs",
-                     lang_printable_name (TREE_TYPE (TREE_TYPE (list)), 0),
-                     fct_name,
-                     IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (type))));
-                  free (fct_name);
-                  PATCH_METHOD_RETURN_ERROR ();
-                }
-	    }
-	}
-      else
-	this_arg = primary = resolved;
-
-      if (TYPE_ARRAY_P (type) && identifier == get_identifier ("clone"))
-        is_array_clone_call = 1;
-
-      /* IDENTIFIER_WFL will be used to report any problem further */
-      wfl = identifier_wfl;
-    }
-  /* Resolution of simple names, names generated after a primary: or
-     constructors */
-  else
-    {
-      tree class_to_search = NULL_TREE;
-      int lc;			/* Looking for Constructor */
-
-      /* We search constructor in their target class */
-      if (CALL_CONSTRUCTOR_P (patch))
-	{
-	  if (TREE_CODE (patch) == NEW_CLASS_EXPR)
-	    class_to_search = EXPR_WFL_NODE (wfl);
-	  else if (EXPR_WFL_NODE (TREE_OPERAND (patch, 0)) ==
-		   this_identifier_node)
-	    class_to_search = NULL_TREE;
-	  else if (EXPR_WFL_NODE (TREE_OPERAND (patch, 0)) ==
-		   super_identifier_node)
-	    {
-	      is_super_init = 1;
-	      if (CLASSTYPE_SUPER (current_class))
-		class_to_search =
-		  DECL_NAME (TYPE_NAME (CLASSTYPE_SUPER (current_class)));
-	      else
-		{
-		  parse_error_context (wfl, "Can't invoke super constructor on java.lang.Object");
-		  PATCH_METHOD_RETURN_ERROR ();
-		}
-	    }
-
-	  /* Class to search is NULL if we're searching the current one */
-	  if (class_to_search)
-	    {
-	      class_to_search = resolve_and_layout (class_to_search, wfl);
-
-	      if (!class_to_search)
-		{
-		  parse_error_context
-		    (wfl, "Class %qs not found in type declaration",
-		     IDENTIFIER_POINTER (EXPR_WFL_NODE (wfl)));
-		  PATCH_METHOD_RETURN_ERROR ();
-		}
-
-	      /* Can't instantiate an abstract class, but we can
-	         invoke it's constructor. It's use within the `new'
-	         context is denied here. */
-	      if (CLASS_ABSTRACT (class_to_search)
-		  && TREE_CODE (patch) == NEW_CLASS_EXPR)
-		{
-		  parse_error_context
-		    (wfl, "Class %qs is an abstract class. It can't be instantiated",
-		     IDENTIFIER_POINTER (EXPR_WFL_NODE (wfl)));
-		  PATCH_METHOD_RETURN_ERROR ();
-		}
-
-	      class_to_search = TREE_TYPE (class_to_search);
-	    }
-	  else
-	    class_to_search = current_class;
-	  lc = 1;
-	}
-      /* This is a regular search in the local class, unless an
-         alternate class is specified. */
-      else
-	{
-	  if (where != NULL_TREE)
-	    class_to_search = where;
-	  else if (QUALIFIED_P (name))
-	    class_to_search = current_class;
-	  else
-	    {
-	      class_to_search = current_class;
-
-	      for (;;)
-		{
-		  if (has_method (class_to_search, name))
-		    break;
-		  if (! INNER_CLASS_TYPE_P (class_to_search))
-		    {
-		      parse_error_context (wfl,
-					   "No method named %qs in scope",
-					   IDENTIFIER_POINTER (name));
-		      PATCH_METHOD_RETURN_ERROR ();
-		    }
-		  class_to_search
-		    = TREE_TYPE (DECL_CONTEXT (TYPE_NAME (class_to_search)));
-		}
-	    }
-	  lc = 0;
-	}
-
-      /* NAME is a simple identifier or comes from a primary. Search
-	 in the class whose declaration contain the method being
-	 invoked. */
-      resolve_and_layout (class_to_search, NULL_TREE);
-
-      list = lookup_method_invoke (lc, wfl, class_to_search, name, args);
-      /* Don't continue if no method were found, as the next statement
-         can't be executed then. */
-      if (!list)
-	PATCH_METHOD_RETURN_ERROR ();
-
-      if (TYPE_ARRAY_P (class_to_search)
-          && DECL_NAME (list) == get_identifier ("clone"))
-        is_array_clone_call = 1;
-
-      /* Check for static reference of non static methods.  */
-      if (check_for_static_method_reference (wfl, patch, list,
-					     class_to_search, primary))
-	PATCH_METHOD_RETURN_ERROR ();
-
-      /* Check for inner classes creation from illegal contexts */
-      if (lc && (INNER_CLASS_TYPE_P (class_to_search)
-		 && !CLASS_STATIC (TYPE_NAME (class_to_search)))
-	  && INNER_ENCLOSING_SCOPE_CHECK (class_to_search)
-	  && !DECL_INIT_P (current_function_decl))
-	{
-	  parse_error_context
-	    (wfl, "No enclosing instance for inner class %qs is in scope%s",
-	     lang_printable_name (class_to_search, 0),
-	     (!current_this ? "" :
-	      "; an explicit one must be provided when creating this inner class"));
-	  PATCH_METHOD_RETURN_ERROR ();
-	}
-
-      /* Non static methods are called with the current object extra
-	 argument.  If PATCH is a `new TYPE()', the argument is the value
-	 returned by the object allocator.  If method is resolved as a
-	 primary, use the primary otherwise use the current THIS. */
-      args = nreverse (args);
-      if (TREE_CODE (patch) != NEW_CLASS_EXPR)
-	{
-	  this_arg = primary ? primary : current_this;
-
-	  /* If we're using an access method, things are different.
-	     There are two family of cases:
-
-	     1) We're not generating bytecodes:
-
-	     - LIST is non-static.  Its invocation is transformed from
-	       x(a1,...,an) into this$<n>.x(a1,....an).
-	     - LIST is static.  Its invocation is transformed from
-	       x(a1,...,an) into TYPE_OF(this$<n>).x(a1,....an)
-
-	     2) We're generating bytecodes:
-
-	     - LIST is non-static.  Its invocation is transformed from
-	       x(a1,....,an) into access$<n>(this$<n>,a1,...,an).
-	     - LIST is static.  Its invocation is transformed from
-	       x(a1,....,an) into TYPE_OF(this$<n>).x(a1,....an).
-
-	     Of course, this$<n> can be arbitrarily complex, ranging from
-	     this$0 (the immediate outer context) to
-	     access$0(access$0(...(this$0))).
-
-	     maybe_use_access_method returns a nonzero value if the
-	     this_arg has to be moved into the (then generated) stub
-	     argument list.  In the meantime, the selected function
-	     might have been replaced by a generated stub.  */
-          if (METHOD_STATIC (list))
-            maybe_use_access_method (0, &list, NULL);
-	  else if (!primary &&
-	           maybe_use_access_method (is_super_init, &list, &this_arg))
-	    {
-	      args = tree_cons (NULL_TREE, this_arg, args);
-	      this_arg = NULL_TREE; /* So it doesn't get chained twice */
-	    }
-	}
-    }
-
-  /* Merge point of all resolution schemes. If we have nothing, this
-     is an error, already signaled */
-  if (!list)
-    PATCH_METHOD_RETURN_ERROR ();
-
-  /* Check accessibility, position the is_static flag, build and
-     return the call */
-  if (not_accessible_p (DECL_CONTEXT (current_function_decl), list,
-			(primary ? TREE_TYPE (TREE_TYPE (primary)) :
-			 NULL_TREE), from_super)
-      /* Calls to clone() on array types are permitted as a special-case. */
-      && !is_array_clone_call)
-    {
-      const char *const fct_name = IDENTIFIER_POINTER (DECL_NAME (list));
-      const char *const access =
-	accessibility_string (get_access_flags_from_decl (list));
-      const char *const klass =
-	IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (DECL_CONTEXT (list))));
-      const char *const refklass =
-	IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (current_class)));
-      const char *const what = (DECL_CONSTRUCTOR_P (list)
-				? "constructor" : "method");
-      parse_error_context (wfl,
-			   "Can't access %s %s %<%s.%s%> from %qs",
-			   access, what, klass, fct_name, refklass);
-      PATCH_METHOD_RETURN_ERROR ();
-    }
-
-  /* Deprecation check: check whether the method being invoked or the
-     instance-being-created's type are deprecated.  */
-  if (TREE_CODE (patch) == NEW_CLASS_EXPR)
-    check_deprecation (wfl, TYPE_NAME (DECL_CONTEXT (list)));
-  check_deprecation (wfl, list);
-
-  /* If invoking a innerclass constructor, there are hidden parameters
-     to pass */
-  if (TREE_CODE (patch) == NEW_CLASS_EXPR
-      && PURE_INNER_CLASS_TYPE_P (DECL_CONTEXT (list)))
-    {
-      /* And make sure we add the accessed local variables to be saved
-	 in field aliases. */
-      args = build_alias_initializer_parameter_list
-	(AIPL_FUNCTION_CTOR_INVOCATION, DECL_CONTEXT (list), args, NULL);
-
-      /* Secretly pass the current_this/primary as a second argument */
-      if (primary || current_this)
-	{
-	  tree extra_arg;
-	  tree this_type = (current_this ?
-			    TREE_TYPE (TREE_TYPE (current_this)) : NULL_TREE);
-	  /* Method's (list) enclosing context */
-	  tree mec = DECL_CONTEXT (TYPE_NAME (DECL_CONTEXT (list)));
-	  /* If we have a primary, use it. */
-	  if (primary)
-	    extra_arg = primary;
-	  /* The current `this' is an inner class but isn't a direct
-	     enclosing context for the inner class we're trying to
-	     create. Build an access to the proper enclosing context
-	     and use it. */
-	  else if (current_this && PURE_INNER_CLASS_TYPE_P (this_type)
-		   && this_type != TREE_TYPE (mec))
-	    {
-
-	      extra_arg = build_access_to_thisn (current_class,
-						 TREE_TYPE (mec), 0);
-	      extra_arg = java_complete_tree (extra_arg);
-	    }
-	  /* Otherwise, just use the current `this' as an enclosing
-             context. */
-	  else
-	    extra_arg = current_this;
-	  args = tree_cons (NULL_TREE, extra_arg, args);
-	}
-      else
-	args = tree_cons (NULL_TREE, integer_zero_node, args);
-    }
-
-  /* This handles the situation where a constructor invocation needs
-     to have an enclosing context passed as a second parameter (the
-     constructor is one of an inner class). */
-  if ((is_super_init ||
-       (TREE_CODE (patch) == CALL_EXPR && name == this_identifier_node))
-      && PURE_INNER_CLASS_TYPE_P (DECL_CONTEXT (list)))
-    {
-      tree dest = TYPE_NAME (DECL_CONTEXT (list));
-      tree extra_arg =
-	build_access_to_thisn (current_class, DECL_CONTEXT (dest), 0);
-      extra_arg = java_complete_tree (extra_arg);
-      args = tree_cons (NULL_TREE, extra_arg, args);
-    }
-
-  is_static_flag = METHOD_STATIC (list);
-  if (! is_static_flag && this_arg != NULL_TREE)
-    args = tree_cons (NULL_TREE, this_arg, args);
-
-  /* In the context of an explicit constructor invocation, we can't
-     invoke any method relying on `this'. Exceptions are: we're
-     invoking a static function, primary exists and is not the current
-     this, we're creating a new object. */
-  if (ctxp->explicit_constructor_p
-      && !is_static_flag
-      && (!primary || primary == current_this)
-      && (TREE_CODE (patch) != NEW_CLASS_EXPR))
-    {
-      parse_error_context (wfl, "Can't reference %<this%> before the superclass constructor has been called");
-      PATCH_METHOD_RETURN_ERROR ();
-    }
-  java_parser_context_restore_global ();
-  if (is_static)
-    *is_static = is_static_flag;
-  /* Sometimes, we want the decl of the selected method. Such as for
-     EH checking */
-  if (ret_decl)
-    *ret_decl = list;
-  patch = patch_invoke (patch, list, args);
-
-  /* Now is a good time to insert the call to finit$ */
-  if (is_super_init && CLASS_HAS_FINIT_P (current_class))
-    {
-      tree finit_parms, finit_call;
-
-      /* Prepare to pass hidden parameters to finit$, if any. */
-      finit_parms = build_alias_initializer_parameter_list
-	(AIPL_FUNCTION_FINIT_INVOCATION, current_class, NULL_TREE, NULL);
-
-      finit_call =
-	build_method_invocation (build_wfl_node (finit_identifier_node),
-				 finit_parms);
-
-      /* Generate the code used to initialize fields declared with an
-	 initialization statement and build a compound statement along
-	 with the super constructor invocation. */
-      CAN_COMPLETE_NORMALLY (patch) = 1;
-      patch = build2 (COMPOUND_EXPR, void_type_node, patch,
-		      java_complete_tree (finit_call));
-    }
-  return patch;
-}
-
-/* Check that we're not trying to do a static reference to a method in
-   non static method. Return 1 if it's the case, 0 otherwise. */
-
-static int
-check_for_static_method_reference (tree wfl, tree node, tree method,
-				   tree where, tree primary)
-{
-  if (METHOD_STATIC (current_function_decl)
-      && !METHOD_STATIC (method) && !primary && !CALL_CONSTRUCTOR_P (node))
-    {
-      char *fct_name = xstrdup (lang_printable_name (method, 0));
-      parse_error_context
-	(wfl, "Can't make static reference to method %<%s %s%> in class %qs",
-	 lang_printable_name (TREE_TYPE (TREE_TYPE (method)), 0), fct_name,
-	 IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (where))));
-      free (fct_name);
-      return 1;
-    }
-  return 0;
-}
-
-/* Fix the invocation of *MDECL if necessary in the case of an
-   invocation across a nested class.  *THIS_ARG might be modified
-   appropriately and an alternative access to *MDECL might be
-   returned.  */
-
-static int
-maybe_use_access_method (int is_super_init, tree *mdecl, tree *this_arg)
-{
-  tree ctx;
-  tree md = *mdecl, ta = NULL_TREE;
-  int to_return = 0;
-  int non_static_context = !METHOD_STATIC (md);
-
-  if (is_super_init
-      || DECL_FINIT_P (md)
-      || DECL_INSTINIT_P (md)
-      || !nested_member_access_p (current_class, md))
-    return 0;
-
-  /* If we're calling a method found in an enclosing class, generate
-     what it takes to retrieve the right `this'.  Don't do that if we're
-     invoking a static method.  Note that if MD's type is unrelated to
-     CURRENT_CLASS, then the current this can be used. */
-
-  if (non_static_context 
-      && !inherits_from_p (current_class, DECL_CONTEXT (md))
-      && DECL_CONTEXT (TYPE_NAME (current_class)))
-    {
-      ta = *this_arg;
-      ctx = TREE_TYPE (DECL_CONTEXT (TYPE_NAME (current_class)));
-      if (inherits_from_p (ctx, DECL_CONTEXT (md)))
-	{
-	  ta = build_current_thisn (current_class);
-	  ta = build_wfl_node (ta);
-	}
-      else
-	{
-	  tree type = ctx;
-	  while (type)
-	    {
-	      maybe_build_thisn_access_method (type);
-	      if (inherits_from_p (type, DECL_CONTEXT (md)))
-		{
-		  ta = build_access_to_thisn (ctx, type, 0);
-		  break;
-		}
-	      type = (DECL_CONTEXT (TYPE_NAME (type)) ?
-		      TREE_TYPE (DECL_CONTEXT (TYPE_NAME (type))) : NULL_TREE);
-	    }
-	}
-      ta = java_complete_tree (ta);
-    }
-
-  /* We might have to use an access method to get to MD. We can
-     break the method access rule as long as we're not generating
-     bytecode.  */
-  if (METHOD_PRIVATE (md) && flag_emit_class_files)
-    {
-      md = build_nested_method_access_method (md);
-      to_return = 1;
-    }
-
-  *mdecl = md;
-  if (this_arg)
-    *this_arg = ta;
-
-  /* Returning a nonzero value indicates we were doing a non static
-     method invocation that is now a static invocation. It will have
-     callee displace `this' to insert it in the regular argument
-     list. */
-  return (non_static_context && to_return);
-}
-
-/* Patch an invoke expression METHOD and ARGS, based on its invocation
-   mode.  */
-
-static tree
-patch_invoke (tree patch, tree method, tree args)
-{
-  tree dtable, func;
-  tree original_call, t, ta;
-  tree check = NULL_TREE;
-
-  /* Last step for args: convert build-in types. If we're dealing with
-     a new TYPE() type call, the first argument to the constructor
-     isn't found in the incoming argument list, but delivered by
-     `new' */
-  t = TYPE_ARG_TYPES (TREE_TYPE (method));
-  if (TREE_CODE (patch) == NEW_CLASS_EXPR)
-    t = TREE_CHAIN (t);
-  for (ta = args; t != end_params_node && ta;
-       t = TREE_CHAIN (t), ta = TREE_CHAIN (ta))
-    if (JPRIMITIVE_TYPE_P (TREE_TYPE (TREE_VALUE (ta))) &&
-	TREE_TYPE (TREE_VALUE (ta)) != TREE_VALUE (t))
-      TREE_VALUE (ta) = convert (TREE_VALUE (t), TREE_VALUE (ta));
-
-  /* Resolve unresolved returned type issues */
-  t = TREE_TYPE (TREE_TYPE (method));
-  if (TREE_CODE (t) == POINTER_TYPE && !CLASS_LOADED_P (TREE_TYPE (t)))
-    resolve_and_layout (TREE_TYPE (t), NULL);
-
-  if (flag_emit_class_files)
-    func = method;
-  else
-    {
-      switch (invocation_mode (method, CALL_USING_SUPER (patch)))
-	{
-	case INVOKE_VIRTUAL:
-	  {
-	    tree signature = build_java_signature (TREE_TYPE (method));
-	    tree special;
-	    maybe_rewrite_invocation (&method, &args, &signature, &special);
-
-	    dtable = invoke_build_dtable (0, args);
-	    func = build_invokevirtual (dtable, method, special);
-	  }
-	  break;
-
-	case INVOKE_NONVIRTUAL:
-	  /* If the object for the method call is null, we throw an
-	     exception.  We don't do this if the object is the current
-	     method's `this'.  In other cases we just rely on an
-	     optimization pass to eliminate redundant checks.  */
-	  if (TREE_VALUE (args) != current_this)
-	    {
-	      /* We use a save_expr here to make sure we only evaluate
-		 the new `self' expression once.  */
-	      tree save_arg = save_expr (TREE_VALUE (args));
-	      TREE_VALUE (args) = save_arg;
-	      check = java_check_reference (save_arg, 1);
-	    }
-	  /* Fall through.  */
-
-	case INVOKE_SUPER:
-	case INVOKE_STATIC:
-	  {
-	    tree signature = build_java_signature (TREE_TYPE (method));
-	    tree special;
-	    maybe_rewrite_invocation (&method, &args, &signature, &special);
-	    func = build_known_method_ref (method, TREE_TYPE (method),
-					   DECL_CONTEXT (method),
-					   signature, args, special);
-	  }
-	  break;
-
-	case INVOKE_INTERFACE:
-	  dtable = invoke_build_dtable (1, args);
-	  func = build_invokeinterface (dtable, method);
-	  break;
-
-	default:
-	  abort ();
-	}
-
-      /* Ensure self_type is initialized, (invokestatic). FIXME */
-      func = build1 (NOP_EXPR, build_pointer_type (TREE_TYPE (method)), func);
-    }
-
-  TREE_TYPE (patch) = TREE_TYPE (TREE_TYPE (method));
-  TREE_OPERAND (patch, 0) = func;
-  TREE_OPERAND (patch, 1) = args;
-  patch = check_for_builtin (method, patch);
-  original_call = patch;
-
-  /* We're processing a `new TYPE ()' form. New is called and its
-     returned value is the first argument to the constructor. We build
-     a COMPOUND_EXPR and use saved expression so that the overall NEW
-     expression value is a pointer to a newly created and initialized
-     class. */
-  if (TREE_CODE (original_call) == NEW_CLASS_EXPR)
-    {
-      tree class = DECL_CONTEXT (method);
-      tree c1, saved_new, new;
-      tree alloc_node;
-
-      if (flag_emit_class_files)
-	{
-	  TREE_TYPE (patch) = build_pointer_type (class);
-	  return patch;
-	}
-      if (!TYPE_SIZE (class))
-	safe_layout_class (class);
-      alloc_node =
-	(class_has_finalize_method (class) ? alloc_object_node
-		  			   : alloc_no_finalizer_node);
-      new = build3 (CALL_EXPR, promote_type (class),
-		    build_address_of (alloc_node),
-		    build_tree_list (NULL_TREE, build_class_ref (class)),
-		    NULL_TREE);
-      saved_new = save_expr (new);
-      c1 = build_tree_list (NULL_TREE, saved_new);
-      TREE_CHAIN (c1) = TREE_OPERAND (original_call, 1);
-      TREE_OPERAND (original_call, 1) = c1;
-      TREE_SET_CODE (original_call, CALL_EXPR);
-      patch = build2 (COMPOUND_EXPR, TREE_TYPE (new), patch, saved_new);
-    }
-
-  /* If CHECK is set, then we are building a check to see if the object
-     is NULL.  */
-  if (check != NULL_TREE)
-    {
-      /* We have to call force_evaluation_order now because creating a
- 	 COMPOUND_EXPR wraps the arg list in a way that makes it
- 	 unrecognizable by force_evaluation_order later.  Yuk.  */
-      patch = build2 (COMPOUND_EXPR, TREE_TYPE (patch), check, 
-		      force_evaluation_order (patch));
-      TREE_SIDE_EFFECTS (patch) = 1;
-    }
-
-  /* In order to be able to modify PATCH later, we SAVE_EXPR it and
-     put it as the first expression of a COMPOUND_EXPR. The second
-     expression being an empty statement to be later patched if
-     necessary. We remember a TREE_LIST (the PURPOSE is the method,
-     the VALUE is the compound) in a hashtable and return a
-     COMPOUND_EXPR built so that the result of the evaluation of the
-     original PATCH node is returned. */
-  if (STATIC_CLASS_INIT_OPT_P ()
-      && current_function_decl && METHOD_STATIC (method))
-    {
-      tree list;
-      tree fndecl = current_function_decl;
-      /* We have to call force_evaluation_order now because creating a
-	 COMPOUND_EXPR wraps the arg list in a way that makes it
-	 unrecognizable by force_evaluation_order later.  Yuk.  */
-      tree save = force_evaluation_order (patch);
-      tree type = TREE_TYPE (patch);
-
-      patch = build2 (COMPOUND_EXPR, type, save, build_java_empty_stmt ());
-      list = tree_cons (method, patch,
-			DECL_FUNCTION_STATIC_METHOD_INVOCATION_COMPOUND (fndecl));
-
-      DECL_FUNCTION_STATIC_METHOD_INVOCATION_COMPOUND (fndecl) = list;
-
-      patch = build2 (COMPOUND_EXPR, type, patch, save);
-    }
-
-  return patch;
-}
-
-static int
-invocation_mode (tree method, int super)
-{
-  int access = get_access_flags_from_decl (method);
-
-  if (super)
-    return INVOKE_SUPER;
-
-  if (access & ACC_STATIC)
-    return INVOKE_STATIC;
-
-  /* We have to look for a constructor before we handle nonvirtual
-     calls; otherwise the constructor will look nonvirtual.  */
-  if (DECL_CONSTRUCTOR_P (method))
-    return INVOKE_STATIC;
-
-  if (access & ACC_PRIVATE)
-    return INVOKE_NONVIRTUAL;
-
-  /* Binary compatibility: just because it's final today, that doesn't
-     mean it'll be final tomorrow.  */
-  if (! flag_indirect_dispatch  
-      || DECL_CONTEXT (method) == object_type_node)
-    {
-      if (access & ACC_FINAL)
-	return INVOKE_NONVIRTUAL;
-
-      if (CLASS_FINAL (TYPE_NAME (DECL_CONTEXT (method))))
-	return INVOKE_NONVIRTUAL;
-    }
-
-  if (CLASS_INTERFACE (TYPE_NAME (DECL_CONTEXT (method))))
-    return INVOKE_INTERFACE;
-
-  return INVOKE_VIRTUAL;
-}
-
-/* Retrieve a refined list of matching methods. It covers the step
-   15.11.2 (Compile-Time Step 2) */
-
-static tree
-lookup_method_invoke (int lc, tree cl, tree class, tree name, tree arg_list)
-{
-  tree atl = end_params_node;		/* Arg Type List */
-  tree method, signature, list, node;
-  const char *candidates;		/* Used for error report */
-  char *dup;
-
-  /* Fix the arguments */
-  for (node = arg_list; node; node = TREE_CHAIN (node))
-    {
-      tree current_arg = TREE_TYPE (TREE_VALUE (node));
-      /* Non primitive type may have to be resolved */
-      if (!JPRIMITIVE_TYPE_P (current_arg))
-	resolve_and_layout (current_arg, NULL_TREE);
-      /* And promoted */
-      if (TREE_CODE (current_arg) == RECORD_TYPE)
-        current_arg = promote_type (current_arg);
-      /* If we're building an anonymous constructor call, and one of
-	 the arguments has array type, cast it to a size-less array
-	 type.  This prevents us from getting a strange gcj-specific
-	 "sized array" signature in the constructor's signature.  */
-      if (lc && ANONYMOUS_CLASS_P (class)
-	  && TREE_CODE (current_arg) == POINTER_TYPE
-	  && TYPE_ARRAY_P (TREE_TYPE (current_arg)))
-	{
-	  tree elt = TYPE_ARRAY_ELEMENT (TREE_TYPE (current_arg));
-	  current_arg = build_pointer_type (build_java_array_type (elt, -1));
-	}
-      atl = tree_cons (NULL_TREE, current_arg, atl);
-    }
-
-  /* Presto. If we're dealing with an anonymous class and a
-     constructor call, generate the right constructor now, since we
-     know the arguments' types. */
-
-  if (lc && ANONYMOUS_CLASS_P (class))
-    {
-      tree mdecl = craft_constructor (TYPE_NAME (class), atl);
-      /* The anonymous class may have already been laid out, so make sure
-         the new constructor is laid out here.  */
-      layout_class_method (class, CLASSTYPE_SUPER (class), mdecl, NULL_TREE);
-    }
-
-  /* Find all candidates and then refine the list, searching for the
-     most specific method. */
-  list = find_applicable_accessible_methods_list (lc, class, name, atl);
-  list = find_most_specific_methods_list (list, class);
-  if (list && !TREE_CHAIN (list))
-    return TREE_VALUE (list);
-
-  /* Issue an error. List candidates if any. Candidates are listed
-     only if accessible (non accessible methods may end-up here for
-     the sake of a better error report). */
-  candidates = NULL;
-  if (list)
-    {
-      tree current;
-      obstack_grow (&temporary_obstack, ". Candidates are:\n", 18);
-      for (current = list; current; current = TREE_CHAIN (current))
-	{
-	  tree cm = TREE_VALUE (current);
-	  char string [4096];
-	  if (!cm || not_accessible_p (class, cm, NULL_TREE, 0))
-	    continue;
-	  sprintf
-	    (string, "  '%s' in '%s'%s",
-	     get_printable_method_name (cm),
-	     IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (DECL_CONTEXT (cm)))),
-	     (TREE_CHAIN (current) ? "\n" : ""));
-	  obstack_grow (&temporary_obstack, string, strlen (string));
-	}
-      obstack_1grow (&temporary_obstack, '\0');
-      candidates = obstack_finish (&temporary_obstack);
-    }
-  /* Issue the error message */
-  method = make_node (FUNCTION_TYPE);
-  TYPE_ARG_TYPES (method) = atl;
-  signature = build_java_argument_signature (method);
-  dup = xstrdup (lang_printable_name (class, 0));
-  parse_error_context (cl, "Can't find %s %<%s(%s)%> in type %qs%s",
-		       (lc ? "constructor" : "method"),
-		       (lc ? dup : IDENTIFIER_POINTER (name)),
-		       IDENTIFIER_POINTER (signature), dup,
-		       (candidates ? candidates : ""));
-  free (dup);
-  return NULL_TREE;
-}
-
-/* 15.11.2.1: Find Methods that are Applicable and Accessible. LC is 1
-   when we're looking for a constructor. */
-
-static tree
-find_applicable_accessible_methods_list (int lc, tree class, tree name,
-					 tree arglist)
-{
-  static htab_t searched_classes;
-  static int search_not_done = 0;
-  tree list = NULL_TREE, all_list = NULL_TREE;
-  tree base_binfo;
-  int i;
-
-  /* Check the hash table to determine if this class has been searched
-     already. */
-  if (searched_classes)
-    {
-      if (htab_find (searched_classes, class) != NULL)
-	return NULL;
-    }
-  else
-    {
-      searched_classes = htab_create (10, htab_hash_pointer,
-				      htab_eq_pointer, NULL);
-    }
-
-  search_not_done++;
-  *htab_find_slot (searched_classes, class, INSERT) = class;
-
-  if (!CLASS_LOADED_P (class))
-    {
-      load_class (class, 1);
-      safe_layout_class (class);
-    }
-
-  /* Search interfaces */
-  if (TREE_CODE (TYPE_NAME (class)) == TYPE_DECL
-      && CLASS_INTERFACE (TYPE_NAME (class)))
-    {
-      search_applicable_methods_list (lc, TYPE_METHODS (class),
-				      name, arglist, &list, &all_list);
-      for (i = 1; BINFO_BASE_ITERATE (TYPE_BINFO (class), i, base_binfo); i++)
-	{
-	  tree t = BINFO_TYPE (base_binfo);
-	  tree rlist;
-	  
-	  rlist = find_applicable_accessible_methods_list (lc,  t, name,
-							   arglist);
-	  list = chainon (rlist, list);
-	}
-    }
-  /* Search classes */
-  else
-    {
-      search_applicable_methods_list (lc, TYPE_METHODS (class),
-				      name, arglist, &list, &all_list);
-
-      /* When looking finit$, class$ or instinit$, we turn LC to 1 so
-	 that we only search in class. Note that we should have found
-	 something at this point. */
-      if (ID_FINIT_P (name) || ID_CLASSDOLLAR_P (name) || ID_INSTINIT_P (name))
-	{
-	  lc = 1;
-	  if (!list)
-	    abort ();
-	}
-
-      /* We must search all interfaces of this class */
-      if (!lc)
-	{
-	  for (i = 1;
-	       BINFO_BASE_ITERATE (TYPE_BINFO (class), i, base_binfo); i++)
-	    {
-	      tree t = BINFO_TYPE (base_binfo);
-	      if (t != object_type_node)
-		{
-		  tree rlist
-		    = find_applicable_accessible_methods_list (lc, t,
-							       name, arglist);
-		  list = chainon (rlist, list);
-		}
-	    }
-	}
-
-      /* Search superclass */
-      if (!lc && CLASSTYPE_SUPER (class) != NULL_TREE)
-	{
-          tree rlist;
-          class = CLASSTYPE_SUPER (class);
-          rlist = find_applicable_accessible_methods_list (lc, class,
-                                                           name, arglist);
-          list = chainon (rlist, list);
-        }
-    }
-
-  search_not_done--;
-
-  /* We're done. Reset the searched classes list and finally search
-     java.lang.Object if it wasn't searched already. */
-  if (!search_not_done)
-    {
-      if (!lc
-	  && TYPE_METHODS (object_type_node)
-	  && htab_find (searched_classes, object_type_node) == NULL)
-	{
-          search_applicable_methods_list (lc,
-                                          TYPE_METHODS (object_type_node),
-                                          name, arglist, &list, &all_list);
-        }
-      htab_delete (searched_classes);
-      searched_classes = NULL;
-    }
-
-  /* Either return the list obtained or all selected (but
-     inaccessible) methods for better error report. */
-  return (!list ? all_list : list);
-}
-
-/* Effectively search for the appropriate method in method */
-
-static void
-search_applicable_methods_list (int lc, tree method, tree name, tree arglist,
-				tree *list, tree *all_list)
-{
-  for (; method; method = TREE_CHAIN (method))
-    {
-      /* When dealing with constructor, stop here, otherwise search
-         other classes */
-      if (lc && !DECL_CONSTRUCTOR_P (method))
-	continue;
-      else if (!lc && (DECL_CONSTRUCTOR_P (method)
-		       || (DECL_NAME (method) != name)))
-	continue;
-
-      if (argument_types_convertible (method, arglist))
-	{
-	  /* Retain accessible methods only */
-	  if (!not_accessible_p (DECL_CONTEXT (current_function_decl),
-				 method, NULL_TREE, 0))
-	    *list = tree_cons (NULL_TREE, method, *list);
-	  else
-	    /* Also retain all selected method here */
-	    *all_list = tree_cons (NULL_TREE, method, *list);
-	}
-    }
-}
-
-/* 15.11.2.2 Choose the Most Specific Method */
-
-static tree
-find_most_specific_methods_list (tree list, tree class)
-{
-  int max = 0;
-  int abstract, candidates;
-  tree current, new_list = NULL_TREE;
-  for (current = list; current; current = TREE_CHAIN (current))
-    {
-      tree method;
-      DECL_SPECIFIC_COUNT (TREE_VALUE (current)) = 0;
-
-      for (method = list; method; method = TREE_CHAIN (method))
-	{
-	  tree method_v, current_v;
-	  /* Don't test a method against itself */
-	  if (method == current)
-	    continue;
-
-	  method_v = TREE_VALUE (method);
-	  current_v = TREE_VALUE (current);
-
-	  /* Compare arguments and location where methods where declared */
-	  if (argument_types_convertible (method_v, current_v))
-	    {
-	      /* We have a rather odd special case here.  The front
-		 end doesn't properly implement inheritance, so we
-		 work around it here.  The idea is, if we are
-		 comparing a method declared in a class to one
-		 declared in an interface, and the invocation's
-		 qualifying class is a class (and not an interface),
-		 then we consider the method's class to be the
-		 qualifying class of the invocation.  This lets us
-		 fake the result of ordinary inheritance.  */
-	      tree context_v = DECL_CONTEXT (current_v);
-	      if (TYPE_INTERFACE_P (DECL_CONTEXT (method_v))
-		  && ! TYPE_INTERFACE_P (context_v)
-		  && ! TYPE_INTERFACE_P (class))
-		context_v = class;
-
-	      if (valid_method_invocation_conversion_p
-		  (DECL_CONTEXT (method_v), context_v))
-		{
-		  int v = (DECL_SPECIFIC_COUNT (current_v) += 1);
-		  max = (v > max ? v : max);
-		}
-	    }
-	}
-    }
-
-  /* Review the list and select the maximally specific methods */
-  for (current = list, abstract = -1, candidates = -1;
-       current; current = TREE_CHAIN (current))
-    if (DECL_SPECIFIC_COUNT (TREE_VALUE (current)) == max)
-      {
-	new_list = tree_cons (NULL_TREE, TREE_VALUE (current), new_list);
-	abstract += (METHOD_ABSTRACT (TREE_VALUE (current)) ? 1 : 0);
-	candidates++;
-      }
-
-  /* If we have several and they're all abstract, just pick the
-     closest one. */
-  if (candidates > 0 && candidates == abstract)
-    {
-      /* FIXME: merge the throws clauses.  There is no convenient way
-	 to do this in gcj right now, since ideally we'd like to
-	 introduce a new METHOD_DECL here, but that is really not
-	 possible.  */
-      new_list = nreverse (new_list);
-      TREE_CHAIN (new_list) = NULL_TREE;
-      return new_list;
-    }
-
-  /* We have several (we couldn't find a most specific), all but one
-     are abstract, we pick the only non abstract one. */
-  if (candidates > 0 && (candidates == abstract+1))
-    {
-      for (current = new_list; current; current = TREE_CHAIN (current))
-	if (!METHOD_ABSTRACT (TREE_VALUE (current)))
-	  {
-	    TREE_CHAIN (current) = NULL_TREE;
-	    new_list = current;
-	  }
-    }
-
-  /* If we can't find one, lower expectations and try to gather multiple
-     maximally specific methods */
-  while (!new_list && max)
-    {
-      while (--max > 0)
-	{
-	  if (DECL_SPECIFIC_COUNT (TREE_VALUE (current)) == max)
-	    new_list = tree_cons (NULL_TREE, TREE_VALUE (current), new_list);
-	}
-    }
-
-  return new_list;
-}
-
-/* Make sure that the type of each M2_OR_ARGLIST arguments can be
-   converted by method invocation conversion (5.3) to the type of the
-   corresponding parameter of M1. Implementation expects M2_OR_ARGLIST
-   to change less often than M1. */
-
-static GTY(()) tree m2_arg_value;
-static GTY(()) tree m2_arg_cache;
-
-static int
-argument_types_convertible (tree m1, tree m2_or_arglist)
-{
-  tree m1_arg, m2_arg;
-
-  SKIP_THIS_AND_ARTIFICIAL_PARMS (m1_arg, m1)
-
-  if (m2_arg_value == m2_or_arglist)
-    m2_arg = m2_arg_cache;
-  else
-    {
-      /* M2_OR_ARGLIST can be a function DECL or a raw list of
-         argument types */
-      if (m2_or_arglist && TREE_CODE (m2_or_arglist) == FUNCTION_DECL)
-	{
-	  m2_arg = TYPE_ARG_TYPES (TREE_TYPE (m2_or_arglist));
-	  if (!METHOD_STATIC (m2_or_arglist))
-	    m2_arg = TREE_CHAIN (m2_arg);
-	}
-      else
-	m2_arg = m2_or_arglist;
-
-      m2_arg_value = m2_or_arglist;
-      m2_arg_cache = m2_arg;
-    }
-
-  while (m1_arg != end_params_node && m2_arg != end_params_node)
-    {
-      resolve_and_layout (TREE_VALUE (m1_arg), NULL_TREE);
-      if (!valid_method_invocation_conversion_p (TREE_VALUE (m1_arg),
-						 TREE_VALUE (m2_arg)))
-	break;
-      m1_arg = TREE_CHAIN (m1_arg);
-      m2_arg = TREE_CHAIN (m2_arg);
-    }
-  return m1_arg == end_params_node && m2_arg == end_params_node;
-}
-
-/* Qualification routines */
-
-/* Given a name x.y.z, look up x locally.  If it's found, save the
-   decl.  If it's not found, mark the name as RESOLVE_PACKAGE_NAME_P,
-   so that we later try and load the appropriate classes.  */
-static void
-qualify_ambiguous_name (tree id)
-{
-  tree name, decl;
-
-  /* We inspect the first item of the qualification list.  As a sanity
-     check, make sure that it is an identfier node.  */
-  tree qual = EXPR_WFL_QUALIFICATION (id);
-  tree qual_wfl = QUAL_WFL (qual);
-
-  if (TREE_CODE (qual_wfl) != EXPR_WITH_FILE_LOCATION)
-    return;
-
-  name = EXPR_WFL_NODE (qual_wfl);
-
-  /* If we don't have an identifier, or we have a 'this' or 'super',
-     then field access processing is all we need : there is nothing
-     for us to do.  */
-  if (!name || TREE_CODE (name) != IDENTIFIER_NODE ||
-      name == this_identifier_node ||
-      name == super_identifier_node)
-    return;
-
-  /* If name appears within the scope of a local variable declaration
-     or parameter declaration, or is a field within an enclosing
-     class, then it is an expression name.  Save the decl and let
-     resolve_field_access do it's work.  */
-  if ((decl = IDENTIFIER_LOCAL_VALUE (name)) ||
-      (decl = lookup_field_wrapper (current_class, name)))
-    {
-      QUAL_RESOLUTION (qual) = decl;
-      return;
-    }
-
-  /* If name is a known class name (either declared or imported), mark
-     us as a type name.  */
-  if ((decl = resolve_and_layout (name, NULL_TREE)))
-    {
-      RESOLVE_TYPE_NAME_P (qual_wfl) = 1;
-      QUAL_RESOLUTION (qual) = decl;
-    }
-
-  /* Check here that NAME isn't declared by more than one
-     type-import-on-demand declaration of the compilation unit
-     containing NAME. FIXME */
-
-  /* We couldn't find a declaration for the name.  Assume for now that
-     we have a qualified class name that needs to be loaded from an
-     external class file.  */
-  else
-    RESOLVE_PACKAGE_NAME_P (qual_wfl) = 1;
-
-  /* Propagate the qualification across other components of the
-     qualified name */
-  for (qual = TREE_CHAIN (qual); qual;
-       qual_wfl = QUAL_WFL (qual), qual = TREE_CHAIN (qual))
-    {
-      if (RESOLVE_PACKAGE_NAME_P (qual_wfl))
-	RESOLVE_PACKAGE_NAME_P (QUAL_WFL (qual)) = 1;
-    }
-
-  /* Store the global qualification for the ambiguous part of ID back
-     into ID fields */
-  if (RESOLVE_TYPE_NAME_P (qual_wfl))
-    RESOLVE_TYPE_NAME_P (id) = 1;
-  else if (RESOLVE_PACKAGE_NAME_P (qual_wfl))
-    RESOLVE_PACKAGE_NAME_P (id) = 1;
-}
-
-/* Patch tree nodes in a function body. When a BLOCK is found, push
-   local variable decls if present.
-   Same as java_complete_lhs, but does resolve static finals to values. */
-
-static tree
-java_complete_tree (tree node)
-{
-  node = java_complete_lhs (node);
-  if (JDECL_P (node) && CLASS_FINAL_VARIABLE_P (node)
-      && DECL_INITIAL (node) != NULL_TREE)
-    {
-      tree value = fold_constant_for_init (node, node);
-      if (value != NULL_TREE)
-	return value;
-    }
-  return node;
-}
-
-static tree
-java_stabilize_reference (tree node)
-{
-  if (TREE_CODE (node) == COMPOUND_EXPR)
-    {
-      tree op0 = TREE_OPERAND (node, 0);
-      tree op1 = TREE_OPERAND (node, 1);
-      TREE_OPERAND (node, 0) = save_expr (op0);
-      TREE_OPERAND (node, 1) = java_stabilize_reference (op1);
-      return node;
-    }
-  return stabilize_reference (node);
-}
-
-/* Patch tree nodes in a function body. When a BLOCK is found, push
-   local variable decls if present.
-   Same as java_complete_tree, but does not resolve static finals to values. */
-
-static tree
-java_complete_lhs (tree node)
-{
-  tree nn, cn, wfl_op1, wfl_op2, wfl_op3;
-  int flag;
-
-  /* CONVERT_EXPR always has its type set, even though it needs to be
-     worked out. */
-  if (TREE_TYPE (node) && TREE_CODE (node) != CONVERT_EXPR)
-    return node;
-
-  /* The switch block implements cases processing container nodes
-     first.  Contained nodes are always written back. Leaves come
-     next and return a value. */
-  switch (TREE_CODE (node))
-    {
-    case BLOCK:
-
-      /* 1- Block section.
-	 Set the local values on decl names so we can identify them
-	 faster when they're referenced. At that stage, identifiers
-	 are legal so we don't check for declaration errors. */
-      for (cn = BLOCK_EXPR_DECLS (node); cn; cn = TREE_CHAIN (cn))
-	{
-	  DECL_CONTEXT (cn) = current_function_decl;
-	  IDENTIFIER_LOCAL_VALUE (DECL_NAME (cn)) = cn;
-	}
-      if (BLOCK_EXPR_BODY (node) == NULL_TREE)
-	  CAN_COMPLETE_NORMALLY (node) = 1;
-      else
-	{
-	  tree stmt = BLOCK_EXPR_BODY (node);
-	  tree *ptr;
-	  int error_seen = 0;
-	  if (TREE_CODE (stmt) == COMPOUND_EXPR)
-	    {
-	      /* Re-order from (((A; B); C); ...; Z) to
-		 (A; (B; (C ; (...; Z)))).
-		 This makes it easier to scan the statements left-to-right
-		 without using recursion (which might overflow the stack
-		 if the block has many statements. */
-	      for (;;)
-		{
-		  tree left = TREE_OPERAND (stmt, 0);
-		  if (TREE_CODE (left) != COMPOUND_EXPR)
-		    break;
-		  TREE_OPERAND (stmt, 0) = TREE_OPERAND (left, 1);
-		  TREE_OPERAND (left, 1) = stmt;
-		  stmt = left;
-		}
-	      BLOCK_EXPR_BODY (node) = stmt;
-	    }
-
-	  /* Now do the actual complete, without deep recursion for
-             long blocks. */
-	  ptr = &BLOCK_EXPR_BODY (node);
-	  while (TREE_CODE (*ptr) == COMPOUND_EXPR
-		 && !IS_EMPTY_STMT (TREE_OPERAND (*ptr, 1)))
-	    {
-	      tree cur = java_complete_tree (TREE_OPERAND (*ptr, 0));
-	      tree *next = &TREE_OPERAND (*ptr, 1);
-	      TREE_OPERAND (*ptr, 0) = cur;
-	      if (IS_EMPTY_STMT (cur))
-		{
-		  /* Optimization;  makes it easier to detect empty bodies.
-		     Most useful for <clinit> with all-constant initializer. */
-		  *ptr = *next;
-		  continue;
-		}
-	      if (TREE_CODE (cur) == ERROR_MARK)
-		error_seen++;
-	      else if (! CAN_COMPLETE_NORMALLY (cur))
-		{
-		  wfl_op2 = *next;
-		  for (;;)
-		    {
-		      if (TREE_CODE (wfl_op2) == BLOCK)
-			wfl_op2 = BLOCK_EXPR_BODY (wfl_op2);
-		      else if (TREE_CODE (wfl_op2) == COMPOUND_EXPR)
-			wfl_op2 = TREE_OPERAND (wfl_op2, 0);
-		      else
-			break;
-		    }
-		  if (TREE_CODE (wfl_op2) != CASE_EXPR
-		      && TREE_CODE (wfl_op2) != DEFAULT_EXPR)
-		    unreachable_stmt_error (*ptr);
-		}
-	      if (TREE_TYPE (*ptr) == NULL_TREE)
-		TREE_TYPE (*ptr) = void_type_node;
-	      ptr = next;
-	    }
-	  *ptr = java_complete_tree (*ptr);
-
-	  if (TREE_CODE (*ptr) == ERROR_MARK || error_seen > 0)
-	    return error_mark_node;
-	  CAN_COMPLETE_NORMALLY (node) = CAN_COMPLETE_NORMALLY (*ptr);
-	}
-      /* Turn local bindings to null */
-      for (cn = BLOCK_EXPR_DECLS (node); cn; cn = TREE_CHAIN (cn))
-	IDENTIFIER_LOCAL_VALUE (DECL_NAME (cn)) = NULL_TREE;
-
-      TREE_TYPE (node) = void_type_node;
-      break;
-
-      /* 2- They are expressions but ultimately deal with statements */
-
-    case THROW_EXPR:
-      wfl_op1 = TREE_OPERAND (node, 0);
-      COMPLETE_CHECK_OP_0 (node);
-      /* 14.19 A throw statement cannot complete normally. */
-      CAN_COMPLETE_NORMALLY (node) = 0;
-      return patch_throw_statement (node, wfl_op1);
-
-    case SYNCHRONIZED_EXPR:
-      wfl_op1 = TREE_OPERAND (node, 0);
-      return patch_synchronized_statement (node, wfl_op1);
-
-    case TRY_EXPR:
-      return patch_try_statement (node);
-
-    case TRY_FINALLY_EXPR:
-      COMPLETE_CHECK_OP_0 (node);
-      COMPLETE_CHECK_OP_1 (node);
-      if (IS_EMPTY_STMT (TREE_OPERAND (node, 0)))
-	/* Reduce try/finally nodes with an empty try block.  */
-	return TREE_OPERAND (node, 1);
-      if (IS_EMPTY_STMT (TREE_OPERAND (node, 1)))
-	/* Likewise for an empty finally block.  */
-	return TREE_OPERAND (node, 0);
-      CAN_COMPLETE_NORMALLY (node)
-	= (CAN_COMPLETE_NORMALLY (TREE_OPERAND (node, 0))
-	   && CAN_COMPLETE_NORMALLY (TREE_OPERAND (node, 1)));
-      TREE_TYPE (node) = TREE_TYPE (TREE_OPERAND (node, 0));
-      return node;
-
-    case LABELED_BLOCK_EXPR:
-      PUSH_LABELED_BLOCK (node);
-      if (LABELED_BLOCK_BODY (node))
-	COMPLETE_CHECK_OP_1 (node);
-      TREE_TYPE (node) = void_type_node;
-      POP_LABELED_BLOCK ();
-
-      if (IS_EMPTY_STMT (LABELED_BLOCK_BODY (node)))
-	{
-	  LABELED_BLOCK_BODY (node) = NULL_TREE;
-	  CAN_COMPLETE_NORMALLY (node) = 1;
-	}
-      else if (CAN_COMPLETE_NORMALLY (LABELED_BLOCK_BODY (node)))
-	CAN_COMPLETE_NORMALLY (node) = 1;
-      return node;
-
-    case EXIT_BLOCK_EXPR:
-      return patch_bc_statement (node);
-
-    case CASE_EXPR:
-      cn = java_complete_tree (TREE_OPERAND (node, 0));
-      if (cn == error_mark_node)
-	return cn;
-
-      /* First, the case expression must be constant. Values of final
-         fields are accepted. */
-      nn = fold_constant_for_init (cn, NULL_TREE);
-      if (nn != NULL_TREE)
-	cn = nn;
-
-      cn = fold (cn);
-      if ((TREE_CODE (cn) == COMPOUND_EXPR
-	   || TREE_CODE (cn) == COMPONENT_REF)
-	  && JDECL_P (TREE_OPERAND (cn, 1))
-	  && FIELD_FINAL (TREE_OPERAND (cn, 1))
-	  && DECL_INITIAL (TREE_OPERAND (cn, 1)))
-	{
-	  cn = fold_constant_for_init (DECL_INITIAL (TREE_OPERAND (cn, 1)),
-				       TREE_OPERAND (cn, 1));
-	}
-      /* Accept final locals too. */
-      else if (TREE_CODE (cn) == VAR_DECL && DECL_FINAL (cn) 
-	       && DECL_INITIAL (cn))
-	cn = fold_constant_for_init (DECL_INITIAL (cn), cn);
-
-      if (!TREE_CONSTANT (cn))
-	{
-	  EXPR_WFL_LINECOL (wfl_operator) = EXPR_WFL_LINECOL (node);
-	  parse_error_context (node, "Constant expression required");
-	  return error_mark_node;
-	}
-
-      nn = ctxp->current_loop;
-
-      /* It must be assignable to the type of the switch expression. */
-      if (!try_builtin_assignconv (NULL_TREE,
-				   TREE_TYPE (TREE_OPERAND (nn, 0)), cn))
-	{
-	  EXPR_WFL_LINECOL (wfl_operator) = EXPR_WFL_LINECOL (node);
-	  parse_error_context
-	    (wfl_operator,
-	     "Incompatible type for case. Can't convert %qs to %<int%>",
-	     lang_printable_name (TREE_TYPE (cn), 0));
-	  return error_mark_node;
-	}
-
-      cn = fold (convert (int_type_node, cn));
-      TREE_CONSTANT_OVERFLOW (cn) = 0;
-      CAN_COMPLETE_NORMALLY (cn) = 1;
-
-      /* Save the label on a list so that we can later check for
-	 duplicates.  */
-      case_label_list = tree_cons (node, cn, case_label_list);
-
-      /* Multiple instance of a case label bearing the same value is
-	 checked later. The case expression is all right so far. */
-      if (TREE_CODE (cn) == VAR_DECL)
-	cn = DECL_INITIAL (cn);
-      TREE_OPERAND (node, 0) = cn;
-      TREE_TYPE (node) = void_type_node;
-      CAN_COMPLETE_NORMALLY (node) = 1;
-      TREE_SIDE_EFFECTS (node) = 1;
-      break;
-
-    case DEFAULT_EXPR:
-      nn = ctxp->current_loop;
-      /* Only one default label is allowed per switch statement */
-      if (SWITCH_HAS_DEFAULT (nn))
-	{
-#ifdef USE_MAPPED_LOCATION
-	  SET_EXPR_LOCATION (wfl_operator, EXPR_LOCATION (node));
-#else
-	  EXPR_WFL_LINECOL (wfl_operator) = EXPR_WFL_LINECOL (node);
-#endif
-	  parse_error_context (wfl_operator,
-			       "Duplicate case label: %<default%>");
-	  return error_mark_node;
-	}
-      else
-	SWITCH_HAS_DEFAULT (nn) = 1;
-      TREE_TYPE (node) = void_type_node;
-      TREE_SIDE_EFFECTS (node) = 1;
-      CAN_COMPLETE_NORMALLY (node) = 1;
-      break;
-
-    case SWITCH_EXPR:
-    case LOOP_EXPR:
-      PUSH_LOOP (node);
-      /* Check whether the loop was enclosed in a labeled
-         statement. If not, create one, insert the loop in it and
-         return the node */
-      nn = patch_loop_statement (node);
-
-      /* Anyways, walk the body of the loop */
-      if (TREE_CODE (node) == LOOP_EXPR)
-	TREE_OPERAND (node, 0) = java_complete_tree (TREE_OPERAND (node, 0));
-      /* Switch statement: walk the switch expression and the cases */
-      else
-	node = patch_switch_statement (node);
-
-      if (node == error_mark_node || TREE_OPERAND (node, 0) == error_mark_node)
-	nn = error_mark_node;
-      else
-	{
-	  TREE_TYPE (nn) = TREE_TYPE (node) = void_type_node;
-	  /* If we returned something different, that's because we
-	     inserted a label. Pop the label too. */
-	  if (nn != node)
-	    {
-	      if (CAN_COMPLETE_NORMALLY (node))
-		CAN_COMPLETE_NORMALLY (nn) = 1;
-	      POP_LABELED_BLOCK ();
-	    }
-	}
-      POP_LOOP ();
-      return nn;
-
-    case EXIT_EXPR:
-      TREE_OPERAND (node, 0) = java_complete_tree (TREE_OPERAND (node, 0));
-      return patch_exit_expr (node);
-
-    case COND_EXPR:
-      /* Condition */
-      TREE_OPERAND (node, 0) = java_complete_tree (TREE_OPERAND (node, 0));
-      if (TREE_OPERAND (node, 0) == error_mark_node)
-	return error_mark_node;
-      /* then-else branches */
-      TREE_OPERAND (node, 1) = java_complete_tree (TREE_OPERAND (node, 1));
-      if (TREE_OPERAND (node, 1) == error_mark_node)
-	return error_mark_node;
-      {
-	/* This is a special case due to build_assertion().  When
-	   assertions are disabled we build a COND_EXPR in which
-	   Operand 1 is the body of the assertion.  If that happens to
-	   be a string concatenation we'll need to patch it here.  */
-	tree patched = patch_string (TREE_OPERAND (node, 1));
-	if (patched)
-	  TREE_OPERAND (node, 1) = patched;
-      }
-     TREE_OPERAND (node, 2) = java_complete_tree (TREE_OPERAND (node, 2));
-      if (TREE_OPERAND (node, 2) == error_mark_node)
-	return error_mark_node;
-      return patch_if_else_statement (node);
-      break;
-
-    case CONDITIONAL_EXPR:
-      /* Condition */
-      wfl_op1 = TREE_OPERAND (node, 0);
-      COMPLETE_CHECK_OP_0 (node);
-      wfl_op2 = TREE_OPERAND (node, 1);
-      COMPLETE_CHECK_OP_1 (node);
-      wfl_op3 = TREE_OPERAND (node, 2);
-      COMPLETE_CHECK_OP_2 (node);
-      return patch_conditional_expr (node, wfl_op1, wfl_op2);
-
-      /* 3- Expression section */
-    case COMPOUND_EXPR:
-      wfl_op2 = TREE_OPERAND (node, 1);
-      TREE_OPERAND (node, 0) = nn =
-	java_complete_tree (TREE_OPERAND (node, 0));
-      if (IS_EMPTY_STMT (wfl_op2))
-	CAN_COMPLETE_NORMALLY (node) = CAN_COMPLETE_NORMALLY (nn);
-      else
-	{
-	  if (! CAN_COMPLETE_NORMALLY (nn) && TREE_CODE (nn) != ERROR_MARK)
-	    {
-	      /* An unreachable condition in a do-while statement
-		 is *not* (technically) an unreachable statement. */
-	      nn = wfl_op2;
-	      if (TREE_CODE (nn) == EXPR_WITH_FILE_LOCATION)
-		nn = EXPR_WFL_NODE (nn);
-	      /* NN can be NULL_TREE exactly when UPDATE is, in
-		 finish_for_loop.  */
-	      if (nn != NULL_TREE && TREE_CODE (nn) != EXIT_EXPR)
-		{
-		  SET_WFL_OPERATOR (wfl_operator, node, wfl_op2);
-		  if (SUPPRESS_UNREACHABLE_ERROR (nn))
-		    {
-		      /* Perhaps this warning should have an
-			 associated flag.  The code being compiled is
-			 pedantically correct, but useless.  */
-		      parse_warning_context (wfl_operator,
-					     "Unreachable statement");
-		    }
-		  else
-		    parse_error_context (wfl_operator,
-					 "Unreachable statement");
-		}
-	    }
-	  TREE_OPERAND (node, 1) = java_complete_tree (TREE_OPERAND (node, 1));
-	  if (TREE_OPERAND (node, 1) == error_mark_node)
-	    return error_mark_node;
-	  /* Even though we might allow the case where the first
-	     operand doesn't return normally, we still should compute
-	     CAN_COMPLETE_NORMALLY correctly.  */
-	  CAN_COMPLETE_NORMALLY (node)
-	    = (CAN_COMPLETE_NORMALLY (TREE_OPERAND (node, 0))
-	       && CAN_COMPLETE_NORMALLY (TREE_OPERAND (node, 1)));
-	}
-      TREE_TYPE (node) = TREE_TYPE (TREE_OPERAND (node, 1));
-      break;
-
-    case RETURN_EXPR:
-      /* CAN_COMPLETE_NORMALLY (node) = 0; */
-      return patch_return (node);
-
-    case EXPR_WITH_FILE_LOCATION:
-      if (!EXPR_WFL_NODE (node) /* Or a PRIMARY flag ? */
-	  || TREE_CODE (EXPR_WFL_NODE (node)) == IDENTIFIER_NODE)
-	{
-	  node = resolve_expression_name (node, NULL);
-	  if (node == error_mark_node)
-	    return node;
-	  CAN_COMPLETE_NORMALLY (node) = 1;
-	}
-      else
-	{
-	  tree body;
-	  location_t save_location = input_location;
-#ifdef USE_MAPPED_LOCATION
-	  input_location = EXPR_LOCATION (node);
-	  if (input_location == UNKNOWN_LOCATION)
-	    input_location = save_location;
-#else
-	  input_line = EXPR_WFL_LINENO (node);
-#endif
-	  body = java_complete_tree (EXPR_WFL_NODE (node));
-	  input_location = save_location;
-	  EXPR_WFL_NODE (node) = body;
-	  TREE_SIDE_EFFECTS (node) = TREE_SIDE_EFFECTS (body);
-	  CAN_COMPLETE_NORMALLY (node) = CAN_COMPLETE_NORMALLY (body);
-	  if (IS_EMPTY_STMT (body) || TREE_CONSTANT (body))
-	    {
-	      /* Makes it easier to constant fold, detect empty bodies. */
-	      return body;
-	    }
-	  if (body == error_mark_node)
-	    {
-	      /* Its important for the evaluation of assignment that
-		 this mark on the TREE_TYPE is propagated. */
-	      TREE_TYPE (node) = error_mark_node;
-	      return error_mark_node;
-	    }
-	  else
-	    TREE_TYPE (node) = TREE_TYPE (EXPR_WFL_NODE (node));
-
-	}
-      break;
-
-    case NEW_ARRAY_EXPR:
-      /* Patch all the dimensions */
-      flag = 0;
-      for (cn = TREE_OPERAND (node, 1); cn; cn = TREE_CHAIN (cn))
-	{
-	  int location = EXPR_WFL_LINECOL (TREE_VALUE (cn));
-	  tree dim = convert (int_type_node,
-			      java_complete_tree (TREE_VALUE (cn)));
-	  if (dim == error_mark_node)
-	    {
-	      flag = 1;
-	      continue;
-	    }
-	  else
-	    {
-	      TREE_VALUE (cn) = dim;
-	      /* Setup the location of the current dimension, for
-		 later error report. */
-#ifdef USE_MAPPED_LOCATION
-	      TREE_PURPOSE (cn) = expr_add_location (NULL_TREE, location, 0);
-#else
-	      TREE_PURPOSE (cn) =
-		build_expr_wfl (NULL_TREE, input_filename, 0, 0);
-	      EXPR_WFL_LINECOL (TREE_PURPOSE (cn)) = location;
-#endif
-	    }
-	}
-      /* They complete the array creation expression, if no errors
-         were found. */
-      CAN_COMPLETE_NORMALLY (node) = 1;
-      return (flag ? error_mark_node
-	      : force_evaluation_order (patch_newarray (node)));
-
-    case NEW_ANONYMOUS_ARRAY_EXPR:
-      /* Create the array type if necessary. */
-      if (ANONYMOUS_ARRAY_DIMS_SIG (node))
-	{
-	  tree type = ANONYMOUS_ARRAY_BASE_TYPE (node);
-	  if (!(type = resolve_type_during_patch (type)))
-	    return error_mark_node;
-	  type = build_array_from_name (type, NULL_TREE,
-					ANONYMOUS_ARRAY_DIMS_SIG (node), NULL);
-	  ANONYMOUS_ARRAY_BASE_TYPE (node) = build_pointer_type (type);
-	}
-      node = patch_new_array_init (ANONYMOUS_ARRAY_BASE_TYPE (node),
-				   ANONYMOUS_ARRAY_INITIALIZER (node));
-      if (node == error_mark_node)
-	return error_mark_node;
-      CAN_COMPLETE_NORMALLY (node) = 1;
-      return node;
-
-    case NEW_CLASS_EXPR:
-    case CALL_EXPR:
-      /* Complete function's argument(s) first */
-      if (complete_function_arguments (node))
-	return error_mark_node;
-      else
-	{
-	  tree decl, wfl = TREE_OPERAND (node, 0);
-	  int in_this = CALL_THIS_CONSTRUCTOR_P (node);
-	  int from_super = (EXPR_WFL_NODE (TREE_OPERAND (node, 0)) ==
-                           super_identifier_node);
-	  tree arguments;
-#ifdef USE_MAPPED_LOCATION
-	  source_location location = EXPR_LOCATION (node);
-#else
-	  int location = EXPR_WFL_LINECOL (node);
-#endif
-
-	  node = patch_method_invocation (node, NULL_TREE, NULL_TREE,
-					  from_super, 0, &decl);
-	  if (node == error_mark_node)
-	    return error_mark_node;
-
-	  if (TREE_CODE (node) == CALL_EXPR
-	      && TREE_OPERAND (node, 1) != NULL_TREE)
-	    arguments = TREE_VALUE (TREE_OPERAND (node, 1));
-	  else
-	    arguments = NULL_TREE;
-	  check_thrown_exceptions (location, decl, arguments);
-	  /* If we call this(...), register signature and positions */
-	  if (in_this)
-	    DECL_CONSTRUCTOR_CALLS (current_function_decl) =
-	      tree_cons (wfl, decl,
-			 DECL_CONSTRUCTOR_CALLS (current_function_decl));
-	  CAN_COMPLETE_NORMALLY (node) = 1;
-	  return force_evaluation_order (node);
-	}
-
-    case MODIFY_EXPR:
-      /* Save potential wfls */
-      wfl_op1 = TREE_OPERAND (node, 0);
-      TREE_OPERAND (node, 0) = nn = java_complete_lhs (wfl_op1);
-
-      if (MODIFY_EXPR_FROM_INITIALIZATION_P (node)
-	  && TREE_CODE (nn) == VAR_DECL && TREE_STATIC (nn)
-	  && DECL_INITIAL (nn) != NULL_TREE)
-	{
-	  tree value;
-
-	  value = fold_constant_for_init (nn, nn);
-
-	  /* When we have a primitype type, or a string and we're not
-             emitting a class file, we actually don't want to generate
-             anything for the assignment. */
-	  if (value != NULL_TREE && 
-	      (JPRIMITIVE_TYPE_P (TREE_TYPE (value)) || 
-	       (TREE_TYPE (value) == string_ptr_type_node &&
-		! flag_emit_class_files)))
-	    {
-	      /* Prepare node for patch_assignment */
-	      TREE_OPERAND (node, 1) = value;
-	      /* Call patch assignment to verify the assignment */
-	      if (patch_assignment (node, wfl_op1) == error_mark_node)
-		return error_mark_node;
-	      /* Set DECL_INITIAL properly (a conversion might have
-                 been decided by patch_assignment) and return the
-                 empty statement. */
-	      else
-		{
-		  tree patched = patch_string (TREE_OPERAND (node, 1));
-		  if (patched)
-		    DECL_INITIAL (nn) = patched;
-		  else
-		    DECL_INITIAL (nn) = TREE_OPERAND (node, 1);
-		  DECL_FIELD_FINAL_IUD (nn) = 1;
-		  return build_java_empty_stmt ();
-		}
-	    }
-	  if (! flag_emit_class_files)
-	    DECL_INITIAL (nn) = NULL_TREE;
-	}
-      wfl_op2 = TREE_OPERAND (node, 1);
-
-      if (TREE_OPERAND (node, 0) == error_mark_node)
-	return error_mark_node;
-
-      flag = COMPOUND_ASSIGN_P (wfl_op2);
-      if (flag)
-	{
-	  /* This might break when accessing outer field from inner
-             class. TESTME, FIXME */
-	  tree lvalue = java_stabilize_reference (TREE_OPERAND (node, 0));
-
-	  /* Hand stabilize the lhs on both places */
-	  TREE_OPERAND (node, 0) = lvalue;
-	  TREE_OPERAND (TREE_OPERAND (node, 1), 0) =
-	    (flag_emit_class_files ? lvalue : save_expr (lvalue));
-
-	  /* 15.25.2.a: Left hand is not an array access. FIXME */
-	  /* Now complete the RHS. We write it back later on. */
-	  nn = java_complete_tree (TREE_OPERAND (node, 1));
-
-	  if ((cn = patch_string (nn)))
-	    nn = cn;
-
-	  /* The last part of the rewrite for E1 op= E2 is to have
-	     E1 = (T)(E1 op E2), with T being the type of E1. */
-	  nn = java_complete_tree (build_cast (EXPR_WFL_LINECOL (wfl_op2),
-					       TREE_TYPE (lvalue), nn));
-
-	  /* If the assignment is compound and has reference type,
-	     then ensure the LHS has type String and nothing else.  */
-	  if (JREFERENCE_TYPE_P (TREE_TYPE (lvalue))
-	      && ! JSTRING_TYPE_P (TREE_TYPE (lvalue)))
-	    parse_error_context (wfl_op2,
-				 "Incompatible type for %<+=%>. Can't convert %qs to %<java.lang.String%>",
-				 lang_printable_name (TREE_TYPE (lvalue), 0));
-
-	  /* 15.25.2.b: Left hand is an array access. FIXME */
-	}
-
-      /* If we're about to patch a NEW_ARRAY_INIT, we call a special
-	 function to complete this RHS. Note that a NEW_ARRAY_INIT
-	 might have been already fully expanded if created as a result
-	 of processing an anonymous array initializer. We avoid doing
-	 the operation twice by testing whether the node already bears
-	 a type. */
-      else if (TREE_CODE (wfl_op2) == NEW_ARRAY_INIT && !TREE_TYPE (wfl_op2))
-	nn = patch_new_array_init (TREE_TYPE (TREE_OPERAND (node, 0)),
-				   TREE_OPERAND (node, 1));
-      /* Otherwise we simply complete the RHS */
-      else
-	nn = java_complete_tree (TREE_OPERAND (node, 1));
-
-      if (nn == error_mark_node)
-	return error_mark_node;
-
-      /* Write back the RHS as we evaluated it. */
-      TREE_OPERAND (node, 1) = nn;
-
-      /* In case we're handling = with a String as a RHS, we need to
-	 produce a String out of the RHS (it might still be a
-	 STRING_CST or a StringBuffer at this stage */
-      if ((nn = patch_string (TREE_OPERAND (node, 1))))
-	TREE_OPERAND (node, 1) = nn;
-
-      if ((nn = nested_field_access_fix (wfl_op1, TREE_OPERAND (node, 0),
-					 TREE_OPERAND (node, 1))))
-	{
-	  /* We return error_mark_node if nested_field_access_fix
-	     detects we write into a final. */
-	  if (nn == error_mark_node)
-	    return error_mark_node;
-	  node = nn;
-	}
-      else
-	{
-	  node = patch_assignment (node, wfl_op1);
-	  if (node == error_mark_node)
-	    return error_mark_node;
-	  /* Reorganize the tree if necessary. */
-	  if (flag && (!JREFERENCE_TYPE_P (TREE_TYPE (node))
-		       || JSTRING_P (TREE_TYPE (node))))
-	    node = java_refold (node);
-	}
-
-      /* Seek to set DECL_INITIAL to a proper value, since it might have
-	 undergone a conversion in patch_assignment. We do that only when
-	 it's necessary to have DECL_INITIAL properly set. */
-      nn = TREE_OPERAND (node, 0);
-      if (TREE_CODE (nn) == VAR_DECL
-	  && DECL_INITIAL (nn) && CONSTANT_VALUE_P (DECL_INITIAL (nn))
-	  && FIELD_STATIC (nn) && FIELD_FINAL (nn)
-	  && (JPRIMITIVE_TYPE_P (TREE_TYPE (nn))
-	      || TREE_TYPE (nn) == string_ptr_type_node))
-	DECL_INITIAL (nn) = TREE_OPERAND (node, 1);
-
-      CAN_COMPLETE_NORMALLY (node) = 1;
-      return node;
-
-    case MULT_EXPR:
-    case PLUS_EXPR:
-    case MINUS_EXPR:
-    case LSHIFT_EXPR:
-    case RSHIFT_EXPR:
-    case URSHIFT_EXPR:
-    case BIT_AND_EXPR:
-    case BIT_XOR_EXPR:
-    case BIT_IOR_EXPR:
-    case TRUNC_MOD_EXPR:
-    case TRUNC_DIV_EXPR:
-    case RDIV_EXPR:
-    case TRUTH_ANDIF_EXPR:
-    case TRUTH_ORIF_EXPR:
-    case EQ_EXPR:
-    case NE_EXPR:
-    case GT_EXPR:
-    case GE_EXPR:
-    case LT_EXPR:
-    case LE_EXPR:
-      /* Operands 0 and 1 are WFL in certain cases only. patch_binop
-	 knows how to handle those cases. */
-      wfl_op1 = TREE_OPERAND (node, 0);
-      wfl_op2 = TREE_OPERAND (node, 1);
-
-      CAN_COMPLETE_NORMALLY (node) = 1;
-      /* Don't complete string nodes if dealing with the PLUS operand. */
-      if (TREE_CODE (node) != PLUS_EXPR || !JSTRING_P (wfl_op1))
-        {
-          nn = java_complete_tree (wfl_op1);
-          if (nn == error_mark_node)
-            return error_mark_node;
-
-          TREE_OPERAND (node, 0) = nn;
-        }
-      if (TREE_CODE (node) != PLUS_EXPR || !JSTRING_P (wfl_op2))
-        {
-          nn = java_complete_tree (wfl_op2);
-          if (nn == error_mark_node)
-            return error_mark_node;
-
-          TREE_OPERAND (node, 1) = nn;
-        }
-      return patch_binop (node, wfl_op1, wfl_op2, 0);
-
-    case INSTANCEOF_EXPR:
-      wfl_op1 = TREE_OPERAND (node, 0);
-      COMPLETE_CHECK_OP_0 (node);
-      return patch_binop (node, wfl_op1, TREE_OPERAND (node, 1), 0);
-
-    case UNARY_PLUS_EXPR:
-    case NEGATE_EXPR:
-    case TRUTH_NOT_EXPR:
-    case BIT_NOT_EXPR:
-    case PREDECREMENT_EXPR:
-    case PREINCREMENT_EXPR:
-    case POSTDECREMENT_EXPR:
-    case POSTINCREMENT_EXPR:
-    case CONVERT_EXPR:
-      /* There are cases were wfl_op1 is a WFL. patch_unaryop knows
-	 how to handle those cases. */
-      wfl_op1 = TREE_OPERAND (node, 0);
-      CAN_COMPLETE_NORMALLY (node) = 1;
-      if (TREE_CODE (node) == PREDECREMENT_EXPR
-	  || TREE_CODE (node) == PREINCREMENT_EXPR
-	  || TREE_CODE (node) == POSTDECREMENT_EXPR
-	  || TREE_CODE (node) == POSTINCREMENT_EXPR)
-	{ /* We don't want static finals to be resolved to their value
-	     to avoid ICEing later. It solves PR8923. */
-	  TREE_OPERAND (node, 0) = java_complete_lhs (wfl_op1);
-	}
-      else
-	{
-	  TREE_OPERAND (node, 0) = java_complete_tree (wfl_op1);
-	}
-      if (TREE_OPERAND (node, 0) == error_mark_node)
-	return error_mark_node;
-      node = patch_unaryop (node, wfl_op1);
-      CAN_COMPLETE_NORMALLY (node) = 1;
-      break;
-
-    case ARRAY_REF:
-      /* There are cases were wfl_op1 is a WFL. patch_array_ref knows
-	 how to handle those cases. */
-      wfl_op1 = TREE_OPERAND (node, 0);
-      TREE_OPERAND (node, 0) = java_complete_tree (wfl_op1);
-      if (TREE_OPERAND (node, 0) == error_mark_node)
-	return error_mark_node;
-      if (!flag_emit_class_files)
-	TREE_OPERAND (node, 0) = save_expr (TREE_OPERAND (node, 0));
-      /* The same applies to wfl_op2 */
-      wfl_op2 = TREE_OPERAND (node, 1);
-      TREE_OPERAND (node, 1) = java_complete_tree (wfl_op2);
-      if (TREE_OPERAND (node, 1) == error_mark_node)
-	return error_mark_node;
-      if (!flag_emit_class_files)
-	TREE_OPERAND (node, 1) = save_expr (TREE_OPERAND (node, 1));
-      return patch_array_ref (node);
-
-    case RECORD_TYPE:
-      return node;;
-
-    case COMPONENT_REF:
-      /* The first step in the re-write of qualified name handling.  FIXME.
-	 So far, this is only to support PRIMTYPE.class ->
-	 PRIMCLASS.TYPE. */
-      {
-	tree prim_class = TREE_OPERAND (node, 0);
-	tree name = TREE_OPERAND (node, 1);
-	tree field;
-	
-	gcc_assert (TREE_CODE (prim_class) == NOP_EXPR);
-	prim_class = java_complete_tree (TREE_TYPE (prim_class));
-	gcc_assert (TREE_CODE (prim_class) == RECORD_TYPE);
-	field = lookup_field_wrapper (prim_class, name);
-	
-	if (field == NULL_TREE)
-	  {
-	    error ("missing static field %qs", IDENTIFIER_POINTER (name));
-	    return error_mark_node;
-	  }
-	if (! FIELD_STATIC (field))
-	  {
-	    error ("not a static field %qs", IDENTIFIER_POINTER (name));
-	    return error_mark_node;
-	  }
-	return field;
-      }
-      break;
-
-    case THIS_EXPR:
-      /* Can't use THIS in a static environment */
-      if (!current_this)
-	{
-	  EXPR_WFL_LINECOL (wfl_operator) = EXPR_WFL_LINECOL (node);
-	  parse_error_context (wfl_operator,
-			       "Keyword %<this%> used outside allowed context");
-	  TREE_TYPE (node) = error_mark_node;
-	  return error_mark_node;
-	}
-      if (ctxp->explicit_constructor_p)
-	{
-	  EXPR_WFL_LINECOL (wfl_operator) = EXPR_WFL_LINECOL (node);
-	  parse_error_context
-	    (wfl_operator, "Can't reference %<this%> or %<super%> before the superclass constructor has been called");
-	  TREE_TYPE (node) = error_mark_node;
-	  return error_mark_node;
-	}
-      return current_this;
-
-    case CLASS_LITERAL:
-      CAN_COMPLETE_NORMALLY (node) = 1;
-      node = patch_incomplete_class_ref (node);
-      if (node == error_mark_node)
-	return error_mark_node;
-      break;
-
-    default:
-      CAN_COMPLETE_NORMALLY (node) = 1;
-      /* Ok: may be we have a STRING_CST or a crafted `StringBuffer'
-	 and it's time to turn it into the appropriate String object */
-      if ((nn = patch_string (node)))
-	node = nn;
-      else
-	internal_error ("No case for %s", tree_code_name [TREE_CODE (node)]);
-    }
-  return node;
-}
-
-/* Complete function call's argument. Return a nonzero value is an
-   error was found.  */
-
-static int
-complete_function_arguments (tree node)
-{
-  int flag = 0;
-  tree cn;
-
-  ctxp->explicit_constructor_p += (CALL_EXPLICIT_CONSTRUCTOR_P (node) ? 1 : 0);
-  for (cn = TREE_OPERAND (node, 1); cn; cn = TREE_CHAIN (cn))
-    {
-      tree wfl = TREE_VALUE (cn), parm, temp;
-      parm = java_complete_tree (wfl);
-
-      if (parm == error_mark_node)
-	{
-	  flag = 1;
-	  continue;
-	}
-      /* If we have a string literal that we haven't transformed yet or a
-	 crafted string buffer, as a result of the use of the String
-	 `+' operator. Build `parm.toString()' and expand it. */
-      if ((temp = patch_string (parm)))
-	parm = temp;
-
-      TREE_VALUE (cn) = parm;
-    }
-  ctxp->explicit_constructor_p -= (CALL_EXPLICIT_CONSTRUCTOR_P (node) ? 1 : 0);
-  return flag;
-}
-
-/* Sometimes (for loops and variable initialized during their
-   declaration), we want to wrap a statement around a WFL and turn it
-   debugable.  */
-
-static tree
-build_debugable_stmt (int location, tree stmt)
-{
-  if (TREE_CODE (stmt) != EXPR_WITH_FILE_LOCATION)
-    {
-#ifdef USE_MAPPED_LOCATION
-      stmt = expr_add_location (stmt, location, 1);
-#else
-      stmt = build_expr_wfl (stmt, input_filename, 0, 0);
-      EXPR_WFL_LINECOL (stmt) = location;
-      JAVA_MAYBE_GENERATE_DEBUG_INFO (stmt);
-#endif
-    }
-  return stmt;
-}
-
-static tree
-build_expr_block (tree body, tree decls)
-{
-  tree node = make_node (BLOCK);
-  BLOCK_EXPR_DECLS (node) = decls;
-  BLOCK_EXPR_BODY (node) = body;
-  if (body)
-    TREE_TYPE (node) = TREE_TYPE (body);
-  TREE_SIDE_EFFECTS (node) = 1;
-  return node;
-}
-
-/* Create a new function block and link it appropriately to current
-   function block chain */
-
-static tree
-enter_block (void)
-{
-  tree b = build_expr_block (NULL_TREE, NULL_TREE);
-
-  /* Link block B supercontext to the previous block. The current
-     function DECL is used as supercontext when enter_a_block is called
-     for the first time for a given function. The current function body
-     (DECL_FUNCTION_BODY) is set to be block B.  */
-
-  tree fndecl = current_function_decl;
-
-  if (!fndecl) {
-    BLOCK_SUPERCONTEXT (b) = current_static_block;
-    current_static_block = b;
-  }
-
-  else if (!DECL_FUNCTION_BODY (fndecl))
-    {
-      BLOCK_SUPERCONTEXT (b) = fndecl;
-      DECL_FUNCTION_BODY (fndecl) = b;
-    }
-  else
-    {
-      BLOCK_SUPERCONTEXT (b) = DECL_FUNCTION_BODY (fndecl);
-      DECL_FUNCTION_BODY (fndecl) = b;
-    }
-  return b;
-}
-
-/* Exit a block by changing the current function body
-   (DECL_FUNCTION_BODY) to the current block super context, only if
-   the block being exited isn't the method's top level one.  */
-
-static tree
-exit_block (void)
-{
-  tree b;
-  if (current_function_decl)
-    {
-      b = DECL_FUNCTION_BODY (current_function_decl);
-      if (BLOCK_SUPERCONTEXT (b) != current_function_decl)
-	DECL_FUNCTION_BODY (current_function_decl) = BLOCK_SUPERCONTEXT (b);
-    }
-  else
-    {
-      b = current_static_block;
-
-      if (BLOCK_SUPERCONTEXT (b))
-	current_static_block = BLOCK_SUPERCONTEXT (b);
-    }
-  return b;
-}
-
-/* Lookup for NAME in the nested function's blocks, all the way up to
-   the current toplevel one. It complies with Java's local variable
-   scoping rules.  */
-
-static tree
-lookup_name_in_blocks (tree name)
-{
-  tree b = GET_CURRENT_BLOCK (current_function_decl);
-
-  while (b != current_function_decl)
-    {
-      tree current;
-
-      /* Paranoid sanity check. To be removed */
-      if (TREE_CODE (b) != BLOCK)
-	abort ();
-
-      for (current = BLOCK_EXPR_DECLS (b); current;
-	   current = TREE_CHAIN (current))
-	if (DECL_NAME (current) == name)
-	  return current;
-      b = BLOCK_SUPERCONTEXT (b);
-    }
-  return NULL_TREE;
-}
-
-static void
-maybe_absorb_scoping_blocks (void)
-{
-  while (BLOCK_IS_IMPLICIT (GET_CURRENT_BLOCK (current_function_decl)))
-    {
-      tree b = exit_block ();
-      java_method_add_stmt (current_function_decl, b);
-      SOURCE_FRONTEND_DEBUG (("Absorbing scoping block at line %d", input_line));
-    }
-}
-
-
-/* This section of the source is reserved to build_* functions that
-   are building incomplete tree nodes and the patch_* functions that
-   are completing them.  */
-
-/* Wrap a non WFL node around a WFL.  */
-
-static tree
-build_wfl_wrap (tree node, int location)
-{
-  tree wfl, node_to_insert = node;
-
-  /* We want to process THIS . xxx symbolically, to keep it consistent
-     with the way we're processing SUPER. A THIS from a primary as a
-     different form than a SUPER. Turn THIS into something symbolic */
-  if (TREE_CODE (node) == THIS_EXPR)
-    node_to_insert = wfl = build_wfl_node (this_identifier_node);
-  else
-#ifdef USE_MAPPED_LOCATION
-    wfl = build_unknown_wfl (NULL_TREE);
-
-  SET_EXPR_LOCATION (wfl, location);
-#else
-    wfl = build_expr_wfl (NULL_TREE, ctxp->filename, 0, 0);
-
-  EXPR_WFL_LINECOL (wfl) = location;
-#endif
-  EXPR_WFL_QUALIFICATION (wfl) = build_tree_list (node_to_insert, NULL_TREE);
-  return wfl;
-}
-
-/* Build a super() constructor invocation. Returns an empty statement if
-   we're currently dealing with the class java.lang.Object. */
-
-static tree
-build_super_invocation (tree mdecl)
-{
-  if (DECL_CONTEXT (mdecl) == object_type_node)
-    return build_java_empty_stmt ();
-  else
-    {
-      tree super_wfl = build_wfl_node (super_identifier_node);
-      tree a = NULL_TREE, t;
-
-      /* This is called after parsing is done, so the parser context
-         won't be accurate. Set location info from current_class decl. */
-      tree class_wfl = lookup_cl (TYPE_NAME (current_class));
-      EXPR_WFL_LINECOL (super_wfl) = EXPR_WFL_LINECOL (class_wfl);
-
-      /* If we're dealing with an anonymous class, pass the arguments
-         of the crafted constructor along. */
-      if (ANONYMOUS_CLASS_P (DECL_CONTEXT (mdecl)))
-	{
-	  SKIP_THIS_AND_ARTIFICIAL_PARMS (t, mdecl);
-	  for (; t != end_params_node; t = TREE_CHAIN (t))
-	    a = tree_cons (NULL_TREE, build_wfl_node (TREE_PURPOSE (t)), a);
-	}
-      return build_method_invocation (super_wfl, a);
-    }
-}
-
-/* Build a SUPER/THIS qualified method invocation.  */
-
-static tree
-build_this_super_qualified_invocation (int use_this, tree name, tree args,
-				       int lloc, int rloc)
-{
-  tree invok;
-  tree wfl =
-    build_wfl_node (use_this ? this_identifier_node : super_identifier_node);
-  EXPR_WFL_LINECOL (wfl) = lloc;
-  invok = build_method_invocation (name, args);
-  return make_qualified_primary (wfl, invok, rloc);
-}
-
-/* Build an incomplete CALL_EXPR node. */
-
-static tree
-build_method_invocation (tree name, tree args)
-{
-  tree call = build3 (CALL_EXPR, NULL_TREE, name, args, NULL_TREE);
-  TREE_SIDE_EFFECTS (call) = 1;
-  EXPR_WFL_LINECOL (call) = EXPR_WFL_LINECOL (name);
-  return call;
-}
-
-/* Build an incomplete new xxx(...) node. */
-
-static tree
-build_new_invocation (tree name, tree args)
-{
-  tree call = build3 (NEW_CLASS_EXPR, NULL_TREE, name, args, NULL_TREE);
-  TREE_SIDE_EFFECTS (call) = 1;
-  EXPR_WFL_LINECOL (call) = EXPR_WFL_LINECOL (name);
-  return call;
-}
-
-/* Build an incomplete assignment expression. */
-
-static tree
-build_assignment (int op, int op_location, tree lhs, tree rhs)
-{
-  tree assignment;
-  /* Build the corresponding binop if we deal with a Compound
-     Assignment operator. Mark the binop sub-tree as part of a
-     Compound Assignment expression */
-  if (op != ASSIGN_TK)
-    {
-      rhs = build_binop (BINOP_LOOKUP (op), op_location, lhs, rhs);
-      COMPOUND_ASSIGN_P (rhs) = 1;
-    }
-  assignment = build2 (MODIFY_EXPR, NULL_TREE, lhs, rhs);
-  TREE_SIDE_EFFECTS (assignment) = 1;
-  EXPR_WFL_LINECOL (assignment) = op_location;
-  return assignment;
-}
-
-/* Print an INTEGER_CST node as decimal in a static buffer, and return
-   the buffer.  This is used only for string conversion.  */
-static char *
-string_convert_int_cst (tree node)
-{
-  /* Long.MIN_VALUE is -9223372036854775808, 20 characters.  */
-  static char buffer[21];
-
-  unsigned HOST_WIDE_INT lo = TREE_INT_CST_LOW (node);
-  unsigned HOST_WIDE_INT hi = TREE_INT_CST_HIGH (node);
-  char *p = buffer + sizeof (buffer);
-  int neg = 0;
-
-  unsigned HOST_WIDE_INT hibit = (((unsigned HOST_WIDE_INT) 1)
-				  << (HOST_BITS_PER_WIDE_INT - 1));
-
-  *--p = '\0';
-
-  /* If negative, note the fact and negate the value.  */
-  if ((hi & hibit))
-    {
-      lo = ~lo;
-      hi = ~hi;
-      if (++lo == 0)
-	++hi;
-      neg = 1;
-    }
-
-  /* Divide by 10 until there are no bits left.  */
-  do
-    {
-      unsigned HOST_WIDE_INT acc = 0;
-      unsigned HOST_WIDE_INT outhi = 0, outlo = 0;
-      unsigned int i;
-
-      /* Use long division to compute the result and the remainder.  */
-      for (i = 0; i < 2 * HOST_BITS_PER_WIDE_INT; ++i)
-	{
-	  /* Shift a bit into accumulator.  */
-	  acc <<= 1;
-	  if ((hi & hibit))
-	    acc |= 1;
-
-	  /* Shift the value.  */
-	  hi <<= 1;
-	  if ((lo & hibit))
-	    hi |= 1;
-	  lo <<= 1;
-
-	  /* Shift the correct bit into the result.  */
-	  outhi <<= 1;
-	  if ((outlo & hibit))
-	    outhi |= 1;
-	  outlo <<= 1;
-	  if (acc >= 10)
-	    {
-	      acc -= 10;
-	      outlo |= 1;
-	    }
-	}
-
-      /* '0' == 060 in Java, but might not be here (think EBCDIC).  */
-      *--p = '\060' + acc;
-
-      hi = outhi;
-      lo = outlo;
-    }
-  while (hi || lo);
-
-  if (neg)
-    *--p = '\055'; /* '-' == 055 in Java, but might not be here.  */
-
-  return p;
-}
-
-/* Print an INTEGER_CST node in a static buffer, and return the
-   buffer.  This is used only for error handling.  */
-char *
-print_int_node (tree node)
-{
-  static char buffer [80];
-  if (TREE_CONSTANT_OVERFLOW (node))
-    sprintf (buffer, "<overflow>");
-
-  if (TREE_INT_CST_HIGH (node) == 0)
-    sprintf (buffer, HOST_WIDE_INT_PRINT_UNSIGNED,
-	     TREE_INT_CST_LOW (node));
-  else if (TREE_INT_CST_HIGH (node) == -1
-	   && TREE_INT_CST_LOW (node) != 0)
-    sprintf (buffer, "-" HOST_WIDE_INT_PRINT_UNSIGNED,
-	     -TREE_INT_CST_LOW (node));
-  else
-    sprintf (buffer, HOST_WIDE_INT_PRINT_DOUBLE_HEX,
-	     TREE_INT_CST_HIGH (node), TREE_INT_CST_LOW (node));
-
-  return buffer;
-}
-
-
-/* Return 1 if an assignment to a FINAL is attempted in a non suitable
-   context.  */
-
-/* 15.25 Assignment operators. */
-
-static tree
-patch_assignment (tree node, tree wfl_op1)
-{
-  tree rhs = TREE_OPERAND (node, 1);
-  tree lvalue = TREE_OPERAND (node, 0), llvalue;
-  tree lhs_type = NULL_TREE, rhs_type, new_rhs = NULL_TREE;
-  int error_found = 0;
-  int lvalue_from_array = 0;
-  int is_return = 0;
-
-  EXPR_WFL_LINECOL (wfl_operator) = EXPR_WFL_LINECOL (node);
-
-  /* Lhs can be a named variable */
-  if (JDECL_P (lvalue))
-    {
-      lhs_type = TREE_TYPE (lvalue);
-    }
-  /* Or Lhs can be an array access. */
-  else if (TREE_CODE (lvalue) == ARRAY_REF)
-    {
-      lhs_type = TREE_TYPE (lvalue);
-      lvalue_from_array = 1;
-    }
-  /* Or a field access */
-  else if (TREE_CODE (lvalue) == COMPONENT_REF)
-    lhs_type = TREE_TYPE (lvalue);
-  /* Or a function return slot */
-  else if (TREE_CODE (lvalue) == RESULT_DECL)
-    {
-      /* If the return type is an integral type, then we create the
-	 RESULT_DECL with a promoted type, but we need to do these
-	 checks against the unpromoted type to ensure type safety.  So
-	 here we look at the real type, not the type of the decl we
-	 are modifying.  */
-      lhs_type = TREE_TYPE (TREE_TYPE (current_function_decl));
-      is_return = 1;
-    }
-  /* Otherwise, we might want to try to write into an optimized static
-     final, this is an of a different nature, reported further on. */
-  else if (TREE_CODE (wfl_op1) == EXPR_WITH_FILE_LOCATION
-	   && resolve_expression_name (wfl_op1, &llvalue))
-    {
-      lhs_type = TREE_TYPE (lvalue);
-    }
-  else
-    {
-      parse_error_context (wfl_op1, "Invalid left hand side of assignment");
-      error_found = 1;
-    }
-
-  rhs_type = TREE_TYPE (rhs);
-
-  /* 5.1 Try the assignment conversion for builtin type. */
-  new_rhs = try_builtin_assignconv (wfl_op1, lhs_type, rhs);
-
-  /* 5.2 If it failed, try a reference conversion */
-  if (!new_rhs)
-    new_rhs = try_reference_assignconv (lhs_type, rhs);
-
-  /* 15.25.2 If we have a compound assignment, convert RHS into the
-     type of the LHS */
-  else if (COMPOUND_ASSIGN_P (TREE_OPERAND (node, 1)))
-    new_rhs = convert (lhs_type, rhs);
-
-  /* Explicit cast required. This is an error */
-  if (!new_rhs)
-    {
-      char *t1 = xstrdup (lang_printable_name (TREE_TYPE (rhs), 0));
-      char *t2 = xstrdup (lang_printable_name (lhs_type, 0));
-      tree wfl;
-      char operation [32];	/* Max size known */
-
-      /* If the assignment is part of a declaration, we use the WFL of
-	 the declared variable to point out the error and call it a
-	 declaration problem. If the assignment is a genuine =
-	 operator, we call is a operator `=' problem, otherwise we
-	 call it an assignment problem. In both of these last cases,
-	 we use the WFL of the operator to indicate the error. */
-
-      if (MODIFY_EXPR_FROM_INITIALIZATION_P (node))
-	{
-	  wfl = wfl_op1;
-	  strcpy (operation, "declaration");
-	}
-      else
-	{
-	  wfl = wfl_operator;
-	  if (COMPOUND_ASSIGN_P (TREE_OPERAND (node, 1)))
-	    strcpy (operation, "assignment");
-	  else if (is_return)
-	    strcpy (operation, "'return'");
-	  else
-	    strcpy (operation, "'='");
-	}
-
-      if (!valid_cast_to_p (rhs_type, lhs_type))
-	parse_error_context
-	  (wfl, "Incompatible type for %s. Can't convert %qs to %qs",
-	   operation, t1, t2);
-      else
-	parse_error_context (wfl, "Incompatible type for %s. Explicit cast needed to convert %qs to %qs",
-			     operation, t1, t2);
-      free (t1); free (t2);
-      error_found = 1;
-    }
-
-  if (error_found)
-    return error_mark_node;
-
-  /* If we're processing a `return' statement, promote the actual type
-     to the promoted type.  */
-  if (is_return)
-    new_rhs = convert (TREE_TYPE (lvalue), new_rhs);
-
-  /* 10.10: Array Store Exception runtime check */
-  if (!flag_emit_class_files
-      && lvalue_from_array
-      && JREFERENCE_TYPE_P (TYPE_ARRAY_ELEMENT (lhs_type)))
-    {
-      tree array, store_check, base, index_expr;
-
-      /* Save RHS so that it doesn't get re-evaluated by the store check. */
-      new_rhs = save_expr (new_rhs);
-
-      /* Get the INDIRECT_REF. */
-      array = TREE_OPERAND (TREE_OPERAND (lvalue, 0), 0);
-      /* Get the array pointer expr. */
-      array = TREE_OPERAND (array, 0);
-      store_check = build_java_arraystore_check (array, new_rhs);
-
-      index_expr = TREE_OPERAND (lvalue, 1);
-
-      if (TREE_CODE (index_expr) == COMPOUND_EXPR)
-	{
-	  /* A COMPOUND_EXPR here is a bounds check. The bounds check must
-	     happen before the store check, so prepare to insert the store
-	     check within the second operand of the existing COMPOUND_EXPR. */
-	  base = index_expr;
-	}
-      else
-        base = lvalue;
-
-      index_expr = TREE_OPERAND (base, 1);
-      TREE_OPERAND (base, 1) = build2 (COMPOUND_EXPR, TREE_TYPE (index_expr),
-				       store_check, index_expr);
-    }
-
-  /* Final locals can be used as case values in switch
-     statement. Prepare them for this eventuality. */
-  if (TREE_CODE (lvalue) == VAR_DECL
-      && DECL_FINAL (lvalue)
-      && TREE_CONSTANT (new_rhs)
-      && IDENTIFIER_LOCAL_VALUE (DECL_NAME (lvalue))
-      && JINTEGRAL_TYPE_P (TREE_TYPE (lvalue))
-      )
-    {
-      TREE_CONSTANT (lvalue) = 1;
-      TREE_INVARIANT (lvalue) = 1;
-      DECL_INITIAL (lvalue) = new_rhs;
-    }
-
-  /* Copy the rhs if it's a reference.  */
-  if (! flag_check_references && ! flag_emit_class_files && optimize > 0)
-    {
-      switch (TREE_CODE (new_rhs))
-	{
-	case ARRAY_REF:
-	case INDIRECT_REF:
-	case COMPONENT_REF:
-	  /* Transform a = foo.bar 
-	     into a = ({int tmp; tmp = foo.bar;}).
-	     We need to ensure that if a read from memory fails
-	     because of a NullPointerException, a destination variable
-	     will remain unchanged.  An explicit temporary does what
-	     we need.  
-
-	     If flag_check_references is set, this is unnecessary
-	     because we'll check each reference before doing any
-	     reads.  If optimize is not set the result will never be
-	     written to a stack slot that contains the LHS.  */
-	  {
-	    tree tmp = build_decl (VAR_DECL, get_identifier ("<tmp>"), 
-				   TREE_TYPE (new_rhs));
-	    tree block = make_node (BLOCK);
-	    tree assignment 
-	      = build2 (MODIFY_EXPR, TREE_TYPE (new_rhs), tmp, fold (new_rhs));
-	    DECL_CONTEXT (tmp) = current_function_decl;
-	    TREE_TYPE (block) = TREE_TYPE (new_rhs);
-	    BLOCK_VARS (block) = tmp;
-	    BLOCK_EXPR_BODY (block) = assignment;
-	    TREE_SIDE_EFFECTS (block) = 1;
-	    new_rhs = block;
-	  }
-	  break;
-	default:
-	  break;
-	}
-    }
-
-  TREE_OPERAND (node, 0) = lvalue;
-  TREE_OPERAND (node, 1) = new_rhs;
-  TREE_TYPE (node) = lhs_type;
-  return node;
-}
-
-/* Check that type SOURCE can be cast into type DEST. If the cast
-   can't occur at all, return NULL; otherwise, return a possibly
-   modified rhs.  */
-
-static tree
-try_reference_assignconv (tree lhs_type, tree rhs)
-{
-  tree new_rhs = NULL_TREE;
-  tree rhs_type = TREE_TYPE (rhs);
-
-  if (!JPRIMITIVE_TYPE_P (rhs_type) && JREFERENCE_TYPE_P (lhs_type))
-    {
-      /* `null' may be assigned to any reference type */
-      if (rhs == null_pointer_node)
-        new_rhs = null_pointer_node;
-      /* Try the reference assignment conversion */
-      else if (valid_ref_assignconv_cast_p (rhs_type, lhs_type, 0))
-	new_rhs = rhs;
-      /* This is a magic assignment that we process differently */
-      else if (TREE_CODE (rhs) == JAVA_EXC_OBJ_EXPR)
-	new_rhs = rhs;
-    }
-  return new_rhs;
-}
-
-/* Check that RHS can be converted into LHS_TYPE by the assignment
-   conversion (5.2), for the cases of RHS being a builtin type. Return
-   NULL_TREE if the conversion fails or if because RHS isn't of a
-   builtin type. Return a converted RHS if the conversion is possible.  */
-
-static tree
-try_builtin_assignconv (tree wfl_op1, tree lhs_type, tree rhs)
-{
-  tree new_rhs = NULL_TREE;
-  tree rhs_type = TREE_TYPE (rhs);
-
-  /* Handle boolean specially.  */
-  if (TREE_CODE (rhs_type) == BOOLEAN_TYPE
-      || TREE_CODE (lhs_type) == BOOLEAN_TYPE)
-    {
-      if (TREE_CODE (rhs_type) == BOOLEAN_TYPE
-	  && TREE_CODE (lhs_type) == BOOLEAN_TYPE)
-	new_rhs = rhs;
-    }
-
-  /* 5.1.1 Try Identity Conversion,
-     5.1.2 Try Widening Primitive Conversion */
-  else if (valid_builtin_assignconv_identity_widening_p (lhs_type, rhs_type))
-    new_rhs = convert (lhs_type, rhs);
-
-  /* Try a narrowing primitive conversion (5.1.3):
-       - expression is a constant expression of type byte, short, char,
-         or int, AND
-       - variable is byte, short or char AND
-       - The value of the expression is representable in the type of the
-         variable */
-  else if ((rhs_type == byte_type_node || rhs_type == short_type_node
-	    || rhs_type == char_type_node || rhs_type == int_type_node)
-	    && TREE_CONSTANT (rhs)
-	   && (lhs_type == byte_type_node || lhs_type == char_type_node
-	       || lhs_type == short_type_node))
-    {
-      if (int_fits_type_p (rhs, lhs_type))
-        new_rhs = convert (lhs_type, rhs);
-      else if (wfl_op1)		/* Might be called with a NULL */
-	parse_warning_context
-	  (wfl_op1,
-           "Constant expression %qs too wide for narrowing primitive conversion to %qs",
-	   print_int_node (rhs), lang_printable_name (lhs_type, 0));
-      /* Reported a warning that will turn into an error further
-	 down, so we don't return */
-    }
-
-  return new_rhs;
-}
-
-/* Return 1 if RHS_TYPE can be converted to LHS_TYPE by identity
-   conversion (5.1.1) or widening primitive conversion (5.1.2).  Return
-   0 is the conversion test fails.  This implements parts the method
-   invocation conversion (5.3).  */
-
-static int
-valid_builtin_assignconv_identity_widening_p (tree lhs_type, tree rhs_type)
-{
-  /* 5.1.1: This is the identity conversion part. */
-  if (lhs_type == rhs_type)
-    return 1;
-
-  /* Reject non primitive types and boolean conversions.  */
-  if (!JNUMERIC_TYPE_P (lhs_type) || !JNUMERIC_TYPE_P (rhs_type))
-    return 0;
-
-  /* 5.1.2: widening primitive conversion. byte, even if it's smaller
-     than a char can't be converted into a char. Short can't too, but
-     the < test below takes care of that */
-  if (lhs_type == char_type_node && rhs_type == byte_type_node)
-    return 0;
-
-  /* Accept all promoted type here. Note, we can't use <= in the test
-     below, because we still need to bounce out assignments of short
-     to char and the likes */
-  if (lhs_type == int_type_node
-      && (rhs_type == promoted_byte_type_node
-	  || rhs_type == promoted_short_type_node
-	  || rhs_type == promoted_char_type_node
-	  || rhs_type == promoted_boolean_type_node))
-    return 1;
-
-  /* From here, an integral is widened if its precision is smaller
-     than the precision of the LHS or if the LHS is a floating point
-     type, or the RHS is a float and the RHS a double. */
-  if ((JINTEGRAL_TYPE_P (rhs_type) && JINTEGRAL_TYPE_P (lhs_type)
-       && (TYPE_PRECISION (rhs_type) < TYPE_PRECISION (lhs_type)))
-      || (JINTEGRAL_TYPE_P (rhs_type) && JFLOAT_TYPE_P (lhs_type))
-      || (rhs_type == float_type_node && lhs_type == double_type_node))
-    return 1;
-
-  return 0;
-}
-
-/* Check that something of SOURCE type can be assigned or cast to
-   something of DEST type at runtime. Return 1 if the operation is
-   valid, 0 otherwise. If CAST is set to 1, we're treating the case
-   were SOURCE is cast into DEST, which borrows a lot of the
-   assignment check. */
-
-static int
-valid_ref_assignconv_cast_p (tree source, tree dest, int cast)
-{
-  /* SOURCE or DEST might be null if not from a declared entity. */
-  if (!source || !dest)
-    return 0;
-  if (JNULLP_TYPE_P (source))
-    return 1;
-  if (TREE_CODE (source) == POINTER_TYPE)
-    source = TREE_TYPE (source);
-  if (TREE_CODE (dest) == POINTER_TYPE)
-    dest = TREE_TYPE (dest);
-
-  /* If source and dest are being compiled from bytecode, they may need to
-     be loaded. */
-  if (CLASS_P (source) && !CLASS_LOADED_P (source))
-    {
-      load_class (source, 1);
-      safe_layout_class (source);
-    }
-  if (CLASS_P (dest) && !CLASS_LOADED_P (dest))
-    {
-      load_class (dest, 1);
-      safe_layout_class (dest);
-    }
-
-  /* Case where SOURCE is a class type */
-  if (TYPE_CLASS_P (source))
-    {
-      if (TYPE_CLASS_P (dest))
-	return  (source == dest
-		 || inherits_from_p (source, dest)
-		 || (cast && inherits_from_p (dest, source)));
-      if (TYPE_INTERFACE_P (dest))
-	{
-	  /* If doing a cast and SOURCE is final, the operation is
-             always correct a compile time (because even if SOURCE
-             does not implement DEST, a subclass of SOURCE might). */
-	  if (cast && !CLASS_FINAL (TYPE_NAME (source)))
-	    return 1;
-	  /* Otherwise, SOURCE must implement DEST */
-	  return interface_of_p (dest, source);
-	}
-      /* DEST is an array, cast permitted if SOURCE is of Object type */
-      return (cast && source == object_type_node ? 1 : 0);
-    }
-  if (TYPE_INTERFACE_P (source))
-    {
-      if (TYPE_CLASS_P (dest))
-	{
-	  /* If not casting, DEST must be the Object type */
-	  if (!cast)
-	    return dest == object_type_node;
-	  /* We're doing a cast. The cast is always valid is class
-	     DEST is not final, otherwise, DEST must implement SOURCE */
-	  else if (!CLASS_FINAL (TYPE_NAME (dest)))
-	    return 1;
-	  else
-	    return interface_of_p (source, dest);
-	}
-      if (TYPE_INTERFACE_P (dest))
-	{
-	  /* If doing a cast, then if SOURCE and DEST contain method
-             with the same signature but different return type, then
-             this is a (compile time) error */
-	  if (cast)
-	    {
-	      tree method_source, method_dest;
-	      tree source_type;
-	      tree source_sig;
-	      tree source_name;
-	      for (method_source = TYPE_METHODS (source); method_source;
-		   method_source = TREE_CHAIN (method_source))
-		{
-		  source_sig =
-		    build_java_argument_signature (TREE_TYPE (method_source));
-		  source_type = TREE_TYPE (TREE_TYPE (method_source));
-		  source_name = DECL_NAME (method_source);
-		  for (method_dest = TYPE_METHODS (dest);
-		       method_dest; method_dest = TREE_CHAIN (method_dest))
-		    if (source_sig ==
-			build_java_argument_signature (TREE_TYPE (method_dest))
-			&& source_name == DECL_NAME (method_dest)
-			&& source_type != TREE_TYPE (TREE_TYPE (method_dest)))
-		      return 0;
-		}
-	      return 1;
-	    }
-	  else
-	    return source == dest || interface_of_p (dest, source);
-	}
-      else
-	{
-	  /* Array */
-	  return (cast
-		  && (DECL_NAME (TYPE_NAME (source))
-		      == java_lang_cloneable_identifier_node
-		      || (DECL_NAME (TYPE_NAME (source))
-			  == java_io_serializable_identifier_node)));
-	}
-    }
-  if (TYPE_ARRAY_P (source))
-    {
-      if (TYPE_CLASS_P (dest))
-	return dest == object_type_node;
-      /* Can't cast an array to an interface unless the interface is
-	 java.lang.Cloneable or java.io.Serializable.  */
-      if (TYPE_INTERFACE_P (dest))
-	return (DECL_NAME (TYPE_NAME (dest))
-		== java_lang_cloneable_identifier_node
-		|| (DECL_NAME (TYPE_NAME (dest))
-		    == java_io_serializable_identifier_node));
-      else			/* Arrays */
-	{
-	  tree source_element_type = TYPE_ARRAY_ELEMENT (source);
-	  tree dest_element_type = TYPE_ARRAY_ELEMENT (dest);
-
-	  /* In case of severe errors, they turn out null */
-	  if (!dest_element_type || !source_element_type)
-	    return 0;
-	  if (source_element_type == dest_element_type)
-	    return 1;
-	  return valid_ref_assignconv_cast_p (source_element_type,
-					      dest_element_type, cast);
-	}
-      return 0;
-    }
-  return 0;
-}
-
-static int
-valid_cast_to_p (tree source, tree dest)
-{
-  if (TREE_CODE (source) == POINTER_TYPE)
-    source = TREE_TYPE (source);
-  if (TREE_CODE (dest) == POINTER_TYPE)
-    dest = TREE_TYPE (dest);
-
-  if (TREE_CODE (source) == RECORD_TYPE && TREE_CODE (dest) == RECORD_TYPE)
-    return valid_ref_assignconv_cast_p (source, dest, 1);
-
-  else if (JNUMERIC_TYPE_P (source) && JNUMERIC_TYPE_P (dest))
-    return 1;
-
-  else if (TREE_CODE (source) == BOOLEAN_TYPE
-	   && TREE_CODE (dest) == BOOLEAN_TYPE)
-    return 1;
-
-  return 0;
-}
-
-static tree
-do_unary_numeric_promotion (tree arg)
-{
-  tree type = TREE_TYPE (arg);
-  if (TREE_CODE (type) == INTEGER_TYPE && TYPE_PRECISION (type) < 32)
-    arg = convert (int_type_node, arg);
-  return arg;
-}
-
-/* Return a nonzero value if SOURCE can be converted into DEST using
-   the method invocation conversion rule (5.3).  */
-static int
-valid_method_invocation_conversion_p (tree dest, tree source)
-{
-  return ((JPRIMITIVE_TYPE_P (source) && JPRIMITIVE_TYPE_P (dest)
-	   && valid_builtin_assignconv_identity_widening_p (dest, source))
-	  || ((JREFERENCE_TYPE_P (source) || JNULLP_TYPE_P (source))
-	      && (JREFERENCE_TYPE_P (dest) || JNULLP_TYPE_P (dest))
-	      && valid_ref_assignconv_cast_p (source, dest, 0)));
-}
-
-/* Build an incomplete binop expression. */
-
-static tree
-build_binop (enum tree_code op, int op_location, tree op1, tree op2)
-{
-  tree binop = build2 (op, NULL_TREE, op1, op2);
-  TREE_SIDE_EFFECTS (binop) = 1;
-  /* Store the location of the operator, for better error report. The
-     string of the operator will be rebuild based on the OP value. */
-  EXPR_WFL_LINECOL (binop) = op_location;
-  return binop;
-}
-
-/* Build the string of the operator retained by NODE. If NODE is part
-   of a compound expression, add an '=' at the end of the string. This
-   function is called when an error needs to be reported on an
-   operator. The string is returned as a pointer to a static character
-   buffer. */
-
-static char *
-operator_string (tree node)
-{
-#define BUILD_OPERATOR_STRING(S)					\
-  {									\
-    sprintf (buffer, "%s%s", S, (COMPOUND_ASSIGN_P (node) ? "=" : ""));	\
-    return buffer;							\
-  }
-
-  static char buffer [10];
-  switch (TREE_CODE (node))
-    {
-    case MULT_EXPR: BUILD_OPERATOR_STRING ("*");
-    case RDIV_EXPR: BUILD_OPERATOR_STRING ("/");
-    case TRUNC_MOD_EXPR: BUILD_OPERATOR_STRING ("%");
-    case PLUS_EXPR: BUILD_OPERATOR_STRING ("+");
-    case MINUS_EXPR: BUILD_OPERATOR_STRING ("-");
-    case LSHIFT_EXPR: BUILD_OPERATOR_STRING ("<<");
-    case RSHIFT_EXPR: BUILD_OPERATOR_STRING (">>");
-    case URSHIFT_EXPR: BUILD_OPERATOR_STRING (">>>");
-    case BIT_AND_EXPR: BUILD_OPERATOR_STRING ("&");
-    case BIT_XOR_EXPR: BUILD_OPERATOR_STRING ("^");
-    case BIT_IOR_EXPR: BUILD_OPERATOR_STRING ("|");
-    case TRUTH_ANDIF_EXPR: BUILD_OPERATOR_STRING ("&&");
-    case TRUTH_ORIF_EXPR: BUILD_OPERATOR_STRING ("||");
-    case EQ_EXPR: BUILD_OPERATOR_STRING ("==");
-    case NE_EXPR: BUILD_OPERATOR_STRING ("!=");
-    case GT_EXPR: BUILD_OPERATOR_STRING (">");
-    case GE_EXPR: BUILD_OPERATOR_STRING (">=");
-    case LT_EXPR: BUILD_OPERATOR_STRING ("<");
-    case LE_EXPR: BUILD_OPERATOR_STRING ("<=");
-    case UNARY_PLUS_EXPR: BUILD_OPERATOR_STRING ("+");
-    case NEGATE_EXPR: BUILD_OPERATOR_STRING ("-");
-    case TRUTH_NOT_EXPR: BUILD_OPERATOR_STRING ("!");
-    case BIT_NOT_EXPR: BUILD_OPERATOR_STRING ("~");
-    case PREINCREMENT_EXPR:	/* Fall through */
-    case POSTINCREMENT_EXPR: BUILD_OPERATOR_STRING ("++");
-    case PREDECREMENT_EXPR:	/* Fall through */
-    case POSTDECREMENT_EXPR: BUILD_OPERATOR_STRING ("--");
-    default:
-      internal_error ("unregistered operator %s",
-		      tree_code_name [TREE_CODE (node)]);
-    }
-  return NULL;
-#undef BUILD_OPERATOR_STRING
-}
-
-/* Return 1 if VAR_ACCESS1 is equivalent to VAR_ACCESS2.  */
-
-static int
-java_decl_equiv (tree var_acc1, tree var_acc2)
-{
-  if (JDECL_P (var_acc1))
-    return (var_acc1 == var_acc2);
-
-  return (TREE_CODE (var_acc1) == COMPONENT_REF
-	  && TREE_CODE (var_acc2) == COMPONENT_REF
-	  && TREE_OPERAND (TREE_OPERAND (var_acc1, 0), 0)
-	     == TREE_OPERAND (TREE_OPERAND (var_acc2, 0), 0)
-	  && TREE_OPERAND (var_acc1, 1) == TREE_OPERAND (var_acc2, 1));
-}
-
-/* Return a nonzero value if CODE is one of the operators that can be
-   used in conjunction with the `=' operator in a compound assignment.  */
-
-static int
-binop_compound_p (enum tree_code code)
-{
-  int i;
-  for (i = 0; i < BINOP_COMPOUND_CANDIDATES; i++)
-    if (binop_lookup [i] == code)
-      break;
-
-  return i < BINOP_COMPOUND_CANDIDATES;
-}
-
-/* Reorganize after a fold to get SAVE_EXPR to generate what we want.  */
-
-static tree
-java_refold (tree t)
-{
-  tree c, b, ns, decl;
-
-  if (TREE_CODE (t) != MODIFY_EXPR)
-    return t;
-
-  c = TREE_OPERAND (t, 1);
-  if (! (c && TREE_CODE (c) == COMPOUND_EXPR
-	 && TREE_CODE (TREE_OPERAND (c, 0)) == MODIFY_EXPR
-	 && binop_compound_p (TREE_CODE (TREE_OPERAND (c, 1)))))
-    return t;
-
-  /* Now the left branch of the binary operator. */
-  b = TREE_OPERAND (TREE_OPERAND (c, 1), 0);
-  if (! (b && TREE_CODE (b) == NOP_EXPR
-	 && TREE_CODE (TREE_OPERAND (b, 0)) == SAVE_EXPR))
-    return t;
-
-  ns = TREE_OPERAND (TREE_OPERAND (b, 0), 0);
-  if (! (ns && TREE_CODE (ns) == NOP_EXPR
-	 && TREE_CODE (TREE_OPERAND (ns, 0)) == SAVE_EXPR))
-    return t;
-
-  decl = TREE_OPERAND (TREE_OPERAND (ns, 0), 0);
-  if ((JDECL_P (decl) || TREE_CODE (decl) == COMPONENT_REF)
-      /* It's got to be the an equivalent decl */
-      && java_decl_equiv (decl, TREE_OPERAND (TREE_OPERAND (c, 0), 0)))
-    {
-      /* Shorten the NOP_EXPR/SAVE_EXPR path. */
-      TREE_OPERAND (TREE_OPERAND (c, 1), 0) = TREE_OPERAND (ns, 0);
-      /* Substitute the COMPOUND_EXPR by the BINOP_EXPR */
-      TREE_OPERAND (t, 1) = TREE_OPERAND (c, 1);
-      /* Change the right part of the BINOP_EXPR */
-      TREE_OPERAND (TREE_OPERAND (t, 1), 1) = TREE_OPERAND (c, 0);
-    }
-
-  return t;
-}
-
-/* Binary operators (15.16 up to 15.18). We return error_mark_node on
-   errors but we modify NODE so that it contains the type computed
-   according to the expression, when it's fixed. Otherwise, we write
-   error_mark_node as the type. It allows us to further the analysis
-   of remaining nodes and detects more errors in certain cases.  */
-
-static tree
-patch_binop (tree node, tree wfl_op1, tree wfl_op2, int folding)
-{
-  tree op1 = TREE_OPERAND (node, 0);
-  tree op2 = TREE_OPERAND (node, 1);
-  tree op1_type = TREE_TYPE (op1);
-  tree op2_type = TREE_TYPE (op2);
-  tree prom_type = NULL_TREE, cn;
-  enum tree_code code = TREE_CODE (node);
-
-  /* If 1, tell the routine that we have to return error_mark_node
-     after checking for the initialization of the RHS */
-  int error_found = 0;
-
-  EXPR_WFL_LINECOL (wfl_operator) = EXPR_WFL_LINECOL (node);
-
-  /* If either op<n>_type are NULL, this might be early signs of an
-     error situation, unless it's too early to tell (in case we're
-     handling a `+', `==', `!=' or `instanceof'.) We want to set op<n>_type
-     correctly so the error can be later on reported accurately. */
-  if (! (code == PLUS_EXPR || code == NE_EXPR
-	 || code == EQ_EXPR || code == INSTANCEOF_EXPR))
-    {
-      tree n;
-      if (! op1_type)
-	{
-	  n = java_complete_tree (op1);
-	  op1_type = TREE_TYPE (n);
-	}
-      if (! op2_type)
-	{
-	  n = java_complete_tree (op2);
-	  op2_type = TREE_TYPE (n);
-	}
-    }
-
-  switch (code)
-    {
-    /* 15.16 Multiplicative operators */
-    case MULT_EXPR:		/* 15.16.1 Multiplication Operator * */
-    case RDIV_EXPR:		/* 15.16.2 Division Operator / */
-    case TRUNC_DIV_EXPR:	/* 15.16.2 Integral type Division Operator / */
-    case TRUNC_MOD_EXPR:	/* 15.16.3 Remainder operator % */
-      if (!JNUMERIC_TYPE_P (op1_type) || !JNUMERIC_TYPE_P (op2_type))
-	{
-	  if (!JNUMERIC_TYPE_P (op1_type))
-	    ERROR_CANT_CONVERT_TO_NUMERIC (wfl_operator, node, op1_type);
-	  if (!JNUMERIC_TYPE_P (op2_type) && (op1_type != op2_type))
-	    ERROR_CANT_CONVERT_TO_NUMERIC (wfl_operator, node, op2_type);
-	  TREE_TYPE (node) = error_mark_node;
-	  error_found = 1;
-	  break;
-	}
-      prom_type = binary_numeric_promotion (op1_type, op2_type, &op1, &op2);
-
-      /* Detect integral division by zero */
-      if ((code == RDIV_EXPR || code == TRUNC_MOD_EXPR)
-	  && TREE_CODE (prom_type) == INTEGER_TYPE
-	  && (op2 == integer_zero_node || op2 == long_zero_node ||
-	      (TREE_CODE (op2) == INTEGER_CST &&
-	       ! TREE_INT_CST_LOW (op2)  && ! TREE_INT_CST_HIGH (op2))))
-	{
-	  parse_warning_context
-            (wfl_operator,
-             "Evaluating this expression will result in an arithmetic exception being thrown");
-	  TREE_CONSTANT (node) = 0;
-	  TREE_INVARIANT (node) = 0;
-	}
-
-      /* Change the division operator if necessary */
-      if (code == RDIV_EXPR && TREE_CODE (prom_type) == INTEGER_TYPE)
-	TREE_SET_CODE (node, TRUNC_DIV_EXPR);
-
-      /* Before divisions as is disappear, try to simplify and bail if
-         applicable, otherwise we won't perform even simple
-         simplifications like (1-1)/3. We can't do that with floating
-         point number, folds can't handle them at this stage. */
-      if (code == RDIV_EXPR && TREE_CONSTANT (op1) && TREE_CONSTANT (op2)
-	  && JINTEGRAL_TYPE_P (op1) && JINTEGRAL_TYPE_P (op2))
-	{
-	  TREE_TYPE (node) = prom_type;
-	  node = fold (node);
-	  if (TREE_CODE (node) != code)
-	    return node;
-	}
-
-      if (TREE_CODE (prom_type) == INTEGER_TYPE
-	  && flag_use_divide_subroutine
-	  && ! flag_emit_class_files
-	  && (code == RDIV_EXPR || code == TRUNC_MOD_EXPR))
-	return build_java_soft_divmod (TREE_CODE (node), prom_type, op1, op2);
-
-      /* This one is more complicated. FLOATs are processed by a
-	 function call to soft_fmod. Duplicate the value of the
-	 COMPOUND_ASSIGN_P flag. */
-      if (code == TRUNC_MOD_EXPR)
-	{
-	  tree mod = build_java_binop (TRUNC_MOD_EXPR, prom_type, op1, op2);
-	  COMPOUND_ASSIGN_P (mod) = COMPOUND_ASSIGN_P (node);
-	  return mod;
-	}
-      break;
-
-    /* 15.17 Additive Operators */
-    case PLUS_EXPR:		/* 15.17.1 String Concatenation Operator + */
-
-      /* Operation is valid if either one argument is a string
-	 constant, a String object or a StringBuffer crafted for the
-	 purpose of the a previous usage of the String concatenation
-	 operator */
-
-      if (TREE_CODE (op1) == STRING_CST
-	  || TREE_CODE (op2) == STRING_CST
-	  || JSTRING_TYPE_P (op1_type)
-	  || JSTRING_TYPE_P (op2_type)
-	  || IS_CRAFTED_STRING_BUFFER_P (op1)
-	  || IS_CRAFTED_STRING_BUFFER_P (op2))
-	return build_string_concatenation (op1, op2);
-
-    case MINUS_EXPR:		/* 15.17.2 Additive Operators (+ and -) for
-				   Numeric Types */
-      if (!JNUMERIC_TYPE_P (op1_type) || !JNUMERIC_TYPE_P (op2_type))
-	{
-	  if (!JNUMERIC_TYPE_P (op1_type))
-	    ERROR_CANT_CONVERT_TO_NUMERIC (wfl_operator, node, op1_type);
-	  if (!JNUMERIC_TYPE_P (op2_type) && (op1_type != op2_type))
-	    ERROR_CANT_CONVERT_TO_NUMERIC (wfl_operator, node, op2_type);
-	  TREE_TYPE (node) = error_mark_node;
-	  error_found = 1;
-	  break;
-	}
-      prom_type = binary_numeric_promotion (op1_type, op2_type, &op1, &op2);
-      break;
-
-    /* 15.18 Shift Operators */
-    case LSHIFT_EXPR:
-    case RSHIFT_EXPR:
-    case URSHIFT_EXPR:
-      if (!JINTEGRAL_TYPE_P (op1_type) || !JINTEGRAL_TYPE_P (op2_type))
-	{
-	  if (!JINTEGRAL_TYPE_P (op1_type))
-	    ERROR_CAST_NEEDED_TO_INTEGRAL (wfl_operator, node, op1_type);
-	  else
-	    {
-	      if (JNUMERIC_TYPE_P (op2_type))
-		parse_error_context (wfl_operator,
-				     "Incompatible type for %qs. Explicit cast needed to convert shift distance from %qs to integral",
-				     operator_string (node),
-				     lang_printable_name (op2_type, 0));
-	      else
-		parse_error_context (wfl_operator,
-				     "Incompatible type for %qs. Can't convert shift distance from %qs to integral",
-				     operator_string (node),
-				     lang_printable_name (op2_type, 0));
-	    }
-	  TREE_TYPE (node) = error_mark_node;
-	  error_found = 1;
-	  break;
-	}
-
-      /* Unary numeric promotion (5.6.1) is performed on each operand
-         separately */
-      op1 = do_unary_numeric_promotion (op1);
-      op2 = do_unary_numeric_promotion (op2);
-
-      /* If the right hand side is of type `long', first cast it to
-	 `int'.  */
-      if (TREE_TYPE (op2) == long_type_node)
-	op2 = build1 (CONVERT_EXPR, int_type_node, op2);
-
-      /* The type of the shift expression is the type of the promoted
-         type of the left-hand operand */
-      prom_type = TREE_TYPE (op1);
-
-      /* Shift int only up to 0x1f and long up to 0x3f */
-      if (prom_type == int_type_node)
-	op2 = fold_build2 (BIT_AND_EXPR, int_type_node, op2,
-			   build_int_cst (NULL_TREE, 0x1f));
-      else
-	op2 = fold_build2 (BIT_AND_EXPR, int_type_node, op2,
-			   build_int_cst (NULL_TREE, 0x3f));
-
-      /* The >>> operator is a >> operating on unsigned quantities */
-      if (code == URSHIFT_EXPR && (folding || ! flag_emit_class_files))
-	{
-	  tree to_return;
-          tree utype = java_unsigned_type (prom_type);
-          op1 = convert (utype, op1);
-
-	  to_return = fold_build2 (RSHIFT_EXPR, utype, op1, op2);
-	  to_return = convert (prom_type, to_return);
-	  /* Copy the original value of the COMPOUND_ASSIGN_P flag */
-	  COMPOUND_ASSIGN_P (to_return) = COMPOUND_ASSIGN_P (node);
-	  TREE_SIDE_EFFECTS (to_return)
-	    = TREE_SIDE_EFFECTS (op1) | TREE_SIDE_EFFECTS (op2);
-	  return to_return;
-	}
-      break;
-
-      /* 15.19.1 Type Comparison Operator instanceof */
-    case INSTANCEOF_EXPR:
-
-      TREE_TYPE (node) = boolean_type_node;
-
-      /* OP1_TYPE might be NULL when OP1 is a string constant.  */
-      if ((cn = patch_string (op1)))
-	{
-	  op1 = cn;
-	  op1_type = TREE_TYPE (op1);
-	}
-      if (op1_type == NULL_TREE)
-	abort ();
-
-      if (!(op2_type = resolve_type_during_patch (op2)))
-	return error_mark_node;
-
-      /* The first operand must be a reference type or the null type */
-      if (!JREFERENCE_TYPE_P (op1_type) && op1 != null_pointer_node)
-	error_found = 1;	/* Error reported further below */
-
-      /* The second operand must be a reference type */
-      if (!JREFERENCE_TYPE_P (op2_type))
-	{
-	  SET_WFL_OPERATOR (wfl_operator, node, wfl_op2);
-	  parse_error_context
-	    (wfl_operator, "Invalid argument %qs for %<instanceof%>",
-	     lang_printable_name (op2_type, 0));
-	  error_found = 1;
-	}
-
-      if (!error_found && valid_ref_assignconv_cast_p (op1_type, op2_type, 1))
-	{
-	  /* If the first operand is null, the result is always false */
-	  if (op1 == null_pointer_node)
-	    return boolean_false_node;
-	  else if (flag_emit_class_files)
-	    {
-	      TREE_OPERAND (node, 1) = op2_type;
-	      TREE_SIDE_EFFECTS (node) = TREE_SIDE_EFFECTS (op1);
-	      return node;
-	    }
-	  /* Otherwise we have to invoke instance of to figure it out */
-	  else
-	    return build_instanceof (op1, op2_type);
-	}
-      /* There is no way the expression operand can be an instance of
-	 the type operand. This is a compile time error. */
-      else
-	{
-	  char *t1 = xstrdup (lang_printable_name (op1_type, 0));
-	  SET_WFL_OPERATOR (wfl_operator, node, wfl_op1);
-	  parse_error_context
-	    (wfl_operator, "Impossible for %qs to be instance of %qs",
-	     t1, lang_printable_name (op2_type, 0));
-	  free (t1);
-	  error_found = 1;
-	}
-
-      break;
-
-      /* 15.21 Bitwise and Logical Operators */
-    case BIT_AND_EXPR:
-    case BIT_XOR_EXPR:
-    case BIT_IOR_EXPR:
-      if (JINTEGRAL_TYPE_P (op1_type) && JINTEGRAL_TYPE_P (op2_type))
-	/* Binary numeric promotion is performed on both operand and the
-	   expression retain that type */
-	prom_type = binary_numeric_promotion (op1_type, op2_type, &op1, &op2);
-
-      else if (TREE_CODE (op1_type) == BOOLEAN_TYPE
-	       && TREE_CODE (op1_type) == BOOLEAN_TYPE)
-	/* The type of the bitwise operator expression is BOOLEAN */
-	prom_type = boolean_type_node;
-      else
-	{
-	  if (!JINTEGRAL_TYPE_P (op1_type))
-	    ERROR_CAST_NEEDED_TO_INTEGRAL (wfl_operator, node, op1_type);
-	  if (!JINTEGRAL_TYPE_P (op2_type) && (op1_type != op2_type))
-	    ERROR_CAST_NEEDED_TO_INTEGRAL (wfl_operator, node, op2_type);
-	  TREE_TYPE (node) = error_mark_node;
-	  error_found = 1;
-	  /* Insert a break here if adding thing before the switch's
-             break for this case */
-	}
-      break;
-
-      /* 15.22 Conditional-And Operator */
-    case TRUTH_ANDIF_EXPR:
-      /* 15.23 Conditional-Or Operator */
-    case TRUTH_ORIF_EXPR:
-      /* Operands must be of BOOLEAN type */
-      if (TREE_CODE (op1_type) != BOOLEAN_TYPE ||
-	  TREE_CODE (op2_type) != BOOLEAN_TYPE)
-	{
-	  if (TREE_CODE (op1_type) != BOOLEAN_TYPE)
-	    ERROR_CANT_CONVERT_TO_BOOLEAN (wfl_operator, node, op1_type);
-	  if (TREE_CODE (op2_type) != BOOLEAN_TYPE && (op1_type != op2_type))
-	    ERROR_CANT_CONVERT_TO_BOOLEAN (wfl_operator, node, op2_type);
-	  TREE_TYPE (node) = boolean_type_node;
-	  error_found = 1;
-	  break;
-	}
-      else if (integer_zerop (op1))
-	{
-	  return code == TRUTH_ANDIF_EXPR ? op1 : op2;
-	}
-      else if (integer_onep (op1))
-	{
-	  return code == TRUTH_ANDIF_EXPR ? op2 : op1;
-	}
-      /* The type of the conditional operators is BOOLEAN */
-      prom_type = boolean_type_node;
-      break;
-
-      /* 15.19.1 Numerical Comparison Operators <, <=, >, >= */
-    case LT_EXPR:
-    case GT_EXPR:
-    case LE_EXPR:
-    case GE_EXPR:
-      /* The type of each of the operands must be a primitive numeric
-         type */
-      if (!JNUMERIC_TYPE_P (op1_type) || ! JNUMERIC_TYPE_P (op2_type))
-	{
-	  if (!JNUMERIC_TYPE_P (op1_type))
-	    ERROR_CANT_CONVERT_TO_NUMERIC (wfl_operator, node, op1_type);
-	  if (!JNUMERIC_TYPE_P (op2_type) && (op1_type != op2_type))
-	    ERROR_CANT_CONVERT_TO_NUMERIC (wfl_operator, node, op2_type);
-	  TREE_TYPE (node) = boolean_type_node;
-	  error_found = 1;
-	  break;
-	}
-      /* Binary numeric promotion is performed on the operands */
-      binary_numeric_promotion (op1_type, op2_type, &op1, &op2);
-      /* The type of the relation expression is always BOOLEAN */
-      prom_type = boolean_type_node;
-      break;
-
-      /* 15.20 Equality Operator */
-    case EQ_EXPR:
-    case NE_EXPR:
-      /* It's time for us to patch the strings. */
-      if ((cn = patch_string (op1)))
-       {
-         op1 = cn;
-         op1_type = TREE_TYPE (op1);
-       }
-      if ((cn = patch_string (op2)))
-       {
-         op2 = cn;
-         op2_type = TREE_TYPE (op2);
-       }
-
-      /* 15.20.1 Numerical Equality Operators == and != */
-      /* Binary numeric promotion is performed on the operands */
-      if (JNUMERIC_TYPE_P (op1_type) && JNUMERIC_TYPE_P (op2_type))
-	binary_numeric_promotion (op1_type, op2_type, &op1, &op2);
-
-      /* 15.20.2 Boolean Equality Operators == and != */
-      else if (TREE_CODE (op1_type) == BOOLEAN_TYPE &&
-	  TREE_CODE (op2_type) == BOOLEAN_TYPE)
-	;			/* Nothing to do here */
-
-      /* 15.20.3 Reference Equality Operators == and != */
-      /* Types have to be either references or the null type. If
-         they're references, it must be possible to convert either
-         type to the other by casting conversion. */
-      else if ((op1 == null_pointer_node && op2 == null_pointer_node)
-               || (op1 == null_pointer_node && JREFERENCE_TYPE_P (op2_type))
-               || (JREFERENCE_TYPE_P (op1_type) && op2 == null_pointer_node)
-	       || (JREFERENCE_TYPE_P (op1_type) && JREFERENCE_TYPE_P (op2_type)
-		   && (valid_ref_assignconv_cast_p (op1_type, op2_type, 1)
-		       || valid_ref_assignconv_cast_p (op2_type,
-						       op1_type, 1))))
-	;			/* Nothing to do here */
-
-      /* Else we have an error figure what can't be converted into
-	 what and report the error */
-      else
-	{
-	  char *t1;
-	  t1 = xstrdup (lang_printable_name (op1_type, 0));
-	  parse_error_context
-	    (wfl_operator,
-	     "Incompatible type for %qs. Can't convert %qs to %qs",
-	     operator_string (node), t1,
-	     lang_printable_name (op2_type, 0));
-	  free (t1);
-	  TREE_TYPE (node) = boolean_type_node;
-	  error_found = 1;
-	  break;
-	}
-      prom_type = boolean_type_node;
-      break;
-    default:
-      abort ();
-    }
-
-  if (error_found)
-    return error_mark_node;
-
-  TREE_OPERAND (node, 0) = op1;
-  TREE_OPERAND (node, 1) = op2;
-  TREE_TYPE (node) = prom_type;
-  TREE_SIDE_EFFECTS (node) = TREE_SIDE_EFFECTS (op1) | TREE_SIDE_EFFECTS (op2);
-
-  /* fold does not respect side-effect order as required for Java but not C.
-   * Also, it sometimes create SAVE_EXPRs which are bad when emitting
-   * bytecode.
-   */
-  if (flag_emit_class_files ? (TREE_CONSTANT (op1) && TREE_CONSTANT (op2))
-      : ! TREE_SIDE_EFFECTS (node))
-    node = fold (node);
-  return node;
-}
-
-/* Concatenate the STRING_CST CSTE and STRING. When AFTER is a non
-   zero value, the value of CSTE comes after the valude of STRING */
-
-static tree
-do_merge_string_cste (tree cste, const char *string, int string_len, int after)
-{
-  const char *old = TREE_STRING_POINTER (cste);
-  int old_len = TREE_STRING_LENGTH (cste);
-  int len = old_len + string_len;
-  char *new = alloca (len+1);
-
-  if (after)
-    {
-      memcpy (new, string, string_len);
-      memcpy (&new [string_len], old, old_len);
-    }
-  else
-    {
-      memcpy (new, old, old_len);
-      memcpy (&new [old_len], string, string_len);
-    }
-  new [len] = '\0';
-  return build_string (len, new);
-}
-
-/* Tries to merge OP1 (a STRING_CST) and OP2 (if suitable). Return a
-   new STRING_CST on success, NULL_TREE on failure.  */
-
-static tree
-merge_string_cste (tree op1, tree op2, int after)
-{
-  /* Handle two string constants right away.  */
-  if (TREE_CODE (op2) == STRING_CST)
-    return do_merge_string_cste (op1, TREE_STRING_POINTER (op2),
-				 TREE_STRING_LENGTH (op2), after);
-
-  /* Reasonable integer constant can be treated right away.  */
-  if (TREE_CODE (op2) == INTEGER_CST && !TREE_CONSTANT_OVERFLOW (op2))
-    {
-      static const char *const boolean_true = "true";
-      static const char *const boolean_false = "false";
-      static const char *const null_pointer = "null";
-      char ch[4];
-      const char *string;
-
-      if (op2 == boolean_true_node)
-	string = boolean_true;
-      else if (op2 == boolean_false_node)
-	string = boolean_false;
-      else if (op2 == null_pointer_node
-	       || (integer_zerop (op2)
-		   && TREE_CODE (TREE_TYPE (op2)) == POINTER_TYPE))
-	/* FIXME: null is not a compile-time constant, so it is only safe to
-	   merge if the overall expression is non-constant. However, this
-	   code always merges without checking the overall expression.  */
-	string = null_pointer;
-      else if (TREE_TYPE (op2) == char_type_node)
-	{
-	  /* Convert the character into UTF-8.	*/
-	  unsigned int c = (unsigned int) TREE_INT_CST_LOW (op2);
-	  unsigned char *p = (unsigned char *) ch;
-	  if (0x01 <= c && c <= 0x7f)
-	    *p++ = (unsigned char) c;
-	  else if (c < 0x7ff)
-	    {
-	      *p++ = (unsigned char) (c >> 6 | 0xc0);
-	      *p++ = (unsigned char) ((c & 0x3f) | 0x80);
-	    }
-	  else
-	    {
-	      *p++ = (unsigned char) (c >> 12 | 0xe0);
-	      *p++ = (unsigned char) (((c >> 6) & 0x3f) | 0x80);
-	      *p++ = (unsigned char) ((c & 0x3f) | 0x80);
-	    }
-	  *p = '\0';
-
-	  string = ch;
-	}
-      else
-	string = string_convert_int_cst (op2);
-
-      return do_merge_string_cste (op1, string, strlen (string), after);
-    }
-  return NULL_TREE;
-}
-
-/* Tries to statically concatenate OP1 and OP2 if possible. Either one
-   has to be a STRING_CST and the other part must be a STRING_CST or a
-   INTEGRAL constant. Return a new STRING_CST if the operation
-   succeed, NULL_TREE otherwise.
-
-   If the case we want to optimize for space, we might want to return
-   NULL_TREE for each invocation of this routine. FIXME */
-
-static tree
-string_constant_concatenation (tree op1, tree op2)
-{
-  if (TREE_CODE (op1) == STRING_CST || (TREE_CODE (op2) == STRING_CST))
-    {
-      tree string, rest;
-      int invert;
-
-      string = (TREE_CODE (op1) == STRING_CST ? op1 : op2);
-      rest   = (string == op1 ? op2 : op1);
-      invert = (string == op1 ? 0 : 1 );
-
-      /* Walk REST, only if it looks reasonable */
-      if (TREE_CODE (rest) != STRING_CST
-	  && !IS_CRAFTED_STRING_BUFFER_P (rest)
-	  && !JSTRING_TYPE_P (TREE_TYPE (rest))
-	  && TREE_CODE (rest) == EXPR_WITH_FILE_LOCATION)
-	{
-	  rest = java_complete_tree (rest);
-	  if (rest == error_mark_node)
-	    return error_mark_node;
-	  rest = fold (rest);
-	}
-      return merge_string_cste (string, rest, invert);
-    }
-  return NULL_TREE;
-}
-
-/* Implement the `+' operator. Does static optimization if possible,
-   otherwise create (if necessary) and append elements to a
-   StringBuffer. The StringBuffer will be carried around until it is
-   used for a function call or an assignment. Then toString() will be
-   called on it to turn it into a String object. */
-
-static tree
-build_string_concatenation (tree op1, tree op2)
-{
-  tree result;
-  int side_effects = TREE_SIDE_EFFECTS (op1) | TREE_SIDE_EFFECTS (op2);
-
-  /* Try to do some static optimization */
-  if ((result = string_constant_concatenation (op1, op2)))
-    return result;
-
-  /* Discard empty strings on either side of the expression */
-  if (TREE_CODE (op1) == STRING_CST && TREE_STRING_LENGTH (op1) == 0)
-    {
-      op1 = op2;
-      op2 = NULL_TREE;
-    }
-  else if (TREE_CODE (op2) == STRING_CST && TREE_STRING_LENGTH (op2) == 0)
-    op2 = NULL_TREE;
-
-  /* If operands are string constant, turn then into object references */
-  if (TREE_CODE (op1) == STRING_CST)
-    op1 = patch_string_cst (op1);
-  if (op2 && TREE_CODE (op2) == STRING_CST)
-    op2 = patch_string_cst (op2);
-
-  /* If either one of the constant is null and the other non null
-     operand is a String constant, return it. */
-  if ((TREE_CODE (op1) == STRING_CST) && !op2)
-    return op1;
-
-  /* If OP1 isn't already a StringBuffer, create and
-     initialize a new one */
-  if (!IS_CRAFTED_STRING_BUFFER_P (op1))
-    {
-      /* Two solutions here:
-	 1) OP1 is a constant string reference, we call new StringBuffer(OP1)
-	 2) OP1 is something else, we call new StringBuffer().append(OP1).  */
-      if (TREE_CONSTANT (op1) && JSTRING_TYPE_P (TREE_TYPE (op1)))
-	op1 = BUILD_STRING_BUFFER (op1);
-      else
-	{
-	  tree aNew = BUILD_STRING_BUFFER (NULL_TREE);
-	  op1 = make_qualified_primary (aNew, BUILD_APPEND (op1), 0);
-	}
-    }
-
-  if (op2)
-    {
-      /* OP1 is no longer the last node holding a crafted StringBuffer */
-      IS_CRAFTED_STRING_BUFFER_P (op1) = 0;
-      /* Create a node for `{new...,xxx}.append (op2)' */
-      op1 = make_qualified_primary (op1, BUILD_APPEND (op2), 0);
-    }
-
-  /* Mark the last node holding a crafted StringBuffer */
-  IS_CRAFTED_STRING_BUFFER_P (op1) = 1;
-
-  TREE_SIDE_EFFECTS (op1) = side_effects;
-  return op1;
-}
-
-/* Patch the string node NODE. NODE can be a STRING_CST of a crafted
-   StringBuffer. If no string were found to be patched, return
-   NULL. */
-
-static tree
-patch_string (tree node)
-{
-  if (node == error_mark_node)
-    return error_mark_node;
-  if (TREE_CODE (node) == STRING_CST)
-    return patch_string_cst (node);
-  else if (IS_CRAFTED_STRING_BUFFER_P (node))
-    {
-      int saved = ctxp->explicit_constructor_p;
-      tree invoke = build_method_invocation (wfl_to_string, NULL_TREE);
-      tree ret;
-      /* Temporary disable forbid the use of `this'. */
-      ctxp->explicit_constructor_p = 0;
-      ret = java_complete_tree (make_qualified_primary (node, invoke, 0));
-      /* String concatenation arguments must be evaluated in order too. */
-      ret = force_evaluation_order (ret);
-      /* Restore it at its previous value */
-      ctxp->explicit_constructor_p = saved;
-      return ret;
-    }
-  return NULL_TREE;
-}
-
-/* Build the internal representation of a string constant.  */
-
-static tree
-patch_string_cst (tree node)
-{
-  int location;
-  if (! flag_emit_class_files)
-    {
-      node = get_identifier (TREE_STRING_POINTER (node));
-      location = alloc_name_constant (CONSTANT_String, node);
-      node = build_ref_from_constant_pool (location);
-    }
-  TREE_CONSTANT (node) = 1;
-  TREE_INVARIANT (node) = 1;
-
-  /* ??? Guessing that the class file code can't handle casts.  */
-  if (! flag_emit_class_files)
-    node = convert (string_ptr_type_node, node);
-  else
-    TREE_TYPE (node) = string_ptr_type_node;
-
-  return node;
-}
-
-/* Build an incomplete unary operator expression. */
-
-static tree
-build_unaryop (int op_token, int op_location, tree op1)
-{
-  enum tree_code op;
-  tree unaryop;
-  switch (op_token)
-    {
-    case PLUS_TK: op = UNARY_PLUS_EXPR; break;
-    case MINUS_TK: op = NEGATE_EXPR; break;
-    case NEG_TK: op = TRUTH_NOT_EXPR; break;
-    case NOT_TK: op = BIT_NOT_EXPR; break;
-    default: abort ();
-    }
-
-  unaryop = build1 (op, NULL_TREE, op1);
-  TREE_SIDE_EFFECTS (unaryop) = 1;
-  /* Store the location of the operator, for better error report. The
-     string of the operator will be rebuild based on the OP value. */
-  EXPR_WFL_LINECOL (unaryop) = op_location;
-  return unaryop;
-}
-
-/* Special case for the ++/-- operators, since they require an extra
-   argument to build, which is set to NULL and patched
-   later. IS_POST_P is 1 if the operator, 0 otherwise.  */
-
-static tree
-build_incdec (int op_token, int op_location, tree op1, int is_post_p)
-{
-  static const enum tree_code lookup [2][2] =
-    {
-      { PREDECREMENT_EXPR, PREINCREMENT_EXPR, },
-      { POSTDECREMENT_EXPR, POSTINCREMENT_EXPR, },
-    };
-  tree node = build2 (lookup [is_post_p][(op_token - DECR_TK)],
-		      NULL_TREE, op1, NULL_TREE);
-  TREE_SIDE_EFFECTS (node) = 1;
-  /* Store the location of the operator, for better error report. The
-     string of the operator will be rebuild based on the OP value. */
-  EXPR_WFL_LINECOL (node) = op_location;
-
-  /* Report an error if the operand is a constant. */
-  if (TREE_CONSTANT (op1)) {
-    parse_error_context (node, "%qs cannot be used with a constant",
-                         operator_string (node));
-    return error_mark_node;
-  }
-
-  return node;
-}
-
-/* Build an incomplete cast operator, based on the use of the
-   CONVERT_EXPR. Note that TREE_TYPE of the constructed node is
-   set. java_complete_tree is trained to walk a CONVERT_EXPR even
-   though its type is already set.  */
-
-static tree
-build_cast (int location, tree type, tree exp)
-{
-  tree node = build1 (CONVERT_EXPR, type, exp);
-  EXPR_WFL_LINECOL (node) = location;
-  return node;
-}
-
-/* Build an incomplete class reference operator.  */
-static tree
-build_incomplete_class_ref (int location, tree class_name)
-{
-  tree node = build1 (CLASS_LITERAL, NULL_TREE, class_name);
-  tree class_decl = GET_CPC ();
-  tree this_class = TREE_TYPE (class_decl);
-
-  /* Generate the synthetic static method `class$'.  (Previously we
-     deferred this, causing different method tables to be emitted
-     for native code and bytecode.)  */
-  if (!TYPE_DOT_CLASS (this_class)
-      && !JPRIMITIVE_TYPE_P (class_name)
-      && !(TREE_CODE (class_name) == VOID_TYPE))
-    {
-      tree cpc_list = GET_CPC_LIST();
-      tree cpc = cpc_list;
-      tree target_class;
-
-      /* For inner classes, add a 'class$' method to their outermost
-	 context, creating it if necessary.  */
-      
-      while (GET_NEXT_ENCLOSING_CPC(cpc))
-	cpc = GET_NEXT_ENCLOSING_CPC(cpc);
-      class_decl = TREE_VALUE (cpc);
-
-      target_class = TREE_TYPE (class_decl);
-
-      if (CLASS_INTERFACE (TYPE_NAME (target_class)))
-	{
-	  /* For interfaces, adding a static 'class$' method directly 
-	     is illegal.  So create an inner class to contain the new
-	     method.  Empirically this matches the behavior of javac.  */
-	  tree t, inner;
-	  /* We want the generated inner class inside the outermost class. */
-	  GET_CPC_LIST() = cpc;
-	  t = build_wfl_node (DECL_NAME (TYPE_NAME (object_type_node)));
-	  inner = create_anonymous_class (t);
-	  target_class = TREE_TYPE (inner);
-	  end_class_declaration (1);
-	  GET_CPC_LIST() = cpc_list;
-	}
-
-      if (TYPE_DOT_CLASS (target_class) == NULL_TREE)
-	build_dot_class_method (target_class);
-
-      if (this_class != target_class)
-      	TYPE_DOT_CLASS (this_class) = TYPE_DOT_CLASS (target_class);
-    }
-
-  EXPR_WFL_LINECOL (node) = location;
-  return node;
-}
-
-/* Complete an incomplete class reference operator.  */
-static tree
-patch_incomplete_class_ref (tree node)
-{
-  tree type = TREE_OPERAND (node, 0);
-  tree ref_type;
-
-  if (!(ref_type = resolve_type_during_patch (type)))
-    return error_mark_node;
-
-  /* If we're not emitting class files and we know ref_type is a
-     compiled class, build a direct reference.  */
-  if ((! flag_emit_class_files && is_compiled_class (ref_type))
-      || JPRIMITIVE_TYPE_P (ref_type)
-      || TREE_CODE (ref_type) == VOID_TYPE)
-    {
-      tree dot = build_class_ref (ref_type);
-      /* A class referenced by `foo.class' is initialized.  */
-      if (!flag_emit_class_files)
-       dot = build_class_init (ref_type, dot);
-      return java_complete_tree (dot);
-    }
-
-  /* If we're emitting class files and we have to deal with non
-     primitive types, we invoke the synthetic static method `class$'.  */
-  ref_type = build_dot_class_method_invocation (current_class, ref_type);
-  return java_complete_tree (ref_type);
-}
-
-/* 15.14 Unary operators. We return error_mark_node in case of error,
-   but preserve the type of NODE if the type is fixed.  */
-
-static tree
-patch_unaryop (tree node, tree wfl_op)
-{
-  tree op = TREE_OPERAND (node, 0);
-  tree op_type = TREE_TYPE (op);
-  tree prom_type = NULL_TREE, value, decl;
-  int nested_field_flag = 0;
-  int code = TREE_CODE (node);
-  int error_found = 0;
-
-  EXPR_WFL_LINECOL (wfl_operator) = EXPR_WFL_LINECOL (node);
-
-  switch (code)
-    {
-      /* 15.13.2 Postfix Increment Operator ++ */
-    case POSTINCREMENT_EXPR:
-      /* 15.13.3 Postfix Increment Operator -- */
-    case POSTDECREMENT_EXPR:
-      /* 15.14.1 Prefix Increment Operator ++ */
-    case PREINCREMENT_EXPR:
-      /* 15.14.2 Prefix Decrement Operator -- */
-    case PREDECREMENT_EXPR:
-      op = decl = extract_field_decl (op);
-      nested_field_flag
-        = nested_field_expanded_access_p (op, NULL, NULL, NULL);
-      /* We might be trying to change an outer field accessed using
-         access method. */
-      if (nested_field_flag)
-	{
-	  /* Retrieve the decl of the field we're trying to access. We
-             do that by first retrieving the function we would call to
-             access the field. It has been already verified that this
-             field isn't final */
-	  if (flag_emit_class_files)
-	    decl = TREE_OPERAND (op, 0);
-	  else
-	    decl = TREE_OPERAND (TREE_OPERAND (TREE_OPERAND (op, 0), 0), 0);
-	  decl = DECL_FUNCTION_ACCESS_DECL (decl);
-	}
-      /* We really should have a JAVA_ARRAY_EXPR to avoid this */
-      else if (!JDECL_P (decl)
-	  && TREE_CODE (decl) != COMPONENT_REF
-	  && !(flag_emit_class_files && TREE_CODE (decl) == ARRAY_REF)
-	  && TREE_CODE (decl) != INDIRECT_REF
-	  && !(TREE_CODE (decl) == COMPOUND_EXPR
-	       && TREE_OPERAND (decl, 1)
-	       && (TREE_CODE (TREE_OPERAND (decl, 1)) == INDIRECT_REF)))
-	{
-	  TREE_TYPE (node) = error_mark_node;
-	  error_found = 1;
-	}
-
-      /* From now on, we know that op is a variable and that it has a
-         valid wfl. We use wfl_op to locate errors related to the
-         ++/-- operand. */
-      if (!JNUMERIC_TYPE_P (op_type))
-	{
-	  parse_error_context
-	    (wfl_op, "Invalid argument type %qs to %qs",
-	     lang_printable_name (op_type, 0), operator_string (node));
-	  TREE_TYPE (node) = error_mark_node;
-	  error_found = 1;
-	}
-      else
-	{
-	  /* Before the addition, binary numeric promotion is performed on
-	     both operands, if really necessary */
-	  if (JINTEGRAL_TYPE_P (op_type))
-	    {
-	      value = build_int_cst (op_type, 1);
-	      TREE_TYPE (node) = op_type;
-	    }
-	  else
-	    {
-	      value = build_int_cst (NULL_TREE, 1);
-	      TREE_TYPE (node) =
-		binary_numeric_promotion (op_type,
-					  TREE_TYPE (value), &op, &value);
-	    }
-
-	  /* We remember we might be accessing an outer field */
-	  if (nested_field_flag)
-	    {
-	      /* We re-generate an access to the field */
-	      value = build2 (PLUS_EXPR, TREE_TYPE (op),
-			      build_nested_field_access (wfl_op, decl), value);
-
-	      /* And we patch the original access$() into a write
-                 with plus_op as a rhs */
-	      return nested_field_access_fix (node, op, value);
-	    }
-
-	  /* And write back into the node. */
-	  TREE_OPERAND (node, 0) = op;
-	  TREE_OPERAND (node, 1) = value;
-	  /* Convert the overall back into its original type, if
-             necessary, and return */
-	  if (JINTEGRAL_TYPE_P (op_type))
-	    return fold (node);
-	  else
-	    return fold (convert (op_type, node));
-	}
-      break;
-
-      /* 15.14.3 Unary Plus Operator + */
-    case UNARY_PLUS_EXPR:
-      /* 15.14.4 Unary Minus Operator - */
-    case NEGATE_EXPR:
-      if (!JNUMERIC_TYPE_P (op_type))
-	{
-	  ERROR_CANT_CONVERT_TO_NUMERIC (wfl_operator, node, op_type);
-	  TREE_TYPE (node) = error_mark_node;
-	  error_found = 1;
-	}
-      /* Unary numeric promotion is performed on operand */
-      else
-	{
-	  op = do_unary_numeric_promotion (op);
-	  prom_type = TREE_TYPE (op);
-	  if (code == UNARY_PLUS_EXPR)
-	    return fold (op);
-	}
-      break;
-
-      /* 15.14.5 Bitwise Complement Operator ~ */
-    case BIT_NOT_EXPR:
-      if (!JINTEGRAL_TYPE_P (op_type))
-	{
-	  ERROR_CAST_NEEDED_TO_INTEGRAL (wfl_operator, node, op_type);
-	  TREE_TYPE (node) = error_mark_node;
-	  error_found = 1;
-	}
-      else
-	{
-	  op = do_unary_numeric_promotion (op);
-	  prom_type = TREE_TYPE (op);
-	}
-      break;
-
-      /* 15.14.6 Logical Complement Operator ! */
-    case TRUTH_NOT_EXPR:
-      if (TREE_CODE (op_type) != BOOLEAN_TYPE)
-	{
-	  ERROR_CANT_CONVERT_TO_BOOLEAN (wfl_operator, node, op_type);
-	  /* But the type is known. We will report an error if further
-	     attempt of a assignment is made with this rhs */
-	  TREE_TYPE (node) = boolean_type_node;
-	  error_found = 1;
-	}
-      else
-	prom_type = boolean_type_node;
-      break;
-
-      /* 15.15 Cast Expression */
-    case CONVERT_EXPR:
-      value = patch_cast (node, wfl_operator);
-      if (value == error_mark_node)
-	{
-	  /* If this cast is part of an assignment, we tell the code
-	     that deals with it not to complain about a mismatch,
-	     because things have been cast, anyways */
-	  TREE_TYPE (node) = error_mark_node;
-	  error_found = 1;
-	}
-      else
-	{
-	  value = fold (value);
-	  return value;
-	}
-      break;
-
-    case NOP_EXPR:
-      /* This can only happen when the type is already known.  */
-      gcc_assert (TREE_TYPE (node) != NULL_TREE);
-      prom_type = TREE_TYPE (node);
-      break;
-    }
-
-  if (error_found)
-    return error_mark_node;
-
-  /* There are cases where node has been replaced by something else
-     and we don't end up returning here: UNARY_PLUS_EXPR,
-     CONVERT_EXPR, {POST,PRE}{INCR,DECR}EMENT_EXPR. */
-  TREE_OPERAND (node, 0) = fold (op);
-  TREE_TYPE (node) = prom_type;
-  TREE_SIDE_EFFECTS (node) = TREE_SIDE_EFFECTS (op);
-  return fold (node);
-}
-
-/* Generic type resolution that sometimes takes place during node
-   patching. Returned the resolved type or generate an error
-   message. Return the resolved type or NULL_TREE.  */
-
-static tree
-resolve_type_during_patch (tree type)
-{
-  if (unresolved_type_p (type, NULL))
-    {
-      tree type_decl = resolve_and_layout (EXPR_WFL_NODE (type), type);
-      if (!type_decl)
-	{
-	  parse_error_context (type,
-			       "Class %qs not found in type declaration",
-			       IDENTIFIER_POINTER (EXPR_WFL_NODE (type)));
-	  return NULL_TREE;
-	}
-
-      check_deprecation (type, type_decl);
-
-      return TREE_TYPE (type_decl);
-    }
-  return type;
-}
-
-/* 5.5 Casting Conversion. error_mark_node is returned if an error is
-   found. Otherwise NODE or something meant to replace it is returned.  */
-
-static tree
-patch_cast (tree node, tree wfl_op)
-{
-  tree op = TREE_OPERAND (node, 0);
-  tree cast_type = TREE_TYPE (node);
-  tree patched, op_type;
-  char *t1;
-
-  /* Some string patching might be necessary at this stage */
-  if ((patched = patch_string (op)))
-    TREE_OPERAND (node, 0) = op = patched;
-  op_type = TREE_TYPE (op);
-
-  /* First resolve OP_TYPE if unresolved */
-  if (!(cast_type = resolve_type_during_patch (cast_type)))
-    return error_mark_node;
-
-  /* Check on cast that are proven correct at compile time */
-  if (JNUMERIC_TYPE_P (cast_type) && JNUMERIC_TYPE_P (op_type))
-    {
-      /* Same type */
-      if (cast_type == op_type)
-	return node;
-
-      /* A narrowing conversion from a floating-point number to an
-	 integral type requires special handling (5.1.3).  */
-      if (JFLOAT_TYPE_P (op_type) && JINTEGRAL_TYPE_P (cast_type))
-	if (cast_type != long_type_node)
-	  op = convert (integer_type_node, op);
-
-      /* Try widening/narrowing conversion.  Potentially, things need
-	 to be worked out in gcc so we implement the extreme cases
-	 correctly.  fold_convert() needs to be fixed.  */
-      return convert (cast_type, op);
-    }
-
-  /* It's also valid to cast a boolean into a boolean */
-  if (op_type == boolean_type_node && cast_type == boolean_type_node)
-    return node;
-
-  /* null can be casted to references */
-  if (op == null_pointer_node && JREFERENCE_TYPE_P (cast_type))
-    return build_null_of_type (cast_type);
-
-  /* The remaining legal casts involve conversion between reference
-     types. Check for their compile time correctness. */
-  if (JREFERENCE_TYPE_P (op_type) && JREFERENCE_TYPE_P (cast_type)
-      && valid_ref_assignconv_cast_p (op_type, cast_type, 1))
-    {
-      TREE_TYPE (node) = promote_type (cast_type);
-      /* Now, the case can be determined correct at compile time if
-         OP_TYPE can be converted into CAST_TYPE by assignment
-         conversion (5.2) */
-
-      if (valid_ref_assignconv_cast_p (op_type, cast_type, 0))
-	{
-	  TREE_SET_CODE (node, NOP_EXPR);
-	  return node;
-	}
-
-      if (flag_emit_class_files)
-	{
-	  TREE_SET_CODE (node, CONVERT_EXPR);
-	  return node;
-	}
-
-      /* The cast requires a run-time check */
-      return build3 (CALL_EXPR, promote_type (cast_type),
-		     build_address_of (soft_checkcast_node),
-		     tree_cons (NULL_TREE, build_class_ref (cast_type),
-				build_tree_list (NULL_TREE, op)),
-		     NULL_TREE);
-    }
-
-  /* Any other casts are proven incorrect at compile time */
-  t1 = xstrdup (lang_printable_name (op_type, 0));
-  parse_error_context (wfl_op, "Invalid cast from %qs to %qs",
-		       t1, lang_printable_name (cast_type, 0));
-  free (t1);
-  return error_mark_node;
-}
-
-/* Build a null constant and give it the type TYPE.  */
-
-static tree
-build_null_of_type (tree type)
-{
-  tree node = build_int_cst (promote_type (type), 0);
-  return node;
-}
-
-/* Build an ARRAY_REF incomplete tree node. Note that operand 1 isn't
-   a list of indices. */
-static tree
-build_array_ref (int location, tree array, tree index)
-{
-  tree node = build4 (ARRAY_REF, NULL_TREE, array, index,
-		      NULL_TREE, NULL_TREE);
-  EXPR_WFL_LINECOL (node) = location;
-  return node;
-}
-
-/* 15.12 Array Access Expression */
-
-static tree
-patch_array_ref (tree node)
-{
-  tree array = TREE_OPERAND (node, 0);
-  tree array_type  = TREE_TYPE (array);
-  tree index = TREE_OPERAND (node, 1);
-  tree index_type = TREE_TYPE (index);
-  int error_found = 0;
-
-  EXPR_WFL_LINECOL (wfl_operator) = EXPR_WFL_LINECOL (node);
-
-  if (TREE_CODE (array_type) == POINTER_TYPE)
-    array_type = TREE_TYPE (array_type);
-
-  /* The array reference must be an array */
-  if (!TYPE_ARRAY_P (array_type))
-    {
-      parse_error_context
-	(wfl_operator,
-	 "%<[]%> can only be applied to arrays. It can't be applied to %qs",
-	 lang_printable_name (array_type, 0));
-      TREE_TYPE (node) = error_mark_node;
-      error_found = 1;
-    }
-
-  /* The array index undergoes unary numeric promotion. The promoted
-     type must be int */
-  index = do_unary_numeric_promotion (index);
-  if (TREE_TYPE (index) != int_type_node)
-    {
-      if (valid_cast_to_p (index_type, int_type_node))
-	parse_error_context (wfl_operator,
-   "Incompatible type for %<[]%>. Explicit cast needed to convert %qs to %<int%>",
-			     lang_printable_name (index_type, 0));
-      else
-	parse_error_context (wfl_operator,
-          "Incompatible type for %<[]%>. Can't convert %qs to %<int%>",
-			     lang_printable_name (index_type, 0));
-      TREE_TYPE (node) = error_mark_node;
-      error_found = 1;
-    }
-
-  if (error_found)
-    return error_mark_node;
-
-  array_type = TYPE_ARRAY_ELEMENT (array_type);
-
-  if (flag_emit_class_files)
-    {
-      TREE_OPERAND (node, 0) = array;
-      TREE_OPERAND (node, 1) = index;
-    }
-  else
-    node = build_java_arrayaccess (array, array_type, index);
-  TREE_TYPE (node) = array_type;
-  return node;
-}
-
-/* 15.9 Array Creation Expressions */
-
-static tree
-build_newarray_node (tree type, tree dims, int extra_dims)
-{
-  tree node = build3 (NEW_ARRAY_EXPR, NULL_TREE, type,
-		      nreverse (dims),
-		      build_int_cst (NULL_TREE, extra_dims));
-  return node;
-}
-
-static tree
-patch_newarray (tree node)
-{
-  tree type = TREE_OPERAND (node, 0);
-  tree dims = TREE_OPERAND (node, 1);
-  tree cdim, array_type;
-  int error_found = 0;
-  int ndims = 0;
-  int xdims = TREE_INT_CST_LOW (TREE_OPERAND (node, 2));
-
-  /* Dimension types are verified. It's better for the types to be
-     verified in order. */
-  for (cdim = dims, ndims = 0; cdim; cdim = TREE_CHAIN (cdim), ndims++ )
-    {
-      int dim_error = 0;
-      tree dim = TREE_VALUE (cdim);
-
-      /* Dim might have been saved during its evaluation */
-      dim = (TREE_CODE (dim) == SAVE_EXPR ? TREE_OPERAND (dim, 0) : dim);
-
-      /* The type of each specified dimension must be an integral type. */
-      if (!JINTEGRAL_TYPE_P (TREE_TYPE (dim)))
-	dim_error = 1;
-
-      /* Each expression undergoes an unary numeric promotion (5.6.1) and the
-	 promoted type must be int. */
-      else
-	{
-	  dim = do_unary_numeric_promotion (dim);
-	  if (TREE_TYPE (dim) != int_type_node)
-	    dim_error = 1;
-	}
-
-      /* Report errors on types here */
-      if (dim_error)
-	{
-	  parse_error_context
-	    (TREE_PURPOSE (cdim),
-	     "Incompatible type for dimension in array creation expression. %s convert %qs to %<int%>",
-	     (valid_cast_to_p (TREE_TYPE (dim), int_type_node) ?
-	      "Explicit cast needed to" : "Can't"),
-	     lang_printable_name (TREE_TYPE (dim), 0));
-	  error_found = 1;
-	}
-
-      TREE_PURPOSE (cdim) = NULL_TREE;
-    }
-
-  /* Resolve array base type if unresolved */
-  if (!(type = resolve_type_during_patch (type)))
-    error_found = 1;
-
-  if (error_found)
-    {
-      /* We don't want further evaluation of this bogus array creation
-         operation */
-      TREE_TYPE (node) = error_mark_node;
-      return error_mark_node;
-    }
-
-  /* Set array_type to the actual (promoted) array type of the result. */
-  if (TREE_CODE (type) == RECORD_TYPE)
-    type = build_pointer_type (type);
-  while (--xdims >= 0)
-    {
-      type = promote_type (build_java_array_type (type, -1));
-    }
-  dims = nreverse (dims);
-  array_type = type;
-  for (cdim = dims; cdim; cdim = TREE_CHAIN (cdim))
-    {
-      type = array_type;
-      array_type
-	= build_java_array_type (type,
-				 TREE_CODE (cdim) == INTEGER_CST
-				 ? (HOST_WIDE_INT) TREE_INT_CST_LOW (cdim)
-				 : -1);
-      array_type = promote_type (array_type);
-    }
-  dims = nreverse (dims);
-
-  /* The node is transformed into a function call. Things are done
-     differently according to the number of dimensions. If the number
-     of dimension is equal to 1, then the nature of the base type
-     (primitive or not) matters. */
-  if (ndims == 1)
-    return build_new_array (type, TREE_VALUE (dims));
-
-  /* Can't reuse what's already written in expr.c because it uses the
-     JVM stack representation. Provide a build_multianewarray. FIXME */
-  return build3 (CALL_EXPR, array_type,
-		 build_address_of (soft_multianewarray_node),
-		 tree_cons (NULL_TREE,
-			    build_class_ref (TREE_TYPE (array_type)),
-			    tree_cons (NULL_TREE,
-				       build_int_cst (NULL_TREE, ndims),
-				       dims)),
-		 NULL_TREE);
-}
-
-/* 10.6 Array initializer.  */
-
-/* Build a wfl for array element that don't have one, so we can
-   pin-point errors.  */
-
-static tree
-maybe_build_array_element_wfl (tree node)
-{
-  if (TREE_CODE (node) != EXPR_WITH_FILE_LOCATION)
-    {
-      /* FIXME - old code used "prev_lc.line" and "elc.prev_col */
-      return build_expr_wfl (NULL_TREE,
-#ifdef USE_MAPPED_LOCATION
-			     input_location
-#else
-			     ctxp->filename,
-			     ctxp->lexer->token_start.line,
-			     ctxp->lexer->token_start.col
-#endif
-			     );
-    }
-  else
-    return NULL_TREE;
-}
-
-/* Build a NEW_ARRAY_INIT that features a CONSTRUCTOR node. This makes
-   identification of initialized arrays easier to detect during walk
-   and expansion.  */
-
-static tree
-build_new_array_init (int location, tree values)
-{
-  tree constructor = build_constructor_from_list (NULL_TREE,
-						  nreverse (values));
-  tree to_return = build1 (NEW_ARRAY_INIT, NULL_TREE, constructor);
-  EXPR_WFL_LINECOL (to_return) = location;
-  return to_return;
-}
-
-/* Expand a NEW_ARRAY_INIT node. Return error_mark_node if an error
-   occurred.  Otherwise return NODE after having set its type
-   appropriately.  */
-
-static tree
-patch_new_array_init (tree type, tree node)
-{
-  int error_seen = 0;
-  tree element_type;
-  unsigned HOST_WIDE_INT length;
-  constructor_elt *current;
-  int all_constant = 1;
-  tree init = TREE_OPERAND (node, 0);
-
-  if (TREE_CODE (type) != POINTER_TYPE || ! TYPE_ARRAY_P (TREE_TYPE (type)))
-    {
-      parse_error_context (node,
-			   "Invalid array initializer for non-array type %qs",
-			   lang_printable_name (type, 1));
-      return error_mark_node;
-    }
-  type = TREE_TYPE (type);
-  element_type = TYPE_ARRAY_ELEMENT (type);
-
-  for (length = 0;
-       VEC_iterate (constructor_elt, CONSTRUCTOR_ELTS (init),
-		    length, current);
-       length++)
-    {
-      tree elt = current->value;
-      if (elt == NULL_TREE || TREE_CODE (elt) != NEW_ARRAY_INIT)
-	{
-	  error_seen |= array_constructor_check_entry (element_type, current);
-	  elt = current->value;
-	  /* When compiling to native code, STRING_CST is converted to
-	     INDIRECT_REF, but still with a TREE_CONSTANT flag. */
-	  if (! TREE_CONSTANT (elt) || TREE_CODE (elt) == INDIRECT_REF)
-	    all_constant = 0;
-	}
-      else
-	{
-	  current->value = patch_new_array_init (element_type, elt);
-	  current->index = NULL_TREE;
-	  all_constant = 0;
-	}
-      if (elt && TREE_CODE (elt) == TREE_LIST
-	  && TREE_VALUE (elt) == error_mark_node)
-	error_seen = 1;
-    }
-
-  if (error_seen)
-    return error_mark_node;
-
-  /* Create a new type. We can't reuse the one we have here by
-     patching its dimension because it originally is of dimension -1
-     hence reused by gcc. This would prevent triangular arrays. */
-  type = build_java_array_type (element_type, length);
-  TREE_TYPE (init) = TREE_TYPE (TREE_CHAIN (TREE_CHAIN (TYPE_FIELDS (type))));
-  TREE_TYPE (node) = promote_type (type);
-  TREE_CONSTANT (init) = all_constant;
-  TREE_INVARIANT (init) = all_constant;
-  TREE_CONSTANT (node) = all_constant;
-  TREE_INVARIANT (node) = all_constant;
-  return node;
-}
-
-/* Verify that one entry of the initializer element list can be
-   assigned to the array base type. Report 1 if an error occurred, 0
-   otherwise.  */
-
-static int
-array_constructor_check_entry (tree type, constructor_elt *entry)
-{
-  char *array_type_string = NULL;	/* For error reports */
-  tree value, type_value, new_value, wfl_value, patched;
-  int error_seen = 0;
-
-  new_value = NULL_TREE;
-  wfl_value = entry->value;
-
-  value = java_complete_tree (entry->value);
-  /* patch_string return error_mark_node if arg is error_mark_node */
-  if ((patched = patch_string (value)))
-    value = patched;
-  if (value == error_mark_node)
-    return 1;
-
-  type_value = TREE_TYPE (value);
-
-  /* At anytime, try_builtin_assignconv can report a warning on
-     constant overflow during narrowing. */
-  SET_WFL_OPERATOR (wfl_operator, entry->index, wfl_value);
-  new_value = try_builtin_assignconv (wfl_operator, type, value);
-  if (!new_value && (new_value = try_reference_assignconv (type, value)))
-    type_value = promote_type (type);
-
-  /* Check and report errors */
-  if (!new_value)
-    {
-      const char *const msg = (!valid_cast_to_p (type_value, type) ?
-		   "Can't" : "Explicit cast needed to");
-      if (!array_type_string)
-	array_type_string = xstrdup (lang_printable_name (type, 1));
-      parse_error_context
-	(wfl_operator, "Incompatible type for array. %s convert %qs to %qs",
-	 msg, lang_printable_name (type_value, 1), array_type_string);
-      error_seen = 1;
-    }
-
-  if (new_value)
-    entry->value = new_value;
-
-  if (array_type_string)
-    free (array_type_string);
-
-  entry->index = NULL_TREE;
-  return error_seen;
-}
-
-static tree
-build_this (int location)
-{
-  tree node = build_wfl_node (this_identifier_node);
-  TREE_SET_CODE (node, THIS_EXPR);
-  EXPR_WFL_LINECOL (node) = location;
-  return node;
-}
-
-/* 14.15 The return statement. It builds a modify expression that
-   assigns the returned value to the RESULT_DECL that hold the value
-   to be returned. */
-
-static tree
-build_return (int location, tree op)
-{
-  tree node = build1 (RETURN_EXPR, NULL_TREE, op);
-  EXPR_WFL_LINECOL (node) = location;
-  node = build_debugable_stmt (location, node);
-  return node;
-}
-
-static tree
-patch_return (tree node)
-{
-  tree return_exp = TREE_OPERAND (node, 0);
-  tree meth = current_function_decl;
-  tree mtype = TREE_TYPE (TREE_TYPE (current_function_decl));
-  int error_found = 0;
-
-  TREE_TYPE (node) = error_mark_node;
-  EXPR_WFL_LINECOL (wfl_operator) = EXPR_WFL_LINECOL (node);
-
-  /* It's invalid to have a return value within a function that is
-     declared with the keyword void or that is a constructor */
-  if (return_exp && (mtype == void_type_node || DECL_CONSTRUCTOR_P (meth)))
-    error_found = 1;
-
-  /* It's invalid to use a return statement in a static block */
-  if (DECL_CLINIT_P (current_function_decl))
-    error_found = 1;
-
-  /* It's invalid to have a no return value within a function that
-     isn't declared with the keyword `void' */
-  if (!return_exp && (mtype != void_type_node && !DECL_CONSTRUCTOR_P (meth)))
-    error_found = 2;
-
-  if (DECL_INSTINIT_P (current_function_decl))
-    error_found = 1;
-
-  if (error_found)
-    {
-      if (DECL_INSTINIT_P (current_function_decl))
-	parse_error_context (wfl_operator,
-			     "%<return%> inside instance initializer");
-
-      else if (DECL_CLINIT_P (current_function_decl))
-	parse_error_context (wfl_operator,
-			     "%<return%> inside static initializer");
-
-      else if (!DECL_CONSTRUCTOR_P (meth))
-	{
-	  char *t = xstrdup (lang_printable_name (mtype, 0));
-	  parse_error_context (wfl_operator,
-			       "%<return%> with%s value from %<%s %s%>",
-			       (error_found == 1 ? "" : "out"),
-			       t, lang_printable_name (meth, 2));
-	  free (t);
-	}
-      else
-	parse_error_context (wfl_operator,
-			     "%<return%> with value from constructor %qs",
-			     lang_printable_name (meth, 2));
-      return error_mark_node;
-    }
-
-  /* If we have a return_exp, build a modify expression and expand
-     it. Note: at that point, the assignment is declared valid, but we
-     may want to carry some more hacks */
-  if (return_exp)
-    {
-      tree exp = java_complete_tree (return_exp);
-      tree modify, patched;
-
-      if ((patched = patch_string (exp)))
-	exp = patched;
-
-      modify = build2 (MODIFY_EXPR, NULL_TREE, DECL_RESULT (meth), exp);
-      EXPR_WFL_LINECOL (modify) = EXPR_WFL_LINECOL (node);
-      modify = java_complete_tree (modify);
-
-      if (modify != error_mark_node)
-	{
-	  TREE_SIDE_EFFECTS (modify) = 1;
-	  TREE_OPERAND (node, 0) = modify;
-	}
-      else
-	return error_mark_node;
-    }
-  TREE_TYPE (node) = void_type_node;
-  TREE_SIDE_EFFECTS (node) = 1;
-  return node;
-}
-
-/* 14.8 The if Statement */
-
-static tree
-build_if_else_statement (int location, tree expression, tree if_body,
-			 tree else_body)
-{
-  tree node;
-  if (!else_body)
-    else_body = build_java_empty_stmt ();
-  node = build3 (COND_EXPR, NULL_TREE, expression, if_body, else_body);
-  EXPR_WFL_LINECOL (node) = location;
-  node = build_debugable_stmt (location, node);
-  return node;
-}
-
-static tree
-patch_if_else_statement (tree node)
-{
-  tree expression = TREE_OPERAND (node, 0);
-  int can_complete_normally
-    = (CAN_COMPLETE_NORMALLY (TREE_OPERAND (node, 1))
-       | CAN_COMPLETE_NORMALLY (TREE_OPERAND (node, 2)));
-
-  TREE_TYPE (node) = error_mark_node;
-  EXPR_WFL_LINECOL (wfl_operator) = EXPR_WFL_LINECOL (node);
-
-  /* The type of expression must be boolean */
-  if (TREE_TYPE (expression) != boolean_type_node
-      && TREE_TYPE (expression) != promoted_boolean_type_node)
-    {
-      parse_error_context
-	(wfl_operator,
-	 "Incompatible type for %<if%>. Can't convert %qs to %<boolean%>",
-	 lang_printable_name (TREE_TYPE (expression), 0));
-      return error_mark_node;
-    }
-
-  TREE_TYPE (node) = void_type_node;
-  TREE_SIDE_EFFECTS (node) = 1;
-  CAN_COMPLETE_NORMALLY (node) = can_complete_normally;
-  return node;
-}
-
-/* 14.6 Labeled Statements */
-
-/* Action taken when a labeled statement is parsed. a new
-   LABELED_BLOCK_EXPR is created. No statement is attached to the
-   label, yet.  LABEL can be NULL_TREE for artificially-generated blocks. */
-
-static tree
-build_labeled_block (int location, tree label)
-{
-  tree label_name ;
-  tree label_decl, node;
-  if (label == NULL_TREE || label == continue_identifier_node)
-    label_name = label;
-  else
-    {
-      label_name = merge_qualified_name (label_id, label);
-      /* Issue an error if we try to reuse a label that was previously
-	 declared */
-      if (IDENTIFIER_LOCAL_VALUE (label_name))
-	{
-	  EXPR_WFL_LINECOL (wfl_operator) = location;
-	  parse_error_context (wfl_operator,
-            "Declaration of %qs shadows a previous label declaration",
-			       IDENTIFIER_POINTER (label));
-	  EXPR_WFL_LINECOL (wfl_operator) =
-	    EXPR_WFL_LINECOL (IDENTIFIER_LOCAL_VALUE (label_name));
-	  parse_error_context (wfl_operator,
-            "This is the location of the previous declaration of label %qs",
-			       IDENTIFIER_POINTER (label));
-	  java_error_count--;
-	}
-    }
-
-  label_decl = create_label_decl (label_name);
-  node = build2 (LABELED_BLOCK_EXPR, NULL_TREE, label_decl, NULL_TREE);
-  EXPR_WFL_LINECOL (node) = location;
-  TREE_SIDE_EFFECTS (node) = 1;
-  return node;
-}
-
-/* A labeled statement LBE is attached a statement.  */
-
-static tree
-finish_labeled_statement (tree lbe, /* Labeled block expr */
-			  tree statement)
-{
-  /* In anyways, tie the loop to its statement */
-  LABELED_BLOCK_BODY (lbe) = statement;
-  pop_labeled_block ();
-  POP_LABELED_BLOCK ();
-  return lbe;
-}
-
-/* 14.10, 14.11, 14.12 Loop Statements */
-
-/* Create an empty LOOP_EXPR and make it the last in the nested loop
-   list. */
-
-static tree
-build_new_loop (tree loop_body)
-{
-  tree loop = build1 (LOOP_EXPR, NULL_TREE, loop_body);
-  TREE_SIDE_EFFECTS (loop) = 1;
-  PUSH_LOOP (loop);
-  return loop;
-}
-
-/* Create a loop body according to the following structure:
-     COMPOUND_EXPR
-       COMPOUND_EXPR		(loop main body)
-         EXIT_EXPR		(this order is for while/for loops.
-         LABELED_BLOCK_EXPR      the order is reversed for do loops)
-           LABEL_DECL           (a continue occurring here branches at the
-           BODY			 end of this labeled block)
-       INCREMENT		(if any)
-
-  REVERSED, if nonzero, tells that the loop condition expr comes
-  after the body, like in the do-while loop.
-
-  To obtain a loop, the loop body structure described above is
-  encapsulated within a LOOP_EXPR surrounded by a LABELED_BLOCK_EXPR:
-
-   LABELED_BLOCK_EXPR
-     LABEL_DECL                   (use this label to exit the loop)
-     LOOP_EXPR
-       <structure described above> */
-
-static tree
-build_loop_body (int location, tree condition, int reversed)
-{
-  tree first, second, body;
-
-  condition = build1 (EXIT_EXPR, NULL_TREE, condition); /* Force walk */
-  EXPR_WFL_LINECOL (condition) = location; /* For accurate error report */
-  condition = build_debugable_stmt (location, condition);
-  TREE_SIDE_EFFECTS (condition) = 1;
-
-  body = build_labeled_block (0, continue_identifier_node);
-  first = (reversed ? body : condition);
-  second = (reversed ? condition : body);
-  return build2 (COMPOUND_EXPR, NULL_TREE,
-		 build2 (COMPOUND_EXPR, NULL_TREE, first, second),
-		 build_java_empty_stmt ());
-}
-
-/* Install CONDITION (if any) and loop BODY (using REVERSED to tell
-   their order) on the current loop. Unlink the current loop from the
-   loop list.  */
-
-static tree
-finish_loop_body (int location, tree condition, tree body, int reversed)
-{
-  tree to_return = ctxp->current_loop;
-  tree loop_body = LOOP_EXPR_BODY (to_return);
-  if (condition)
-    {
-      tree cnode = LOOP_EXPR_BODY_CONDITION_EXPR (loop_body, reversed);
-      /* We wrapped the EXIT_EXPR around a WFL so we can debug it.
-         The real EXIT_EXPR is one operand further. */
-      EXPR_WFL_LINECOL (cnode) = location;
-      if (TREE_CODE (cnode) == EXPR_WITH_FILE_LOCATION)
-	{
-	  cnode = EXPR_WFL_NODE (cnode);
-	  /* This one is for accurate error reports */
-	  EXPR_WFL_LINECOL (cnode) = location;
-	}
-      TREE_OPERAND (cnode, 0) = condition;
-    }
-  LOOP_EXPR_BODY_BODY_EXPR (loop_body, reversed) = body;
-  POP_LOOP ();
-  return to_return;
-}
-
-/* Tailored version of finish_loop_body for FOR loops, when FOR
-   loops feature the condition part */
-
-static tree
-finish_for_loop (int location, tree condition, tree update, tree body)
-{
-  /* Put the condition and the loop body in place */
-  tree loop = finish_loop_body (location, condition, body, 0);
-  /* LOOP is the current loop which has been now popped of the loop
-     stack.  Mark the update block as reachable and install it.  We do
-     this because the (current interpretation of the) JLS requires
-     that the update expression be considered reachable even if the
-     for loop's body doesn't complete normally.  */
-  if (update != NULL_TREE && !IS_EMPTY_STMT (update))
-    {
-      tree up2 = update;
-      if (TREE_CODE (up2) == EXPR_WITH_FILE_LOCATION)
-	up2 = EXPR_WFL_NODE (up2);
-      /* It is possible for the update expression to be an
-	 EXPR_WFL_NODE wrapping nothing.  */
-      if (up2 != NULL_TREE && !IS_EMPTY_STMT (up2))
-	{
-	  /* Try to detect constraint violations.  These would be
-	     programming errors somewhere.  */
-	  if (! EXPR_P (up2) || TREE_CODE (up2) == LOOP_EXPR)
-	    abort ();
-	  SUPPRESS_UNREACHABLE_ERROR (up2) = 1;
-	}
-    }
-  LOOP_EXPR_BODY_UPDATE_BLOCK (LOOP_EXPR_BODY (loop)) = update;
-  return loop;
-}
-
-/* Try to find the loop a block might be related to. This comprises
-   the case where the LOOP_EXPR is found as the second operand of a
-   COMPOUND_EXPR, because the loop happens to have an initialization
-   part, then expressed as the first operand of the COMPOUND_EXPR. If
-   the search finds something, 1 is returned. Otherwise, 0 is
-   returned. The search is assumed to start from a
-   LABELED_BLOCK_EXPR's block.  */
-
-static tree
-search_loop (tree statement)
-{
-  if (TREE_CODE (statement) == LOOP_EXPR)
-    return statement;
-
-  if (TREE_CODE (statement) == BLOCK)
-    statement = BLOCK_SUBBLOCKS (statement);
-  else
-    return NULL_TREE;
-
-  if (statement && TREE_CODE (statement) == COMPOUND_EXPR)
-    while (statement && TREE_CODE (statement) == COMPOUND_EXPR)
-      statement = TREE_OPERAND (statement, 1);
-
-  return (TREE_CODE (statement) == LOOP_EXPR
-	  && FOR_LOOP_P (statement) ? statement : NULL_TREE);
-}
-
-/* Return 1 if LOOP can be found in the labeled block BLOCK. 0 is
-   returned otherwise.  */
-
-static int
-labeled_block_contains_loop_p (tree block, tree loop)
-{
-  if (!block)
-    return 0;
-
-  if (LABELED_BLOCK_BODY (block) == loop)
-    return 1;
-
-  if (FOR_LOOP_P (loop) && search_loop (LABELED_BLOCK_BODY (block)) == loop)
-    return 1;
-
-  return 0;
-}
-
-/* If the loop isn't surrounded by a labeled statement, create one and
-   insert LOOP as its body.  */
-
-static tree
-patch_loop_statement (tree loop)
-{
-  tree loop_label;
-
-  TREE_TYPE (loop) = void_type_node;
-  if (labeled_block_contains_loop_p (ctxp->current_labeled_block, loop))
-    return loop;
-
-  loop_label = build_labeled_block (0, NULL_TREE);
-  /* LOOP is an EXPR node, so it should have a valid EXPR_WFL_LINECOL
-     that LOOP_LABEL could enquire about, for a better accuracy. FIXME */
-  LABELED_BLOCK_BODY (loop_label) = loop;
-  PUSH_LABELED_BLOCK (loop_label);
-  return loop_label;
-}
-
-/* 14.13, 14.14: break and continue Statements */
-
-/* Build a break or a continue statement. a null NAME indicates an
-   unlabeled break/continue statement.  */
-
-static tree
-build_bc_statement (int location, int is_break, tree name)
-{
-  tree break_continue, label_block_expr = NULL_TREE;
-
-  if (name)
-    {
-      if (!(label_block_expr = IDENTIFIER_LOCAL_VALUE
-	    (merge_qualified_name (label_id, EXPR_WFL_NODE (name)))))
-	/* Null means that we don't have a target for this named
-	   break/continue. In this case, we make the target to be the
-	   label name, so that the error can be reported accurately in
-	   patch_bc_statement. */
-	label_block_expr = EXPR_WFL_NODE (name);
-    }
-  /* Unlabeled break/continue will be handled during the
-     break/continue patch operation */
-  break_continue = build1 (EXIT_BLOCK_EXPR, NULL_TREE, label_block_expr);
-
-  IS_BREAK_STMT_P (break_continue) = is_break;
-  TREE_SIDE_EFFECTS (break_continue) = 1;
-  EXPR_WFL_LINECOL (break_continue) = location;
-  break_continue = build_debugable_stmt (location, break_continue);
-  return break_continue;
-}
-
-/* Verification of a break/continue statement. */
-
-static tree
-patch_bc_statement (tree node)
-{
-  tree bc_label = EXIT_BLOCK_LABELED_BLOCK (node), target_stmt;
-  tree labeled_block = ctxp->current_labeled_block;
-  EXPR_WFL_LINECOL (wfl_operator) = EXPR_WFL_LINECOL (node);
-
-  /* Having an identifier here means that the target is unknown. */
-  if (bc_label != NULL_TREE && TREE_CODE (bc_label) == IDENTIFIER_NODE)
-    {
-      parse_error_context (wfl_operator, "No label definition found for %qs",
-			   IDENTIFIER_POINTER (bc_label));
-      return error_mark_node;
-    }
-  if (! IS_BREAK_STMT_P (node))
-    {
-      /* It's a continue statement. */
-      for (;; labeled_block = TREE_CHAIN (labeled_block))
-	{
-	  if (labeled_block == NULL_TREE)
-	    {
-	      if (bc_label == NULL_TREE)
-		parse_error_context (wfl_operator,
-				     "%<continue%> must be in loop");
-	      else
-		parse_error_context
-		  (wfl_operator, "continue label %qs does not name a loop",
-		   IDENTIFIER_POINTER (bc_label));
-	      return error_mark_node;
-	    }
-	  if ((DECL_NAME (LABELED_BLOCK_LABEL (labeled_block))
-	       == continue_identifier_node)
-	      && (bc_label == NULL_TREE
-		  || TREE_CHAIN (labeled_block) == bc_label))
-	    {
-	      bc_label = labeled_block;
-	      break;
-	    }
-	}
-    }
-  else if (!bc_label)
-    {
-      for (;; labeled_block = TREE_CHAIN (labeled_block))
-	{
-	  if (labeled_block == NULL_TREE)
-	    {
-	      parse_error_context (wfl_operator,
-				     "%<break%> must be in loop or switch");
-	      return error_mark_node;
-	    }
-	  target_stmt = LABELED_BLOCK_BODY (labeled_block);
-	  if (TREE_CODE (target_stmt) == SWITCH_EXPR
-	      || search_loop (target_stmt))
-	    {
-	      bc_label = labeled_block;
-	      break;
-	    }
-	}
-    }
-
-  EXIT_BLOCK_LABELED_BLOCK (node) = bc_label;
-  CAN_COMPLETE_NORMALLY (bc_label) = 1;
-
-  /* Our break/continue don't return values. */
-  TREE_TYPE (node) = void_type_node;
-  /* Encapsulate the break within a compound statement so that it's
-     expanded all the times by expand_expr (and not clobbered
-     sometimes, like after a if statement) */
-  node = add_stmt_to_compound (NULL_TREE, void_type_node, node);
-  TREE_SIDE_EFFECTS (node) = 1;
-  return node;
-}
-
-/* Process the exit expression belonging to a loop. Its type must be
-   boolean.  */
-
-static tree
-patch_exit_expr (tree node)
-{
-  tree expression = TREE_OPERAND (node, 0);
-  TREE_TYPE (node) = error_mark_node;
-  EXPR_WFL_LINECOL (wfl_operator) = EXPR_WFL_LINECOL (node);
-
-  /* The type of expression must be boolean */
-  if (TREE_TYPE (expression) != boolean_type_node)
-    {
-      parse_error_context
-	(wfl_operator,
-    "Incompatible type for loop conditional. Can't convert %qs to %<boolean%>",
-	 lang_printable_name (TREE_TYPE (expression), 0));
-      return error_mark_node;
-    }
-  /* Now we know things are allright, invert the condition, fold and
-     return */
-  TREE_OPERAND (node, 0) =
-    fold_build1 (TRUTH_NOT_EXPR, boolean_type_node, expression);
-
-  if (! integer_zerop (TREE_OPERAND (node, 0))
-      && ctxp->current_loop != NULL_TREE
-      && TREE_CODE (ctxp->current_loop) == LOOP_EXPR)
-    CAN_COMPLETE_NORMALLY (ctxp->current_loop) = 1;
-  if (! integer_onep (TREE_OPERAND (node, 0)))
-    CAN_COMPLETE_NORMALLY (node) = 1;
-
-
-  TREE_TYPE (node) = void_type_node;
-  return node;
-}
-
-/* 14.9 Switch statement */
-
-static tree
-patch_switch_statement (tree node)
-{
-  tree se = TREE_OPERAND (node, 0), se_type;
-  tree save, iter;
-
-  /* Complete the switch expression */
-  se = TREE_OPERAND (node, 0) = java_complete_tree (se);
-  se_type = TREE_TYPE (se);
-  /* The type of the switch expression must be char, byte, short or
-     int */
-  if (! JINTEGRAL_TYPE_P (se_type) || se_type == long_type_node)
-    {
-      EXPR_WFL_LINECOL (wfl_operator) = EXPR_WFL_LINECOL (node);
-      parse_error_context (wfl_operator,
-	  "Incompatible type for %<switch%>. Can't convert %qs to %<int%>",
-			   lang_printable_name (se_type, 0));
-      /* This is what java_complete_tree will check */
-      TREE_OPERAND (node, 0) = error_mark_node;
-      return error_mark_node;
-    }
-
-  /* Save and restore the outer case label list.  */
-  save = case_label_list;
-  case_label_list = NULL_TREE;
-
-  TREE_OPERAND (node, 1) = java_complete_tree (TREE_OPERAND (node, 1));
-
-  /* See if we've found a duplicate label.  We can't leave this until
-     code generation, because in `--syntax-only' and `-C' modes we
-     don't do ordinary code generation.  */
-  for (iter = case_label_list; iter != NULL_TREE; iter = TREE_CHAIN (iter))
-    {
-      HOST_WIDE_INT val = TREE_INT_CST_LOW (TREE_VALUE (iter));
-      tree subiter;
-      for (subiter = TREE_CHAIN (iter);
-	   subiter != NULL_TREE;
-	   subiter = TREE_CHAIN (subiter))
-	{
-	  HOST_WIDE_INT subval = TREE_INT_CST_LOW (TREE_VALUE (subiter));
-	  if (val == subval)
-	    {
-	      EXPR_WFL_LINECOL (wfl_operator)
-		= EXPR_WFL_LINECOL (TREE_PURPOSE (iter));
-	      /* The case_label_list is in reverse order, so print the
-		 outer label first.  */
-	      parse_error_context (wfl_operator, "duplicate case label: %<"
-				   HOST_WIDE_INT_PRINT_DEC "%>", subval);
-	      EXPR_WFL_LINECOL (wfl_operator)
-		= EXPR_WFL_LINECOL (TREE_PURPOSE (subiter));
-	      parse_error_context (wfl_operator, "original label is here");
-
-	      break;
-	    }
-	}
-    }
-
-  case_label_list = save;
-
-  /* Ready to return */
-  if (TREE_CODE (TREE_OPERAND (node, 1)) == ERROR_MARK)
-    {
-      TREE_TYPE (node) = error_mark_node;
-      return error_mark_node;
-    }
-  TREE_TYPE (node) = void_type_node;
-  TREE_SIDE_EFFECTS (node) = 1;
-  CAN_COMPLETE_NORMALLY (node)
-    = CAN_COMPLETE_NORMALLY (TREE_OPERAND (node, 1))
-      || ! SWITCH_HAS_DEFAULT (node);
-  return node;
-}
-
-/* Assertions.  */
-
-/* Build an assertion expression for `assert CONDITION : VALUE'; VALUE
-   might be NULL_TREE.  */
-static tree
-build_assertion (
-#ifdef USE_MAPPED_LOCATION
-		 source_location location,
-#else
-		 int location,
-#endif
-		 tree condition, tree value)
-{
-  tree node;
-  tree klass = GET_CPC ();
-
-  if (! enable_assertions (klass))
-    {
-      condition = build2 (TRUTH_ANDIF_EXPR, NULL_TREE,
-			  boolean_false_node, condition);
-      if (value == NULL_TREE)
-	value = build_java_empty_stmt ();
-      return build_if_else_statement (location, condition,
-				      value, NULL_TREE);
-    }
-
-  if (! CLASS_USES_ASSERTIONS (klass))
-    {
-      tree field, classdollar, id, call;
-      tree class_type = TREE_TYPE (klass);
-
-      field = add_field (class_type,
-			 get_identifier ("$assertionsDisabled"),
-			 boolean_type_node,
-			 ACC_PRIVATE | ACC_STATIC | ACC_FINAL);
-      MAYBE_CREATE_VAR_LANG_DECL_SPECIFIC (field);
-      FIELD_SYNTHETIC (field) = 1;
-
-      classdollar = build_incomplete_class_ref (location, class_type);
-
-      /* Call CLASS.desiredAssertionStatus().  */
-      id = build_wfl_node (get_identifier ("desiredAssertionStatus"));
-      call = build3 (CALL_EXPR, NULL_TREE, id, NULL_TREE, NULL_TREE);
-      call = make_qualified_primary (classdollar, call, location);
-      TREE_SIDE_EFFECTS (call) = 1;
-
-      /* Invert to obtain !CLASS.desiredAssertionStatus().  This may
-	 seem odd, but we do it to generate code identical to that of
-	 the JDK.  */
-      call = build1 (TRUTH_NOT_EXPR, NULL_TREE, call);
-      TREE_SIDE_EFFECTS (call) = 1;
-      DECL_INITIAL (field) = call;
-
-      /* Record the initializer in the initializer statement list.  */
-      call = build2 (MODIFY_EXPR, NULL_TREE, field, call);
-      TREE_CHAIN (call) = CPC_STATIC_INITIALIZER_STMT (ctxp);
-      SET_CPC_STATIC_INITIALIZER_STMT (ctxp, call);
-      MODIFY_EXPR_FROM_INITIALIZATION_P (call) = 1;
-
-      CLASS_USES_ASSERTIONS (klass) = 1;
-    }
-
-  if (value != NULL_TREE)
-    value = tree_cons (NULL_TREE, value, NULL_TREE);
-
-  node = build_wfl_node (get_identifier ("java"));
-  node = make_qualified_name (node, build_wfl_node (get_identifier ("lang")),
-			      location);
-  node = make_qualified_name (node, build_wfl_node (get_identifier ("AssertionError")),
-			      location);
-
-  node = build3 (NEW_CLASS_EXPR, NULL_TREE, node, value, NULL_TREE);
-  TREE_SIDE_EFFECTS (node) = 1;
-  /* It is too early to use BUILD_THROW.  */
-  node = build1 (THROW_EXPR, NULL_TREE, node);
-  TREE_SIDE_EFFECTS (node) = 1;
-
-  /* We invert the condition; if we just put NODE as the `else' part
-     then we generate weird-looking bytecode.  */
-  condition = build1 (TRUTH_NOT_EXPR, NULL_TREE, condition);
-  /* Check $assertionsDisabled.  */
-  condition
-    = build2 (TRUTH_ANDIF_EXPR, NULL_TREE,
-	      build1 (TRUTH_NOT_EXPR, NULL_TREE,
-		      build_wfl_node (get_identifier ("$assertionsDisabled"))),
-	      condition);
-  node = build_if_else_statement (location, condition, node, NULL_TREE);
-  return node;
-}
-
-/* 14.18 The try/catch statements */
-
-/* Encapsulate TRY_STMTS' in a try catch sequence. The catch clause
-   catches TYPE and executes CATCH_STMTS.  */
-
-static tree
-encapsulate_with_try_catch (int location, tree type_or_name, tree try_stmts,
-			    tree catch_stmts)
-{
-  tree try_block, catch_clause_param, catch_block, catch;
-
-  /* First build a try block */
-  try_block = build_expr_block (try_stmts, NULL_TREE);
-
-  /* Build a catch block: we need a catch clause parameter */
-  if (TREE_CODE (type_or_name) == EXPR_WITH_FILE_LOCATION)
-    {
-      tree catch_type = obtain_incomplete_type (type_or_name);
-      jdep *dep;
-      catch_clause_param = build_decl (VAR_DECL, wpv_id, catch_type);
-      register_incomplete_type (JDEP_VARIABLE, type_or_name,
-				catch_clause_param, catch_type);
-      dep = CLASSD_LAST (ctxp->classd_list);
-      JDEP_GET_PATCH (dep) = &TREE_TYPE (catch_clause_param);
-    }
-  else
-    catch_clause_param = build_decl (VAR_DECL, wpv_id,
-				     build_pointer_type (type_or_name));
-
-  /* And a block */
-  catch_block = build_expr_block (NULL_TREE, catch_clause_param);
-
-  /* Initialize the variable and store in the block */
-  catch = build2 (MODIFY_EXPR, NULL_TREE, catch_clause_param,
-		  build0 (JAVA_EXC_OBJ_EXPR, ptr_type_node));
-  add_stmt_to_block (catch_block, NULL_TREE, catch);
-
-  /* Add the catch statements */
-  add_stmt_to_block (catch_block, NULL_TREE, catch_stmts);
-
-  /* Now we can build a JAVA_CATCH_EXPR */
-  catch_block = build1 (JAVA_CATCH_EXPR, NULL_TREE, catch_block);
-
-  return build_try_statement (location, try_block, catch_block);
-}
-
-static tree
-build_try_statement (int location, tree try_block, tree catches)
-{
-  tree node = build2 (TRY_EXPR, NULL_TREE, try_block, catches);
-  EXPR_WFL_LINECOL (node) = location;
-  return node;
-}
-
-static tree
-build_try_finally_statement (int location, tree try_block, tree finally)
-{
-  tree node = build2 (TRY_FINALLY_EXPR, NULL_TREE, try_block, finally);
-  EXPR_WFL_LINECOL (node) = location;
-  return node;
-}
-
-static tree
-patch_try_statement (tree node)
-{
-  int error_found = 0;
-  tree try = TREE_OPERAND (node, 0);
-  /* Exception handlers are considered in left to right order */
-  tree catch = nreverse (TREE_OPERAND (node, 1));
-  tree current, caught_type_list = NULL_TREE;
-
-  /* Check catch clauses, if any. Every time we find an error, we try
-     to process the next catch clause. We process the catch clause before
-     the try block so that when processing the try block we can check thrown
-     exceptions against the caught type list. */
-  for (current = catch; current; current = TREE_CHAIN (current))
-    {
-      tree carg_decl, carg_type;
-      tree sub_current, catch_block, catch_clause;
-      int unreachable;
-
-      /* At this point, the structure of the catch clause is
-	   JAVA_CATCH_EXPR		(catch node)
-	     BLOCK	        (with the decl of the parameter)
-               COMPOUND_EXPR
-                 MODIFY_EXPR   (assignment of the catch parameter)
-		 BLOCK	        (catch clause block)
-       */
-      catch_clause = TREE_OPERAND (current, 0);
-      carg_decl = BLOCK_EXPR_DECLS (catch_clause);
-      carg_type = TREE_TYPE (TREE_TYPE (carg_decl));
-
-      /* Catch clauses can't have more than one parameter declared,
-	 but it's already enforced by the grammar. Make sure that the
-	 only parameter of the clause statement in of class Throwable
-	 or a subclass of Throwable, but that was done earlier. The
-	 catch clause parameter type has also been resolved. */
-
-      /* Just make sure that the catch clause parameter type inherits
-	 from java.lang.Throwable */
-      if (!inherits_from_p (carg_type, throwable_type_node))
-	{
-	  EXPR_WFL_LINECOL (wfl_operator) = EXPR_WFL_LINECOL (current);
-	  parse_error_context (wfl_operator,
-			       "Can't catch class %qs. Catch clause parameter type must be a subclass of class %<java.lang.Throwable%>",
-			       lang_printable_name (carg_type, 0));
-	  error_found = 1;
-	  continue;
-	}
-
-      /* Partial check for unreachable catch statement: The catch
-	 clause is reachable iff is no earlier catch block A in
-	 the try statement such that the type of the catch
-	 clause's parameter is the same as or a subclass of the
-	 type of A's parameter */
-      unreachable = 0;
-      for (sub_current = catch;
-	   sub_current != current; sub_current = TREE_CHAIN (sub_current))
-	{
-	  tree sub_catch_clause, decl;
-	  sub_catch_clause = TREE_OPERAND (sub_current, 0);
-	  decl = BLOCK_EXPR_DECLS (sub_catch_clause);
-
-	  if (inherits_from_p (carg_type, TREE_TYPE (TREE_TYPE (decl))))
-	    {
-	      EXPR_WFL_LINECOL (wfl_operator) = EXPR_WFL_LINECOL (current);
-	      parse_error_context
-		(wfl_operator,
-		 "%<catch%> not reached because of the catch clause at line %d",
-		 EXPR_WFL_LINENO (sub_current));
-	      unreachable = error_found = 1;
-	      break;
-	    }
-	}
-      /* Complete the catch clause block */
-      catch_block = java_complete_tree (TREE_OPERAND (current, 0));
-      if (catch_block == error_mark_node)
-	{
-	  error_found = 1;
-	  continue;
-	}
-      if (CAN_COMPLETE_NORMALLY (catch_block))
-	CAN_COMPLETE_NORMALLY (node) = 1;
-      TREE_OPERAND (current, 0) = catch_block;
-
-      if (unreachable)
-	continue;
-
-      /* Things to do here: the exception must be thrown */
-
-      /* Link this type to the caught type list */
-      caught_type_list = tree_cons (NULL_TREE, carg_type, caught_type_list);
-    }
-
-  PUSH_EXCEPTIONS (caught_type_list);
-  if ((try = java_complete_tree (try)) == error_mark_node)
-    error_found = 1;
-  if (CAN_COMPLETE_NORMALLY (try))
-    CAN_COMPLETE_NORMALLY (node) = 1;
-  POP_EXCEPTIONS ();
-
-  /* Verification ends here */
-  if (error_found)
-    return error_mark_node;
-
-  TREE_OPERAND (node, 0) = try;
-  TREE_OPERAND (node, 1) = catch;
-  TREE_TYPE (node) = void_type_node;
-  return node;
-}
-
-/* 14.17 The synchronized Statement */
-
-static tree
-patch_synchronized_statement (tree node, tree wfl_op1)
-{
-  tree expr = java_complete_tree (TREE_OPERAND (node, 0));
-  tree block = TREE_OPERAND (node, 1);
-
-  tree tmp, enter, exit, expr_decl, assignment;
-
-  if (expr == error_mark_node)
-    {
-      block = java_complete_tree (block);
-      return expr;
-    }
-
-  /* We might be trying to synchronize on a STRING_CST */
-  if ((tmp = patch_string (expr)))
-    expr = tmp;
-
-  /* The TYPE of expr must be a reference type */
-  if (!JREFERENCE_TYPE_P (TREE_TYPE (expr)))
-    {
-      SET_WFL_OPERATOR (wfl_operator, node, wfl_op1);
-      parse_error_context (wfl_operator, "Incompatible type for %<synchronized%>. Can't convert %qs to %<java.lang.Object%>",
-			   lang_printable_name (TREE_TYPE (expr), 0));
-      return error_mark_node;
-    }
-
-  /* Generate a try-finally for the synchronized statement, except
-     that the handler that catches all throw exception calls
-     _Jv_MonitorExit and then rethrow the exception.
-     The synchronized statement is then implemented as:
-     TRY
-       {
-         _Jv_MonitorEnter (expression)
-	 synchronized_block
-         _Jv_MonitorExit (expression)
-       }
-     CATCH_ALL
-       {
-         e = _Jv_exception_info ();
-	 _Jv_MonitorExit (expression)
-	 Throw (e);
-       } */
-
-  expr_decl = build_decl (VAR_DECL, generate_name (), TREE_TYPE (expr));
-  BUILD_MONITOR_ENTER (enter, expr_decl);
-  BUILD_MONITOR_EXIT (exit, expr_decl);
-  CAN_COMPLETE_NORMALLY (enter) = 1;
-  CAN_COMPLETE_NORMALLY (exit) = 1;
-  assignment = build2 (MODIFY_EXPR, NULL_TREE, expr_decl, expr);
-  TREE_SIDE_EFFECTS (assignment) = 1;
-  node = build2 (COMPOUND_EXPR, NULL_TREE,
-		 build2 (COMPOUND_EXPR, NULL_TREE, assignment, enter),
-		 build2 (TRY_FINALLY_EXPR, NULL_TREE, block, exit));
-  node = build_expr_block (node, expr_decl);
-
-  return java_complete_tree (node);
-}
-
-/* 14.16 The throw Statement */
-
-static tree
-patch_throw_statement (tree node, tree wfl_op1)
-{
-  tree expr = TREE_OPERAND (node, 0);
-  tree type = TREE_TYPE (expr);
-  int unchecked_ok = 0, tryblock_throws_ok = 0;
-
-  /* Thrown expression must be assignable to java.lang.Throwable */
-  if (!try_reference_assignconv (throwable_type_node, expr))
-    {
-      SET_WFL_OPERATOR (wfl_operator, node, wfl_op1);
-      parse_error_context (wfl_operator,
-    "Can't throw %qs; it must be a subclass of class %<java.lang.Throwable%>",
-			   lang_printable_name (type, 0));
-      /* If the thrown expression was a reference, we further the
-         compile-time check. */
-      if (!JREFERENCE_TYPE_P (type))
-	return error_mark_node;
-    }
-
-  /* At least one of the following must be true */
-
-  /* The type of the throw expression is a not checked exception,
-     i.e. is a unchecked expression. */
-  unchecked_ok = IS_UNCHECKED_EXCEPTION_P (TREE_TYPE (type));
-
-  SET_WFL_OPERATOR (wfl_operator, node, wfl_op1);
-  /* An instance can't throw a checked exception unless that exception
-     is explicitly declared in the `throws' clause of each
-     constructor. This doesn't apply to anonymous classes, since they
-     don't have declared constructors. */
-  if (!unchecked_ok
-      && DECL_INSTINIT_P (current_function_decl)
-      && !ANONYMOUS_CLASS_P (current_class))
-    {
-      tree current;
-      for (current = TYPE_METHODS (current_class); current;
-	   current = TREE_CHAIN (current))
-	if (DECL_CONSTRUCTOR_P (current)
-	    && !check_thrown_exceptions_do (TREE_TYPE (expr)))
-	  {
-	    parse_error_context (wfl_operator, "Checked exception %qs can't be thrown in instance initializer (not all declared constructor are declaring it in their %<throws%> clause)",
-				 lang_printable_name (TREE_TYPE (expr), 0));
-	    return error_mark_node;
-	  }
-    }
-
-  /* Throw is contained in a try statement and at least one catch
-     clause can receive the thrown expression or the current method is
-     declared to throw such an exception. Or, the throw statement is
-     contained in a method or constructor declaration and the type of
-     the Expression is assignable to at least one type listed in the
-     throws clause the declaration. */
-  if (!unchecked_ok)
-    tryblock_throws_ok = check_thrown_exceptions_do (TREE_TYPE (expr));
-  if (!(unchecked_ok || tryblock_throws_ok))
-    {
-      /* If there is a surrounding try block that has no matching
-	 clatch clause, report it first. A surrounding try block exits
-	 only if there is something after the list of checked
-	 exception thrown by the current function (if any). */
-      if (IN_TRY_BLOCK_P ())
-	parse_error_context (wfl_operator, "Checked exception %qs can't be caught by any of the catch clause(s) of the surrounding %<try%> block",
-			     lang_printable_name (type, 0));
-      /* If we have no surrounding try statement and the method doesn't have
-	 any throws, report it now. FIXME */
-
-      /* We report that the exception can't be throw from a try block
-         in all circumstances but when the `throw' is inside a static
-         block. */
-      else if (!EXCEPTIONS_P (currently_caught_type_list)
-	       && !tryblock_throws_ok)
-	{
-	  if (DECL_CLINIT_P (current_function_decl))
-	    parse_error_context (wfl_operator,
-                   "Checked exception %qs can't be thrown in initializer",
-				 lang_printable_name (type, 0));
-	  else
-	    parse_error_context (wfl_operator,
-                   "Checked exception %qs isn't thrown from a %<try%> block",
-				 lang_printable_name (type, 0));
-	}
-      /* Otherwise, the current method doesn't have the appropriate
-         throws declaration */
-      else
-	parse_error_context (wfl_operator, "Checked exception %qs doesn't match any of current method's %<throws%> declaration(s)",
-			     lang_printable_name (type, 0));
-      return error_mark_node;
-    }
-
-  if (! flag_emit_class_files)
-    BUILD_THROW (node, expr);
-
-  return node;
-}
-
-/* Add EXCEPTION to the throws clause of MDECL.  If MDECL already throws
-   a super-class of EXCEPTION, keep the superclass instead.  If MDECL already
-   throws a sub-class of EXCEPTION, replace the sub-class with EXCEPTION.  */
-static void
-add_exception_to_throws (tree mdecl, tree exception)
-{
-  tree mthrows;
-  
-  /* Ignore unchecked exceptions. */
-  if (IS_UNCHECKED_EXCEPTION_P (exception))
-    return;
-
-  for (mthrows = DECL_FUNCTION_THROWS (mdecl);
-       mthrows; mthrows = TREE_CHAIN (mthrows))
-    {
-      if (inherits_from_p (exception, TREE_VALUE (mthrows)))
-        return;
-      if (inherits_from_p (TREE_VALUE (mthrows), exception))
-        {
-	  TREE_VALUE (mthrows) = exception;
-	  return;
-	}
-    }
-  
-  mthrows = DECL_FUNCTION_THROWS (mdecl);
-  DECL_FUNCTION_THROWS (mdecl) = build_tree_list (mthrows, exception);
-}
-
-/* Check that exception said to be thrown by method DECL can be
-   effectively caught from where DECL is invoked.  THIS_EXPR is the
-   expression that computes `this' for the method call.  */
-static void
-check_thrown_exceptions (
-#ifdef USE_MAPPED_LOCATION
-			 source_location location,
-#else
-
-			 int location,
-#endif
-			 tree decl, tree this_expr)
-{
-  tree throws;
-  int is_array_call = 0;
-
-  /* Skip check within generated methods, such as access$<n>.  */
-  if (NESTED_FIELD_ACCESS_IDENTIFIER_P (DECL_NAME (current_function_decl)))
-    return;
-
-  if (this_expr != NULL_TREE
-      && TREE_CODE (TREE_TYPE (this_expr)) == POINTER_TYPE
-      && TYPE_ARRAY_P (TREE_TYPE (TREE_TYPE (this_expr))))
-    is_array_call = 1;
-
-  /* For all the unchecked exceptions thrown by DECL.  */
-  for (throws = DECL_FUNCTION_THROWS (decl); throws;
-       throws = TREE_CHAIN (throws))
-    if (!check_thrown_exceptions_do (TREE_VALUE (throws)))
-      {
-	/* Suppress errors about cloning arrays.  */
-	if (is_array_call && DECL_NAME (decl) == get_identifier ("clone"))
-	  continue;
-
-#ifdef USE_MAPPED_LOCATION
-	SET_EXPR_LOCATION (wfl_operator, location);
-#else
-	EXPR_WFL_LINECOL (wfl_operator) = location;
-#endif
-	if (ANONYMOUS_CLASS_P (DECL_CONTEXT (current_function_decl))
-	    && (DECL_FINIT_P (current_function_decl)
-	        || DECL_INIT_P (current_function_decl)
-		|| DECL_CONSTRUCTOR_P (current_function_decl)))
-	  {
-	    /* Add "throws" to the initializer's exception list */
-	    tree exception = TREE_VALUE (throws);
-	    add_exception_to_throws (current_function_decl, exception);	  
-	  }
-	else if (DECL_FINIT_P (current_function_decl))
-	  {
-	    parse_error_context
-              (wfl_operator, "Exception %qs can't be thrown in initializer",
-	       lang_printable_name (TREE_VALUE (throws), 0));
-	  }
-	else
-	  {
-	    parse_error_context
-	      (wfl_operator, "Exception %qs must be caught, or it must be declared in the %<throws%> clause of %qs",
-	       lang_printable_name (TREE_VALUE (throws), 0),
-	       (DECL_INIT_P (current_function_decl) ?
-		IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (current_class))) :
-		IDENTIFIER_POINTER (DECL_NAME (current_function_decl))));
-	  }
-      }
-}
-
-/* Return 1 if checked EXCEPTION is caught at the current nesting level of
-   try-catch blocks, OR is listed in the `throws' clause of the
-   current method.  */
-
-static int
-check_thrown_exceptions_do (tree exception)
-{
-  tree list = currently_caught_type_list;
-  resolve_and_layout (exception, NULL_TREE);
-  /* First, all the nested try-catch-finally at that stage. The
-     last element contains `throws' clause exceptions, if any. */
-  if (IS_UNCHECKED_EXCEPTION_P (exception))
-    return 1;
-  while (list)
-    {
-      tree caught;
-      for (caught = TREE_VALUE (list); caught; caught = TREE_CHAIN (caught))
-	if (valid_ref_assignconv_cast_p (exception, TREE_VALUE (caught), 0))
-	  return 1;
-      list = TREE_CHAIN (list);
-    }
-  return 0;
-}
-
-/* This function goes over all of CLASS_TYPE ctors and checks whether
-   each of them features at least one unchecked exception in its
-   `throws' clause. If it's the case, it returns `true', `false'
-   otherwise.  */
-
-static bool
-ctors_unchecked_throws_clause_p (tree class_type)
-{
-  tree current;
-
-  for (current = TYPE_METHODS (class_type); current;
-       current = TREE_CHAIN (current))
-    {
-      bool ctu = false;	/* Ctor Throws Unchecked */
-      if (DECL_CONSTRUCTOR_P (current))
-	{
-	  tree throws;
-	  for (throws = DECL_FUNCTION_THROWS (current); throws && !ctu;
-	       throws = TREE_CHAIN (throws))
-	    if (inherits_from_p (TREE_VALUE (throws), exception_type_node))
-	      ctu = true;
-	}
-      /* We return false as we found one ctor that is unfit. */
-      if (!ctu && DECL_CONSTRUCTOR_P (current))
-	return false;
-    }
-  /* All ctors feature at least one unchecked exception in their
-     `throws' clause. */
-  return true;
-}
-
-/* 15.24 Conditional Operator ?: */
-
-static tree
-patch_conditional_expr (tree node, tree wfl_cond, tree wfl_op1)
-{
-  tree cond = TREE_OPERAND (node, 0);
-  tree op1 = TREE_OPERAND (node, 1);
-  tree op2 = TREE_OPERAND (node, 2);
-  tree resulting_type = NULL_TREE;
-  tree t1, t2, patched;
-  int error_found = 0;
-
-  /* The condition and operands of ?: might be StringBuffers crafted
-     as a result of a string concatenation.  Obtain decent ones here.  */
-  if ((patched = patch_string (cond)))
-    TREE_OPERAND (node, 0) = cond = patched;
-  if ((patched = patch_string (op1)))
-    TREE_OPERAND (node, 1) = op1 = patched;
-  if ((patched = patch_string (op2)))
-    TREE_OPERAND (node, 2) = op2 = patched;
-
-  t1 = TREE_TYPE (op1);
-  t2 = TREE_TYPE (op2);
-
-  /* The first expression must be a boolean */
-  if (TREE_TYPE (cond) != boolean_type_node)
-    {
-      SET_WFL_OPERATOR (wfl_operator, node, wfl_cond);
-      parse_error_context (wfl_operator,
-               "Incompatible type for %<?:%>. Can't convert %qs to %<boolean%>",
-			   lang_printable_name (TREE_TYPE (cond), 0));
-      error_found = 1;
-    }
-
-  /* Second and third can be numeric, boolean (i.e. primitive),
-     references or null. Anything else results in an error */
-  if (!((JNUMERIC_TYPE_P (t1) && JNUMERIC_TYPE_P (t2))
-	|| ((JREFERENCE_TYPE_P (t1) || op1 == null_pointer_node)
-	    && (JREFERENCE_TYPE_P (t2) || op2 == null_pointer_node))
-	|| (t1 == boolean_type_node && t2 == boolean_type_node)))
-    error_found = 1;
-
-  /* Determine the type of the conditional expression. Same types are
-     easy to deal with */
-  else if (t1 == t2)
-    resulting_type = t1;
-
-  /* There are different rules for numeric types */
-  else if (JNUMERIC_TYPE_P (t1))
-    {
-      /* if byte/short found, the resulting type is short */
-      if ((t1 == byte_type_node && t2 == short_type_node)
-	  || (t1 == short_type_node && t2 == byte_type_node))
-	resulting_type = short_type_node;
-
-      /* If t1 is a constant int and t2 is of type byte, short or char
-	 and t1's value fits in t2, then the resulting type is t2 */
-      else if ((t1 == int_type_node && TREE_CONSTANT (TREE_OPERAND (node, 1)))
-	  && JBSC_TYPE_P (t2) && int_fits_type_p (TREE_OPERAND (node, 1), t2))
-	resulting_type = t2;
-
-      /* If t2 is a constant int and t1 is of type byte, short or char
-	 and t2's value fits in t1, then the resulting type is t1 */
-      else if ((t2 == int_type_node && TREE_CONSTANT (TREE_OPERAND (node, 2)))
-	  && JBSC_TYPE_P (t1) && int_fits_type_p (TREE_OPERAND (node, 2), t1))
-	resulting_type = t1;
-
-      /* Otherwise, binary numeric promotion is applied and the
-	 resulting type is the promoted type of operand 1 and 2 */
-      else
-	resulting_type = binary_numeric_promotion (t1, t2,
-						   &TREE_OPERAND (node, 1),
-						   &TREE_OPERAND (node, 2));
-    }
-
-  /* Cases of a reference and a null type */
-  else if (JREFERENCE_TYPE_P (t1) && op2 == null_pointer_node)
-    resulting_type = t1;
-
-  else if (JREFERENCE_TYPE_P (t2) && op1 == null_pointer_node)
-    resulting_type = t2;
-
-  /* Last case: different reference types. If a type can be converted
-     into the other one by assignment conversion, the latter
-     determines the type of the expression */
-  else if ((resulting_type = try_reference_assignconv (t1, op2)))
-    resulting_type = promote_type (t1);
-
-  else if ((resulting_type = try_reference_assignconv (t2, op1)))
-    resulting_type = promote_type (t2);
-
-  /* If we don't have any resulting type, we're in trouble */
-  if (!resulting_type)
-    {
-      char *t = xstrdup (lang_printable_name (t1, 0));
-      SET_WFL_OPERATOR (wfl_operator, node, wfl_op1);
-      parse_error_context (wfl_operator,
-		 "Incompatible type for %<?:%>. Can't convert %qs to %qs",
-			   t, lang_printable_name (t2, 0));
-      free (t);
-      error_found = 1;
-    }
-
-  if (error_found)
-    {
-      TREE_TYPE (node) = error_mark_node;
-      return error_mark_node;
-    }
-
-  TREE_TYPE (node) = resulting_type;
-  TREE_SET_CODE (node, COND_EXPR);
-  CAN_COMPLETE_NORMALLY (node) = 1;
-  return node;
-}
-
-/* Wrap EXPR with code to initialize DECL's class, if appropriate. */
-
-static tree
-maybe_build_class_init_for_field (tree decl, tree expr)
-{
-  tree clas = DECL_CONTEXT (decl);
-  if (flag_emit_class_files)
-    return expr;
-
-  if (TREE_CODE (decl) == VAR_DECL && FIELD_STATIC (decl)
-      && FIELD_FINAL (decl))
-    {
-      tree init = DECL_INITIAL (decl);
-      if (init != NULL_TREE)
-	init = fold_constant_for_init (init, decl);
-      if (init != NULL_TREE && CONSTANT_VALUE_P (init))
-	return expr;
-    }
-
-  return build_class_init (clas, expr);
-}
-
-/* Try to constant fold NODE.
-   If NODE is not a constant expression, return NULL_EXPR.
-   CONTEXT is a static final VAR_DECL whose initializer we are folding. */
-
-static tree
-fold_constant_for_init (tree node, tree context)
-{
-  tree op0, op1, val;
-  enum tree_code code = TREE_CODE (node);
-
-  switch (code)
-    {
-    case INTEGER_CST:
-      if (node == null_pointer_node)
-	return NULL_TREE;
-    case STRING_CST:
-    case REAL_CST:
-      return node;
-
-    case PLUS_EXPR:
-    case MINUS_EXPR:
-    case MULT_EXPR:
-    case TRUNC_MOD_EXPR:
-    case RDIV_EXPR:
-    case LSHIFT_EXPR:
-    case RSHIFT_EXPR:
-    case URSHIFT_EXPR:
-    case BIT_AND_EXPR:
-    case BIT_XOR_EXPR:
-    case BIT_IOR_EXPR:
-    case TRUTH_ANDIF_EXPR:
-    case TRUTH_ORIF_EXPR:
-    case EQ_EXPR:
-    case NE_EXPR:
-    case GT_EXPR:
-    case GE_EXPR:
-    case LT_EXPR:
-    case LE_EXPR:
-      op0 = TREE_OPERAND (node, 0);
-      op1 = TREE_OPERAND (node, 1);
-      val = fold_constant_for_init (op0, context);
-      if (val == NULL_TREE || ! TREE_CONSTANT (val))
-	return NULL_TREE;
-      TREE_OPERAND (node, 0) = val;
-      val = fold_constant_for_init (op1, context);
-      if (val == NULL_TREE || ! TREE_CONSTANT (val))
-	return NULL_TREE;
-      TREE_OPERAND (node, 1) = val;
-      return patch_binop (node, op0, op1, 1);
-
-    case UNARY_PLUS_EXPR:
-    case NEGATE_EXPR:
-    case TRUTH_NOT_EXPR:
-    case BIT_NOT_EXPR:
-    case CONVERT_EXPR:
-    case NOP_EXPR:
-      op0 = TREE_OPERAND (node, 0);
-      val = fold_constant_for_init (op0, context);
-      if (val == NULL_TREE || ! TREE_CONSTANT (val))
-	return NULL_TREE;
-      TREE_OPERAND (node, 0) = val;
-      val = patch_unaryop (node, op0);
-      if (! TREE_CONSTANT (val))
-	return NULL_TREE;
-      return val;
-
-      break;
-
-    case COND_EXPR:
-      val = fold_constant_for_init (TREE_OPERAND (node, 0), context);
-      if (val == NULL_TREE || ! TREE_CONSTANT (val))
-	return NULL_TREE;
-      TREE_OPERAND (node, 0) = val;
-      val = fold_constant_for_init (TREE_OPERAND (node, 1), context);
-      if (val == NULL_TREE || ! TREE_CONSTANT (val))
-	return NULL_TREE;
-      TREE_OPERAND (node, 1) = val;
-      val = fold_constant_for_init (TREE_OPERAND (node, 2), context);
-      if (val == NULL_TREE || ! TREE_CONSTANT (val))
-	return NULL_TREE;
-      TREE_OPERAND (node, 2) = val;
-      return integer_zerop (TREE_OPERAND (node, 0)) ? TREE_OPERAND (node, 2)
-	: TREE_OPERAND (node, 1);
-
-    case VAR_DECL:
-    case FIELD_DECL:
-      if (! FIELD_FINAL (node)
-	  || DECL_INITIAL (node) == NULL_TREE)
-	return NULL_TREE;
-      val = DECL_INITIAL (node);
-      /* Guard against infinite recursion. */
-      DECL_INITIAL (node) = NULL_TREE;
-      val = fold_constant_for_init (val, node);
-      if (val != NULL_TREE && TREE_CODE (val) != STRING_CST)
-	val = try_builtin_assignconv (NULL_TREE, TREE_TYPE (node), val);
-      DECL_INITIAL (node) = val;
-      return val;
-
-    case EXPR_WITH_FILE_LOCATION:
-      /* Compare java_complete_tree and resolve_expression_name. */
-      if (!EXPR_WFL_NODE (node) /* Or a PRIMARY flag ? */
-	  || TREE_CODE (EXPR_WFL_NODE (node)) == IDENTIFIER_NODE)
-	{
-	  tree name = EXPR_WFL_NODE (node);
-	  tree decl;
-	  if (PRIMARY_P (node))
-	    return NULL_TREE;
-	  else if (! QUALIFIED_P (name))
-	    {
-	      decl = lookup_field_wrapper (DECL_CONTEXT (context), name);
-	      if (decl == NULL_TREE
-		  || (! FIELD_STATIC (decl) && ! FIELD_FINAL (decl)))
-		return NULL_TREE;
-	      return fold_constant_for_init (decl, decl);
-	    }
-	  else
-	    {
-	      tree r = NULL_TREE;
-	      /* Install the proper context for the field resolution.  */
-	      tree saved_current_class = current_class;
-	      /* Wait until the USE_COMPONENT_REF re-write.  FIXME. */
-	      current_class = DECL_CONTEXT (context);
-	      qualify_ambiguous_name (node);
-	      r = resolve_field_access (node, &decl, NULL);
-	      /* Restore prior context.  */
-	      current_class = saved_current_class;
-	      if (r != error_mark_node && decl != NULL_TREE)
-		return fold_constant_for_init (decl, decl);
-	      return NULL_TREE;
-	    }
-	}
-      else
-	{
-	  op0 = TREE_OPERAND (node, 0);
-	  val = fold_constant_for_init (op0, context);
-	  if (val == NULL_TREE || ! TREE_CONSTANT (val))
-	    return NULL_TREE;
-	  TREE_OPERAND (node, 0) = val;
-	  return val;
-	}
-
-#ifdef USE_COMPONENT_REF
-    case IDENTIFIER:
-    case COMPONENT_REF:
-      ?;
-#endif
-
-    default:
-      return NULL_TREE;
-    }
-}
-
-#ifdef USE_COMPONENT_REF
-/* Context is 'T' for TypeName, 'P' for PackageName,
-   'M' for MethodName, 'E' for ExpressionName, and 'A' for AmbiguousName. */
-
-tree
-resolve_simple_name (tree name, int context)
-{
-}
-
-tree
-resolve_qualified_name (tree name, int context)
-{
-}
-#endif
-
-void
-init_src_parse (void)
-{
-  /* Sanity check; we've been bit by this before.  */
-  if (ARRAY_SIZE (ctxp->modifier_ctx) != MODIFIER_TK - PUBLIC_TK)
-    abort ();
-}
-
-
-
-/* This section deals with the functions that are called when tables
-   recording class initialization information are traversed.  */
-
-/* This function is called for each class that is known definitely
-   initialized when a given static method was called. This function
-   augments a compound expression (INFO) storing all assignment to
-   initialized static class flags if a flag already existed, otherwise
-   a new one is created.  */
-
-static int
-emit_test_initialization (void **entry_p, void *info)
-{
-  tree l = (tree) info;
-  tree decl, init;
-  tree key = (tree) *entry_p;
-  tree *ite;
-  htab_t cf_ht = DECL_FUNCTION_INIT_TEST_TABLE (current_function_decl);
-
-  /* If we haven't found a flag and we're dealing with self registered
-     with current_function_decl, then don't do anything. Self is
-     always added as definitely initialized but this information is
-     valid only if used outside the current function. */
-  if (current_function_decl == TREE_PURPOSE (l)
-      && java_treetreehash_find (cf_ht, key) == NULL)
-    return true;
-
-  ite = java_treetreehash_new (cf_ht, key);
-
-  /* If we don't have a variable, create one and install it. */
-  if (*ite == NULL)
-    {
-      tree block;
-
-      decl = build_decl (VAR_DECL, NULL_TREE, boolean_type_node);
-      MAYBE_CREATE_VAR_LANG_DECL_SPECIFIC (decl);
-      LOCAL_CLASS_INITIALIZATION_FLAG (decl) = 1;
-      DECL_CONTEXT (decl) = current_function_decl;
-      DECL_INITIAL (decl) = boolean_true_node;
-      /* Don't emit any symbolic debugging info for this decl.  */
-      DECL_IGNORED_P (decl) = 1;
-
-      /* The trick is to find the right context for it. */
-      block = BLOCK_SUBBLOCKS (GET_CURRENT_BLOCK (current_function_decl));
-      TREE_CHAIN (decl) = BLOCK_EXPR_DECLS (block);
-      BLOCK_EXPR_DECLS (block) = decl;
-      *ite = decl;
-    }
-  else
-    decl = *ite;
-
-  /* Now simply augment the compound that holds all the assignments
-     pertaining to this method invocation. */
-  init = build2 (MODIFY_EXPR, boolean_type_node, decl, boolean_true_node);
-  TREE_SIDE_EFFECTS (init) = 1;
-  TREE_VALUE (l) = add_stmt_to_compound (TREE_VALUE (l), void_type_node, init);
-  TREE_SIDE_EFFECTS (TREE_VALUE (l)) = 1;
-
-  return true;
-}
-
-#ifdef __XGETTEXT__
-/* Depending on the version of Bison used to compile this grammar,
-   it may issue generic diagnostics spelled "syntax error" or
-   "parse error".  To prevent this from changing the translation
-   template randomly, we list all the variants of this particular
-   diagnostic here.  Translators: there is no fine distinction
-   between diagnostics with "syntax error" in them, and diagnostics
-   with "parse error" in them.  It's okay to give them both the same
-   translation.  */
-const char d1[] = N_("syntax error");
-const char d2[] = N_("parse error");
-const char d3[] = N_("syntax error; also virtual memory exhausted");
-const char d4[] = N_("parse error; also virtual memory exhausted");
-const char d5[] = N_("syntax error: cannot back up");
-const char d6[] = N_("parse error: cannot back up");
-#endif
-
-#include "gt-java-parse.h"
-#include "gtype-java.h"
diff --git a/gcc/java/typeck.c b/gcc/java/typeck.c
index c0d6e4a..26c0031 100644
--- a/gcc/java/typeck.c
+++ b/gcc/java/typeck.c
@@ -356,7 +356,7 @@ tree
 build_java_array_type (tree element_type, HOST_WIDE_INT length)
 {
   tree sig, t, fld, atype, arfld;
-  char buf[23]; /* 20 for the digits of a 64 bit number + "[]" + \0 */
+  char buf[23];
   tree elsig = build_java_signature (element_type);
   tree el_name = element_type;
   buf[0] = '[';