diff options
Diffstat (limited to 'gcc/java/parse.y')
| -rw-r--r-- | gcc/java/parse.y | 880 |
1 files changed, 282 insertions, 598 deletions
diff --git a/gcc/java/parse.y b/gcc/java/parse.y index aa5bc2c..dcdcc41 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -2630,8 +2630,7 @@ constant_expression: `dims:' rule is being used. */ static int -pop_current_osb (ctxp) - struct parser_ctxt *ctxp; +pop_current_osb (struct parser_ctxt *ctxp) { int to_return; @@ -2655,8 +2654,7 @@ pop_current_osb (ctxp) created context becomes the current one. */ static void -create_new_parser_context (copy_from_previous) - int copy_from_previous; +create_new_parser_context (int copy_from_previous) { struct parser_ctxt *new; @@ -2676,14 +2674,13 @@ create_new_parser_context (copy_from_previous) /* Create a new parser context and make it the current one. */ void -java_push_parser_context () +java_push_parser_context (void) { create_new_parser_context (0); } void -java_pop_parser_context (generate) - int generate; +java_pop_parser_context (int generate) { tree current; struct parser_ctxt *toFree, *next; @@ -2727,7 +2724,7 @@ java_pop_parser_context (generate) variables. */ void -java_parser_context_save_global () +java_parser_context_save_global (void) { if (!ctxp) { @@ -2751,7 +2748,7 @@ java_parser_context_save_global () previous context the current one. */ void -java_parser_context_restore_global () +java_parser_context_restore_global (void) { lineno = ctxp->lineno; current_class = ctxp->class_type; @@ -2773,7 +2770,7 @@ java_parser_context_restore_global () classes be parsed. */ static void -java_parser_context_suspend () +java_parser_context_suspend (void) { /* This makes debugging through java_debug_context easier */ static const char *const name = "<inner buffer context>"; @@ -2799,7 +2796,7 @@ java_parser_context_suspend () can resume as if no context was ever saved. */ static void -java_parser_context_resume () +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 */ @@ -2826,7 +2823,7 @@ java_parser_context_resume () linked. */ static void -java_parser_context_push_initialized_field () +java_parser_context_push_initialized_field (void) { tree node; @@ -2848,7 +2845,7 @@ java_parser_context_push_initialized_field () or <clinit> functions. */ static void -java_parser_context_pop_initialized_field () +java_parser_context_pop_initialized_field (void) { tree stmts; tree class_type = TREE_TYPE (GET_CPC ()); @@ -2883,8 +2880,7 @@ java_parser_context_pop_initialized_field () } static tree -reorder_static_initialized (list) - tree list; +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 @@ -2920,8 +2916,7 @@ reorder_static_initialized (list) {int i; for (i = 0; i < (C); i++) fputc (' ', stderr);} static void -java_debug_context_do (tab) - int tab; +java_debug_context_do (int tab) { struct parser_ctxt *copy = ctxp; while (copy) @@ -2949,7 +2944,7 @@ java_debug_context_do (tab) debugger. */ void -java_debug_context () +java_debug_context (void) { java_debug_context_do (0); } @@ -2964,7 +2959,7 @@ static int force_error = 0; /* Reporting an constructor invocation error. */ static void -parse_ctor_invocation_error () +parse_ctor_invocation_error (void) { if (DECL_CONSTRUCTOR_P (current_function_decl)) yyerror ("Constructor invocation must be first thing in a constructor"); @@ -2975,8 +2970,7 @@ parse_ctor_invocation_error () /* Reporting JDK1.1 features not implemented. */ static tree -parse_jdk1_1_error (msg) - const char *msg; +parse_jdk1_1_error (const char *msg) { sorry (": `%s' JDK1.1(TM) feature", msg); java_error_count++; @@ -2986,8 +2980,7 @@ parse_jdk1_1_error (msg) static int do_warning = 0; void -yyerror (msg) - const char *msg; +yyerror (const char *msg) { static java_lc elc; static int prev_lineno; @@ -3051,10 +3044,7 @@ yyerror (msg) } static void -issue_warning_error_from_context (cl, msg, ap) - tree cl; - const char *msg; - va_list ap; +issue_warning_error_from_context (tree cl, const char *msg, va_list ap) { const char *saved, *saved_input_filename; char buffer [4096]; @@ -3104,8 +3094,7 @@ parse_warning_context (tree cl, const char *msg, ...) } static tree -find_expr_with_wfl (node) - tree node; +find_expr_with_wfl (tree node) { while (node) { @@ -3148,8 +3137,7 @@ find_expr_with_wfl (node) last line of the method the error occurs in. */ static void -missing_return_error (method) - tree method; +missing_return_error (tree method) { EXPR_WFL_SET_LINECOL (wfl_operator, DECL_SOURCE_LINE_LAST (method), -2); parse_error_context (wfl_operator, "Missing return statement"); @@ -3158,8 +3146,7 @@ missing_return_error (method) /* Issue an unreachable statement error. From NODE, find the next statement to report appropriately. */ static void -unreachable_stmt_error (node) - tree node; +unreachable_stmt_error (tree node) { /* Browse node to find the next expression node that has a WFL. Use the location to report the error */ @@ -3178,7 +3165,7 @@ unreachable_stmt_error (node) } int -java_report_errors () +java_report_errors (void) { if (java_error_count) fprintf (stderr, "%d error%s", @@ -3192,8 +3179,7 @@ java_report_errors () } static char * -java_accstring_lookup (flags) - int flags; +java_accstring_lookup (int flags) { static char buffer [80]; #define COPY_RETURN(S) {strcpy (buffer, S); return buffer;} @@ -3221,9 +3207,7 @@ java_accstring_lookup (flags) variables. */ static void -classitf_redefinition_error (context, id, decl, cl) - const char *context; - tree id, decl, cl; +classitf_redefinition_error (const char *context, tree id, tree decl, tree cl) { parse_error_context (cl, "%s `%s' already defined in %s:%d", context, IDENTIFIER_POINTER (id), @@ -3232,9 +3216,7 @@ classitf_redefinition_error (context, id, decl, cl) } static void -variable_redefinition_error (context, name, type, line) - tree context, name, type; - int line; +variable_redefinition_error (tree context, tree name, tree type, int line) { const char *type_name; @@ -3256,9 +3238,7 @@ variable_redefinition_error (context, name, type, line) the node pointed to by TRIMMED unless TRIMMED is null. */ static int -build_type_name_from_array_name (aname, trimmed) - tree aname; - tree *trimmed; +build_type_name_from_array_name (tree aname, tree *trimmed) { const char *name = IDENTIFIER_POINTER (aname); int len = IDENTIFIER_LENGTH (aname); @@ -3273,8 +3253,7 @@ build_type_name_from_array_name (aname, trimmed) } static tree -build_array_from_name (type, type_wfl, name, ret_name) - tree type, type_wfl, name, *ret_name; +build_array_from_name (tree type, tree type_wfl, tree name, tree *ret_name) { int more_dims = 0; @@ -3326,8 +3305,7 @@ build_array_from_name (type, type_wfl, name, ret_name) identifier. */ static tree -build_unresolved_array_type (type_or_wfl) - tree type_or_wfl; +build_unresolved_array_type (tree type_or_wfl) { const char *ptr; tree wfl; @@ -3353,8 +3331,7 @@ build_unresolved_array_type (type_or_wfl) } static void -parser_add_interface (class_decl, interface_decl, wfl) - tree class_decl, interface_decl, wfl; +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 `%s' repeated", @@ -3365,9 +3342,8 @@ parser_add_interface (class_decl, interface_decl, wfl) encountered. TAG is 0 for a class, 1 for an interface. */ static int -check_class_interface_creation (is_interface, flags, raw_name, qualified_name, decl, cl) - int is_interface, flags; - tree raw_name, qualified_name, decl, cl; +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 */ @@ -3483,8 +3459,7 @@ check_class_interface_creation (is_interface, flags, raw_name, qualified_name, d /* Construct a nested class name. If the final component starts with a digit, return true. Otherwise return false. */ static int -make_nested_class_name (cpc_list) - tree cpc_list; +make_nested_class_name (tree cpc_list) { tree name; @@ -3507,8 +3482,7 @@ make_nested_class_name (cpc_list) /* Can't redefine a class already defined in an earlier scope. */ static int -check_inner_class_redefinition (raw_name, cl) - tree raw_name, cl; +check_inner_class_redefinition (tree raw_name, tree cl) { tree scope_list; @@ -3528,9 +3502,8 @@ check_inner_class_redefinition (raw_name, cl) we remember ENCLOSING and SUPER. */ static tree -resolve_inner_class (circularity_hash, cl, enclosing, super, class_type) - htab_t circularity_hash; - tree cl, *enclosing, *super, class_type; +resolve_inner_class (htab_t circularity_hash, tree cl, tree *enclosing, + tree *super, tree class_type) { tree local_enclosing = *enclosing; tree local_super = NULL_TREE; @@ -3593,8 +3566,7 @@ resolve_inner_class (circularity_hash, cl, enclosing, super, class_type) qualified. */ static tree -find_as_inner_class (enclosing, name, cl) - tree enclosing, name, cl; +find_as_inner_class (tree enclosing, tree name, tree cl) { tree qual, to_return; if (!enclosing) @@ -3647,8 +3619,7 @@ find_as_inner_class (enclosing, name, cl) through. */ static tree -find_as_inner_class_do (qual, enclosing) - tree qual, enclosing; +find_as_inner_class_do (tree qual, tree enclosing) { if (!qual) return NULL_TREE; @@ -3678,9 +3649,7 @@ find_as_inner_class_do (qual, enclosing) DECL. */ static void -set_nested_class_simple_name_value (outer, set) - tree outer; - int set; +set_nested_class_simple_name_value (tree outer, int set) { tree l; @@ -3690,7 +3659,7 @@ set_nested_class_simple_name_value (outer, set) } static void -link_nested_class_to_enclosing () +link_nested_class_to_enclosing (void) { if (GET_ENCLOSING_CPC ()) { @@ -3702,8 +3671,7 @@ link_nested_class_to_enclosing () } static tree -maybe_make_nested_class_name (name) - tree name; +maybe_make_nested_class_name (tree name) { tree id = NULL_TREE; @@ -3737,8 +3705,8 @@ maybe_make_nested_class_name (name) line CL and do other maintenance things. */ static tree -maybe_create_class_interface_decl (decl, raw_name, qualified_name, cl) - tree decl, raw_name, qualified_name, cl; +maybe_create_class_interface_decl (tree decl, tree raw_name, + tree qualified_name, tree cl) { if (!decl) decl = push_class (make_class (), qualified_name); @@ -3775,8 +3743,7 @@ maybe_create_class_interface_decl (decl, raw_name, qualified_name, cl) } static void -add_superinterfaces (decl, interface_list) - tree decl, interface_list; +add_superinterfaces (tree decl, tree interface_list) { tree node; /* Superinterface(s): if present and defined, parser_check_super_interface () @@ -3805,9 +3772,7 @@ add_superinterfaces (decl, interface_list) interface's decl in pass 2. */ static tree -create_interface (flags, id, super) - int flags; - tree id, super; +create_interface (int flags, tree id, tree super) { tree raw_name = EXPR_WFL_NODE (id); tree q_name = parser_qualified_classname (raw_name); @@ -3866,8 +3831,7 @@ create_interface (flags, id, super) DEP. */ static void -patch_anonymous_class (type_decl, class_decl, wfl) - tree type_decl, class_decl, wfl; +patch_anonymous_class (tree type_decl, tree class_decl, tree wfl) { tree class = TREE_TYPE (class_decl); tree type = TREE_TYPE (type_decl); @@ -3899,9 +3863,7 @@ patch_anonymous_class (type_decl, class_decl, wfl) } static tree -create_anonymous_class (location, type_name) - int location; - tree type_name; +create_anonymous_class (int location, tree type_name) { char buffer [80]; tree super = NULL_TREE, itf = NULL_TREE; @@ -3943,9 +3905,7 @@ create_anonymous_class (location, type_name) interface's decl in pass 2. */ static tree -create_class (flags, id, super, interfaces) - int flags; - tree id, super, interfaces; +create_class (int flags, tree id, tree super, tree interfaces) { tree raw_name = EXPR_WFL_NODE (id); tree class_id, decl; @@ -4051,8 +4011,7 @@ create_class (flags, id, super, interfaces) parser context if necessary. */ static void -end_class_declaration (resume) - int resume; +end_class_declaration (int resume) { /* If an error occurred, context weren't pushed and won't need to be popped by a resume. */ @@ -4075,9 +4034,7 @@ end_class_declaration (resume) } static void -add_inner_class_fields (class_decl, fct_decl) - tree class_decl; - tree fct_decl; +add_inner_class_fields (tree class_decl, tree fct_decl) { tree block, marker, f; @@ -4165,9 +4122,7 @@ add_inner_class_fields (class_decl, fct_decl) can't set the CLASS_LOADED_P flag */ static tree -find_field (class, name) - tree class; - tree name; +find_field (tree class, tree name) { tree decl; for (decl = TYPE_FIELDS (class); decl; decl = TREE_CHAIN (decl)) @@ -4182,8 +4137,7 @@ find_field (class, name) of CLASS */ static tree -lookup_field_wrapper (class, name) - tree class, name; +lookup_field_wrapper (tree class, tree name) { tree type = class; tree decl = NULL_TREE; @@ -4222,8 +4176,7 @@ lookup_field_wrapper (class, name) otherwise. */ static int -duplicate_declaration_error_p (new_field_name, new_type, cl) - tree new_field_name, new_type, cl; +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); @@ -4258,9 +4211,7 @@ duplicate_declaration_error_p (new_field_name, new_type, cl) be later resolved in java_complete_class () */ static void -register_fields (flags, type, variable_list) - int flags; - tree type, variable_list; +register_fields (int flags, tree type, tree variable_list) { tree current, saved_type; tree class_type = NULL_TREE; @@ -4405,8 +4356,7 @@ register_fields (flags, type, variable_list) local(s). */ static tree -generate_finit (class_type) - tree class_type; +generate_finit (tree class_type) { int count = 0; tree list = TYPE_FINIT_STMT_LIST (class_type); @@ -4440,8 +4390,7 @@ generate_finit (class_type) statements in a try/catch/rethrow sequence. */ static tree -generate_instinit (class_type) - tree class_type; +generate_instinit (tree class_type) { tree current; tree compound = NULL_TREE; @@ -4483,8 +4432,7 @@ generate_instinit (class_type) /* FIXME */ static tree -build_instinit_invocation (class_type) - tree class_type; +build_instinit_invocation (tree class_type) { tree to_return = NULL_TREE; @@ -4514,9 +4462,7 @@ static int patch_stage; with a constructor. */ static tree -method_header (flags, type, mdecl, throws) - int flags; - tree type, mdecl, throws; +method_header (int flags, tree type, tree mdecl, tree throws) { tree type_wfl = NULL_TREE; tree meth_name = NULL_TREE; @@ -4726,8 +4672,7 @@ method_header (flags, type, mdecl, throws) } static void -fix_method_argument_names (orig_arg, meth) - tree orig_arg, meth; +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) @@ -4746,8 +4691,7 @@ fix_method_argument_names (orig_arg, meth) /* Complete the method declaration with METHOD_BODY. */ static void -finish_method_declaration (method_body) - tree method_body; +finish_method_declaration (tree method_body) { int flags; @@ -4805,8 +4749,7 @@ finish_method_declaration (method_body) /* Build a an error message for constructor circularity errors. */ static char * -constructor_circularity_msg (from, to) - tree from, to; +constructor_circularity_msg (tree from, tree to) { static char string [4096]; char *t = xstrdup (lang_printable_name (from, 0)); @@ -4820,8 +4763,7 @@ constructor_circularity_msg (from, to) static GTY(()) tree vcc_list; static int -verify_constructor_circularity (meth, current) - tree meth, current; +verify_constructor_circularity (tree meth, tree current) { tree c; @@ -4865,8 +4807,7 @@ verify_constructor_circularity (meth, current) /* Check modifiers that can be declared but exclusively */ static void -check_modifiers_consistency (flags) - int flags; +check_modifiers_consistency (int flags) { int acc_count = 0; tree cl = NULL_TREE; @@ -4890,8 +4831,7 @@ check_modifiers_consistency (flags) /* Check the methode header METH for abstract specifics features */ static void -check_abstract_method_header (meth) - tree meth; +check_abstract_method_header (tree meth) { int flags = get_access_flags_from_decl (meth); @@ -4912,8 +4852,7 @@ check_abstract_method_header (meth) incomplete types. */ static tree -method_declarator (id, list) - tree id, list; +method_declarator (tree id, tree list) { tree arg_types = NULL_TREE, current, node; tree meth = make_node (FUNCTION_TYPE); @@ -5010,9 +4949,7 @@ method_declarator (id, list) } static int -unresolved_type_p (wfl, returned) - tree wfl; - tree *returned; +unresolved_type_p (tree wfl, tree *returned) { if (TREE_CODE (wfl) == EXPR_WITH_FILE_LOCATION) @@ -5038,8 +4975,7 @@ unresolved_type_p (wfl, returned) qualification from the current package definition. */ static tree -parser_qualified_classname (name) - tree name; +parser_qualified_classname (tree name) { tree nested_class_name; @@ -5056,8 +4992,7 @@ parser_qualified_classname (name) everything is OK. */ static int -parser_check_super_interface (super_decl, this_decl, this_wfl) - tree super_decl, this_decl, this_wfl; +parser_check_super_interface (tree super_decl, tree this_decl, tree this_wfl) { tree super_type = TREE_TYPE (super_decl); @@ -5091,8 +5026,7 @@ parser_check_super_interface (super_decl, this_decl, this_wfl) 0 if everthing is OK. */ static int -parser_check_super (super_decl, this_decl, wfl) - tree super_decl, this_decl, wfl; +parser_check_super (tree super_decl, tree this_decl, tree wfl) { tree super_type = TREE_TYPE (super_decl); @@ -5130,8 +5064,7 @@ parser_check_super (super_decl, this_decl, wfl) CTXP list of type dependency list. */ static void -create_jdep_list (ctxp) - struct parser_ctxt *ctxp; +create_jdep_list (struct parser_ctxt *ctxp) { jdeplist *new = xmalloc (sizeof (jdeplist)); new->first = new->last = NULL; @@ -5140,8 +5073,7 @@ create_jdep_list (ctxp) } static jdeplist * -reverse_jdep_list (ctxp) - struct parser_ctxt *ctxp; +reverse_jdep_list (struct parser_ctxt *ctxp) { register jdeplist *prev = NULL, *current, *next; for (current = ctxp->classd_list; current; current = next) @@ -5158,8 +5090,7 @@ reverse_jdep_list (ctxp) registered again. */ static tree -obtain_incomplete_type (type_name) - tree type_name; +obtain_incomplete_type (tree type_name) { tree ptr = NULL_TREE, name; @@ -5184,9 +5115,7 @@ obtain_incomplete_type (type_name) manner. */ static tree -register_incomplete_type (kind, wfl, decl, ptr) - int kind; - tree wfl, decl, ptr; +register_incomplete_type (int kind, tree wfl, tree decl, tree ptr) { jdep *new = xmalloc (sizeof (jdep)); @@ -5225,9 +5154,7 @@ register_incomplete_type (kind, wfl, decl, ptr) otherwise. */ static tree -check_inner_circular_reference (source, target) - tree source; - tree target; +check_inner_circular_reference (tree source, tree target) { tree basetype_vec = TYPE_BINFO_BASETYPES (source); tree ctx, cl; @@ -5273,8 +5200,7 @@ check_inner_circular_reference (source, target) otherwise. TYPE can be an interface or a class. */ static tree -check_circular_reference (type) - tree type; +check_circular_reference (tree type) { tree basetype_vec = TYPE_BINFO_BASETYPES (type); int i; @@ -5300,7 +5226,7 @@ check_circular_reference (type) } void -java_check_circular_reference () +java_check_circular_reference (void) { tree current; for (current = ctxp->class_list; current; current = TREE_CHAIN (current)) @@ -5326,10 +5252,8 @@ java_check_circular_reference () finit$. */ static tree -build_alias_initializer_parameter_list (mode, class_type, parm, artificial) - int mode; - tree class_type, parm; - int *artificial; +build_alias_initializer_parameter_list (int mode, tree class_type, tree parm, + int *artificial) { tree field; tree additional_parms = NULL_TREE; @@ -5407,8 +5331,7 @@ build_alias_initializer_parameter_list (mode, class_type, parm, artificial) enforced. This is the case for anonymous classes. */ static tree -craft_constructor (class_decl, args) - tree class_decl, args; +craft_constructor (tree class_decl, tree args) { tree class_type = TREE_TYPE (class_decl); tree parm = NULL_TREE; @@ -5466,7 +5389,7 @@ craft_constructor (class_decl, args) compilation triggered this one to be simply loaded. */ void -java_fix_constructors () +java_fix_constructors (void) { tree current; @@ -5500,8 +5423,7 @@ java_fix_constructors () about the class processed currently. */ void -safe_layout_class (class) - tree class; +safe_layout_class (tree class) { tree save_current_class = current_class; const char *save_input_filename = input_filename; @@ -5515,8 +5437,7 @@ safe_layout_class (class) } static tree -jdep_resolve_class (dep) - jdep *dep; +jdep_resolve_class (jdep *dep) { tree decl; @@ -5548,7 +5469,7 @@ jdep_resolve_class (dep) /* Complete unsatisfied class declaration and their dependencies */ void -java_complete_class () +java_complete_class (void) { tree cclass; jdeplist *cclassd; @@ -5696,8 +5617,7 @@ java_complete_class () array. */ static tree -resolve_class (enclosing, class_type, decl, cl) - tree enclosing, class_type, decl, cl; +resolve_class (tree enclosing, tree class_type, tree decl, tree cl) { tree tname = TYPE_NAME (class_type); tree resolved_type = TREE_TYPE (class_type); @@ -5747,8 +5667,7 @@ resolve_class (enclosing, class_type, decl, cl) qualify_and_find. */ tree -do_resolve_class (enclosing, class_type, decl, cl) - tree enclosing, class_type, decl, cl; +do_resolve_class (tree enclosing, tree class_type, tree decl, tree cl) { tree new_class_decl = NULL_TREE, super = NULL_TREE; tree saved_enclosing_type = enclosing ? TREE_TYPE (enclosing) : NULL_TREE; @@ -5901,8 +5820,7 @@ do_resolve_class (enclosing, class_type, decl, cl) } static tree -qualify_and_find (class_type, package, name) - tree class_type, package, name; +qualify_and_find (tree class_type, tree package, tree name) { tree new_qualified = merge_qualified_name (package, name); tree new_class_decl; @@ -5925,9 +5843,7 @@ qualify_and_find (class_type, package, name) called when type resolution is necessary during the walk pass. */ static tree -resolve_and_layout (something, cl) - tree something; - tree cl; +resolve_and_layout (tree something, tree cl) { tree decl, decl_type; @@ -5988,8 +5904,7 @@ resolve_and_layout (something, cl) layout. The current parsing context is saved and restored */ static tree -resolve_no_layout (name, cl) - tree name, cl; +resolve_no_layout (tree name, tree cl) { tree ptr, decl; BUILD_PTR_FROM_NAME (ptr, name); @@ -6005,8 +5920,7 @@ resolve_no_layout (name, cl) use an identifier tree. */ static const char * -purify_type_name (name) - const char *name; +purify_type_name (const char *name) { int len = strlen (name); int bracket_found; @@ -6024,8 +5938,7 @@ purify_type_name (name) /* The type CURRENT refers to can't be found. We print error messages. */ static void -complete_class_report_errors (dep) - jdep *dep; +complete_class_report_errors (jdep *dep) { const char *name; @@ -6091,8 +6004,7 @@ complete_class_report_errors (dep) <init> */ static const char * -get_printable_method_name (decl) - tree decl; +get_printable_method_name (tree decl) { const char *to_return; tree name = NULL_TREE; @@ -6115,8 +6027,7 @@ get_printable_method_name (decl) function it's a FWL, so we can track errors more accurately.) */ static int -check_method_redefinition (class, method) - tree class, method; +check_method_redefinition (tree class, tree method) { tree redef, sig; @@ -6146,9 +6057,8 @@ check_method_redefinition (class, method) /* Return 1 if check went ok, 0 otherwise. */ static int -check_abstract_method_definitions (do_interface, class_decl, type) - int do_interface; - tree class_decl, type; +check_abstract_method_definitions (int do_interface, tree class_decl, + tree type) { tree class = TREE_TYPE (class_decl); tree method, end_type; @@ -6242,8 +6152,7 @@ check_abstract_method_definitions (do_interface, class_decl, type) methods. */ static void -java_check_abstract_method_definitions (class_decl) - tree class_decl; +java_check_abstract_method_definitions (tree class_decl) { tree class = TREE_TYPE (class_decl); tree super, vector; @@ -6273,8 +6182,7 @@ java_check_abstract_method_definitions (class_decl) safe to build a method signature or not. */ static int -check_method_types_complete (decl) - tree decl; +check_method_types_complete (tree decl) { tree type = TREE_TYPE (decl); tree args; @@ -6295,8 +6203,7 @@ check_method_types_complete (decl) /* Visible interface to check methods contained in CLASS_DECL */ void -java_check_methods (class_decl) - tree class_decl; +java_check_methods (tree class_decl) { if (CLASS_METHOD_CHECKED_P (TREE_TYPE (class_decl))) return; @@ -6315,8 +6222,7 @@ java_check_methods (class_decl) declaration. */ static void -java_check_regular_methods (class_decl) - tree class_decl; +java_check_regular_methods (tree class_decl) { int saw_constructor = ANONYMOUS_CLASS_P (TREE_TYPE (class_decl)); tree method; @@ -6490,8 +6396,7 @@ java_check_regular_methods (class_decl) is incompatible with the `throws' clause of FOUND (if any). */ static void -check_throws_clauses (method, method_wfl, found) - tree method, method_wfl, found; +check_throws_clauses (tree method, tree method_wfl, tree found) { tree mthrows, fthrows; @@ -6525,8 +6430,7 @@ check_throws_clauses (method, method_wfl, found) /* Check abstract method of interface INTERFACE */ static void -java_check_abstract_methods (interface_decl) - tree interface_decl; +java_check_abstract_methods (tree interface_decl) { int i, n; tree method, basetype_vec, found; @@ -6594,8 +6498,7 @@ java_check_abstract_methods (interface_decl) signature. Return a matching method only if their types differ. */ static tree -lookup_java_interface_method2 (class, method_decl) - tree class, method_decl; +lookup_java_interface_method2 (tree class, tree method_decl) { int i, n; tree basetype_vec = TYPE_BINFO_BASETYPES (class), to_return; @@ -6627,9 +6530,7 @@ lookup_java_interface_method2 (class, method_decl) matching method only if their types differ. */ static tree -lookup_java_method2 (clas, method_decl, do_interface) - tree clas, method_decl; - int do_interface; +lookup_java_method2 (tree clas, tree method_decl, int do_interface) { tree method, method_signature, method_name, method_type, name; @@ -6662,8 +6563,7 @@ lookup_java_method2 (clas, method_decl, do_interface) static GTY(()) tree cl_v; static tree -lookup_cl (decl) - tree decl; +lookup_cl (tree decl) { char *line, *found; @@ -6692,8 +6592,7 @@ lookup_cl (decl) /* Look for a simple name in the single-type import list */ static tree -find_name_in_single_imports (name) - tree name; +find_name_in_single_imports (tree name) { tree node; @@ -6707,7 +6606,7 @@ find_name_in_single_imports (name) /* Process all single-type import. */ static int -process_imports () +process_imports (void) { tree import; int error_found; @@ -6766,9 +6665,7 @@ process_imports () statement. */ static void -find_in_imports (enclosing_type, class_type) - tree enclosing_type; - tree class_type; +find_in_imports (tree enclosing_type, tree class_type) { tree import = (enclosing_type ? TYPE_IMPORT_LIST (enclosing_type) : ctxp->import_list); @@ -6785,9 +6682,7 @@ find_in_imports (enclosing_type, class_type) } static int -note_possible_classname (name, len) - const char *name; - int len; +note_possible_classname (const char *name, int len) { tree node; if (len > 5 && strncmp (&name [len-5], ".java", 5) == 0) @@ -6807,8 +6702,7 @@ note_possible_classname (name, len) directory. */ static void -read_import_dir (wfl) - tree wfl; +read_import_dir (tree wfl) { tree package_id = EXPR_WFL_NODE (wfl); const char *package_name = IDENTIFIER_POINTER (package_id); @@ -6929,9 +6823,7 @@ read_import_dir (wfl) entire list, to detected potential double definitions. */ static int -find_in_imports_on_demand (enclosing_type, class_type) - tree enclosing_type; - tree class_type; +find_in_imports_on_demand (tree enclosing_type, tree class_type) { tree class_type_name = TYPE_NAME (class_type); tree import = (enclosing_type ? TYPE_IMPORT_DEMAND_LIST (enclosing_type) : @@ -7031,8 +6923,7 @@ find_in_imports_on_demand (enclosing_type, class_type) particular package is added only once. */ static void -register_package (name) - tree name; +register_package (tree name) { static htab_t pht; void **e; @@ -7049,8 +6940,7 @@ register_package (name) } static tree -resolve_package (pkg, next, type_name) - tree pkg, *next, *type_name; +resolve_package (tree pkg, tree *next, tree *type_name) { tree current; tree decl = NULL_TREE; @@ -7091,8 +6981,7 @@ resolve_package (pkg, next, type_name) access is being attempted. */ static void -check_inner_class_access (decl, enclosing_decl, cl) - tree decl, enclosing_decl, cl; +check_inner_class_access (tree decl, tree enclosing_decl, tree cl) { const char *access; tree enclosing_decl_type; @@ -7207,10 +7096,7 @@ check_pkg_class_access (tree class_name, tree cl, bool verbose) /* Local variable declaration. */ static void -declare_local_variables (modifier, type, vlist) - int modifier; - tree type; - tree vlist; +declare_local_variables (int modifier, tree type, tree vlist) { tree decl, current, saved_type; tree type_wfl = NULL_TREE; @@ -7318,8 +7204,7 @@ declare_local_variables (modifier, type, vlist) /* Called during parsing. Build decls from argument list. */ static void -source_start_java_method (fndecl) - tree fndecl; +source_start_java_method (tree fndecl) { tree tem; tree parm_decl; @@ -7374,10 +7259,8 @@ source_start_java_method (fndecl) /* Called during parsing. Creates an artificial method declaration. */ static tree -create_artificial_method (class, flags, type, name, args) - tree class; - int flags; - tree type, name, args; +create_artificial_method (tree class, int flags, tree type, + tree name, tree args) { tree mdecl; @@ -7395,8 +7278,7 @@ create_artificial_method (class, flags, type, name, args) /* Starts the body if an artificial method. */ static void -start_artificial_method_body (mdecl) - tree mdecl; +start_artificial_method_body (tree mdecl) { DECL_SOURCE_LINE (mdecl) = 1; DECL_SOURCE_LINE_MERGE (mdecl, 1); @@ -7405,8 +7287,7 @@ start_artificial_method_body (mdecl) } static void -end_artificial_method_body (mdecl) - tree mdecl; +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, @@ -7419,9 +7300,7 @@ end_artificial_method_body (mdecl) /* Dump a tree of some kind. This is a convenience wrapper for the dump_* functions in tree-dump.c. */ static void -dump_java_tree (phase, t) - enum tree_dump_index phase; - tree t; +dump_java_tree (enum tree_dump_index phase, tree t) { FILE *stream; int flags; @@ -7438,7 +7317,7 @@ dump_java_tree (phase, t) /* Terminate a function and expand its body. */ static void -source_end_java_method () +source_end_java_method (void) { tree fndecl = current_function_decl; @@ -7491,8 +7370,7 @@ source_end_java_method () expression second operand if necessary. */ tree -java_method_add_stmt (fndecl, expr) - tree fndecl, expr; +java_method_add_stmt (tree fndecl, tree expr) { if (!GET_CURRENT_BLOCK (fndecl)) return NULL_TREE; @@ -7500,8 +7378,7 @@ java_method_add_stmt (fndecl, expr) } static tree -add_stmt_to_block (b, type, stmt) - tree b, type, stmt; +add_stmt_to_block (tree b, tree type, tree stmt) { tree body = BLOCK_EXPR_BODY (b), c; @@ -7520,8 +7397,7 @@ add_stmt_to_block (b, type, stmt) COMPOUND_EXPR and add STMT to it. */ static tree -add_stmt_to_compound (existing, type, stmt) - tree existing, type, stmt; +add_stmt_to_compound (tree existing, tree type, tree stmt) { /* Keep track of this for inlining. */ if (current_function_decl) @@ -7533,7 +7409,7 @@ add_stmt_to_compound (existing, type, stmt) return stmt; } -void java_layout_seen_class_methods () +void java_layout_seen_class_methods (void) { tree previous_list = all_class_list; tree end = NULL_TREE; @@ -7557,7 +7433,7 @@ void java_layout_seen_class_methods () static GTY(()) tree stop_reordering; void -java_reorder_fields () +java_reorder_fields (void) { tree current; @@ -7602,7 +7478,7 @@ java_reorder_fields () classes */ void -java_layout_classes () +java_layout_classes (void) { tree current; int save_error_count = java_error_count; @@ -7639,7 +7515,7 @@ java_layout_classes () generation. */ static void -java_complete_expand_classes () +java_complete_expand_classes (void) { tree current; @@ -7654,8 +7530,7 @@ java_complete_expand_classes () classes, if any. */ static void -java_complete_expand_class (outer) - tree outer; +java_complete_expand_class (tree outer) { tree inner_list; @@ -7681,8 +7556,7 @@ java_complete_expand_class (outer) constructors and then <clinit>. */ static void -java_complete_expand_methods (class_decl) - tree class_decl; +java_complete_expand_methods (tree class_decl) { tree clinit, decl, first_decl; @@ -7783,8 +7657,7 @@ java_complete_expand_methods (class_decl) safely used in some other methods/constructors. */ static tree -maybe_generate_pre_expand_clinit (class_type) - tree class_type; +maybe_generate_pre_expand_clinit (tree class_type) { tree current, mdecl; @@ -7843,8 +7716,7 @@ maybe_generate_pre_expand_clinit (class_type) MODIFY_EXPR with a constant value. */ static int -analyze_clinit_body (this_class, bbody) - tree this_class, bbody; +analyze_clinit_body (tree this_class, tree bbody) { while (bbody) switch (TREE_CODE (bbody)) @@ -7892,8 +7764,7 @@ analyze_clinit_body (this_class, bbody) is empty. Return 1 if <clinit> was discarded, 0 otherwise. */ static int -maybe_yank_clinit (mdecl) - tree mdecl; +maybe_yank_clinit (tree mdecl) { tree type, current; tree fbody, bbody; @@ -7966,8 +7837,7 @@ maybe_yank_clinit (mdecl) expansion of mdecl's body. */ static void -start_complete_expand_method (mdecl) - tree mdecl; +start_complete_expand_method (tree mdecl) { tree tem; @@ -8000,8 +7870,7 @@ start_complete_expand_method (mdecl) /* Complete and expand a method. */ static void -java_complete_expand_method (mdecl) - tree mdecl; +java_complete_expand_method (tree mdecl) { tree fbody, block_body, exception_copy; @@ -8105,8 +7974,7 @@ java_complete_expand_method (mdecl) /* For with each class for which there's code to generate. */ static void -java_expand_method_bodies (class) - tree class; +java_expand_method_bodies (tree class) { tree decl; for (decl = TYPE_METHODS (class); decl; decl = TREE_CHAIN (decl)) @@ -8178,8 +8046,7 @@ java_expand_method_bodies (class) be later turned into a write by calling outer_field_access_fix. */ static tree -build_outer_field_access (id, decl) - tree id, decl; +build_outer_field_access (tree id, tree decl) { tree access = NULL_TREE; tree ctx = TREE_TYPE (DECL_CONTEXT (TYPE_NAME (current_class))); @@ -8228,8 +8095,7 @@ build_outer_field_access (id, decl) access. */ static int -outer_field_access_p (type, decl) - tree type, decl; +outer_field_access_p (tree type, tree decl) { if (!INNER_CLASS_TYPE_P (type) || TREE_CODE (decl) != FIELD_DECL @@ -8267,8 +8133,8 @@ outer_field_access_p (type, decl) call if necessary. */ static int -outer_field_expanded_access_p (node, name, arg_type, arg) - tree node, *name, *arg_type, *arg; +outer_field_expanded_access_p (tree node, tree *name, tree *arg_type, + tree *arg) { int identified = 0; @@ -8314,8 +8180,7 @@ outer_field_expanded_access_p (node, name, arg_type, arg) be identified. */ static tree -outer_field_access_fix (wfl, node, rhs) - tree wfl, node, rhs; +outer_field_access_fix (tree wfl, tree node, tree rhs) { tree name, arg_type, arg; @@ -8335,9 +8200,8 @@ outer_field_access_fix (wfl, node, rhs) read access. */ static tree -build_outer_field_access_expr (lc, type, access_method_name, arg1, arg2) - int lc; - tree type, access_method_name, arg1, arg2; +build_outer_field_access_expr (int lc, tree type, tree access_method_name, + tree arg1, tree arg2) { tree args, cn, access; @@ -8354,7 +8218,7 @@ build_outer_field_access_expr (lc, type, access_method_name, arg1, arg2) } static tree -build_new_access_id () +build_new_access_id (void) { static int access_n_counter = 1; char buffer [128]; @@ -8378,8 +8242,7 @@ build_new_access_id () */ static tree -build_outer_field_access_methods (decl) - tree decl; +build_outer_field_access_methods (tree decl) { tree id, args, stmt, mdecl; @@ -8429,8 +8292,8 @@ build_outer_field_access_methods (decl) /* Build an field access method NAME. */ static tree -build_outer_field_access_method (class, type, name, args, body) - tree class, type, name, args, body; +build_outer_field_access_method (tree class, tree type, tree name, + tree args, tree body) { tree saved_current_function_decl, mdecl; @@ -8454,8 +8317,7 @@ build_outer_field_access_method (class, type, name, args, body) certain kinds of method invocation from inner classes. */ static tree -build_outer_method_access_method (decl) - tree decl; +build_outer_method_access_method (tree decl) { tree saved_current_function_decl, mdecl; tree args = NULL_TREE, call_args = NULL_TREE; @@ -8544,9 +8406,7 @@ build_outer_method_access_method (decl) for example build_outer_field_access). */ static tree -build_access_to_thisn (from, to, lc) - tree from, to; - int lc; +build_access_to_thisn (tree from, tree to, int lc) { tree access = NULL_TREE; @@ -8588,8 +8448,7 @@ build_access_to_thisn (from, to, lc) attribute so that they can't be referred to directly. */ static tree -maybe_build_thisn_access_method (type) - tree type; +maybe_build_thisn_access_method (tree type) { tree mdecl, args, stmt, rtype; tree saved_current_function_decl; @@ -8634,8 +8493,7 @@ static GTY(()) tree saved_thisn; static GTY(()) tree saved_type; static tree -build_current_thisn (type) - tree type; +build_current_thisn (tree type) { static int saved_i = -1; static int saved_type_i = 0; @@ -8674,7 +8532,7 @@ build_current_thisn (type) form used is `this.this$<n> = this$<n>;'. */ static tree -build_thisn_assign () +build_thisn_assign (void) { if (current_class && PURE_INNER_CLASS_TYPE_P (current_class)) { @@ -8703,8 +8561,7 @@ static GTY(()) tree get_message_wfl; static GTY(()) tree type_parm_wfl; static tree -build_dot_class_method (class) - tree class; +build_dot_class_method (tree class) { #define BWF(S) build_wfl_node (get_identifier ((S))) #define MQN(X,Y) make_qualified_name ((X), (Y), 0) @@ -8772,8 +8629,7 @@ build_dot_class_method (class) } static tree -build_dot_class_method_invocation (type) - tree type; +build_dot_class_method_invocation (tree type) { tree sig_id, s; @@ -8799,8 +8655,7 @@ build_dot_class_method_invocation (type) necessary. */ static void -fix_constructors (mdecl) - tree mdecl; +fix_constructors (tree mdecl) { tree iii; /* Instance Initializer Invocation */ tree body = DECL_FUNCTION_BODY (mdecl); @@ -8920,8 +8775,7 @@ fix_constructors (mdecl) for something that has the same signature. */ static int -verify_constructor_super (mdecl) - tree mdecl; +verify_constructor_super (tree mdecl) { tree class = CLASSTYPE_SUPER (current_class); int super_inner = PURE_INNER_CLASS_TYPE_P (class); @@ -8973,7 +8827,7 @@ verify_constructor_super (mdecl) static GTY(()) tree reversed_class_list; void -java_expand_classes () +java_expand_classes (void) { int save_error_count = 0; static struct parser_ctxt *cur_ctxp = NULL; @@ -9096,9 +8950,7 @@ java_expand_classes () separating `.' operator. */ static tree -make_qualified_primary (primary, right, location) - tree primary, right; - int location; +make_qualified_primary (tree primary, tree right, int location) { tree wfl; @@ -9122,8 +8974,7 @@ make_qualified_primary (primary, right, location) /* Simple merge of two name separated by a `.' */ static tree -merge_qualified_name (left, right) - tree left, right; +merge_qualified_name (tree left, tree right) { tree node; if (!left && !right) @@ -9151,9 +9002,7 @@ merge_qualified_name (left, right) inherited from the location information of the `.' operator. */ static tree -make_qualified_name (left, right, location) - tree left, right; - int location; +make_qualified_name (tree left, tree right, int location) { #ifdef USE_COMPONENT_REF tree node = build (COMPONENT_REF, NULL_TREE, left, right); @@ -9187,8 +9036,7 @@ make_qualified_name (left, right, location) last identifier is removed from the linked list */ static tree -cut_identifier_in_qualified (wfl) - tree wfl; +cut_identifier_in_qualified (tree wfl) { tree q; tree previous = NULL_TREE; @@ -9207,9 +9055,7 @@ cut_identifier_in_qualified (wfl) /* Resolve the expression name NAME. Return its decl. */ static tree -resolve_expression_name (id, orig) - tree id; - tree *orig; +resolve_expression_name (tree id, tree *orig) { tree name = EXPR_WFL_NODE (id); tree decl; @@ -9311,8 +9157,7 @@ resolve_expression_name (id, orig) } static void -static_ref_err (wfl, field_id, class_type) - tree wfl, field_id, class_type; +static_ref_err (tree wfl, tree field_id, tree class_type) { parse_error_context (wfl, @@ -9327,9 +9172,7 @@ static_ref_err (wfl, field_id, class_type) recipient's address can be null. */ static tree -resolve_field_access (qual_wfl, field_decl, field_type) - tree qual_wfl; - tree *field_decl, *field_type; +resolve_field_access (tree qual_wfl, tree *field_decl, tree *field_type) { int is_static = 0; tree field_ref; @@ -9392,8 +9235,7 @@ resolve_field_access (qual_wfl, field_decl, field_type) NODE. */ static tree -strip_out_static_field_access_decl (node) - tree node; +strip_out_static_field_access_decl (tree node) { if (TREE_CODE (node) == COMPOUND_EXPR) { @@ -9416,9 +9258,8 @@ strip_out_static_field_access_decl (node) /* 6.5.5.2: Qualified Expression Names */ static int -resolve_qualified_expression_name (wfl, found_decl, where_found, type_found) - tree wfl; - tree *found_decl, *type_found, *where_found; +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; @@ -9966,10 +9807,7 @@ resolve_qualified_expression_name (wfl, found_decl, where_found, type_found) method. */ static int -not_accessible_p (reference, member, where, from_super) - tree reference, member; - tree where; - int from_super; +not_accessible_p (tree reference, tree member, tree where, int from_super) { int access_flag = get_access_flags_from_decl (member); @@ -10041,8 +9879,7 @@ not_accessible_p (reference, member, where, from_super) /* Test deprecated decl access. */ static void -check_deprecation (wfl, decl) - tree wfl, decl; +check_deprecation (tree wfl, tree decl) { const char *file = DECL_SOURCE_FILE (decl); /* Complain if the field is deprecated and the file it was defined @@ -10082,8 +9919,7 @@ check_deprecation (wfl, decl) static GTY(()) tree cicp_cache; static int -class_in_current_package (class) - tree class; +class_in_current_package (tree class) { int qualified_flag; tree left; @@ -10119,8 +9955,7 @@ class_in_current_package (class) done only if certain conditions meet. */ static tree -maybe_access_field (decl, where, type) - tree decl, where, type; +maybe_access_field (tree decl, tree where, tree type) { if (TREE_CODE (decl) == FIELD_DECL && decl != current_this && !FIELD_STATIC (decl)) @@ -10135,12 +9970,8 @@ maybe_access_field (decl, where, type) used. IS_STATIC is set to 1 if the invoked function is static. */ static tree -patch_method_invocation (patch, primary, where, from_super, - is_static, ret_decl) - tree patch, primary, where; - int from_super; - int *is_static; - tree *ret_decl; +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); @@ -10549,8 +10380,8 @@ patch_method_invocation (patch, primary, where, from_super, non static method. Return 1 if it's the case, 0 otherwise. */ static int -check_for_static_method_reference (wfl, node, method, where, primary) - tree wfl, node, method, where, primary; +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)) @@ -10572,9 +10403,7 @@ check_for_static_method_reference (wfl, node, method, where, primary) returned. */ static int -maybe_use_access_method (is_super_init, mdecl, this_arg) - int is_super_init; - tree *mdecl, *this_arg; +maybe_use_access_method (int is_super_init, tree *mdecl, tree *this_arg) { tree ctx; tree md = *mdecl, ta = *this_arg; @@ -10642,8 +10471,7 @@ maybe_use_access_method (is_super_init, mdecl, this_arg) mode. */ static tree -patch_invoke (patch, method, args) - tree patch, method, args; +patch_invoke (tree patch, tree method, tree args) { tree dtable, func; tree original_call, t, ta; @@ -10801,9 +10629,7 @@ patch_invoke (patch, method, args) } static int -invocation_mode (method, super) - tree method; - int super; +invocation_mode (tree method, int super) { int access = get_access_flags_from_decl (method); @@ -10834,10 +10660,7 @@ invocation_mode (method, super) 15.11.2 (Compile-Time Step 2) */ static tree -lookup_method_invoke (lc, cl, class, name, arg_list) - int lc; - tree cl; - tree class, name, arg_list; +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; @@ -10920,9 +10743,8 @@ lookup_method_invoke (lc, cl, class, name, arg_list) when we're looking for a constructor. */ static tree -find_applicable_accessible_methods_list (lc, class, name, arglist) - int lc; - tree class, name, arglist; +find_applicable_accessible_methods_list (int lc, tree class, tree name, + tree arglist) { static htab_t searched_classes; static int search_not_done = 0; @@ -11040,10 +10862,8 @@ find_applicable_accessible_methods_list (lc, class, name, arglist) /* Effectively search for the appropriate method in method */ static void -search_applicable_methods_list (lc, method, name, arglist, list, all_list) - int lc; - tree method, name, arglist; - tree *list, *all_list; +search_applicable_methods_list (int lc, tree method, tree name, tree arglist, + tree *list, tree *all_list) { for (; method; method = TREE_CHAIN (method)) { @@ -11071,8 +10891,7 @@ search_applicable_methods_list (lc, method, name, arglist, list, all_list) /* 15.11.2.2 Choose the Most Specific Method */ static tree -find_most_specific_methods_list (list) - tree list; +find_most_specific_methods_list (tree list) { int max = 0; int abstract, candidates; @@ -11162,8 +10981,7 @@ static GTY(()) tree m2_arg_value; static GTY(()) tree m2_arg_cache; static int -argument_types_convertible (m1, m2_or_arglist) - tree m1, m2_or_arglist; +argument_types_convertible (tree m1, tree m2_or_arglist) { register tree m1_arg, m2_arg; @@ -11203,8 +11021,7 @@ argument_types_convertible (m1, m2_or_arglist) /* Qualification routines */ static void -qualify_ambiguous_name (id) - tree id; +qualify_ambiguous_name (tree id) { tree qual, qual_wfl, name = NULL_TREE, decl, ptr_type = NULL_TREE, saved_current_class; @@ -11436,8 +11253,7 @@ qualify_ambiguous_name (id) } static int -breakdown_qualified (left, right, source) - tree *left, *right, source; +breakdown_qualified (tree *left, tree *right, tree source) { char *p, *base; int l = IDENTIFIER_LENGTH (source); @@ -11465,8 +11281,7 @@ breakdown_qualified (left, right, source) /* Return TRUE if two classes are from the same package. */ static int -in_same_package (name1, name2) - tree name1, name2; +in_same_package (tree name1, tree name2) { tree tmp; tree pkg1; @@ -11496,8 +11311,7 @@ in_same_package (name1, name2) Same as java_complete_lhs, but does resolve static finals to values. */ static tree -java_complete_tree (node) - tree node; +java_complete_tree (tree node) { node = java_complete_lhs (node); if (JDECL_P (node) && CLASS_FINAL_VARIABLE_P (node) @@ -11512,8 +11326,7 @@ java_complete_tree (node) } static tree -java_stabilize_reference (node) - tree node; +java_stabilize_reference (tree node) { if (TREE_CODE (node) == COMPOUND_EXPR) { @@ -11531,8 +11344,7 @@ java_stabilize_reference (node) Same as java_complete_tree, but does not resolve static finals to values. */ static tree -java_complete_lhs (node) - tree node; +java_complete_lhs (tree node) { tree nn, cn, wfl_op1, wfl_op2, wfl_op3; int flag; @@ -12293,8 +12105,7 @@ java_complete_lhs (node) error was found. */ static int -complete_function_arguments (node) - tree node; +complete_function_arguments (tree node) { int flag = 0; tree cn; @@ -12327,9 +12138,7 @@ complete_function_arguments (node) debugable. */ static tree -build_debugable_stmt (location, stmt) - int location; - tree stmt; +build_debugable_stmt (int location, tree stmt) { if (TREE_CODE (stmt) != EXPR_WITH_FILE_LOCATION) { @@ -12341,8 +12150,8 @@ build_debugable_stmt (location, stmt) } static tree -build_expr_block (body, decls) - tree body, decls; +build_expr_block (tree body, tree decls) + { tree node = make_node (BLOCK); BLOCK_EXPR_DECLS (node) = decls; @@ -12357,7 +12166,7 @@ build_expr_block (body, decls) function block chain */ static tree -enter_block () +enter_block (void) { tree b = build_expr_block (NULL_TREE, NULL_TREE); @@ -12391,7 +12200,7 @@ enter_block () the block being exited isn't the method's top level one. */ static tree -exit_block () +exit_block (void) { tree b; if (current_function_decl) @@ -12415,8 +12224,7 @@ exit_block () scoping rules. */ static tree -lookup_name_in_blocks (name) - tree name; +lookup_name_in_blocks (tree name) { tree b = GET_CURRENT_BLOCK (current_function_decl); @@ -12438,7 +12246,7 @@ lookup_name_in_blocks (name) } static void -maybe_absorb_scoping_blocks () +maybe_absorb_scoping_blocks (void) { while (BLOCK_IS_IMPLICIT (GET_CURRENT_BLOCK (current_function_decl))) { @@ -12456,9 +12264,7 @@ maybe_absorb_scoping_blocks () /* Wrap a non WFL node around a WFL. */ static tree -build_wfl_wrap (node, location) - tree node; - int location; +build_wfl_wrap (tree node, int location) { tree wfl, node_to_insert = node; @@ -12479,8 +12285,7 @@ build_wfl_wrap (node, location) we're currently dealing with the class java.lang.Object. */ static tree -build_super_invocation (mdecl) - tree mdecl; +build_super_invocation (tree mdecl) { if (DECL_CONTEXT (mdecl) == object_type_node) return empty_stmt_node; @@ -12503,10 +12308,8 @@ build_super_invocation (mdecl) /* Build a SUPER/THIS qualified method invocation. */ static tree -build_this_super_qualified_invocation (use_this, name, args, lloc, rloc) - int use_this; - tree name, args; - int lloc, rloc; +build_this_super_qualified_invocation (int use_this, tree name, tree args, + int lloc, int rloc) { tree invok; tree wfl = @@ -12519,9 +12322,7 @@ build_this_super_qualified_invocation (use_this, name, args, lloc, rloc) /* Build an incomplete CALL_EXPR node. */ static tree -build_method_invocation (name, args) - tree name; - tree args; +build_method_invocation (tree name, tree args) { tree call = build (CALL_EXPR, NULL_TREE, name, args, NULL_TREE); TREE_SIDE_EFFECTS (call) = 1; @@ -12532,8 +12333,7 @@ build_method_invocation (name, args) /* Build an incomplete new xxx(...) node. */ static tree -build_new_invocation (name, args) - tree name, args; +build_new_invocation (tree name, tree args) { tree call = build (NEW_CLASS_EXPR, NULL_TREE, name, args, NULL_TREE); TREE_SIDE_EFFECTS (call) = 1; @@ -12544,9 +12344,7 @@ build_new_invocation (name, args) /* Build an incomplete assignment expression. */ static tree -build_assignment (op, op_location, lhs, rhs) - int op, op_location; - tree lhs, rhs; +build_assignment (int op, int op_location, tree lhs, tree rhs) { tree assignment; /* Build the corresponding binop if we deal with a Compound @@ -12566,8 +12364,7 @@ build_assignment (op, op_location, lhs, rhs) /* 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 (node) - tree node; +string_convert_int_cst (tree node) { static char buffer[80]; @@ -12640,8 +12437,7 @@ string_convert_int_cst (node) /* Print an INTEGER_CST node in a static buffer, and return the buffer. This is used only for error handling. */ char * -print_int_node (node) - tree node; +print_int_node (tree node) { static char buffer [80]; if (TREE_CONSTANT_OVERFLOW (node)) @@ -12671,9 +12467,7 @@ print_int_node (node) /* 15.25 Assignment operators. */ static tree -patch_assignment (node, wfl_op1) - tree node; - tree wfl_op1; +patch_assignment (tree node, tree wfl_op1) { tree rhs = TREE_OPERAND (node, 1); tree lvalue = TREE_OPERAND (node, 0), llvalue; @@ -12844,8 +12638,7 @@ patch_assignment (node, wfl_op1) modified rhs. */ static tree -try_reference_assignconv (lhs_type, rhs) - tree lhs_type, rhs; +try_reference_assignconv (tree lhs_type, tree rhs) { tree new_rhs = NULL_TREE; tree rhs_type = TREE_TYPE (rhs); @@ -12871,8 +12664,7 @@ try_reference_assignconv (lhs_type, rhs) builtin type. Return a converted RHS if the conversion is possible. */ static tree -try_builtin_assignconv (wfl_op1, lhs_type, rhs) - tree wfl_op1, lhs_type, rhs; +try_builtin_assignconv (tree wfl_op1, tree lhs_type, tree rhs) { tree new_rhs = NULL_TREE; tree rhs_type = TREE_TYPE (rhs); @@ -12922,8 +12714,7 @@ try_builtin_assignconv (wfl_op1, lhs_type, rhs) invocation convertion (5.3). */ static int -valid_builtin_assignconv_identity_widening_p (lhs_type, rhs_type) - tree lhs_type, rhs_type; +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) @@ -12968,10 +12759,7 @@ valid_builtin_assignconv_identity_widening_p (lhs_type, rhs_type) assignment check. */ static int -valid_ref_assignconv_cast_p (source, dest, cast) - tree source; - tree dest; - int cast; +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) @@ -13101,9 +12889,7 @@ valid_ref_assignconv_cast_p (source, dest, cast) } static int -valid_cast_to_p (source, dest) - tree source; - tree dest; +valid_cast_to_p (tree source, tree dest) { if (TREE_CODE (source) == POINTER_TYPE) source = TREE_TYPE (source); @@ -13124,8 +12910,7 @@ valid_cast_to_p (source, dest) } static tree -do_unary_numeric_promotion (arg) - tree arg; +do_unary_numeric_promotion (tree arg) { tree type = TREE_TYPE (arg); if ((TREE_CODE (type) == INTEGER_TYPE && TYPE_PRECISION (type) < 32) @@ -13137,8 +12922,7 @@ do_unary_numeric_promotion (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 (dest, source) - tree dest, source; +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)) @@ -13150,10 +12934,7 @@ valid_method_invocation_conversion_p (dest, source) /* Build an incomplete binop expression. */ static tree -build_binop (op, op_location, op1, op2) - enum tree_code op; - int op_location; - tree op1, op2; +build_binop (enum tree_code op, int op_location, tree op1, tree op2) { tree binop = build (op, NULL_TREE, op1, op2); TREE_SIDE_EFFECTS (binop) = 1; @@ -13170,8 +12951,7 @@ build_binop (op, op_location, op1, op2) buffer. */ static char * -operator_string (node) - tree node; +operator_string (tree node) { #define BUILD_OPERATOR_STRING(S) \ { \ @@ -13220,8 +13000,7 @@ operator_string (node) /* Return 1 if VAR_ACCESS1 is equivalent to VAR_ACCESS2. */ static int -java_decl_equiv (var_acc1, var_acc2) - tree var_acc1, var_acc2; +java_decl_equiv (tree var_acc1, tree var_acc2) { if (JDECL_P (var_acc1)) return (var_acc1 == var_acc2); @@ -13237,8 +13016,7 @@ java_decl_equiv (var_acc1, var_acc2) used in conjunction with the `=' operator in a compound assignment. */ static int -binop_compound_p (code) - enum tree_code code; +binop_compound_p (enum tree_code code) { int i; for (i = 0; i < BINOP_COMPOUND_CANDIDATES; i++) @@ -13251,8 +13029,7 @@ binop_compound_p (code) /* Reorganize after a fold to get SAVE_EXPR to generate what we want. */ static tree -java_refold (t) - tree t; +java_refold (tree t) { tree c, b, ns, decl; @@ -13299,10 +13076,7 @@ java_refold (t) of remaining nodes and detects more errors in certain cases. */ static tree -patch_binop (node, wfl_op1, wfl_op2) - tree node; - tree wfl_op1; - tree wfl_op2; +patch_binop (tree node, tree wfl_op1, tree wfl_op2) { tree op1 = TREE_OPERAND (node, 0); tree op2 = TREE_OPERAND (node, 1); @@ -13722,10 +13496,7 @@ patch_binop (node, wfl_op1, wfl_op2) zero value, the value of CSTE comes after the valude of STRING */ static tree -do_merge_string_cste (cste, string, string_len, after) - tree cste; - const char *string; - int string_len, after; +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); @@ -13750,9 +13521,7 @@ do_merge_string_cste (cste, string, string_len, after) new STRING_CST on success, NULL_TREE on failure */ static tree -merge_string_cste (op1, op2, after) - tree op1, op2; - int after; +merge_string_cste (tree op1, tree op2, int after) { /* Handle two string constants right away */ if (TREE_CODE (op2) == STRING_CST) @@ -13808,8 +13577,7 @@ merge_string_cste (op1, op2, after) NULL_TREE for each invocation of this routine. FIXME */ static tree -string_constant_concatenation (op1, op2) - tree op1, op2; +string_constant_concatenation (tree op1, tree op2) { if (TREE_CODE (op1) == STRING_CST || (TREE_CODE (op2) == STRING_CST)) { @@ -13843,8 +13611,7 @@ string_constant_concatenation (op1, op2) called on it to turn it into a String object. */ static tree -build_string_concatenation (op1, op2) - tree op1, op2; +build_string_concatenation (tree op1, tree op2) { tree result; int side_effects = TREE_SIDE_EFFECTS (op1) | TREE_SIDE_EFFECTS (op2); @@ -13913,8 +13680,7 @@ build_string_concatenation (op1, op2) NULL. */ static tree -patch_string (node) - tree node; +patch_string (tree node) { if (node == error_mark_node) return error_mark_node; @@ -13940,8 +13706,7 @@ patch_string (node) /* Build the internal representation of a string constant. */ static tree -patch_string_cst (node) - tree node; +patch_string_cst (tree node) { int location; if (! flag_emit_class_files) @@ -13958,9 +13723,7 @@ patch_string_cst (node) /* Build an incomplete unary operator expression. */ static tree -build_unaryop (op_token, op_location, op1) - int op_token, op_location; - tree op1; +build_unaryop (int op_token, int op_location, tree op1) { enum tree_code op; tree unaryop; @@ -13986,10 +13749,7 @@ build_unaryop (op_token, op_location, op1) later. IS_POST_P is 1 if the operator, 0 otherwise. */ static tree -build_incdec (op_token, op_location, op1, is_post_p) - int op_token, op_location; - tree op1; - int is_post_p; +build_incdec (int op_token, int op_location, tree op1, int is_post_p) { static const enum tree_code lookup [2][2] = { @@ -14011,9 +13771,7 @@ build_incdec (op_token, op_location, op1, is_post_p) though its type is already set. */ static tree -build_cast (location, type, exp) - int location; - tree type, exp; +build_cast (int location, tree type, tree exp) { tree node = build1 (CONVERT_EXPR, type, exp); EXPR_WFL_LINECOL (node) = location; @@ -14022,9 +13780,7 @@ build_cast (location, type, exp) /* Build an incomplete class reference operator. */ static tree -build_incomplete_class_ref (location, class_name) - int location; - tree class_name; +build_incomplete_class_ref (int location, tree class_name) { tree node = build1 (CLASS_LITERAL, NULL_TREE, class_name); EXPR_WFL_LINECOL (node) = location; @@ -14033,8 +13789,7 @@ build_incomplete_class_ref (location, class_name) /* Complete an incomplete class reference operator. */ static tree -patch_incomplete_class_ref (node) - tree node; +patch_incomplete_class_ref (tree node) { tree type = TREE_OPERAND (node, 0); tree ref_type; @@ -14071,9 +13826,7 @@ patch_incomplete_class_ref (node) but preserve the type of NODE if the type is fixed. */ static tree -patch_unaryop (node, wfl_op) - tree node; - tree wfl_op; +patch_unaryop (tree node, tree wfl_op) { tree op = TREE_OPERAND (node, 0); tree op_type = TREE_TYPE (op); @@ -14261,8 +14014,7 @@ patch_unaryop (node, wfl_op) message. Return the resolved type or NULL_TREE. */ static tree -resolve_type_during_patch (type) - tree type; +resolve_type_during_patch (tree type) { if (unresolved_type_p (type, NULL)) { @@ -14282,9 +14034,7 @@ resolve_type_during_patch (type) found. Otherwise NODE or something meant to replace it is returned. */ static tree -patch_cast (node, wfl_op) - tree node; - tree wfl_op; +patch_cast (tree node, tree wfl_op) { tree op = TREE_OPERAND (node, 0); tree cast_type = TREE_TYPE (node); @@ -14367,8 +14117,7 @@ patch_cast (node, wfl_op) /* Build a null constant and give it the type TYPE. */ static tree -build_null_of_type (type) - tree type; +build_null_of_type (tree type) { tree node = build_int_2 (0, 0); TREE_TYPE (node) = promote_type (type); @@ -14378,9 +14127,7 @@ build_null_of_type (type) /* Build an ARRAY_REF incomplete tree node. Note that operand 1 isn't a list of indices. */ static tree -build_array_ref (location, array, index) - int location; - tree array, index; +build_array_ref (int location, tree array, tree index) { tree node = build (ARRAY_REF, NULL_TREE, array, index); EXPR_WFL_LINECOL (node) = location; @@ -14390,8 +14137,7 @@ build_array_ref (location, array, index) /* 15.12 Array Access Expression */ static tree -patch_array_ref (node) - tree node; +patch_array_ref (tree node) { tree array = TREE_OPERAND (node, 0); tree array_type = TREE_TYPE (array); @@ -14451,10 +14197,7 @@ patch_array_ref (node) /* 15.9 Array Creation Expressions */ static tree -build_newarray_node (type, dims, extra_dims) - tree type; - tree dims; - int extra_dims; +build_newarray_node (tree type, tree dims, int extra_dims) { tree node = build (NEW_ARRAY_EXPR, NULL_TREE, type, nreverse (dims), @@ -14463,8 +14206,7 @@ build_newarray_node (type, dims, extra_dims) } static tree -patch_newarray (node) - tree node; +patch_newarray (tree node) { tree type = TREE_OPERAND (node, 0); tree dims = TREE_OPERAND (node, 1); @@ -14567,8 +14309,7 @@ patch_newarray (node) pin-point errors. */ static tree -maybe_build_array_element_wfl (node) - tree node; +maybe_build_array_element_wfl (tree node) { if (TREE_CODE (node) != EXPR_WITH_FILE_LOCATION) return build_expr_wfl (NULL_TREE, ctxp->filename, @@ -14582,9 +14323,7 @@ maybe_build_array_element_wfl (node) and expansion. */ static tree -build_new_array_init (location, values) - int location; - tree values; +build_new_array_init (int location, tree values) { tree constructor = build (CONSTRUCTOR, NULL_TREE, NULL_TREE, values); tree to_return = build1 (NEW_ARRAY_INIT, NULL_TREE, constructor); @@ -14597,8 +14336,7 @@ build_new_array_init (location, values) appropriately. */ static tree -patch_new_array_init (type, node) - tree type, node; +patch_new_array_init (tree type, tree node) { int error_seen = 0; tree current, element_type; @@ -14661,8 +14399,7 @@ patch_new_array_init (type, node) otherwise. */ static int -array_constructor_check_entry (type, entry) - tree type, entry; +array_constructor_check_entry (tree type, tree entry) { char *array_type_string = NULL; /* For error reports */ tree value, type_value, new_value, wfl_value, patched; @@ -14711,8 +14448,7 @@ array_constructor_check_entry (type, entry) } static tree -build_this (location) - int location; +build_this (int location) { tree node = build_wfl_node (this_identifier_node); TREE_SET_CODE (node, THIS_EXPR); @@ -14725,9 +14461,7 @@ build_this (location) to be returned. */ static tree -build_return (location, op) - int location; - tree op; +build_return (int location, tree op) { tree node = build1 (RETURN_EXPR, NULL_TREE, op); EXPR_WFL_LINECOL (node) = location; @@ -14736,8 +14470,7 @@ build_return (location, op) } static tree -patch_return (node) - tree node; +patch_return (tree node) { tree return_exp = TREE_OPERAND (node, 0); tree meth = current_function_decl; @@ -14821,9 +14554,8 @@ patch_return (node) /* 14.8 The if Statement */ static tree -build_if_else_statement (location, expression, if_body, else_body) - int location; - tree expression, if_body, else_body; +build_if_else_statement (int location, tree expression, tree if_body, + tree else_body) { tree node; if (!else_body) @@ -14835,8 +14567,7 @@ build_if_else_statement (location, expression, if_body, else_body) } static tree -patch_if_else_statement (node) - tree node; +patch_if_else_statement (tree node) { tree expression = TREE_OPERAND (node, 0); int can_complete_normally @@ -14883,9 +14614,7 @@ patch_if_else_statement (node) label, yet. LABEL can be NULL_TREE for artificially-generated blocks. */ static tree -build_labeled_block (location, label) - int location; - tree label; +build_labeled_block (int location, tree label) { tree label_name ; tree label_decl, node; @@ -14921,9 +14650,8 @@ build_labeled_block (location, label) /* A labeled statement LBE is attached a statement. */ static tree -finish_labeled_statement (lbe, statement) - tree lbe; /* Labeled block expr */ - tree statement; +finish_labeled_statement (tree lbe, /* Labeled block expr */ + tree statement) { /* In anyways, tie the loop to its statement */ LABELED_BLOCK_BODY (lbe) = statement; @@ -14938,8 +14666,7 @@ finish_labeled_statement (lbe, statement) list. */ static tree -build_new_loop (loop_body) - tree loop_body; +build_new_loop (tree loop_body) { tree loop = build (LOOP_EXPR, NULL_TREE, loop_body); TREE_SIDE_EFFECTS (loop) = 1; @@ -14968,10 +14695,7 @@ build_new_loop (loop_body) <structure described above> */ static tree -build_loop_body (location, condition, reversed) - int location; - tree condition; - int reversed; +build_loop_body (int location, tree condition, int reversed) { tree first, second, body; @@ -14993,10 +14717,7 @@ build_loop_body (location, condition, reversed) loop list. */ static tree -finish_loop_body (location, condition, body, reversed) - int location; - tree condition, body; - int reversed; +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); @@ -15019,9 +14740,7 @@ finish_loop_body (location, condition, body, reversed) loops feature the condition part */ static tree -finish_for_loop (location, condition, update, body) - int location; - tree condition, update, body; +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); @@ -15055,8 +14774,7 @@ finish_for_loop (location, condition, update, body) LABELED_BLOCK_EXPR's block. */ static tree -search_loop (statement) - tree statement; +search_loop (tree statement) { if (TREE_CODE (statement) == LOOP_EXPR) return statement; @@ -15078,8 +14796,7 @@ search_loop (statement) returned otherwise. */ static int -labeled_block_contains_loop_p (block, loop) - tree block, loop; +labeled_block_contains_loop_p (tree block, tree loop) { if (!block) return 0; @@ -15097,8 +14814,7 @@ labeled_block_contains_loop_p (block, loop) insert LOOP as its body. */ static tree -patch_loop_statement (loop) - tree loop; +patch_loop_statement (tree loop) { tree loop_label; @@ -15120,9 +14836,7 @@ patch_loop_statement (loop) unlabeled break/continue statement. */ static tree -build_bc_statement (location, is_break, name) - int location, is_break; - tree name; +build_bc_statement (int location, int is_break, tree name) { tree break_continue, label_block_expr = NULL_TREE; @@ -15151,8 +14865,7 @@ build_bc_statement (location, is_break, name) /* Verification of a break/continue statement. */ static tree -patch_bc_statement (node) - tree node; +patch_bc_statement (tree node) { tree bc_label = EXIT_BLOCK_LABELED_BLOCK (node), target_stmt; tree labeled_block = ctxp->current_labeled_block; @@ -15228,8 +14941,7 @@ patch_bc_statement (node) boolean. */ static tree -patch_exit_expr (node) - tree node; +patch_exit_expr (tree node) { tree expression = TREE_OPERAND (node, 0); TREE_TYPE (node) = error_mark_node; @@ -15264,8 +14976,7 @@ patch_exit_expr (node) /* 14.9 Switch statement */ static tree -patch_switch_statement (node) - tree node; +patch_switch_statement (tree node) { tree se = TREE_OPERAND (node, 0), se_type; tree save, iter; @@ -15342,9 +15053,7 @@ patch_switch_statement (node) /* Build an assertion expression for `assert CONDITION : VALUE'; VALUE might be NULL_TREE. */ static tree -build_assertion (location, condition, value) - int location; - tree condition, value; +build_assertion (int location, tree condition, tree value) { tree node; tree klass = GET_CPC (); @@ -15421,9 +15130,8 @@ build_assertion (location, condition, value) catches TYPE and executes CATCH_STMTS. */ static tree -encapsulate_with_try_catch (location, type, try_stmts, catch_stmts) - int location; - tree type, try_stmts, catch_stmts; +encapsulate_with_try_catch (int location, tree type, tree try_stmts, + tree catch_stmts) { tree try_block, catch_clause_param, catch_block, catch; @@ -15451,9 +15159,7 @@ encapsulate_with_try_catch (location, type, try_stmts, catch_stmts) } static tree -build_try_statement (location, try_block, catches) - int location; - tree try_block, catches; +build_try_statement (int location, tree try_block, tree catches) { tree node = build (TRY_EXPR, NULL_TREE, try_block, catches); EXPR_WFL_LINECOL (node) = location; @@ -15461,9 +15167,7 @@ build_try_statement (location, try_block, catches) } static tree -build_try_finally_statement (location, try_block, finally) - int location; - tree try_block, finally; +build_try_finally_statement (int location, tree try_block, tree finally) { tree node = build (TRY_FINALLY_EXPR, NULL_TREE, try_block, finally); EXPR_WFL_LINECOL (node) = location; @@ -15471,8 +15175,7 @@ build_try_finally_statement (location, try_block, finally) } static tree -patch_try_statement (node) - tree node; +patch_try_statement (tree node) { int error_found = 0; tree try = TREE_OPERAND (node, 0); @@ -15583,8 +15286,7 @@ patch_try_statement (node) /* 14.17 The synchronized Statement */ static tree -patch_synchronized_statement (node, wfl_op1) - tree node, wfl_op1; +patch_synchronized_statement (tree node, tree wfl_op1) { tree expr = java_complete_tree (TREE_OPERAND (node, 0)); tree block = TREE_OPERAND (node, 1); @@ -15653,8 +15355,7 @@ patch_synchronized_statement (node, wfl_op1) /* 14.16 The throw Statement */ static tree -patch_throw_statement (node, wfl_op1) - tree node, wfl_op1; +patch_throw_statement (tree node, tree wfl_op1) { tree expr = TREE_OPERAND (node, 0); tree type = TREE_TYPE (expr); @@ -15756,9 +15457,7 @@ patch_throw_statement (node, wfl_op1) effectively caught from where DECL is invoked. */ static void -check_thrown_exceptions (location, decl) - int location; - tree decl; +check_thrown_exceptions (int location, tree decl) { tree throws; /* For all the unchecked exceptions thrown by DECL */ @@ -15793,8 +15492,7 @@ check_thrown_exceptions (location, decl) current method. */ static int -check_thrown_exceptions_do (exception) - tree exception; +check_thrown_exceptions_do (tree exception) { tree list = currently_caught_type_list; resolve_and_layout (exception, NULL_TREE); @@ -15814,8 +15512,7 @@ check_thrown_exceptions_do (exception) } static void -purge_unchecked_exceptions (mdecl) - tree mdecl; +purge_unchecked_exceptions (tree mdecl) { tree throws = DECL_FUNCTION_THROWS (mdecl); tree new = NULL_TREE; @@ -15840,8 +15537,7 @@ purge_unchecked_exceptions (mdecl) otherwise. */ static bool -ctors_unchecked_throws_clause_p (class_type) - tree class_type; +ctors_unchecked_throws_clause_p (tree class_type) { tree current; @@ -15869,8 +15565,7 @@ ctors_unchecked_throws_clause_p (class_type) /* 15.24 Conditional Operator ?: */ static tree -patch_conditional_expr (node, wfl_cond, wfl_op1) - tree node, wfl_cond, wfl_op1; +patch_conditional_expr (tree node, tree wfl_cond, tree wfl_op1) { tree cond = TREE_OPERAND (node, 0); tree op1 = TREE_OPERAND (node, 1); @@ -15983,8 +15678,7 @@ patch_conditional_expr (node, wfl_cond, wfl_op1) /* Wrap EXPR with code to initialize DECL's class, if appropriate. */ static tree -maybe_build_class_init_for_field (decl, expr) - tree decl, expr; +maybe_build_class_init_for_field (tree decl, tree expr) { tree clas = DECL_CONTEXT (decl); if (flag_emit_class_files || flag_emit_xref) @@ -16008,9 +15702,7 @@ maybe_build_class_init_for_field (decl, expr) CONTEXT is a static final VAR_DECL whose initializer we are folding. */ static tree -fold_constant_for_init (node, context) - tree node; - tree context; +fold_constant_for_init (tree node, tree context) { tree op0, op1, val; enum tree_code code = TREE_CODE (node); @@ -16157,22 +15849,18 @@ fold_constant_for_init (node, context) 'M' for MethodName, 'E' for ExpressionName, and 'A' for AmbiguousName. */ tree -resolve_simple_name (name, context) - tree name; - int context; +resolve_simple_name (tree name, int context) { } tree -resolve_qualified_name (name, context) - tree name; - int context; +resolve_qualified_name (tree name, int context) { } #endif void -init_src_parse () +init_src_parse (void) { /* Sanity check; we've been bit by this before. */ if (ARRAY_SIZE (ctxp->modifier_ctx) != MODIFIER_TK - PUBLIC_TK) @@ -16187,9 +15875,7 @@ init_src_parse () /* Attach to PTR (a block) the declaration found in ENTRY. */ static int -attach_init_test_initialization_flags (entry, ptr) - void **entry; - void *ptr; +attach_init_test_initialization_flags (void **entry, void *ptr) { tree block = (tree)ptr; struct treetreehash_entry *ite = (struct treetreehash_entry *) *entry; @@ -16209,9 +15895,7 @@ attach_init_test_initialization_flags (entry, ptr) a new one is created. */ static int -emit_test_initialization (entry_p, info) - void **entry_p; - void *info; +emit_test_initialization (void **entry_p, void *info) { tree l = (tree) info; tree decl, init; |