projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better error messages are awesome!
[pspp]
/
src
/
libpspp
/
message.h
diff --git
a/src/libpspp/message.h
b/src/libpspp/message.h
index a99b0818e3438fd6514be202a46c3d6e0f6f8185..0c31b8e309c24ef0ebb039977a469bf3b99cfeec 100644
(file)
--- a/
src/libpspp/message.h
+++ b/
src/libpspp/message.h
@@
-72,19
+72,25
@@
msg_class_from_category_and_severity (enum msg_category category,
return category * 3 + severity;
}
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_location
{
const char *file_name; /* Interned file name, or NULL. */
- 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). */
+ 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_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 *);
bool msg_location_is_empty (const struct msg_location *);
void msg_location_format (const struct msg_location *, struct string *);
@@
-119,10
+125,14
@@
void msg_destroy(struct msg *);
char *msg_to_string (const struct msg *);
/* Emitting messages. */
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 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 (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, ...)
void msg_emit (struct msg *);
void msg_error (int errnum, const char *format, ...)