projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Starting to optimize
[idzebra-moved-to-github.git]
/
dict
/
lookgrep.c
diff --git
a/dict/lookgrep.c
b/dict/lookgrep.c
index
d4e9873
..
bde3771
100644
(file)
--- a/
dict/lookgrep.c
+++ b/
dict/lookgrep.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: lookgrep.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: lookgrep.c,v $
- * Revision 1.22 1999-02-02 14:50:23 adam
+ * Revision 1.24 1999-05-26 07:49:12 adam
+ * C++ compilation.
+ *
+ * Revision 1.23 1999/05/15 14:36:37 adam
+ * Updated dictionary. Implemented "compression" of dictionary.
+ *
+ * Revision 1.22 1999/02/02 14:50:23 adam
* Updated WIN32 code specific sections. Changed header.
*
* Revision 1.21 1998/06/24 12:16:12 adam
* Updated WIN32 code specific sections. Changed header.
*
* Revision 1.21 1998/06/24 12:16:12 adam
@@
-121,13
+127,13
@@
static INLINE MatchWord get_bit (MatchContext *mc, MatchWord *m, int ch,
static MatchContext *mk_MatchContext (struct DFA *dfa, int range)
{
static MatchContext *mk_MatchContext (struct DFA *dfa, int range)
{
- MatchContext *mc = xmalloc (sizeof(*mc));
+ MatchContext *mc = (MatchContext *) xmalloc (sizeof(*mc));
int s;
mc->n = (dfa->no_states+WORD_BITS) / WORD_BITS;
mc->range = range;
mc->fact = (range+1)*mc->n;
int s;
mc->n = (dfa->no_states+WORD_BITS) / WORD_BITS;
mc->range = range;
mc->fact = (range+1)*mc->n;
- mc->match_mask = xcalloc (mc->n, sizeof(*mc->match_mask));
+ mc->match_mask = (MatchWord *) xcalloc (mc->n, sizeof(*mc->match_mask));
for (s = 0; s<dfa->no_states; s++)
if (dfa->states[s]->rule_no)
for (s = 0; s<dfa->no_states; s++)
if (dfa->states[s]->rule_no)
@@
-304,7
+310,7
@@
static int dict_grep (Dict dict, Dict_ptr ptr, MatchContext *mc,
dict_bf_readp (dict->dbf, ptr, &p);
lo = 0;
hi = DICT_nodir(p)-1;
dict_bf_readp (dict->dbf, ptr, &p);
lo = 0;
hi = DICT_nodir(p)-1;
- indxp = (short*) ((char*) p+DICT_pagesize(dict)-sizeof(short));
+ indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
while (lo <= hi)
{
while (lo <= hi)
{
@@
-404,8
+410,7
@@
static int dict_grep (Dict dict, Dict_ptr ptr, MatchContext *mc,
init_pos))
return 1;
dict_bf_readp (dict->dbf, ptr, &p);
init_pos))
return 1;
dict_bf_readp (dict->dbf, ptr, &p);
- indxp = (short*) ((char*) p+DICT_pagesize(dict)
- -sizeof(short));
+ indxp = (short*) ((char*) p+DICT_bsize(p)-sizeof(short));
}
}
}
}
}
}
@@
-452,7
+457,7
@@
int dict_lookup_grep (Dict dict, const char *pattern, int range, void *client,
mc = mk_MatchContext (dfa, range);
mc = mk_MatchContext (dfa, range);
- Rj = xcalloc ((MAX_LENGTH+1) * mc->n, sizeof(*Rj));
+ Rj = (MatchWord *) xcalloc ((MAX_LENGTH+1) * mc->n, sizeof(*Rj));
set_bit (mc, Rj, 0, 0);
for (d = 1; d<=mc->range; d++)
set_bit (mc, Rj, 0, 0);
for (d = 1; d<=mc->range; d++)
@@
-471,8
+476,9
@@
int dict_lookup_grep (Dict dict, const char *pattern, int range, void *client,
}
}
*max_pos = 0;
}
}
*max_pos = 0;
- if (dict->head.last > 1)
- i = dict_grep (dict, 1, mc, Rj, 0, client, userfunc, prefix,
+ if (dict->head.root)
+ i = dict_grep (dict, dict->head.root, mc, Rj, 0, client,
+ userfunc, prefix,
dfa, max_pos, init_pos);
else
i = 0;
dfa, max_pos, init_pos);
else
i = 0;