X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fmessage.h;h=0c31b8e309c24ef0ebb039977a469bf3b99cfeec;hb=09e02e5fc7f463a4243de3daaa9e8f2c6fb2d619;hp=3aca77891e9e0df2f25e96be3317cffd63ee82e8;hpb=e2a7ada9e445ab2b1fd473345709c39157f30b9a;p=pspp

diff --git a/src/libpspp/message.h b/src/libpspp/message.h
index 3aca77891e..0c31b8e309 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 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
@@ -19,24 +19,31 @@
 
 #include <stdarg.h>
 #include <stdbool.h>
-#include <libpspp/compiler.h>
+#include <stddef.h>
+#include "libpspp/compiler.h"
+
+struct string;
 
 /* What kind of message is this? */
 enum msg_category
   {
-    MSG_GENERAL,        /* General info. */
-    MSG_SYNTAX,         /* Messages that relate to syntax files. */
-    MSG_DATA            /* Messages that relate to data files. */
+    MSG_C_GENERAL,              /* General info. */
+    MSG_C_SYNTAX,               /* Messages that relate to syntax files. */
+    MSG_C_DATA,                 /* Messages that relate to data files. */
+    MSG_N_CATEGORIES
   };
 
 /* How important a condition is it? */
 enum msg_severity
   {
-    MSG_ERROR,
-    MSG_WARNING,
-    MSG_NOTE
+    MSG_S_ERROR,
+    MSG_S_WARNING,
+    MSG_S_NOTE,
+    MSG_N_SEVERITIES
   };
 
+const char *msg_severity_to_string (enum msg_severity);
+
 /* Combination of a category and a severity for convenience. */
 enum msg_class
   {
@@ -46,7 +53,6 @@ enum msg_class
     MSG_CLASS_CNT,
   };
 
-
 static inline enum msg_category
 msg_class_to_category (enum msg_class class)
 {
@@ -66,49 +72,88 @@ msg_class_from_category_and_severity (enum msg_category category,
   return category * 3 + severity;
 }
 
-/* A file location.  */
-struct msg_locator
+struct msg_point
+  {
+    int line;                   /* 1-based line number, or 0 if none. */
+    int column;                 /* 1-based column number, or 0 if none. */
+  };
+
+struct msg_location
+  {
+    const char *file_name;      /* Interned file name, or NULL. */
+    struct lex_source *src;
+    struct msg_point p[2];
+  };
+
+void msg_location_uninit (struct msg_location *);
+void msg_location_destroy (struct msg_location *);
+struct msg_location *msg_location_dup (const struct msg_location *);
+
+void msg_location_merge (struct msg_location **, const struct msg_location *);
+
+bool msg_location_is_empty (const struct msg_location *);
+void msg_location_format (const struct msg_location *, struct string *);
+
+struct msg_stack
   {
-    char *file_name;		/* File name. */
-    int line_number;            /* Line number. */
+    struct msg_location *location;
+    char *description;
   };
 
+void msg_stack_destroy (struct msg_stack *);
+struct msg_stack *msg_stack_dup (const struct msg_stack *);
+
 /* A message. */
 struct msg
   {
     enum msg_category category; /* Message category. */
     enum msg_severity severity; /* Message severity. */
-    struct msg_locator where;	/* File location, or (NULL, -1). */
+    struct msg_location *location; /* Code location. */
+    struct msg_stack **stack;
+    size_t n_stack;
+    char *command_name;         /* Name of erroneous command, or NULL.  */
     char *text;                 /* Error text. */
   };
 
-struct source_stream ;
-
 /* Initialization. */
-void msg_init (struct source_stream *, void (*handler) (const struct msg *) );
+void msg_set_handler (void (*handler) (const struct msg *, void *lexer),
+                      void *aux);
 
-void msg_done (void);
-
-struct msg * msg_dup(const struct msg *m);
-void msg_destroy(struct msg *m);
+/* Working with messages. */
+struct msg *msg_dup (const struct msg *);
+void msg_destroy(struct msg *);
+char *msg_to_string (const struct msg *);
 
 /* Emitting messages. */
+void vmsg (enum msg_class, const struct msg_location *,
+           const char *format, va_list args)
+     PRINTF_FORMAT (3, 0);
 void msg (enum msg_class, const char *format, ...)
      PRINTF_FORMAT (2, 3);
+void msg_at (enum msg_class, const struct msg_location *,
+             const char *format, ...)
+     PRINTF_FORMAT (3, 4);
 void msg_emit (struct msg *);
 
+void msg_error (int errnum, const char *format, ...)
+  PRINTF_FORMAT (2, 3);
+
+
 /* Enable and disable messages. */
 void msg_enable (void);
 void msg_disable (void);
 
 /* Error context. */
-void msg_set_command_name (const char *);
-const char *msg_get_command_name (void);
-void msg_push_msg_locator (const struct msg_locator *);
-void msg_pop_msg_locator (const struct msg_locator *);
+bool msg_ui_too_many_errors (void);
+void msg_ui_reset_counts (void);
+bool msg_ui_any_errors (void);
+void msg_ui_disable_warnings (bool);
 
 
 /* Used in panic situations only. */
-void request_bug_report_and_abort (const char *msg) NO_RETURN;
+const char * prepare_diagnostic_information (void);
+const char * prepare_fatal_error_message (void);
+void request_bug_report (const char *msg);
+
 
 #endif /* message.h */