projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First step in making struct variable opaque: the boring mechanical
[pspp-builds.git]
/
src
/
language
/
dictionary
/
weight.c
diff --git
a/src/language/dictionary/weight.c
b/src/language/dictionary/weight.c
index 5d492c4f50ceefcad2e807f85391e0629a3dfe86..56229a285d1e6b9f8fb90ef9212553f852b31820 100644
(file)
--- a/
src/language/dictionary/weight.c
+++ b/
src/language/dictionary/weight.c
@@
-26,6
+26,7
@@
#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>
+#include <language/lexer/variable-parser.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
@@
-33,31
+34,32
@@
#define _(msgid) gettext (msgid)
int
#define _(msgid) gettext (msgid)
int
-cmd_weight (
void
)
+cmd_weight (
struct lexer *lexer, struct dataset *ds
)
{
{
- if (lex_match_id ("OFF"))
- dict_set_weight (default_dict, NULL);
+ struct dictionary *dict = dataset_dict (ds);
+ if (lex_match_id (lexer, "OFF"))
+ dict_set_weight (dataset_dict (ds), NULL);
else
{
struct variable *v;
else
{
struct variable *v;
- lex_match (T_BY);
- v = parse_variable ();
+ lex_match (
lexer,
T_BY);
+ v = parse_variable (
lexer, dict
);
if (!v)
return CMD_CASCADING_FAILURE;
if (!v)
return CMD_CASCADING_FAILURE;
- if (v
->type == ALPHA
)
+ if (v
ar_is_alpha (v)
)
{
msg (SE, _("The weighting variable must be numeric."));
return CMD_CASCADING_FAILURE;
}
{
msg (SE, _("The weighting variable must be numeric."));
return CMD_CASCADING_FAILURE;
}
- if (dict_class_from_id (v
->name
) == DC_SCRATCH)
+ if (dict_class_from_id (v
ar_get_name (v)
) == DC_SCRATCH)
{
msg (SE, _("The weighting variable may not be scratch."));
return CMD_CASCADING_FAILURE;
}
{
msg (SE, _("The weighting variable may not be scratch."));
return CMD_CASCADING_FAILURE;
}
- dict_set_weight (d
efault_d
ict, v);
+ dict_set_weight (dict, v);
}
}
- return lex_end_of_command ();
+ return lex_end_of_command (
lexer
);
}
}