[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[pre-lexer 16/21] message: Add column range to struct msg_locator.
|
From: |
Ben Pfaff |
|
Subject: |
[pre-lexer 16/21] message: Add column range to struct msg_locator. |
|
Date: |
Thu, 23 Sep 2010 21:20:52 -0700 |
data_in() can specify a range of columns for the messages that it outputs,
but until now these were not output in the format specified by the GNU
Coding Standards. This commit fixes that.
---
src/data/data-in.c | 13 +++----------
src/data/por-file-reader.c | 4 ++++
src/data/sys-file-reader.c | 2 ++
src/language/expressions/helpers.c | 4 +++-
src/libpspp/message.c | 32 +++++++++++++++++++++++++++-----
src/libpspp/message.h | 2 ++
tests/language/data-io/data-list.at | 8 ++++----
tests/language/utilities/set.at | 6 +++---
8 files changed, 48 insertions(+), 23 deletions(-)
diff --git a/src/data/data-in.c b/src/data/data-in.c
index 480d335..35a725d 100644
--- a/src/data/data-in.c
+++ b/src/data/data-in.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2009, 2010 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
@@ -1187,15 +1187,6 @@ vdata_warning (const struct data_in *i, const char
*format, va_list args)
ds_init_empty (&text);
ds_put_char (&text, '(');
- if (i->first_column != 0)
- {
- if (i->first_column == i->last_column - 1)
- ds_put_format (&text, _("column %d"), i->first_column);
- else
- ds_put_format (&text, _("columns %d-%d"),
- i->first_column, i->last_column - 1);
- ds_put_cstr (&text, ", ");
- }
ds_put_format (&text, _("%s field) "), fmt_name (i->format));
ds_put_vformat (&text, format, args);
@@ -1204,6 +1195,8 @@ vdata_warning (const struct data_in *i, const char
*format, va_list args)
m.text = ds_cstr (&text);
m.where.file_name = NULL;
m.where.line_number = 0;
+ m.where.first_column = i->first_column;
+ m.where.last_column = i->last_column;
msg_emit (&m);
}
diff --git a/src/data/por-file-reader.c b/src/data/por-file-reader.c
index f3b78b1..adf177b 100644
--- a/src/data/por-file-reader.c
+++ b/src/data/por-file-reader.c
@@ -105,6 +105,8 @@ error (struct pfm_reader *r, const char *msg, ...)
m.severity = MSG_S_ERROR;
m.where.file_name = NULL;
m.where.line_number = 0;
+ m.where.first_column = 0;
+ m.where.last_column = 0;
m.text = ds_cstr (&text);
msg_emit (&m);
@@ -134,6 +136,8 @@ warning (struct pfm_reader *r, const char *msg, ...)
m.severity = MSG_S_WARNING;
m.where.file_name = NULL;
m.where.line_number = 0;
+ m.where.first_column = 0;
+ m.where.last_column = 0;
m.text = ds_cstr (&text);
msg_emit (&m);
diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c
index 5ad5eab..36a2cb7 100644
--- a/src/data/sys-file-reader.c
+++ b/src/data/sys-file-reader.c
@@ -2298,6 +2298,8 @@ sys_msg (struct sfm_reader *r, int class, const char
*format, va_list args)
m.severity = msg_class_to_severity (class);
m.where.file_name = NULL;
m.where.line_number = 0;
+ m.where.first_column = 0;
+ m.where.last_column = 0;
m.text = ds_cstr (&text);
msg_emit (&m);
diff --git a/src/language/expressions/helpers.c
b/src/language/expressions/helpers.c
index 2d707e9..08f787f 100644
--- a/src/language/expressions/helpers.c
+++ b/src/language/expressions/helpers.c
@@ -1,5 +1,5 @@
/* PSPP - a program for statistical analysis.
- Copyright (C) 2008 Free Software Foundation, Inc.
+ Copyright (C) 2008, 2010 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
@@ -36,6 +36,8 @@ expr_error (void *aux UNUSED, const char *format, ...)
m.text = xvasprintf (format, args);
m.where.file_name = NULL;
m.where.line_number = 0;
+ m.where.first_column = 0;
+ m.where.last_column = 0;
va_end (args);
msg_emit (&m);
diff --git a/src/libpspp/message.c b/src/libpspp/message.c
index e0f9bf1..8bd6af9 100644
--- a/src/libpspp/message.c
+++ b/src/libpspp/message.c
@@ -59,6 +59,8 @@ msg (enum msg_class class, const char *format, ...)
m.text = xvasprintf (format, args);
m.where.file_name = NULL;
m.where.line_number = 0;
+ m.where.first_column = 0;
+ m.where.last_column = 0;
va_end (args);
msg_emit (&m);
@@ -116,13 +118,25 @@ msg_to_string (const struct msg *m, const char
*command_name)
ds_init_empty (&s);
if (m->category != MSG_C_GENERAL
- && (m->where.file_name || m->where.line_number != -1))
+ && (m->where.file_name
+ || m->where.line_number > 0
+ || m->where.first_column > 0))
{
if (m->where.file_name)
- ds_put_format (&s, "%s:", m->where.file_name);
+ ds_put_format (&s, "%s", m->where.file_name);
if (m->where.line_number > 0)
- ds_put_format (&s, "%d:", m->where.line_number);
- ds_put_char (&s, ' ');
+ {
+ if (!ds_is_empty (&s))
+ ds_put_char (&s, ':');
+ ds_put_format (&s, "%d", m->where.line_number);
+ }
+ if (m->where.first_column > 0)
+ {
+ ds_put_format (&s, ".%d", m->where.first_column);
+ if (m->where.last_column > m->where.first_column + 1)
+ ds_put_format (&s, "-%d", m->where.last_column - 1);
+ }
+ ds_put_cstr (&s, ": ");
}
switch (m->severity)
@@ -202,6 +216,8 @@ submit_note (char *s)
m.severity = MSG_S_NOTE;
m.where.file_name = NULL;
m.where.line_number = 0;
+ m.where.first_column = 0;
+ m.where.last_column = 0;
m.text = s;
msg_handler (&m);
free (s);
@@ -256,7 +272,13 @@ void
msg_emit (struct msg *m)
{
if ( s_stream )
- get_msg_location (s_stream, &m->where);
+ {
+ struct msg_locator loc;
+
+ get_msg_location (s_stream, &loc);
+ m->where.file_name = loc.file_name;
+ m->where.line_number = loc.line_number;
+ }
else
{
m->where.file_name = NULL;
diff --git a/src/libpspp/message.h b/src/libpspp/message.h
index 6cdf6e8..7c11101 100644
--- a/src/libpspp/message.h
+++ b/src/libpspp/message.h
@@ -72,6 +72,8 @@ struct msg_locator
{
char *file_name; /* File name (NULL if none). */
int line_number; /* Line number (0 if none). */
+ int first_column; /* 1-based column number (0 if none). */
+ int last_column; /* 1-based exclusive last column (0 if none). */
};
/* A message. */
diff --git a/tests/language/data-io/data-list.at
b/tests/language/data-io/data-list.at
index 7683b9c..544b020 100644
--- a/tests/language/data-io/data-list.at
+++ b/tests/language/data-io/data-list.at
@@ -49,7 +49,7 @@ B,F8.0
C,F8.0
D,F8.0
-"data-list.pspp:3: warning: (columns 9-13, F field) Number followed by
garbage."
+data-list.pspp:3.9-13: warning: Data for variable D is not valid as format F:
Number followed by garbage.
Table: Data List
A,B,C,D
@@ -80,7 +80,7 @@ end data.
list.
])
AT_CHECK([pspp -O format=csv data-list.pspp], [0], [dnl
-"data-list.pspp:4: warning: (column 6, F field) Field contents are not
numeric."
+data-list.pspp:4.6: warning: Data for variable D is not valid as format F:
Field contents are not numeric.
Table: Data List
A,B,C,D
@@ -160,9 +160,9 @@ end data.
list.
])
AT_CHECK([pspp -O format=csv data-list.pspp], [0], [dnl
-"data-list.pspp:8: warning: (columns 1-3, F field) Field contents are not
numeric."
+data-list.pspp:8.1-3: warning: Data for variable count is not valid as format
F: Field contents are not numeric.
-"data-list.pspp:11: warning: (columns 1-3, F field) Field contents are not
numeric."
+data-list.pspp:11.1-3: warning: Data for variable count is not valid as format
F: Field contents are not numeric.
Table: Data List
start,end,count
diff --git a/tests/language/utilities/set.at b/tests/language/utilities/set.at
index e84b44d..b281ae4 100644
--- a/tests/language/utilities/set.at
+++ b/tests/language/utilities/set.at
@@ -45,11 +45,11 @@ list.
])
AT_CHECK([pspp -O format=csv set.pspp], [0], [dnl
-"set.pspp:5: warning: (column 3, F field) Field contents are not numeric."
+set.pspp:5.3: warning: Data for variable y is not valid as format F: Field
contents are not numeric.
-"set.pspp:6: warning: (column 3, F field) Field contents are not numeric."
+set.pspp:6.3: warning: Data for variable y is not valid as format F: Field
contents are not numeric.
-"set.pspp:7: warning: (column 1, F field) Field contents are not numeric."
+set.pspp:7.1: warning: Data for variable x is not valid as format F: Field
contents are not numeric.
note: Warnings (3) exceed limit (2). Syntax processing will be halted.
])
--
1.7.1
- [pre-lexer 04/21] syntax-string-source: Fix format string problems., (continued)
- [pre-lexer 04/21] syntax-string-source: Fix format string problems., Ben Pfaff, 2010/09/24
- [pre-lexer 08/21] Make translation easier., Ben Pfaff, 2010/09/24
- [pre-lexer 14/21] command: Add specific DATASET unimplemented commands., Ben Pfaff, 2010/09/24
- [pre-lexer 12/21] command: Remove INSERT from list of unimplemented commands., Ben Pfaff, 2010/09/24
- [pre-lexer 20/21] data-in: Make data_in() parameters more uniform., Ben Pfaff, 2010/09/24
- [pre-lexer 02/21] i18n: Use UTF8 macro instead of "UTF8" literal string., Ben Pfaff, 2010/09/24
- [pre-lexer 09/21] lexer: Improve translatability of lex_error()., Ben Pfaff, 2010/09/24
- [pre-lexer 15/21] message: Consistently initialize locator; use 0 for "no line number"., Ben Pfaff, 2010/09/24
- [pre-lexer 06/21] AGGREGATE: Simplify code., Ben Pfaff, 2010/09/24
- [pre-lexer 17/21] calendar: Use sensible error reporting in calendar_gregorian_to_offset()., Ben Pfaff, 2010/09/24
- [pre-lexer 16/21] message: Add column range to struct msg_locator.,
Ben Pfaff <=
- [pre-lexer 05/21] PERMISSIONS: Add missing check for string token., Ben Pfaff, 2010/09/24
- [pre-lexer 10/21] lexer: Remove DUMP_TOKENS debugging feature., Ben Pfaff, 2010/09/24
- [pre-lexer 18/21] data-in: Eliminate "implied_decimals" parameter from data_in()., Ben Pfaff, 2010/09/24
- [pre-lexer 21/21] data-in: Get rid of first_column, last_column arguments., Ben Pfaff, 2010/09/24
- [pre-lexer 07/21] HOST: Use more modern syntax., Ben Pfaff, 2010/09/24
- Re: [pre-lexer 00/21] preparation for work on lexer, John Darrington, 2010/09/24