projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrite formatted data input routines to conform to SPSS data formats
[pspp-builds.git]
/
src
/
language
/
dictionary
/
missing-values.c
diff --git
a/src/language/dictionary/missing-values.c
b/src/language/dictionary/missing-values.c
index 5d12155890478a65fbf7dee8335d98ddb3e29151..6735d0e548520064468bfb56fd94f58e4f02f608 100644
(file)
--- a/
src/language/dictionary/missing-values.c
+++ b/
src/language/dictionary/missing-values.c
@@
-1,5
+1,5
@@
/* PSPP - computes sample statistics.
/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000
, 2006
Free Software Foundation, Inc.
Written by Ben Pfaff <blp@gnu.org>.
This program is free software; you can redistribute it and/or
Written by Ben Pfaff <blp@gnu.org>.
This program is free software; you can redistribute it and/or
@@
-37,7
+37,7
@@
#define _(msgid) gettext (msgid)
int
#define _(msgid) gettext (msgid)
int
-cmd_missing_values (struct dataset *ds)
+cmd_missing_values (struct
lexer *lexer, struct
dataset *ds)
{
struct variable **v;
size_t nv;
{
struct variable **v;
size_t nv;
@@
-45,23
+45,23
@@
cmd_missing_values (struct dataset *ds)
int retval = CMD_FAILURE;
bool deferred_errors = false;
int retval = CMD_FAILURE;
bool deferred_errors = false;
- while (
token
!= '.')
+ while (
lex_token (lexer)
!= '.')
{
size_t i;
{
size_t i;
- if (!parse_variables (dataset_dict (ds), &v, &nv, PV_NONE))
+ if (!parse_variables (
lexer,
dataset_dict (ds), &v, &nv, PV_NONE))
goto done;
goto done;
- if (!lex_match ('('))
+ if (!lex_match (
lexer,
'('))
{
{
- lex_error (_("expecting `('"));
+ lex_error (
lexer,
_("expecting `('"));
goto done;
}
for (i = 0; i < nv; i++)
mv_init (&v[i]->miss, v[i]->width);
goto done;
}
for (i = 0; i < nv; i++)
mv_init (&v[i]->miss, v[i]->width);
- if (!lex_match (')'))
+ if (!lex_match (
lexer,
')'))
{
struct missing_values mv;
{
struct missing_values mv;
@@
-79,12
+79,12
@@
cmd_missing_values (struct dataset *ds)
if (v[0]->type == NUMERIC)
{
mv_init (&mv, 0);
if (v[0]->type == NUMERIC)
{
mv_init (&mv, 0);
- while (!lex_match (')'))
+ while (!lex_match (
lexer,
')'))
{
double x, y;
bool ok;
{
double x, y;
bool ok;
- if (!parse_num_range (
&x, &y, &v[0]->print
))
+ if (!parse_num_range (
lexer, &x, &y, &v[0]->print.type
))
goto done;
ok = (x == y
goto done;
ok = (x == y
@@
-93,35
+93,40
@@
cmd_missing_values (struct dataset *ds)
if (!ok)
deferred_errors = true;
if (!ok)
deferred_errors = true;
- lex_match (',');
+ lex_match (
lexer,
',');
}
}
else
{
}
}
else
{
+ struct string value;
+
mv_init (&mv, MAX_SHORT_STRING);
mv_init (&mv, MAX_SHORT_STRING);
- while (!lex_match (')'))
+ while (!lex_match (
lexer,
')'))
{
{
- if (!lex_force_string ())
+ if (!lex_force_string (
lexer
))
{
deferred_errors = true;
break;
}
{
deferred_errors = true;
break;
}
+
+ ds_init_string (&value, lex_tokstr (lexer));
- if (ds_length (&
tokstr
) > MAX_SHORT_STRING)
+ if (ds_length (&
value
) > MAX_SHORT_STRING)
{
{
- ds_truncate (&
tokstr
, MAX_SHORT_STRING);
+ ds_truncate (&
value
, MAX_SHORT_STRING);
msg (SE, _("Truncating missing value to short string "
"length (%d characters)."),
MAX_SHORT_STRING);
}
else
msg (SE, _("Truncating missing value to short string "
"length (%d characters)."),
MAX_SHORT_STRING);
}
else
- ds_rpad (&
tokstr
, MAX_SHORT_STRING, ' ');
+ ds_rpad (&
value
, MAX_SHORT_STRING, ' ');
- if (!mv_add_str (&mv, ds_data (&
tokstr
)))
+ if (!mv_add_str (&mv, ds_data (&
value
)))
deferred_errors = true;
deferred_errors = true;
+ ds_destroy (&value);
- lex_get ();
- lex_match (',');
+ lex_get (
lexer
);
+ lex_match (
lexer,
',');
}
}
}
}
@@
-142,11
+147,11
@@
cmd_missing_values (struct dataset *ds)
}
}
}
}
- lex_match ('/');
+ lex_match (
lexer,
'/');
free (v);
v = NULL;
}
free (v);
v = NULL;
}
- retval = lex_end_of_command ();
+ retval = lex_end_of_command (
lexer
);
done:
free (v);
done:
free (v);