X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fweight.c;h=d99c2acb0cb04703eefb57b5e74f43a414c2c0a6;hb=e76e1da37d8bd803dd085a36f978b9c012fbc700;hp=7e25a64602511bba21b7e605767f30f7cfe7e139;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp

diff --git a/src/language/dictionary/weight.c b/src/language/dictionary/weight.c
index 7e25a64602..d99c2acb0c 100644
--- a/src/language/dictionary/weight.c
+++ b/src/language/dictionary/weight.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,14 +18,14 @@
 
 #include <stdio.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 "data/dataset.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)
@@ -46,17 +46,19 @@ cmd_weight (struct lexer *lexer, struct dataset *ds)
 	return CMD_CASCADING_FAILURE;
       if (var_is_alpha (v))
 	{
-	  msg (SE, _("The weighting variable must be numeric."));
+	  lex_next_error (lexer, -1, -1,
+                          _("The weighting variable must be numeric."));
 	  return CMD_CASCADING_FAILURE;
 	}
       if (dict_class_from_id (var_get_name (v)) == DC_SCRATCH)
 	{
-	  msg (SE, _("The weighting variable may not be scratch."));
+	  lex_next_error (lexer, -1, -1,
+                          _("The weighting variable may not be scratch."));
 	  return CMD_CASCADING_FAILURE;
 	}
 
       dict_set_weight (dict, v);
     }
 
-  return lex_end_of_command (lexer);
+  return CMD_SUCCESS;
 }