projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Finish converting struct variable to an opaque type. In this
[pspp]
/
src
/
language
/
dictionary
/
missing-values.c
diff --git
a/src/language/dictionary/missing-values.c
b/src/language/dictionary/missing-values.c
index a330c46e75ace37a8cb9d593a361f7fef771613d..af7eeec9afdc95a55899ff5439b416e8f5835784 100644
(file)
--- a/
src/language/dictionary/missing-values.c
+++ b/
src/language/dictionary/missing-values.c
@@
-22,7
+22,9
@@
#include <stdlib.h>
#include <data/data-in.h>
#include <stdlib.h>
#include <data/data-in.h>
+#include <data/missing-values.h>
#include <data/procedure.h>
#include <data/procedure.h>
+#include <data/value.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
@@
-37,7
+39,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,46
+47,47
@@
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++)
goto done;
}
for (i = 0; i < nv; i++)
-
mv_init (&v[i]->miss, v[i]->width
);
+
var_clear_missing_values (v[i]
);
- if (!lex_match (')'))
+ if (!lex_match (
lexer,
')'))
{
struct missing_values mv;
for (i = 0; i < nv; i++)
{
struct missing_values mv;
for (i = 0; i < nv; i++)
- if (v
[i]->type != v[0]->type
)
+ if (v
ar_get_type (v[i]) != var_get_type (v[0])
)
{
{
- const struct variable *n = v
[0]->type == NUMERIC
? v[0] : v[i];
- const struct variable *s = v
[0]->type == NUMERIC
? v[i] : v[0];
+ const struct variable *n = v
ar_is_numeric (v[0])
? v[0] : v[i];
+ const struct variable *s = v
ar_is_numeric (v[0])
? v[i] : v[0];
msg (SE, _("Cannot mix numeric variables (e.g. %s) and "
"string variables (e.g. %s) within a single list."),
msg (SE, _("Cannot mix numeric variables (e.g. %s) and "
"string variables (e.g. %s) within a single list."),
-
n->name, s->name
);
+
var_get_name (n), var_get_name (s)
);
goto done;
}
goto done;
}
- if (v
[0]->type == NUMERIC
)
+ if (v
ar_is_numeric (v[0])
)
{
mv_init (&mv, 0);
{
mv_init (&mv, 0);
- while (!lex_match (')'))
+ while (!lex_match (
lexer,
')'))
{
{
+ enum fmt_type type = var_get_print_format (v[0])->type;
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, &type
))
goto done;
ok = (x == y
goto done;
ok = (x == y
@@
-93,60
+96,62
@@
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,
',');
}
}
for (i = 0; i < nv; i++)
{
}
}
for (i = 0; i < nv; i++)
{
- if (!mv_is_resizable (&mv, v[i]->width))
+ if (mv_is_resizable (&mv, var_get_width (v[i])))
+ var_set_missing_values (v[i], &mv);
+ else
{
msg (SE, _("Missing values provided are too long to assign "
"to variable of width %d."),
{
msg (SE, _("Missing values provided are too long to assign "
"to variable of width %d."),
- v
[i]->width
);
+ v
ar_get_width (v[i])
);
deferred_errors = true;
}
deferred_errors = true;
}
- else
- {
- mv_copy (&v[i]->miss, &mv);
- mv_resize (&v[i]->miss, v[i]->width);
- }
}
}
}
}
- 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);