X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fweight.c;h=02f73e39848165f46949bbb73008a147a247d900;hb=80e4b4e85d2159c3ac6bcb8c22b895c58f0c5b0d;hp=6528141f8e81f4127f1a29f804d891189502712c;hpb=a19b858e0ac3c69e4a28c0ca6d8674427268a863;p=pspp-builds.git

diff --git a/src/language/dictionary/weight.c b/src/language/dictionary/weight.c
index 6528141f..02f73e39 100644
--- a/src/language/dictionary/weight.c
+++ b/src/language/dictionary/weight.c
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -18,44 +17,48 @@
    02110-1301, USA. */
 
 #include <config.h>
-#include <libpspp/message.h>
+
 #include <stdio.h>
-#include <language/command.h>
+
+#include <data/procedure.h>
 #include <data/dictionary.h>
-#include <libpspp/message.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 <data/variable.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);
 }