02110-1301, USA. */
#include <config.h>
-#include "message.h"
+
#include <stdio.h>
-#include "command.h"
-#include "dictionary.h"
-#include "message.h"
-#include "lexer.h"
-#include "str.h"
-#include "variable.h"
+
+#include <data/procedure.h>
+#include <data/dictionary.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 "gettext.h"
#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;
- 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->type == ALPHA)
+ if (var_is_alpha (v))
{
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 (var_get_name (v)) == DC_SCRATCH)
{
msg (SE, _("The weighting variable may not be scratch."));
return CMD_CASCADING_FAILURE;
}
- dict_set_weight (default_dict, v);
+ dict_set_weight (dict, v);
}
- return lex_end_of_command ();
+ return lex_end_of_command (lexer);
}