From 3080eabcac3a1443d428286e57447b119261841e Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 20 Jul 1995 08:14:34 +0000 Subject: [PATCH] Qualifiers were observed too often. Instead tokens are treated as qualifiers only when separated by comma. --- ccl/cclfind.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/ccl/cclfind.c b/ccl/cclfind.c index ab16f42..fe77fe4 100644 --- a/ccl/cclfind.c +++ b/ccl/cclfind.c @@ -45,7 +45,11 @@ * Europagate, 1995 * * $Log: cclfind.c,v $ - * Revision 1.14 1995/05/16 09:39:26 adam + * Revision 1.15 1995/07/20 08:14:34 adam + * Qualifiers were observed too often. Instead tokens are treated as + * qualifiers only when separated by comma. + * + * Revision 1.14 1995/05/16 09:39:26 adam * LICENSE. * * Revision 1.13 1995/04/17 09:31:42 adam @@ -706,10 +710,15 @@ static struct ccl_rpn_node *search_elements (struct ccl_rpn_attr **qa) } lookahead = look_token; - while (lookahead->kind==CCL_TOK_TERM || lookahead->kind==CCL_TOK_COMMA) - lookahead = lookahead->next; - if (lookahead->kind == CCL_TOK_REL || lookahead->kind == CCL_TOK_EQ) - return qualifiers (lookahead, qa); + while (lookahead->kind==CCL_TOK_TERM) + { + lookahead = lookahead->next; + if (lookahead->kind == CCL_TOK_REL || lookahead->kind == CCL_TOK_EQ) + return qualifiers (lookahead, qa); + if (lookahead->kind != CCL_TOK_COMMA) + break; + lookahead = lookahead->next; + } return search_terms (qa); } -- 1.7.10.4