From 3c5121dc68726f596565894f831e4fa311c99c64 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Wed, 1 Nov 2006 02:12:25 +0000 Subject: [PATCH] Fix error messages and comment. --- src/data/ChangeLog | 4 ++++ src/data/data-in.c | 3 ++- src/language/lexer/ChangeLog | 4 ++++ src/language/lexer/range-parser.c | 2 +- src/language/utilities/set.q | 2 +- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/data/ChangeLog b/src/data/ChangeLog index be7cf441..cc557354 100644 --- a/src/data/ChangeLog +++ b/src/data/ChangeLog @@ -1,3 +1,7 @@ +Tue Oct 31 18:09:24 2006 Ben Pfaff + + * data-in.c (parse_trailer): Fix error message. + Sat Oct 28 11:56:50 2006 Ben Pfaff * format.c (fmt_is_binary): New function. diff --git a/src/data/data-in.c b/src/data/data-in.c index 8a62d8fc..c5556a3c 100644 --- a/src/data/data-in.c +++ b/src/data/data-in.c @@ -835,7 +835,8 @@ parse_trailer (struct data_in *i) if (!have_char (i)) return true; - dls_error (i, _("Trailing garbage \"%s\" following date."), i->s); + dls_error (i, _("Trailing garbage \"%.*s\" following date."), + (int) (i->e - i->s), i->s); return false; } diff --git a/src/language/lexer/ChangeLog b/src/language/lexer/ChangeLog index cee1fd94..29678623 100644 --- a/src/language/lexer/ChangeLog +++ b/src/language/lexer/ChangeLog @@ -1,3 +1,7 @@ +Tue Oct 31 18:09:32 2006 Ben Pfaff + + * range-parser.c (parse_number): Fix error message. + Sat Oct 28 16:17:18 WST 2006 John Darrington * lexer.c lexer.h: Added a line_buffer (previously an external diff --git a/src/language/lexer/range-parser.c b/src/language/lexer/range-parser.c index 334987a3..2934bc8b 100644 --- a/src/language/lexer/range-parser.c +++ b/src/language/lexer/range-parser.c @@ -95,7 +95,7 @@ parse_number (double *x, const struct fmt_spec *f) *x = v.f; if (*x == SYSMIS) { - lex_error (_("System-missing value is not valid here.")); + msg (SE, _("System-missing value is not valid here.")); return false; } return true; diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q index d5b84a71..a7e6e2f0 100644 --- a/src/language/utilities/set.q +++ b/src/language/utilities/set.q @@ -209,7 +209,7 @@ find_cc_separators (const char *cc_string, struct custom_currency *cc) int comma_cnt, dot_cnt; /* Count commas and periods. There must be exactly three of - one or the other, except that an apostrophe acts escapes a + one or the other, except that an apostrophe escapes a following comma or period. */ comma_cnt = dot_cnt = 0; for (sp = cc_string; *sp; sp++) -- 2.30.2