work on better matrix error reporting

[pspp] / src / libpspp / message.h

diff --git a/src/libpspp/message.h b/src/libpspp/message.h
index f0066ee0a745adbd9a2150281a89255947e315ff..d54598b6960513d7f5b0b2797f8b3528da50879e 100644 (file)
--- a/src/libpspp/message.h
+++ b/src/libpspp/message.h
@@ -72,20 +72,29 @@ msg_class_from_category_and_severity (enum msg_category category,
   return category * 3 + severity;
 }
 
+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 msg_point p[2];
+#if 0
     int first_line;             /* 1-based line number, or 0 if 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). */
+#endif
   };
 
 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 *);
+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 *);