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=02f73e39848165f46949bbb73008a147a247d900;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp
diff --git a/src/language/dictionary/weight.c b/src/language/dictionary/weight.c
index 02f73e3984..d99c2acb0c 100644
--- a/src/language/dictionary/weight.c
+++ b/src/language/dictionary/weight.c
@@ -1,33 +1,31 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#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)
@@ -48,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;
}