X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fmessage.c;h=0597588784d12cfeec1be197edd449d5274feb38;hb=03de35c0fe7c134458408dcb32c23bba8b1bb078;hp=ed6d6e7a9b0cc9b3b10df864ddbc30f57a49d926;hpb=a258e53c63a08b0ec48aea8f03808eb651729424;p=pspp diff --git a/src/libpspp/message.c b/src/libpspp/message.c index ed6d6e7a9b..0597588784 100644 --- a/src/libpspp/message.c +++ b/src/libpspp/message.c @@ -1,5 +1,6 @@ /* 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, 2013 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 +17,7 @@ #include -#include "message.h" -#include "msg-locator.h" +#include "libpspp/message.h" #include #include @@ -26,10 +26,12 @@ #include #include -#include -#include -#include +#include "libpspp/cast.h" +#include "libpspp/str.h" +#include "libpspp/version.h" +#include "data/settings.h" +#include "gl/minmax.h" #include "gl/progname.h" #include "gl/xalloc.h" #include "gl/xvasprintf.h" @@ -37,51 +39,93 @@ #include "gettext.h" #define _(msgid) gettext (msgid) -/* Message handler as set by msg_init(). */ -static void (*msg_handler) (const struct msg *); +/* Message handler as set by msg_set_handler(). */ +static void (*msg_handler) (const struct msg *, void *aux); +static void *msg_aux; /* Disables emitting messages if positive. */ static int messages_disabled; /* Public functions. */ -/* Writes error message in CLASS, with text FORMAT, formatted with - printf, to the standard places. */ + void -msg (enum msg_class class, const char *format, ...) +vmsg (enum msg_class class, const char *format, va_list args) { struct msg m; - va_list args; m.category = msg_class_to_category (class); 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); + m.file_name = NULL; + m.first_line = m.last_line = 0; + m.first_column = m.last_column = 0; msg_emit (&m); } -static struct source_stream *s_stream; +/* Writes error message in CLASS, with text FORMAT, formatted with + printf, to the standard places. */ +void +msg (enum msg_class class, const char *format, ...) +{ + va_list args; + va_start (args, format); + vmsg (class, format, args); + va_end (args); +} + + void -msg_init (struct source_stream *ss, void (*handler) (const struct msg *) ) +msg_error (int errnum, const char *format, ...) { - s_stream = ss; - msg_handler = handler; + va_list args; + char *e; + struct msg m; + + m.category = MSG_C_GENERAL; + m.severity = MSG_S_ERROR; + + va_start (args, format); + e = xvasprintf (format, args); + va_end (args); + + m.file_name = NULL; + m.first_line = m.last_line = 0; + m.first_column = m.last_column = 0; + m.text = xasprintf (_("%s: %s"), e, strerror (errnum)); + free (e); + + msg_emit (&m); } + + void -msg_done (void) +msg_set_handler (void (*handler) (const struct msg *, void *aux), void *aux) { + msg_handler = handler; + msg_aux = aux; } /* Working with messages. */ +const char * +msg_severity_to_string (enum msg_severity severity) +{ + switch (severity) + { + case MSG_S_ERROR: + return _("error"); + case MSG_S_WARNING: + return _("warning"); + case MSG_S_NOTE: + default: + return _("note"); + } +} + /* Duplicate a message */ struct msg * msg_dup (const struct msg *m) @@ -89,8 +133,8 @@ msg_dup (const struct msg *m) struct msg *new_msg; new_msg = xmemdup (m, sizeof *m); - if (m->where.file_name != NULL) - new_msg->where.file_name = xstrdup (m->where.file_name); + if (m->file_name != NULL) + new_msg->file_name = xstrdup (m->file_name); new_msg->text = xstrdup (m->text); return new_msg; @@ -98,13 +142,13 @@ msg_dup (const struct msg *m) /* Frees a message created by msg_dup(). - (Messages not created by msg_dup(), as well as their where.file_name + (Messages not created by msg_dup(), as well as their file_name members, are typically not dynamically allocated, so this function should not be used to destroy them.) */ void msg_destroy (struct msg *m) { - free (m->where.file_name); + free (m->file_name); free (m->text); free (m); } @@ -112,47 +156,66 @@ msg_destroy (struct msg *m) char * msg_to_string (const struct msg *m, const char *command_name) { - const char *label; struct string s; ds_init_empty (&s); if (m->category != MSG_C_GENERAL - && (m->where.file_name - || m->where.line_number > 0 - || m->where.first_column > 0)) + && (m->file_name || m->first_line > 0 || m->first_column > 0)) { - if (m->where.file_name) - ds_put_format (&s, "%s", m->where.file_name); - if (m->where.line_number > 0) + int l1 = m->first_line; + int l2 = MAX (m->first_line, m->last_line - 1); + int c1 = m->first_column; + int c2 = MAX (m->first_column, m->last_column - 1); + + if (m->file_name) + ds_put_format (&s, "%s", m->file_name); + + if (l1 > 0) { if (!ds_is_empty (&s)) - ds_put_char (&s, ':'); - ds_put_format (&s, "%d", m->where.line_number); + ds_put_byte (&s, ':'); + + if (l2 > l1) + { + if (c1 > 0) + ds_put_format (&s, "%d.%d-%d.%d", l1, c1, l2, c2); + else + ds_put_format (&s, "%d-%d", l1, l2); + } + else + { + if (c1 > 0) + { + if (c2 > c1) + { + /* The GNU coding standards say to use + LINENO-1.COLUMN-1-COLUMN-2 for this case, but GNU + Emacs interprets COLUMN-2 as LINENO-2 if I do that. + I've submitted an Emacs bug report: + http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7725. + + For now, let's be compatible. */ + ds_put_format (&s, "%d.%d-%d.%d", l1, c1, l1, c2); + } + else + ds_put_format (&s, "%d.%d", l1, c1); + } + else + ds_put_format (&s, "%d", l1); + } } - if (m->where.first_column > 0) + else if (c1 > 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); + if (c2 > c1) + ds_put_format (&s, ".%d-%d", c1, c2); + else + ds_put_format (&s, ".%d", c1); } ds_put_cstr (&s, ": "); } - switch (m->severity) - { - case MSG_S_ERROR: - label = _("error"); - break; - case MSG_S_WARNING: - label = _("warning"); - break; - case MSG_S_NOTE: - default: - label = _("note"); - break; - } - ds_put_format (&s, "%s: ", label); + ds_put_format (&s, "%s: ", msg_severity_to_string (m->severity)); if (m->category == MSG_C_SYNTAX && command_name != NULL) ds_put_format (&s, "%s: ", command_name); @@ -207,6 +270,27 @@ msg_ui_any_errors (void) return counts[MSG_S_ERROR] > 0; } + +static int entrances = 0; + +static void +ship_message (struct msg *m) +{ + entrances++; + if ( ! m->shipped ) + { + if (msg_handler && entrances <= 1) + msg_handler (m, msg_aux); + else + { + fwrite (m->text, 1, strlen (m->text), stderr); + fwrite ("\n", 1, 1, stderr); + } + } + m->shipped = true; + entrances--; +} + static void submit_note (char *s) { @@ -214,29 +298,32 @@ submit_note (char *s) 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.file_name = NULL; + m.first_line = 0; + m.last_line = 0; + m.first_column = 0; + m.last_column = 0; m.text = s; - msg_handler (&m); + m.shipped = false; + + ship_message (&m); + free (s); } static void -process_msg (const struct msg *m) +process_msg (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); + ship_message (m); counts[m->severity]++; max_msgs = settings_get_max_messages (m->severity); @@ -271,20 +358,7 @@ process_msg (const struct msg *m) void msg_emit (struct msg *m) { - 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 = 0; - } - + m->shipped = false; if (!messages_disabled) process_msg (m); @@ -322,7 +396,7 @@ request_bug_report (const char *msg) fprintf (stderr, "include the syntax file that triggered it and a sample\n"); fprintf (stderr, "of any data file used for input.\n"); fprintf (stderr, "proximate cause: %s\n", msg); - fprintf (stderr, "version: %s\n", stat_version); + fprintf (stderr, "version: %s\n", version); fprintf (stderr, "host_system: %s\n", host_system); fprintf (stderr, "build_system: %s\n", build_system); fprintf (stderr, "locale_dir: %s\n", locale_dir);