Makefile.in (ch-version.c): Constify a char*.

	* Makefile.in (ch-version.c): Constify a char*.

	* actions.c (id_cmp, warn_unhandled, adjust_return_value,
	update_else_range_for_int_const, update_else_range_for_range,
	update_else_range_for_range_expr, update_else_range_for_type,
	compute_else_range, check_case_value,
	chill_handle_case_label_range,
	chill_handle_multi_case_label_range,
	chill_handle_multi_case_else_label, chill_handle_multi_case_label,
	chill_handle_multi_case_label_list print_missing_cases): Add
	static prototypes.
	(build_exception_variant): Cast the function argument of qsort.
	(build_rts_call, warn_unhandled, chill_convert_for_assignment,
	adjust_return_value, chill_expand_result,
	build_multi_case_selector_expression, print_missing_cases):
	Constify a char*.
	(print_missing_cases): Introduce an intermediary non-const ptr.
	Add brackets and indent.

	* ch-tree.h (maybe_building_objc_message_expr,
	maybe_objc_comptypes, comptypes_record_hook): Remove declarations.
	(push_handler, pop_handler): Add prototypes.
	(builtin_function, valid_array_index_p,
	build_chill_exception_decl, build_rts_call,
	chill_convert_for_assignment, display_int_cst,
	build_chill_addr_expr, check_have_mode, get_identifier3,
	build_chill_string, register_seize_path, get_unique_identifier,
	add_taskstuff_to_list, gnuchill_version): Constify a char*.
	(finish_chill_function): Add void prototype argument.

	* convert.c (convert_to_reference, convert_to_boolean,
	convert_to_char, base_type_size_in_bytes, remove_tree_element,
	check_ps_range, digest_powerset_tuple, digest_structure_tuple,
	digest_array_tuple, convert1): Add static prototypes.
	(base_type_size_in_bytes): Hide unused function.
	(display_int_cst, digest_array_tuple): Constify a char*.

	* decl.c (set_nesting_level, make_chill_variants, fix_identifier,
	proclaim_decl, maybe_acons, push_scope_decls, pop_scope_decls,
	build_implied_names, bind_sub_modules, layout_array_type,
	do_based_decl, handle_one_level, label_value_cmp,
	find_implied_types): Add static prototypes.
	(boolean_code_name, chill_tree_code_type, chill_tree_code_name):
	Constify a char*.
	(layout_chill_variants): Cast the function argument of qsort.
	(start_chill_function, fix_identifier, init_decl_processing):
	Constify a char*.
	(init_decl_processing): Prefer memcpy over bcopy to avoid casts.
	Use xcalloc instead of xmalloc/bzero.
	(builtin_function, build_chill_exception_decl,
	finish_outer_function): Constify a char*.

	* except.c (start_handler_array, finish_handler_array): Add static
	prototypes.

	* expr.c (chill_expand_expr, chill_expand_case_expr,
	check_arglist_length, internal_build_compound_expr,
	is_really_instance, invalid_operand, invalid_right_operand,
	build_chill_abstime, build_allocate_memory_call,
	build_allocate_global_memory_call, build_return_memory,
	build_chill_duration, build_chill_floatcall,
	build_allocate_getstack, build_chill_allocate,
	build_chill_getstack, build_chill_terminate, build_chill_inttime,
	build_chill_lower_or_upper, build_max_min,
	build_chill_pred_or_succ, expand_packed_set, fold_set_expr,
	build_compare_set_expr, scalar_to_string, build_concat_expr,
	build_compare_string_expr, compare_records, string_char_rep,
	build_boring_bitstring): Add static prototypes.
	(check_have_mode, chill_expand_expr, build_chill_floatcall,
	build_allocate_getstack, build_max_min, build_chill_function_call,
	expand_packed_set, build_compare_set_expr, build_chill_addr_expr,
	string_char_rep): Constify a char*.

	* gperf (hash, in_word_set): Add prototypes.

	* grant.c (newstring, strfree, append, prepend,
	grant_use_seizefile, decode_layout, grant_array_type,
	grant_array_type_selective, get_tag_value,
	get_tag_value_selective, print_enumeral, print_enumeral_selective,
	print_integer_type, find_enum_parent, print_integer_selective,
	print_struct, print_struct_selective, print_proc_exceptions,
	print_proc_tail, print_proc_tail_selective, find_in_decls,
	in_ridpointers, grant_seized_identifier, globalize_decl,
	grant_one_decl_selective, compare_memory_file, search_in_list,
	really_grant_this): Add static prototypes.
	(newstring, append, prepend, grant_use_seizefile,
	print_integer_type, decode_constant, grant_one_decl_selective,
	header_template): Constify a char *.

	* inout.c (add_enum_to_list, build_chill_io_list_type,
	build_io_types, declare_predefined_file, build_access_part,
	textlocation_mode, check_assoc, assoc_call, check_transfer,
	connect_process_optionals, connect_text, connect_access,
	check_access, check_text, get_final_type_and_range,
	process_io_list, check_format_string, get_max_size,
	check_exprlist): Add static prototypes.
	(declare_predefined_file, check_assoc, assoc_call, check_transfer,
	check_access, check_text, process_io_list): Constify a char*.

	* lang.c (deep_const_expr, chill_print_error_function): Add static
	prototypes.

	* lex.c (close_input_file, maybe_number, string_or_char): Constify
	a char*.
	(ch_lex_init, skip_directive, same_file, getlc, yywrap,
	yy_refill): Add static prototypes.
	(build_chill_string, same_file, register_seize_path): Constify a
	char*.

	* lex.h (finish_chill_seizes): Remove unused prototypes.

	* loop.c (build_temporary_variable, maybe_make_for_temp,
	get_unique_identifier): Constify a char*.

	* parse.c (ch_parse_init, check_end_label, end_function,
	build_prefix_clause, PEEK_TOKEN, peek_token_, pushback_token,
	forward_token_, require, check_token, expect, define__PROCNAME__):
	Add static prototypes.
	(build_prefix_clause, expect): Constify a char*.
	(parse_expression, parse_primval, parse_untyped_expr,
	parse_opt_untyped_expr, parse_opt_actions): Add void prototype
	argument.
	(parse_opt_name_string, parse_simple_name_string,
	parse_name_string, parse_defining_occurrence, parse_name,
	parse_optlabel, parse_opt_end_label_semi_colon, parse_modulion,
	parse_spec_module, parse_semi_colon,
	parse_defining_occurrence_list, parse_mode_definition,
	parse_mode_definition_statement, parse_synonym_definition,
	parse_synonym_definition_statement, parse_on_exception_list,
	parse_on_alternatives, parse_loc_declaration,
	parse_declaration_statement, parse_optforbid, parse_postfix,
	parse_postfix_list, parse_rename_clauses, parse_opt_prefix_clause,
	parse_grant_statement, parse_seize_statement,
	parse_param_name_list, parse_param_attr, parse_formpar,
	parse_formparlist, parse_opt_result_spec, parse_opt_except,
	parse_opt_recursive, parse_procedureattr, parse_proc_body,
	parse_procedure_definition, parse_processpar,
	parse_processparlist, parse_process_definition,
	parse_signal_definition, parse_signal_definition_statement,
	parse_then_clause, parse_opt_else_clause, parse_expr_list,
	parse_range_list_clause, pushback_paren_expr, parse_case_label,
	parse_case_label_list, parse_case_label_specification,
	parse_single_dimension_case_action,
	parse_multi_dimension_case_action, parse_case_action,
	parse_asm_operands, parse_asm_clobbers, ch_expand_asm_operands,
	parse_asm_action, parse_begin_end_block, parse_if_action,
	parse_iteration, parse_delay_case_event_list,
	parse_delay_case_action, parse_do_action, parse_receive_spec,
	parse_receive_case_action, parse_send_action, parse_start_action,
	parse_call, parse_tuple_fieldname_list, parse_tuple_element,
	parse_opt_element_list, parse_tuple, parse_operand6,
	parse_operand5, parse_operand4, parse_operand3, parse_operand2,
	parse_operand1, parse_operand0, parse_case_expression,
	parse_then_alternative, parse_else_alternative,
	parse_if_expression, parse_index_mode, parse_set_mode, parse_pos,
	parse_step, parse_opt_layout, parse_field_name_list,
	parse_fixed_field, parse_variant_field_list,
	parse_variant_alternative, parse_field, parse_structure_mode,
	parse_opt_queue_size, parse_procedure_mode, parse_program,
	parse_pass_1_2): Add static prototypes.
	(parse_process_definition): Remove extra argument in function call.
	(parse_range_list_clause): Likewise.

	* satisfy.c (satisfy, cycle_error_print, safe_satisfy_decl,
	satisfy_list, satisfy_list_values): Add static prototype.
	(safe_satisfy_decl): Cast DECL_TASKING_CODE_DECL() to (tree).

	* tasking.c (make_process_struct): Remove unused prototype.
	(validate_process_parameters, get_struct_variable_name,
	decl_tasking_code_variable, get_struct_debug_type_name,
	get_process_wrapper_name, build_tasking_enum,
	build_tasking_message_type, build_receive_signal_case_label,
	build_receive_buffer_case_label, build_receive_buffer_case_end,
	build_receive_signal_case_end): Add static prototypes.
	(struct_name, struct_debug_name, data_name, wrapper_name,
	get_struct_type_name, get_struct_debug_type_name,
	get_tasking_code_name, get_struct_variable_name,
	get_process_wrapper_name): Constify a char*.
	(validate_process_parameters, get_struct_variable_name,
	decl_tasking_code_variable): Hide unused functions.
	(build_start_process, add_taskstuff_to_list, build_queue_length):
	Constify a char*.

	* tree.c (make_powerset_type): Add static prototype.
	(get_identifier3, build_alias_decl, decl_check_rename): Constify a
	char*.

	* typeck.c (extract_constant_from_buffer,
	expand_constant_to_buffer, build_empty_string,
	make_chill_pointer_type, make_chill_range_type,
	apply_chill_array_layout, field_decl_cmp, make_chill_struct_type,
	apply_chill_field_layout): Add static prototype.
	(valid_array_index_p, extract_constant_from_buffer,
	chill_expand_tuple): Constify a char*.
	(layout_chill_struct_type): Cast the function argument of qsort.

