2006-11-08 Brooks Moses <brooks.moses@codesourcery.com>
+ * lang.opt: Add -fmax-errors= option.
+ * gfortran.h (gfc_option_t): Add max_errors element.
+ * options.c (gfc_init_options): Set max_errors default value
+ to 25.
+ (gfc_handle_options): Assign -fmax_errors value to
+ gfc_option.max_errors.
+ * error.c (gfc_increment_error_count): New function, which
+ also checks whether the error count exceeds max_errors.
+ (gfc_warning): Use it.
+ (gfc_warning_now): Use it.
+ (gfc_notify_std): Use it.
+ (gfc_error): Use it.
+ (gfc_error_now): Use it.
+ (gfc_error_check): Use it.
+
+2006-11-08 Brooks Moses <brooks.moses@codesourcery.com>
+
* lang.opt: Remove non-working -qkind= option.
* gfortran.h (gfc_option_t): Remove q_kind member.
* options.c (gfc_init_options): Remove q_kind initialization.
}
+/* Increment the number of errors, and check whether too many have
+ been printed. */
+
+static void
+gfc_increment_error_count (void)
+{
+ errors++;
+ if ((gfc_option.max_errors != 0) && (errors >= gfc_option.max_errors))
+ gfc_fatal_error ("Error count reached limit of %d.", gfc_option.max_errors);
+}
+
+
/* Issue a warning. */
void
cur_error_buffer = &warning_buffer;
va_start (argp, nocmsgid);
+ error_print (_("Warning:"), _(nocmsgid), argp);
+ va_end (argp);
+
+ error_char ('\0');
+
if (buffer_flag == 0)
{
warnings++;
if (warnings_are_errors)
- errors++;
+ gfc_increment_error_count();
}
-
- error_print (_("Warning:"), _(nocmsgid), argp);
- va_end (argp);
-
- error_char ('\0');
}
cur_error_buffer->flag = 1;
cur_error_buffer->index = 0;
- if (buffer_flag == 0)
- {
- if (warning && !warnings_are_errors)
- warnings++;
- else
- errors++;
- }
va_start (argp, nocmsgid);
if (warning)
error_print (_("Warning:"), _(nocmsgid), argp);
va_end (argp);
error_char ('\0');
+
+ if (buffer_flag == 0)
+ {
+ if (warning && !warnings_are_errors)
+ warnings++;
+ else
+ gfc_increment_error_count();
+ }
+
return (warning && !warnings_are_errors) ? SUCCESS : FAILURE;
}
buffer_flag = 0;
warnings++;
if (warnings_are_errors)
- errors++;
+ gfc_increment_error_count();
va_start (argp, nocmsgid);
error_print (_("Warning:"), _(nocmsgid), argp);
cur_error_buffer = &error_buffer;
va_start (argp, nocmsgid);
- if (buffer_flag == 0)
- errors++;
error_print (_("Error:"), _(nocmsgid), argp);
va_end (argp);
error_char ('\0');
+
+ if (buffer_flag == 0)
+ gfc_increment_error_count();
}
i = buffer_flag;
buffer_flag = 0;
- errors++;
va_start (argp, nocmsgid);
error_print (_("Error:"), _(nocmsgid), argp);
va_end (argp);
error_char ('\0');
+
+ gfc_increment_error_count();
+
buffer_flag = i;
if (flag_fatal_errors)
if (error_buffer.flag)
{
- errors++;
if (error_buffer.message != NULL)
fputs (error_buffer.message, stderr);
error_buffer.flag = 0;
+ gfc_increment_error_count();
+
if (flag_fatal_errors)
exit (1);
}
gfc_option.warn_surprising = 0;
gfc_option.warn_tabs = 1;
gfc_option.warn_underflow = 1;
+ gfc_option.max_errors = 25;
gfc_option.flag_all_intrinsics = 0;
gfc_option.flag_default_double = 0;
gfc_option.flag_implicit_none = value;
break;
+ case OPT_fmax_errors_:
+ gfc_option.max_errors = value;
+ break;
+
case OPT_fmax_stack_var_size_:
gfc_option.flag_max_stack_var_size = value;
break;