X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flibpspp%2Fmessage.h;h=d46ea97d60505a8bed5e73cc6887570ed8add29a;hb=ea37b218562bd9c02c23d2669c70b2509e0588ea;hp=8f86d0a8f834110125bacf11da16f51c47ba3994;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp-builds.git

diff --git a/src/libpspp/message.h b/src/libpspp/message.h
index 8f86d0a8..d46ea97d 100644
--- a/src/libpspp/message.h
+++ b/src/libpspp/message.h
@@ -1,5 +1,5 @@
 /* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
    Written by Ben Pfaff <blp@gnu.org>.
 
    This program is free software; you can redistribute it and/or
@@ -17,86 +17,103 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA. */
 
-#if !error_h
-#define error_h 1
+#ifndef MESSAGE_H
+#define MESSAGE_H 1
 
 #include <stdarg.h>
 #include <stdbool.h>
+#include <libpspp/compiler.h>
 
-/* Message classes. */
-enum
+/* What kind of message is this? */
+enum msg_category 
   {
-    SE, SW, SM,			/* Script error/warning/message. */
-    IE, IS,			/* Installation error/script error. */
-    DE, DW,			/* Data-file error/warning. */
-    ME, MW, MM,			/* General error/warning/message. */
-    ERR_CLASS_COUNT,		/* Number of message classes. */
-    ERR_CLASS_MASK = 0xf,	/* Bitmask for class. */
-    ERR_VERBOSITY_SHIFT = 4,	/* Shift count for verbosity. */
-    ERR_VERBOSITY_MASK = 0xf 	/* Bitmask for verbosity. */
+    MSG_GENERAL,        /* General info. */
+    MSG_SYNTAX,         /* Messages that relate to syntax files. */
+    MSG_DATA            /* Messages that relate to data files. */
   };
 
-/* If passed to msg() as CLASS, the return value will cause the message
-   to be displayed only if `verbosity' is at least LEVEL. */
-#define VM(LEVEL) (MM | ((LEVEL) << ERR_VERBOSITY_SHIFT))
+/* How important a condition is it? */
+enum msg_severity 
+  {
+    MSG_ERROR,
+    MSG_WARNING,
+    MSG_NOTE
+  };
+
+/* Combination of a category and a severity for convenience. */
+enum msg_class
+  {
+    ME, MW, MN,			/* General error/warning/note. */
+    SE, SW, SN,			/* Script error/warning/note. */
+    DE, DW, DN,			/* Data-file error/note. */
+    MSG_CLASS_CNT,
+  };
+
+
+static inline enum msg_category
+msg_class_to_category (enum msg_class class) 
+{
+  return class / 3;
+}
+
+static inline enum msg_severity
+msg_class_to_severity (enum msg_class class) 
+{
+  return class % 3;
+}
+
+static inline enum msg_class
+msg_class_from_category_and_severity (enum msg_category category,
+                                      enum msg_severity severity) 
+{
+  return category * 3 + severity;
+}
 
 /* A file location.  */
-struct file_locator
+struct msg_locator
   {
-    const char *filename;		/* Filename. */
+    const char *file_name;		/* File name. */
     int line_number;			/* Line number. */
   };
 
-/* An error message. */
-struct error
+/* A message. */
+struct msg
   {
-    int class;			/* One of the classes above. */
-    struct file_locator where;	/* File location, or (NULL, -1). */
-    const char *title;		/* Special text inserted if not null. */
+    enum msg_category category; /* Message category. */
+    enum msg_severity severity; /* Message severity. */
+    struct msg_locator where;	/* File location, or (NULL, -1). */
+    char *text;                 /* Error text. */
   };
 
-/* Number of errors, warnings reported. */
-extern int err_error_count;
-extern int err_warning_count;
+/* Initialization. */
+void msg_init (void (*handler) (const struct msg *));
+void msg_done (void);
 
-/* If number of allowable errors/warnings is exceeded, then a message
-   is displayed and this flag is set to suppress subsequent
-   messages. */
-extern int err_already_flagged;
+struct msg * msg_dup(const struct msg *m);
+void msg_destroy(struct msg *m);
 
-/* Nonnegative verbosity level.  Higher value == more verbose. */
-extern int err_verbosity;
-
-/* Functions. */
-void msg (int class, const char *format, ...)
+/* Emitting messages. */
+void msg (enum msg_class, const char *format, ...)
      PRINTF_FORMAT (2, 3);
-void tmsg (int class, const char *title, const char *format, ...)
-     PRINTF_FORMAT (3, 4);
-
-/* File-locator stack. */
-void err_push_file_locator (const struct file_locator *);
-void err_pop_file_locator (const struct file_locator *);
-void err_location (struct file_locator *);
+void msg_emit (struct msg *);
 
-/* Obscure functions. */
-void err_set_command_name (const char *);
-void err_done (void);
-void err_check_count (void);
-void err_vmsg (const struct error *, const char *, va_list);
+/* 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 *);
+void msg_location (struct msg_locator *);
 
-/* Used in panic situations only */
-void request_bug_report_and_abort(const char *msg );
+/* Used in panic situations only. */
+void request_bug_report_and_abort (const char *msg);
 
-void err_assert_fail(const char *expr, const char *file, int line);
+void msg_assert_fail (const char *expr, const char *file, int line);
 
 #undef __STRING
 #define __STRING(x) #x
 #undef assert
-
 			       
 #define assert(expr) ( (void) ( expr ? (void) 0 : \
-	       err_assert_fail(__STRING(expr), __FILE__, __LINE__)) )
-
-
+	       msg_assert_fail(__STRING(expr), __FILE__, __LINE__)) )
 
-#endif /* error.h */
+#endif /* message.h */