* Sebastian Hammer, Adam Dickmeiss
*
* $Log: lookgrep.c,v $
- * Revision 1.10 1995-11-16 17:00:44 adam
+ * Revision 1.14 1996-02-02 13:43:51 adam
+ * The public functions simply use char instead of Dict_char to represent
+ * search strings. Dict_char is used internally only.
+ *
+ * Revision 1.13 1996/01/08 09:09:30 adam
+ * Function dfa_parse got 'const' string argument.
+ *
+ * Revision 1.12 1995/12/11 09:04:48 adam
+ * Bug fix: the lookup/scan/lookgrep didn't handle empty dictionary.
+ *
+ * Revision 1.11 1995/12/06 14:43:02 adam
+ * New function: dict_delete.
+ *
+ * Revision 1.10 1995/11/16 17:00:44 adam
* Changed stupid log.
*
* Revision 1.9 1995/10/27 13:58:09 adam
static int dict_grep (Dict dict, Dict_ptr ptr, MatchContext *mc,
MatchWord *Rj, int pos, void *client,
- int (*userfunc)(Dict_char *, const char *, void *),
+ int (*userfunc)(char *, const char *, void *),
Dict_char *prefix, struct DFA *dfa,
int *max_pos)
{
if (ch == DICT_EOS)
{
if (was_match)
- if ((*userfunc)(prefix, info+(j+1)*sizeof(Dict_char),
- client))
+ if ((*userfunc)((char*) prefix,
+ info+(j+1)*sizeof(Dict_char), client))
return 1;
break;
}
if (Rj1[mc->range*mc->n + d] & mc->match_mask[d])
{
prefix[pos+1] = DICT_EOS;
- if ((*userfunc)(prefix, info+sizeof(Dict_ptr)+
+ if ((*userfunc)((char*) prefix,
+ info+sizeof(Dict_ptr)+
sizeof(Dict_char), client))
return 1;
break;
return 0;
}
-int dict_lookup_grep (Dict dict, Dict_char *pattern, int range, void *client,
+int dict_lookup_grep (Dict dict, const char *pattern, int range, void *client,
int *max_pos,
- int (*userfunc)(Dict_char *name, const char *info,
+ int (*userfunc)(char *name, const char *info,
void *client))
{
MatchWord *Rj;
Dict_char prefix[MAX_LENGTH+1];
- char *this_pattern = pattern;
+ const char *this_pattern = pattern;
MatchContext *mc;
struct DFA *dfa = dfa_init();
int i, d;
+ logf (LOG_DEBUG, "dict_lookup_grep '%s' range=%d", pattern, range);
i = dfa_parse (dfa, &this_pattern);
if (i || *this_pattern)
{
}
}
*max_pos = 0;
- i = dict_grep (dict, 1, mc, Rj, 0, client, userfunc, prefix, dfa,
- max_pos);
+ if (dict->head.last > 1)
+ i = dict_grep (dict, 1, mc, Rj, 0, client, userfunc, prefix,
+ dfa, max_pos);
+ else
+ i = 0;
logf (LOG_DEBUG, "max_pos = %d", *max_pos);
dfa_delete (&dfa);
xfree (Rj);