projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fri Feb 11 00:08:36 2005 Ben Pfaff <blp@gnu.org>
[pspp]
/
src
/
weight.c
diff --git
a/src/weight.c
b/src/weight.c
index fd19f8c8978a371ea6f3003dc4a92a6f2eca32f1..c95b7910b28ff5d81365074ea0f800d2a6746354 100644
(file)
--- a/
src/weight.c
+++ b/
src/weight.c
@@
-18,9
+18,10
@@
02111-1307, USA. */
#include <config.h>
02111-1307, USA. */
#include <config.h>
-#include
<assert.h>
+#include
"error.h"
#include <stdio.h>
#include "command.h"
#include <stdio.h>
#include "command.h"
+#include "dictionary.h"
#include "error.h"
#include "lexer.h"
#include "str.h"
#include "error.h"
#include "lexer.h"
#include "str.h"
@@
-37,8
+38,6
@@
struct weight_trns
int
cmd_weight (void)
{
int
cmd_weight (void)
{
- lex_match_id ("WEIGHT");
-
if (lex_match_id ("OFF"))
dict_set_weight (default_dict, NULL);
else
if (lex_match_id ("OFF"))
dict_set_weight (default_dict, NULL);
else
@@
-54,7
+53,7
@@
cmd_weight (void)
msg (SE, _("The weighting variable must be numeric."));
return CMD_FAILURE;
}
msg (SE, _("The weighting variable must be numeric."));
return CMD_FAILURE;
}
- if (
v->name[0] == '#'
)
+ if (
dict_class_from_id (v->name) == DC_SCRATCH
)
{
msg (SE, _("The weighting variable may not be scratch."));
return CMD_FAILURE;
{
msg (SE, _("The weighting variable may not be scratch."));
return CMD_FAILURE;