projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add even more expression tests and fix the bugs they found.
[pspp]
/
src
/
count.c
diff --git
a/src/count.c
b/src/count.c
index a6e70616460cf7ce40583c0f858e5801095d75a7..af9642b8a233d2cb65bb914737cd391a417089da 100644
(file)
--- a/
src/count.c
+++ b/
src/count.c
@@
-23,6
+23,7
@@
#include "alloc.h"
#include "case.h"
#include "command.h"
#include "alloc.h"
#include "case.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"
@@
-243,13
+244,13
@@
parse_numeric_criteria (struct counting * c)
}
cur = &c->crit.n[n++];
}
cur = &c->crit.n[n++];
- if (
token == T_NUM
)
+ if (
lex_is_number ()
)
{
cur->a = tokval;
lex_get ();
if (lex_match_id ("THRU"))
{
{
cur->a = tokval;
lex_get ();
if (lex_match_id ("THRU"))
{
- if (
token == T_NUM
)
+ if (
lex_is_number ()
)
{
if (!lex_force_num ())
return 0;
{
if (!lex_force_num ())
return 0;
@@
-281,7
+282,7
@@
parse_numeric_criteria (struct counting * c)
{
if (!lex_force_match_id ("THRU"))
return 0;
{
if (!lex_force_match_id ("THRU"))
return 0;
- if (
token == T_NUM
)
+ if (
lex_is_number ()
)
{
cur->type = CNT_LOW;
cur->a = tokval;
{
cur->type = CNT_LOW;
cur->a = tokval;