X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fmessage.h;h=36aae9c5d13137d790493ae6ac102ec5cc3ba600;hb=bd8fac754b2cff134bab7e4ad425a0a988123dba;hp=32342f40e993501c56ba7e3245f5e45866b3acad;hpb=e2da62d735c597afeef2e0e9b36e5a4a83d7da94;p=pspp

diff --git a/src/libpspp/message.h b/src/libpspp/message.h
index 32342f40e9..36aae9c5d1 100644
--- a/src/libpspp/message.h
+++ b/src/libpspp/message.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2010, 2011, 2014 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
@@ -21,6 +21,8 @@
 #include <stdbool.h>
 #include "libpspp/compiler.h"
 
+struct string;
+
 /* What kind of message is this? */
 enum msg_category
   {
@@ -69,18 +71,29 @@ msg_class_from_category_and_severity (enum msg_category category,
   return category * 3 + severity;
 }
 
-/* A message. */
-struct msg
+struct msg_location
   {
-    enum msg_category category; /* Message category. */
-    enum msg_severity severity; /* Message severity. */
     char *file_name;            /* Name of file containing error, or NULL. */
     int first_line;             /* 1-based line number, or 0 if none. */
-    int last_line;             /* 1-based exclusive last line (0=none). */
+    int last_line;              /* 1-based exclusive last line (0=none). */
     int first_column;           /* 1-based first column, or 0 if none. */
     int last_column;            /* 1-based exclusive last column (0=none). */
+  };
+
+void msg_location_destroy (struct msg_location *);
+struct msg_location *msg_location_dup (const struct msg_location *);
+
+bool msg_location_is_empty (const struct msg_location *);
+void msg_location_format (const struct msg_location *, struct string *);
+
+/* A message. */
+struct msg
+  {
+    enum msg_category category; /* Message category. */
+    enum msg_severity severity; /* Message severity. */
+    struct msg_location *location; /* Code location. */
+    char *command_name;         /* Name of erroneous command, or NULL.  */
     char *text;                 /* Error text. */
-    bool shipped;               /* True if this message has been emitted */
   };
 
 /* Initialization. */
@@ -90,14 +103,17 @@ void msg_set_handler (void (*handler) (const struct msg *, void *lexer),
 /* Working with messages. */
 struct msg *msg_dup (const struct msg *);
 void msg_destroy(struct msg *);
-char *msg_to_string (const struct msg *, const char *command_name);
+char *msg_to_string (const struct msg *);
 
 /* Emitting messages. */
+void vmsg (enum msg_class class, const char *format, va_list args)
+     PRINTF_FORMAT (2, 0);
 void msg (enum msg_class, const char *format, ...)
      PRINTF_FORMAT (2, 3);
 void msg_emit (struct msg *);
 
-void msg_error (int errnum, const char *format, ...);
+void msg_error (int errnum, const char *format, ...)
+  PRINTF_FORMAT (2, 3);
 
 
 /* Enable and disable messages. */
@@ -112,6 +128,8 @@ void msg_ui_disable_warnings (bool);
 
 
 /* Used in panic situations only. */
+const char * prepare_diagnostic_information (void);
+const char * prepare_fatal_error_message (void);
 void request_bug_report (const char *msg);