projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FLIP: Eliminate false dependency on VAR_NAME_LEN.
[pspp-builds.git]
/
src
/
language
/
stats
/
sort-criteria.c
diff --git
a/src/language/stats/sort-criteria.c
b/src/language/stats/sort-criteria.c
index 9ae299ee6c9e67da5513784eb266c56405e0da20..649760235432fc4222ed70fed7353d7e815a0027 100644
(file)
--- a/
src/language/stats/sort-criteria.c
+++ b/
src/language/stats/sort-criteria.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006
, 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
@@
-63,7
+63,7
@@
parse_sort_criteria (struct lexer *lexer, const struct dictionary *dict,
goto error;
/* Sort direction. */
goto error;
/* Sort direction. */
- if (lex_match (lexer,
'('
))
+ if (lex_match (lexer,
T_LPAREN
))
{
if (lex_match_id (lexer, "D") || lex_match_id (lexer, "DOWN"))
direction = SC_DESCEND;
{
if (lex_match_id (lexer, "D") || lex_match_id (lexer, "DOWN"))
direction = SC_DESCEND;
@@
-74,7
+74,7
@@
parse_sort_criteria (struct lexer *lexer, const struct dictionary *dict,
msg (SE, _("`A' or `D' expected inside parentheses."));
goto error;
}
msg (SE, _("`A' or `D' expected inside parentheses."));
goto error;
}
- if (!lex_match (lexer,
')'
))
+ if (!lex_match (lexer,
T_RPAREN
))
{
msg (SE, _("`)' expected."));
goto error;
{
msg (SE, _("`)' expected."));
goto error;
@@
-94,7
+94,7
@@
parse_sort_criteria (struct lexer *lexer, const struct dictionary *dict,
}
}
while (lex_token (lexer) == T_ID
}
}
while (lex_token (lexer) == T_ID
- && dict_lookup_var (dict, lex_tok
id
(lexer)) != NULL);
+ && dict_lookup_var (dict, lex_tok
cstr
(lexer)) != NULL);
free (local_vars);
return true;
free (local_vars);
return true;