X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fmessage.c;h=c7b56e0a8d3a1b680571244a835b680355eace7f;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=c227a60368a0ff725dacc9baba4e00bf916cf37d;hpb=f550aee00a62fe1d8baf62d83cd7efef6cc2ee92;p=pspp-builds.git diff --git a/src/libpspp/message.c b/src/libpspp/message.c index c227a603..c7b56e0a 100644 --- a/src/libpspp/message.c +++ b/src/libpspp/message.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,8 +16,8 @@ #include -#include "message.h" -#include "msg-locator.h" +#include "libpspp/message.h" +#include "libpspp/msg-locator.h" #include #include @@ -26,8 +26,9 @@ #include #include -#include -#include +#include "data/settings.h" +#include "libpspp/str.h" +#include "libpspp/version.h" #include "gl/progname.h" #include "gl/xalloc.h" @@ -56,6 +57,10 @@ msg (enum msg_class class, const char *format, ...) m.severity = msg_class_to_severity (class); va_start (args, format); m.text = xvasprintf (format, args); + m.where.file_name = NULL; + m.where.line_number = 0; + m.where.first_column = 0; + m.where.last_column = 0; va_end (args); msg_emit (&m); @@ -113,13 +118,25 @@ msg_to_string (const struct msg *m, const char *command_name) ds_init_empty (&s); if (m->category != MSG_C_GENERAL - && (m->where.file_name || m->where.line_number != -1)) + && (m->where.file_name + || m->where.line_number > 0 + || m->where.first_column > 0)) { if (m->where.file_name) - ds_put_format (&s, "%s:", m->where.file_name); - if (m->where.line_number != -1) - ds_put_format (&s, "%d:", m->where.line_number); - ds_put_char (&s, ' '); + ds_put_format (&s, "%s", m->where.file_name); + if (m->where.line_number > 0) + { + if (!ds_is_empty (&s)) + ds_put_byte (&s, ':'); + ds_put_format (&s, "%d", m->where.line_number); + } + if (m->where.first_column > 0) + { + ds_put_format (&s, ".%d", m->where.first_column); + if (m->where.last_column > m->where.first_column + 1) + ds_put_format (&s, "-%d", m->where.last_column - 1); + } + ds_put_cstr (&s, ": "); } switch (m->severity) @@ -145,21 +162,132 @@ msg_to_string (const struct msg *m, const char *command_name) return ds_cstr (&s); } + +/* Number of messages reported, by severity level. */ +static int counts[MSG_N_SEVERITIES]; + +/* True after the maximum number of errors or warnings has been exceeded. */ +static bool too_many_errors; + +/* True after the maximum number of notes has been exceeded. */ +static bool too_many_notes; + +/* True iff warnings have been explicitly disabled (MXWARNS = 0) */ +static bool warnings_off = false; + +/* Checks whether we've had so many errors that it's time to quit + processing this syntax file. */ +bool +msg_ui_too_many_errors (void) +{ + return too_many_errors; +} + +void +msg_ui_disable_warnings (bool x) +{ + warnings_off = x; +} + + +void +msg_ui_reset_counts (void) +{ + int i; + + for (i = 0; i < MSG_N_SEVERITIES; i++) + counts[i] = 0; + too_many_errors = false; + too_many_notes = false; +} + +bool +msg_ui_any_errors (void) +{ + return counts[MSG_S_ERROR] > 0; +} + +static void +submit_note (char *s) +{ + struct msg m; + + m.category = MSG_C_GENERAL; + m.severity = MSG_S_NOTE; + m.where.file_name = NULL; + m.where.line_number = 0; + m.where.first_column = 0; + m.where.last_column = 0; + m.text = s; + msg_handler (&m); + free (s); +} + + + +static void +process_msg (const struct msg *m) +{ + int n_msgs, max_msgs; + + + if (too_many_errors + || (too_many_notes && m->severity == MSG_S_NOTE) + || (warnings_off && m->severity == MSG_S_WARNING) ) + return; + + msg_handler (m); + + counts[m->severity]++; + max_msgs = settings_get_max_messages (m->severity); + n_msgs = counts[m->severity]; + if (m->severity == MSG_S_WARNING) + n_msgs += counts[MSG_S_ERROR]; + if (n_msgs > max_msgs) + { + if (m->severity == MSG_S_NOTE) + { + too_many_notes = true; + submit_note (xasprintf (_("Notes (%d) exceed limit (%d). " + "Suppressing further notes."), + n_msgs, max_msgs)); + } + else + { + too_many_errors = true; + if (m->severity == MSG_S_WARNING) + submit_note (xasprintf (_("Warnings (%d) exceed limit (%d). Syntax processing will be halted."), + n_msgs, max_msgs)); + else + submit_note (xasprintf (_("Errors (%d) exceed limit (%d). Syntax processing will be halted."), + n_msgs, max_msgs)); + } + } +} + + /* Emits M as an error message. Frees allocated data in M. */ void msg_emit (struct msg *m) { - if ( s_stream ) - get_msg_location (s_stream, &m->where); + if ( s_stream && m->where.file_name == NULL ) + { + struct msg_locator loc; + + get_msg_location (s_stream, &loc); + m->where.file_name = loc.file_name; + m->where.line_number = loc.line_number; + } else { m->where.file_name = NULL; - m->where.line_number = -1; + m->where.line_number = 0; } if (!messages_disabled) - msg_handler (m); + process_msg (m); + free (m->text); } @@ -184,7 +312,7 @@ msg_enable (void) /* Private functions. */ void -request_bug_report_and_abort (const char *msg) +request_bug_report (const char *msg) { fprintf (stderr, "******************************************************\n"); fprintf (stderr, "You have discovered a bug in PSPP. Please report this\n"); @@ -206,6 +334,5 @@ request_bug_report_and_abort (const char *msg) #endif ); fprintf (stderr, "******************************************************\n"); - - _exit (EXIT_FAILURE); } +