projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lexer: New type enum token_type.
[pspp-builds.git]
/
src
/
language
/
stats
/
t-test.q
diff --git
a/src/language/stats/t-test.q
b/src/language/stats/t-test.q
index 9eb2c471356b2daa7a6e94f7a7174aac1c7cb65f..3f3fa5d6e0d795f64940def95c82e62fec40705e 100644
(file)
--- a/
src/language/stats/t-test.q
+++ b/
src/language/stats/t-test.q
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009 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
@@
-275,7
+275,7
@@
tts_custom_groups (struct lexer *lexer, struct dataset *ds,
int n_values;
int width;
int n_values;
int width;
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
proc->indep_var = parse_variable (lexer, dataset_dict (ds));
if (proc->indep_var == NULL)
proc->indep_var = parse_variable (lexer, dataset_dict (ds));
if (proc->indep_var == NULL)
@@
-287,19
+287,19
@@
tts_custom_groups (struct lexer *lexer, struct dataset *ds,
value_init (&proc->g_value[0], width);
value_init (&proc->g_value[1], width);
value_init (&proc->g_value[0], width);
value_init (&proc->g_value[1], width);
- if (!lex_match (lexer,
'('
))
+ if (!lex_match (lexer,
T_LPAREN
))
n_values = 0;
else
{
if (!parse_value (lexer, &proc->g_value[0], width))
return 0;
n_values = 0;
else
{
if (!parse_value (lexer, &proc->g_value[0], width))
return 0;
- lex_match (lexer,
','
);
- if (lex_match (lexer,
')'
))
+ lex_match (lexer,
T_COMMA
);
+ if (lex_match (lexer,
T_RPAREN
))
n_values = 1;
else
{
if (!parse_value (lexer, &proc->g_value[1], width)
n_values = 1;
else
{
if (!parse_value (lexer, &proc->g_value[1], width)
- || !lex_force_match (lexer,
')'
))
+ || !lex_force_match (lexer,
T_RPAREN
))
return 0;
n_values = 2;
}
return 0;
n_values = 2;
}
@@
-355,7
+355,7
@@
tts_custom_pairs (struct lexer *lexer, struct dataset *ds,
size_t n_total_pairs;
size_t i, j;
size_t n_total_pairs;
size_t i, j;
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
if (!parse_variables_const (lexer, dataset_dict (ds), &vars1, &n_vars1,
PV_DUPLICATE | PV_NUMERIC | PV_NO_SCRATCH))
if (!parse_variables_const (lexer, dataset_dict (ds), &vars1, &n_vars1,
PV_DUPLICATE | PV_NUMERIC | PV_NO_SCRATCH))
@@
-370,9
+370,9
@@
tts_custom_pairs (struct lexer *lexer, struct dataset *ds,
return 0;
}
return 0;
}
- if (lex_match (lexer,
'('
)
+ if (lex_match (lexer,
T_LPAREN
)
&& lex_match_id (lexer, "PAIRED")
&& lex_match_id (lexer, "PAIRED")
- && lex_match (lexer,
')'
))
+ && lex_match (lexer,
T_RPAREN
))
{
paired = true;
if (n_vars1 != n_vars2)
{
paired = true;
if (n_vars1 != n_vars2)