From-SVN: r28965

1 files changed, 65 insertions, 31 deletions

diff --git a/gcc/ch/expr.c b/gcc/ch/expr.c
index 5e689a2..5781e38 100644
--- a/gcc/ch/expr.c
+++ b/gcc/ch/expr.c
@@ -52,9 +52,43 @@ extern int  special_UC;
 #define HOURS_MAX                                         1193
 #define DAYS_MAX                                            49
 
-/* forward declaration */
-rtx chill_expand_expr PROTO((tree, rtx, enum machine_mode, 
-			     enum expand_modifier));
+/* forward declarations */
+static rtx chill_expand_expr		PROTO ((tree, rtx, enum machine_mode, 
+						enum expand_modifier));
+static tree chill_expand_case_expr	PROTO ((tree));
+static int check_arglist_length		PROTO ((tree, int, int, tree));
+static tree internal_build_compound_expr PROTO ((tree, int));
+static int is_really_instance		PROTO ((tree));
+static int invalid_operand		PROTO ((enum chill_tree_code,
+						tree, int));
+static int invalid_right_operand	PROTO ((enum chill_tree_code, tree));
+static tree build_chill_abstime		PROTO ((tree));
+static tree build_allocate_memory_call	PROTO ((tree, tree));
+static tree build_allocate_global_memory_call PROTO ((tree, tree));
+static tree build_return_memory		PROTO ((tree));
+static tree build_chill_duration	PROTO ((tree, unsigned long,
+						tree, unsigned long));
+static tree build_chill_floatcall	PROTO ((tree, const char *,
+						const char *));
+static tree build_allocate_getstack	PROTO ((tree, tree, const char *,
+						const char *, tree, tree));
+static tree build_chill_allocate	PROTO ((tree, tree));
+static tree build_chill_getstack	PROTO ((tree, tree));
+static tree build_chill_terminate	PROTO ((tree));
+static tree build_chill_inttime		PROTO ((tree, tree));
+static tree build_chill_lower_or_upper	PROTO ((tree, int));
+static tree build_max_min		PROTO ((tree, int));
+static tree build_chill_pred_or_succ	PROTO ((tree, enum tree_code));
+static tree expand_packed_set		PROTO ((const char *, int, tree));
+static tree fold_set_expr		PROTO ((enum chill_tree_code,
+						tree, tree));
+static tree build_compare_set_expr	PROTO ((enum tree_code, tree, tree));
+static tree scalar_to_string		PROTO ((tree));
+static tree build_concat_expr		PROTO ((tree, tree));
+static tree build_compare_string_expr	PROTO ((enum tree_code, tree, tree));
+static tree compare_records		PROTO ((tree, tree));
+static tree string_char_rep		PROTO ((int, tree));
+static tree build_boring_bitstring	PROTO ((long, int));
 
 /* variable to hold the type the DESCR built-in returns */
 static tree descr_type = NULL_TREE;
