projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VARIABLE ROLE: Document the format and add a test.
[pspp]
/
src
/
language
/
data-io
/
data-parser.c
diff --git
a/src/language/data-io/data-parser.c
b/src/language/data-io/data-parser.c
index 3485f7af1bab7598865cae630aaa8356bd887ae4..958326e48d4653cfbde6883f6b6f2a266dcded9a 100644
(file)
--- a/
src/language/data-io/data-parser.c
+++ b/
src/language/data-io/data-parser.c
@@
-455,7
+455,7
@@
cut_field (const struct data_parser *parser, struct dfm_reader *reader,
/* Quoted field. */
int quote = ss_get_byte (&p);
if (!ss_get_until (&p, quote, field))
/* Quoted field. */
int quote = ss_get_byte (&p);
if (!ss_get_until (&p, quote, field))
- msg (
S
W, _("Quoted string extends beyond end of line."));
+ msg (
D
W, _("Quoted string extends beyond end of line."));
if (parser->quote_escape && ss_first (p) == quote)
{
ds_assign_substring (tmp, *field);
if (parser->quote_escape && ss_first (p) == quote)
{
ds_assign_substring (tmp, *field);
@@
-464,7
+464,7
@@
cut_field (const struct data_parser *parser, struct dfm_reader *reader,
struct substring ss;
ds_put_byte (tmp, quote);
if (!ss_get_until (&p, quote, &ss))
struct substring ss;
ds_put_byte (tmp, quote);
if (!ss_get_until (&p, quote, &ss))
- msg (
S
W, _("Quoted string extends beyond end of line."));
+ msg (
D
W, _("Quoted string extends beyond end of line."));
ds_put_substring (tmp, ss);
}
*field = ds_ss (tmp);
ds_put_substring (tmp, ss);
}
*field = ds_ss (tmp);
@@
-483,7
+483,7
@@
cut_field (const struct data_parser *parser, struct dfm_reader *reader,
n_seps++;
}
if (!n_seps)
n_seps++;
}
if (!n_seps)
- msg (
S
W, _("Missing delimiter following quoted string."));
+ msg (
D
W, _("Missing delimiter following quoted string."));
}
}
else
}
}
else
@@
-550,7
+550,7
@@
parse_fixed (const struct data_parser *parser, struct dfm_reader *reader,
if (dfm_eof (reader))
{
if (dfm_eof (reader))
{
- msg (
S
W, _("Partial case of %d of %d records discarded."),
+ msg (
D
W, _("Partial case of %d of %d records discarded."),
row - 1, parser->records_per_case);
return false;
}
row - 1, parser->records_per_case);
return false;
}
@@
-607,7
+607,7
@@
parse_delimited_span (const struct data_parser *parser,
if (dfm_eof (reader))
{
if (f > parser->fields)
if (dfm_eof (reader))
{
if (f > parser->fields)
- msg (
S
W, _("Partial case discarded. The first variable "
+ msg (
D
W, _("Partial case discarded. The first variable "
"missing was %s."), f->name);
ds_destroy (&tmp);
return false;
"missing was %s."), f->name);
ds_destroy (&tmp);
return false;
@@
-649,7
+649,7
@@
parse_delimited_no_span (const struct data_parser *parser,
if (!cut_field (parser, reader, &first_column, &last_column, &tmp, &s))
{
if (f < end - 1 && settings_get_undefined ())
if (!cut_field (parser, reader, &first_column, &last_column, &tmp, &s))
{
if (f < end - 1 && settings_get_undefined ())
- msg (
S
W, _("Missing value(s) for all variables from %s onward. "
+ msg (
D
W, _("Missing value(s) for all variables from %s onward. "
"These will be filled with the system-missing value "
"or blanks, as appropriate."),
f->name);
"These will be filled with the system-missing value "
"or blanks, as appropriate."),
f->name);
@@
-669,7
+669,7
@@
parse_delimited_no_span (const struct data_parser *parser,
s = dfm_get_record (reader);
ss_ltrim (&s, parser->soft_seps);
if (!ss_is_empty (s))
s = dfm_get_record (reader);
ss_ltrim (&s, parser->soft_seps);
if (!ss_is_empty (s))
- msg (
S
W, _("Record ends in data not part of any field."));
+ msg (
D
W, _("Record ends in data not part of any field."));
exit:
dfm_forward_record (reader);
exit:
dfm_forward_record (reader);