/* PSPP - a program for statistical analysis. -*-c-*-
- Copyright (C) 2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2008, 2009, 2010, 2011, 2016 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
if (!lex_match (lexer, T_SLASH))
break;
}
-
if (lex_token (lexer) != T_ENDCMD)
{
lex_error (lexer, _("expecting end of command"));
const struct npar_test *test = specs->test[t];
if ( NULL == test->execute )
{
- msg (SW, _("NPAR subcommand not currently implemented."));
+ msg (SW, _("%s subcommand not currently implemented."), "NPAR");
continue;
}
test->execute (ds, casereader_clone (input), specs->filter, test, specs->exact, specs->timer);
}
- if ( specs->descriptives )
+ if (specs->descriptives && specs->n_vars > 0)
{
summary_descriptives = xnmalloc (sizeof (*summary_descriptives),
specs->n_vars);
if ( (specs->descriptives || specs->quartiles)
&& !taint_has_tainted_successor (casereader_get_taint (input)) )
- do_summary_box (summary_descriptives, specs->vv, specs->n_vars );
+ do_summary_box (summary_descriptives, specs->vv, specs->n_vars,
+ dict_get_weight_format (dataset_dict (ds)));
free (summary_descriptives);
casereader_destroy (input);
}
}
- sort (npar_specs.vv, npar_specs.n_vars, sizeof (*npar_specs.vv),
+ sort (npar_specs.vv, npar_specs.n_vars, sizeof (*npar_specs.vv),
compare_var_ptrs_by_name, NULL);
if ( cmd.statistics )
}
else
{
- lex_error (lexer, _("Expecting MEAN, MEDIAN, MODE or number"));
+ lex_error (lexer, _("Expecting %s, %s, %s or a number."), "MEAN", "MEDIAN", "MODE");
return 0;
}
-
- lex_force_match (lexer, T_RPAREN);
- lex_force_match (lexer, T_EQUALS);
+
+ if (! lex_force_match (lexer, T_RPAREN))
+ return 2;
+
+ if (! lex_force_match (lexer, T_EQUALS))
+ return 2;
+
if (!parse_variables_const_pool (lexer, specs->pool, dataset_dict (ds),
&tp->vars, &tp->n_vars,
PV_NO_SCRATCH | PV_NO_DUPLICATE | PV_NUMERIC))
npar_friedman (struct lexer *lexer, struct dataset *ds,
struct npar_specs *specs)
{
- struct friedman_test *ft = pool_alloc (specs->pool, sizeof (*ft));
+ struct friedman_test *ft = pool_alloc (specs->pool, sizeof (*ft));
struct one_sample_test *ost = &ft->parent;
struct npar_test *nt = &ost->parent;
npar_kendall (struct lexer *lexer, struct dataset *ds,
struct npar_specs *specs)
{
- struct friedman_test *kt = pool_alloc (specs->pool, sizeof (*kt));
+ struct friedman_test *kt = pool_alloc (specs->pool, sizeof (*kt));
struct one_sample_test *ost = &kt->parent;
struct npar_test *nt = &ost->parent;
npar_cochran (struct lexer *lexer, struct dataset *ds,
struct npar_specs *specs)
{
- struct one_sample_test *ft = pool_alloc (specs->pool, sizeof (*ft));
+ struct one_sample_test *ft = pool_alloc (specs->pool, sizeof (*ft));
struct npar_test *nt = &ft->parent;
nt->execute = cochran_execute;
{
cstp->ranged = true;
if ( ! lex_force_num (lexer)) return 0;
- cstp->lo = lex_integer (lexer);
+ cstp->lo = lex_number (lexer);
lex_get (lexer);
- lex_force_match (lexer, T_COMMA);
+ if (! lex_force_match (lexer, T_COMMA)) return 0;
if (! lex_force_num (lexer) ) return 0;
- cstp->hi = lex_integer (lexer);
+ cstp->hi = lex_number (lexer);
if ( cstp->lo >= cstp->hi )
{
msg (ME,
cstp->expected = NULL;
if (lex_match_phrase (lexer, "/EXPECTED"))
{
- lex_force_match (lexer, T_EQUALS);
- if ( ! lex_match_id (lexer, "EQUAL") )
+ if (! lex_force_match (lexer, T_EQUALS)) return 0;
+ if (! lex_match_id (lexer, "EQUAL") )
{
double f;
int n;
if ( lex_match (lexer, T_ASTERISK))
{
n = f;
+ if (!lex_force_num (lexer))
+ return 0;
f = lex_number (lexer);
lex_get (lexer);
}
{
btp->p = lex_number (lexer);
lex_get (lexer);
- lex_force_match (lexer, T_RPAREN);
+ if (!lex_force_match (lexer, T_RPAREN))
+ return 0;
}
else
return 0;
else
equals = true;
- if (equals || lex_match (lexer, T_EQUALS) )
- {
- if (parse_variables_const_pool (lexer, specs->pool, dataset_dict (ds),
- &tp->vars, &tp->n_vars,
- PV_NUMERIC | PV_NO_SCRATCH | PV_NO_DUPLICATE) )
- {
- if (lex_match (lexer, T_LPAREN))
- {
- lex_force_num (lexer);
- btp->category1 = lex_number (lexer);
- lex_get (lexer);
- if ( lex_match (lexer, T_COMMA))
- {
- if ( ! lex_force_num (lexer) ) return 2;
- btp->category2 = lex_number (lexer);
- lex_get (lexer);
- }
- else
- {
- btp->cutpoint = btp->category1;
- }
-
- lex_force_match (lexer, T_RPAREN);
- }
- }
- else
- return 2;
+ if (!equals)
+ if (!lex_force_match (lexer, T_EQUALS))
+ return 0;
- }
+ {
+ if (parse_variables_const_pool (lexer, specs->pool, dataset_dict (ds),
+ &tp->vars, &tp->n_vars,
+ PV_NUMERIC | PV_NO_SCRATCH | PV_NO_DUPLICATE) )
+ {
+ if (lex_match (lexer, T_LPAREN))
+ {
+ if (! lex_force_num (lexer))
+ return 2;
+ btp->category1 = lex_number (lexer);
+ lex_get (lexer);
+ if ( lex_match (lexer, T_COMMA))
+ {
+ if ( ! lex_force_num (lexer) ) return 2;
+ btp->category2 = lex_number (lexer);
+ lex_get (lexer);
+ }
+ else
+ {
+ btp->cutpoint = btp->category1;
+ }
+
+ if (! lex_force_match (lexer, T_RPAREN))
+ return 0;
+ }
+ }
+ else
+ {
+ return 2;
+ }
+ }
specs->n_tests++;
specs->test = pool_realloc (specs->pool,
return false;
nst->indep_var = parse_variable_const (lexer, dict);
+ if (!nst->indep_var)
+ return false;
if ( ! lex_force_match (lexer, T_LPAREN))
return false;
mt->median = SYSMIS;
- if ( lex_match (lexer, T_LPAREN))
+ if ( lex_match (lexer, T_LPAREN) && lex_force_num (lexer))
{
- lex_force_num (lexer);
mt->median = lex_number (lexer);
lex_get (lexer);
- lex_force_match (lexer, T_RPAREN);
+ if (! lex_force_match (lexer, T_RPAREN))
+ return 0;
}
lex_match (lexer, T_EQUALS);
size_t hash = hash_pointer (var, 0);
struct hmapx_node *node;
const struct variable *v = NULL;
-
+
HMAPX_FOR_EACH_WITH_HASH (v, node, hash, var_map)
{
if ( v == var)
}
}
-static void
+static void
n_sample_insert_variables (const struct npar_test *test,
struct hmapx *var_map)
{
if ( lex_match (lexer, T_LPAREN))
{
- if ( lex_force_num (lexer) )
+ if (lex_force_num (lexer) )
{
specs->timer = lex_number (lexer);
lex_get (lexer);
}
- lex_force_match (lexer, T_RPAREN);
+ if (lex_force_match (lexer, T_RPAREN))
+ return 0;
}
}
}