@@ -84,7 +118,7 @@ force_addr_of (value)
 tree
 check_have_mode (exp, context)
      tree exp;
-     char *context;
+     const char *context;
 {
   if (TREE_CODE (exp) != ERROR_MARK && TREE_TYPE (exp) == NULL_TREE)
     {
@@ -134,7 +168,7 @@ check_case_selector_list (list)
   return nreverse(return_list);
 }
 
-tree
+static tree
 chill_expand_case_expr (expr)
      tree expr;
 {
@@ -208,7 +242,7 @@ chill_expand_case_expr (expr)
 
 /* Hook used by expand_expr to expand CHILL-specific tree codes.  */
 
-rtx
+static rtx
 chill_expand_expr (exp, target, tmode, modifier)
      tree exp;
      rtx target;
@@ -221,7 +255,7 @@ chill_expand_expr (exp, target, tmode, modifier)
   rtx original_target = target;
   rtx op0, op1;
   int ignore = target == const0_rtx;
-  char *lib_func;                   /* name of library routine */
+  const char *lib_func;                   /* name of library routine */
 
   if (ignore)
     target = 0, original_target = 0;
@@ -1189,7 +1223,7 @@ build_chill_abs (expr)
   return temp;
 }
 
-tree
+static tree
 build_chill_abstime (exprlist)
      tree exprlist;
 {
@@ -1242,7 +1276,7 @@ build_chill_abstime (exprlist)
 }
 
 
-tree
+static tree
 build_allocate_memory_call (ptr, size)
   tree ptr, size;
 {
@@ -1283,7 +1317,7 @@ build_allocate_memory_call (ptr, size)
 }
 
 
-tree
+static tree
 build_allocate_global_memory_call (ptr, size)
   tree ptr, size;
 {
@@ -1324,7 +1358,7 @@ build_allocate_global_memory_call (ptr, size)
 }
 
 
-tree
+static tree
 build_return_memory (ptr)
   tree ptr;
 {
@@ -1484,7 +1518,7 @@ build_chill_descr (expr)
    MILLISECS, SECS, MINUTES, HOURS and DAYS.
    The built duration value is in milliseconds. */
 
-tree
+static tree
 build_chill_duration (expr, multiplier, fnname, maxvalue)
      tree           expr;
      unsigned long  multiplier;
@@ -1516,8 +1550,8 @@ build_chill_duration (expr, multiplier, fnname, maxvalue)
 static tree
 build_chill_floatcall (expr, chillname, funcname)
      tree expr;
-     char *chillname;
-     char *funcname;
+     const char *chillname;
+     const char *funcname;
 {
   tree result;
   tree type;
@@ -1545,8 +1579,8 @@ static tree
 build_allocate_getstack (mode, value, chill_name, fnname, filename, linenumber)
      tree mode;
      tree value;
-     char *chill_name;
-     char *fnname;
+     const char *chill_name;
+     const char *fnname;
      tree filename;
      tree linenumber;
 {
@@ -1622,7 +1656,7 @@ build_allocate_getstack (mode, value, chill_name, fnname, filename, linenumber)
 }
 
 /* process the ALLOCATE built-in */
-tree
+static tree
 build_chill_allocate (mode, value)
      tree mode;
      tree value;
@@ -1632,7 +1666,7 @@ build_chill_allocate (mode, value)
 }
 
 /* process the GETSTACK built-in */
-tree
+static tree
 build_chill_getstack (mode, value)
      tree mode;
      tree value;
@@ -1642,7 +1676,7 @@ build_chill_getstack (mode, value)
 }
 
 /* process the TERMINATE built-in */
-tree
+static tree
 build_chill_terminate (ptr)
      tree ptr;
 {
@@ -1686,7 +1720,7 @@ build_chill_inttime_type ()
   satisfy_decl (decl, 0);
 }
 
-tree
+static tree
 build_chill_inttime (t, loclist)
      tree t, loclist;
 {
@@ -1993,7 +2027,7 @@ build_max_min (expr, max_min)
       else
 	{
 	  tree parmlist, filename, lineno;
-	  char *funcname;
+	  const char *funcname;
 	  
 	  /* set up to call appropriate runtime function */
 	  if (max_min)
@@ -2479,7 +2513,7 @@ build_chill_function_call (function, expr)
  
   if (valtail != 0 && TREE_VALUE (valtail) != void_type_node)
     {
-      char *errstr = "too many arguments to procedure";
+      const char *errstr = "too many arguments to procedure";
       if (name)
 	error ("%s `%s'", errstr, IDENTIFIER_POINTER (name));
       else
@@ -2488,7 +2522,7 @@ build_chill_function_call (function, expr)
     }
   else if (typetail != 0 && TREE_VALUE (typetail) != void_type_node)
     {
-      char *errstr = "too few arguments to procedure";
+      const char *errstr = "too few arguments to procedure";
       if (name)
 	error ("%s `%s'", errstr, IDENTIFIER_POINTER (name));
       else
@@ -2985,9 +3019,9 @@ build_generalized_call (func, args)
 
 /* Given a set stored as one bit per char (in BUFFER[0 .. BIT_SIZE-1]),
    return a CONTRUCTOR, of type TYPE (a SET_TYPE). */
-tree
+static tree
 expand_packed_set (buffer, bit_size, type)
-     char *buffer;
+     const char *buffer;
      int   bit_size;
      tree type;
 {
@@ -3131,7 +3165,7 @@ build_compare_set_expr (code, op0, op1)
      tree op0, op1;
 {
   tree result_type = NULL_TREE;
-  char *fnname;
+  const char *fnname;
   tree x;
 
   /* These conversions are needed if -fold-strings. */
@@ -3428,7 +3462,7 @@ build_compare_string_expr (code, op0, op1)
   return build (code, boolean_type_node, op0, op1);
 }
 
-tree
+static tree
 compare_records (exp0, exp1)
      tree exp0, exp1;
 {
@@ -4017,7 +4051,7 @@ build_chill_arrow_expr (ref, force)
 tree
 build_chill_addr_expr (ref, errormsg)
      tree ref;
-     char *errormsg;
+     const char *errormsg;
 {
   if (ref == error_mark_node)
     return ref;
@@ -4067,7 +4101,7 @@ build_chill_binary_op (code, op0, op1)
 /*
  * process a string repetition phrase '(' COUNT ')' STRING
  */
-tree
+static tree
 string_char_rep (count, string)
      int count;
      tree string;
@@ -4075,7 +4109,7 @@ string_char_rep (count, string)
   int slen, charindx, repcnt;
   char ch;
   char *temp;
-  char *inp;
+  const char *inp;
   char *outp;
   tree type;
 
@@ -4102,7 +4136,7 @@ string_char_rep (count, string)
 /* Build a bit-string constant containing with the given LENGTH
    containing all ones (if VALUE is true), or all zeros (if VALUE is false). */
 
-tree
+static tree
 build_boring_bitstring (length, value)
      long length;
      int value;