projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NPAR TESTS: Fix "NPAR TESTS BINOMIAL, P = 0.5; N1/N2 < 1" test failure.
[pspp]
/
src
/
language
/
xforms
/
count.c
diff --git
a/src/language/xforms/count.c
b/src/language/xforms/count.c
index 1c9b4d65735f9487b147da120585465b7501ea0d..550db8a5315e454fde88f775b19002c2cee77a92 100644
(file)
--- a/
src/language/xforms/count.c
+++ b/
src/language/xforms/count.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000
, 2009, 2010
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
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
@@
-25,11
+25,10
@@
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
-#include <language/lexer/
rang
e-parser.h>
+#include <language/lexer/
valu
e-parser.h>
#include <language/lexer/variable-parser.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
#include <language/lexer/variable-parser.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
-#include <libpspp/message.h>
#include <libpspp/pool.h>
#include <libpspp/str.h>
#include <libpspp/pool.h>
#include <libpspp/str.h>
@@
-115,7
+114,7
@@
cmd_count (struct lexer *lexer, struct dataset *ds)
/* Get destination variable, or at least its name. */
if (!lex_force_id (lexer))
goto fail;
/* Get destination variable, or at least its name. */
if (!lex_force_id (lexer))
goto fail;
- dv->var = dict_lookup_var (dataset_dict (ds), lex_tok
id
(lexer));
+ dv->var = dict_lookup_var (dataset_dict (ds), lex_tok
cstr
(lexer));
if (dv->var != NULL)
{
if (var_is_alpha (dv->var))
if (dv->var != NULL)
{
if (var_is_alpha (dv->var))
@@
-125,10
+124,10
@@
cmd_count (struct lexer *lexer, struct dataset *ds)
}
}
else
}
}
else
- dv->name = pool_strdup (trns->pool, lex_tok
id
(lexer));
+ dv->name = pool_strdup (trns->pool, lex_tok
cstr
(lexer));
lex_get (lexer);
lex_get (lexer);
- if (!lex_force_match (lexer,
'='
))
+ if (!lex_force_match (lexer,
T_EQUALS
))
goto fail;
crit = dv->crit = pool_alloc (trns->pool, sizeof *crit);
goto fail;
crit = dv->crit = pool_alloc (trns->pool, sizeof *crit);
@@
-144,7
+143,7
@@
cmd_count (struct lexer *lexer, struct dataset *ds)
goto fail;
pool_register (trns->pool, free, crit->vars);
goto fail;
pool_register (trns->pool, free, crit->vars);
- if (!lex_force_match (lexer,
'('
))
+ if (!lex_force_match (lexer,
T_LPAREN
))
goto fail;
crit->value_cnt = 0;
goto fail;
crit->value_cnt = 0;
@@
-155,16
+154,16
@@
cmd_count (struct lexer *lexer, struct dataset *ds)
if (!ok)
goto fail;
if (!ok)
goto fail;
- if (lex_token (lexer) ==
'/' || lex_token (lexer) == '.'
)
+ if (lex_token (lexer) ==
T_SLASH || lex_token (lexer) == T_ENDCMD
)
break;
crit = crit->next = pool_alloc (trns->pool, sizeof *crit);
}
break;
crit = crit->next = pool_alloc (trns->pool, sizeof *crit);
}
- if (lex_token (lexer) ==
'.'
)
+ if (lex_token (lexer) ==
T_ENDCMD
)
break;
break;
- if (!lex_force_match (lexer,
'/'
))
+ if (!lex_force_match (lexer,
T_SLASH
))
goto fail;
dv = dv->next = pool_alloc (trns->pool, sizeof *dv);
}
goto fail;
dv = dv->next = pool_alloc (trns->pool, sizeof *dv);
}
@@
-222,8
+221,8
@@
parse_numeric_criteria (struct lexer *lexer, struct pool *pool, struct criteria
else
return false;
else
return false;
- lex_match (lexer,
','
);
- if (lex_match (lexer,
')'
))
+ lex_match (lexer,
T_COMMA
);
+ if (lex_match (lexer,
T_RPAREN
))
break;
}
return true;
break;
}
return true;
@@
-254,11
+253,11
@@
parse_string_criteria (struct lexer *lexer, struct pool *pool, struct criteria *
return false;
cur = &crit->values.str[crit->value_cnt++];
*cur = pool_alloc (pool, len + 1);
return false;
cur = &crit->values.str[crit->value_cnt++];
*cur = pool_alloc (pool, len + 1);
- str_copy_rpad (*cur, len + 1,
ds_cstr (lex_tokstr (lexer)
));
+ str_copy_rpad (*cur, len + 1,
lex_tokcstr (lexer
));
lex_get (lexer);
lex_get (lexer);
- lex_match (lexer,
','
);
- if (lex_match (lexer,
')'
))
+ lex_match (lexer,
T_COMMA
);
+ if (lex_match (lexer,
T_RPAREN
))
break;
}
break;
}
@@
-268,8
+267,8
@@
parse_string_criteria (struct lexer *lexer, struct pool *pool, struct criteria *
/* Transformation. */
/* Counts the number of values in case C matching CRIT. */
/* Transformation. */
/* Counts the number of values in case C matching CRIT. */
-static in
line in
t
-count_numeric (struct criteria *crit, struct ccase *c)
+static int
+count_numeric (struct criteria *crit,
const
struct ccase *c)
{
int counter = 0;
size_t i;
{
int counter = 0;
size_t i;
@@
-302,8
+301,8
@@
count_numeric (struct criteria *crit, struct ccase *c)
}
/* Counts the number of values in case C matching CRIT. */
}
/* Counts the number of values in case C matching CRIT. */
-static in
line in
t
-count_string (struct criteria *crit, struct ccase *c)
+static int
+count_string (struct criteria *crit,
const
struct ccase *c)
{
int counter = 0;
size_t i;
{
int counter = 0;
size_t i;
@@
-325,12
+324,13
@@
count_string (struct criteria *crit, struct ccase *c)
/* Performs the COUNT transformation T on case C. */
static int
/* Performs the COUNT transformation T on case C. */
static int
-count_trns_proc (void *trns_, struct ccase *c,
+count_trns_proc (void *trns_, struct ccase *
*
c,
casenumber case_num UNUSED)
{
struct count_trns *trns = trns_;
struct dst_var *dv;
casenumber case_num UNUSED)
{
struct count_trns *trns = trns_;
struct dst_var *dv;
+ *c = case_unshare (*c);
for (dv = trns->dst_vars; dv; dv = dv->next)
{
struct criteria *crit;
for (dv = trns->dst_vars; dv; dv = dv->next)
{
struct criteria *crit;
@@
-339,10
+339,10
@@
count_trns_proc (void *trns_, struct ccase *c,
counter = 0;
for (crit = dv->crit; crit; crit = crit->next)
if (var_is_numeric (crit->vars[0]))
counter = 0;
for (crit = dv->crit; crit; crit = crit->next)
if (var_is_numeric (crit->vars[0]))
- counter += count_numeric (crit, c);
+ counter += count_numeric (crit,
*
c);
else
else
- counter += count_string (crit, c);
- case_data_rw (c, dv->var)->f = counter;
+ counter += count_string (crit,
*
c);
+ case_data_rw (
*
c, dv->var)->f = counter;
}
return TRNS_CONTINUE;
}
}
return TRNS_CONTINUE;
}
@@
-351,7
+351,7
@@
count_trns_proc (void *trns_, struct ccase *c,
static bool
count_trns_free (void *trns_)
{
static bool
count_trns_free (void *trns_)
{
- struct count_trns *trns =
(struct count_trns *)
trns_;
+ struct count_trns *trns = trns_;
pool_destroy (trns->pool);
return true;
}
pool_destroy (trns->pool);
return true;
}