Fix sample PQF

[yaz-moved-to-github.git] / cql / lexer.c

diff --git a/cql/lexer.c b/cql/lexer.c
index 495cc04..04113ae 100644 (file)
--- a/cql/lexer.c
+++ b/cql/lexer.c
@@ -1,4 +1,4 @@
-/* $Id: lexer.c,v 1.3 2003-04-14 15:40:03 adam Exp $
+/* $Id: lexer.c,v 1.5 2003-09-04 18:13:39 adam Exp $
    Copyright (C) 2002-2003
    Index Data Aps
 
@@ -9,7 +9,7 @@ See the file LICENSE.
 
 static void putb(YYSTYPE *lval, CQL_parser cp, int c)
 {
-    if (lval->len >= lval->size)
+    if (lval->len+1 >= lval->size)
     {
         char *nb = nmem_malloc(cp->nmem, (lval->size = lval->len * 2 + 20));
         memcpy (nb, lval->buf, lval->len);
@@ -30,7 +30,6 @@ int yylex(YYSTYPE *lval, void *vp)
     int c;
     lval->cql = 0;
     lval->rel = 0;
-    lval->rel = 0;
     lval->len = 0;
     lval->size = 10;
     lval->buf = nmem_malloc(cp->nmem, lval->size);
@@ -107,16 +106,8 @@ int yylex(YYSTYPE *lval, void *vp)
             return OR;
         if (!strcmp(lval->buf, "not"))
             return NOT;
-        if (!strcmp(lval->buf, "exact"))
-            return EXACT;
-        if (!strcmp(lval->buf, "all"))
-            return ALL;
         if (!strncmp(lval->buf, "prox", 4))
             return PROX;
-        if (!strcmp(lval->buf, "any"))
-            return ANY;
-        if (!strcmp(lval->buf, "scr"))
-            return SCR;
     }
     return TERM;
 }