parse.h (ABSTRACT_CHECK, [...]): Avoid the use of ANSI string concatenation.

	* parse.h (ABSTRACT_CHECK, JCONSTRUCTOR_CHECK,
	ERROR_CANT_CONVERT_TO_BOOLEAN, ERROR_CANT_CONVERT_TO_NUMERIC,
	ERROR_CAST_NEEDED_TO_INTEGRAL): Avoid the use of ANSI string
	concatenation.

	* parse.y (synchronized, variable_redefinition_error,
	check_class_interface_creation, create_interface, create_class,
	method_header, finish_method_declaration,
	check_modifiers_consistency, method_declarator,
	complete_class_report_errors, check_abstract_method_definitions,
	java_check_regular_methods, check_throws_clauses,
	java_check_abstract_methods, read_import_dir,
	check_pkg_class_access, declare_local_variables, fix_constructors,
	cut_identifier_in_qualified, resolve_expression_name,
	resolve_qualified_expression_name, patch_method_invocation,
	java_complete_lhs, patch_assignment, try_builtin_assignconv,
	patch_binop, patch_array_ref, patch_newarray, build_labeled_block,
	patch_exit_expr, patch_exit_expr, patch_switch_statement,
	patch_try_statement, patch_synchronized_statement,
	patch_throw_statement, check_thrown_exceptions,
	patch_conditional_expr): Likewise.

From-SVN: r31146

gcc/java/ChangeLog

+1999-12-30  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* parse.h (ABSTRACT_CHECK, JCONSTRUCTOR_CHECK,
+	ERROR_CANT_CONVERT_TO_BOOLEAN, ERROR_CANT_CONVERT_TO_NUMERIC,
+	ERROR_CAST_NEEDED_TO_INTEGRAL): Avoid the use of ANSI string
+	concatenation.
+
+	* parse.y (synchronized, variable_redefinition_error,
+	check_class_interface_creation, create_interface, create_class,
+	method_header, finish_method_declaration,
+	check_modifiers_consistency, method_declarator,
+	complete_class_report_errors, check_abstract_method_definitions,
+	java_check_regular_methods, check_throws_clauses,
+	java_check_abstract_methods, read_import_dir,
+	check_pkg_class_access, declare_local_variables, fix_constructors,
+	cut_identifier_in_qualified, resolve_expression_name,
+	resolve_qualified_expression_name, patch_method_invocation,
+	java_complete_lhs, patch_assignment, try_builtin_assignconv,
+	patch_binop, patch_array_ref, patch_newarray, build_labeled_block,
+	patch_exit_expr, patch_exit_expr, patch_switch_statement,
+	patch_try_statement, patch_synchronized_statement,
+	patch_throw_statement, check_thrown_exceptions,
+	patch_conditional_expr): Likewise.
+
 1999-12-14  Alexandre Petit-Bianco  <apbianco@cygnus.com>
 
 	* class.c (class_depth): Return -1 if the class doesn't load

gcc/java/parse.h

@@ -101,7 +101,7 @@ extern tree stabilize_reference PROTO ((tree));
 
 #define ABSTRACT_CHECK(FLAG, V, CL, S)				\
   if ((FLAG) & (V))						\
-    parse_error_context ((CL), S " method can't be abstract");
+    parse_error_context ((CL), "%s method can't be abstract", (S));
 
 #define JCONSTRUCTOR_CHECK(FLAG, V, CL, S)			\
   if ((FLAG) & (V))						\
@@ -142,8 +142,7 @@ extern tree stabilize_reference PROTO ((tree));
   {                                                                          \
     if (flag_redundant && (cl) && ((flags) & (modifier)))		     \
       parse_warning_context (cl,                                             \
-			     "Discouraged redundant use of `%s' modifier "   \
-			     "in declaration of " format,                    \
+     "Discouraged redundant use of `%s' modifier in declaration of " format, \
 			     java_accstring_lookup (modifier), arg);         \
   }
 
@@ -212,26 +211,26 @@ extern tree stabilize_reference PROTO ((tree));
 
 /* Standard error messages */
 #define ERROR_CANT_CONVERT_TO_BOOLEAN(OPERATOR, NODE, TYPE)		\
-  parse_error_context							\
-    ((OPERATOR), "Incompatible type for `%s'. Can't convert `%s' to "	\
-     "boolean", operator_string ((NODE)), lang_printable_name ((TYPE),0))
+  parse_error_context ((OPERATOR),					\
+    "Incompatible type for `%s'. Can't convert `%s' 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 `%s'. Can't convert `%s' to "	\
-     "numeric type", operator_string ((NODE)), lang_printable_name ((TYPE), 0))
+  parse_error_context ((OPERATOR),					\
+      "Incompatible type for `%s'. Can't convert `%s' 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 `%s'. Explicit" \
-                         " cast needed to convert `%s' to integral",	\
+    parse_error_context (_operator,					\
+"Incompatible type for `%s'. Explicit cast needed to convert `%s' to integral",\
 			 operator_string(_node),			\
 			 lang_printable_name (_type, 0));		\
   else									\
-    parse_error_context (_operator, "Incompatible type for `%s'. Can't" \
-                         " convert `%s' to integral",			\
+    parse_error_context (_operator,					\
+      "Incompatible type for `%s'. Can't convert `%s' to integral",	\
 			 operator_string(_node),			\
 			 lang_printable_name (_type, 0));		\
 } while (0)