/* CCL - lexical analysis
* Europagate, 1995
*
- * $Id: ccltoken.c,v 1.19 2002-06-06 12:54:24 adam Exp $
+ * $Id: ccltoken.c,v 1.22 2003-02-14 18:49:23 adam Exp $
*
* Old Europagate Log:
*
#include <string.h>
#include <stdlib.h>
+#include <ctype.h>
#include <yaz/ccl.h>
case '%':
case '!':
last->kind = CCL_TOK_PROX;
- while (*cp == '%' || *cp == '!')
+ while (isdigit(*cp))
{
++ last->len;
cp++;
cp++;
break;
default:
- if (!strchr ("(),%!><=- \t\n\r", cp[-1]))
+ if (!strchr ("(),%!><= \t\n\r", cp[-1]))
{
- while (*cp && !strchr ("(),%!><=- \t\n\r", *cp))
+ while (*cp && !strchr ("(),%!><= \t\n\r", *cp))
{
cp++;
++ last->len;