X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcount.c;h=af9642b8a233d2cb65bb914737cd391a417089da;hb=4848cff524922cc77ed21662406807471e96a68e;hp=a6e70616460cf7ce40583c0f858e5801095d75a7;hpb=06f9ee45954e5e71fa7f6262dbf37defa1dbf996;p=pspp

diff --git a/src/count.c b/src/count.c
index a6e7061646..af9642b8a2 100644
--- a/src/count.c
+++ b/src/count.c
@@ -23,6 +23,7 @@
 #include "alloc.h"
 #include "case.h"
 #include "command.h"
+#include "dictionary.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++];
-      if (token == T_NUM)
+      if (lex_is_number ())
 	{
 	  cur->a = tokval;
 	  lex_get ();
 	  if (lex_match_id ("THRU"))
 	    {
-	      if (token == T_NUM)
+	      if (lex_is_number ())
 		{
 		  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 (token == T_NUM)
+	  if (lex_is_number ())
 	    {
 	      cur->type = CNT_LOW;
 	      cur->a = tokval;