X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=dfa%2Fgrepper.c;h=d8830a15990312d9541bf0fd4942beaff4516737;hp=cb55b53a131290a94d2e04d74145b576bd488e12;hb=896c0427df9d8eff5de6a1735dcd992e067df844;hpb=c1ecb833ce85c0dc62550a4183975c7397bd4f7c diff --git a/dfa/grepper.c b/dfa/grepper.c index cb55b53..d8830a1 100644 --- a/dfa/grepper.c +++ b/dfa/grepper.c @@ -1,23 +1,33 @@ -/* - * Copyright (C) 1994, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: grepper.c,v $ - * Revision 1.2 1994-10-03 17:22:18 adam - * Optimization of grepper. - * - * Revision 1.1 1994/09/27 16:31:18 adam - * First version of grepper: grep with error correction. - * - */ +/* $Id: grepper.c,v 1.10 2002-08-02 19:26:55 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 + Index Data Aps + +This file is part of the Zebra server. + +Zebra is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Zebra; see the file LICENSE.zebra. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +*/ + + #include #include #include #include #include -#include +#include #include #include "imalloc.h" @@ -63,19 +73,19 @@ static INLINE MatchWord get_bit (MatchContext *mc, MatchWord *m, int ch, return m[mc->n * ch + wno] & (1<n = (dfas->no+WORD_BITS) / WORD_BITS; + mc->n = (dfa->no_states+WORD_BITS) / WORD_BITS; mc->range = range; mc->Sc = icalloc (sizeof(*mc->Sc) * 256 * mc->n); - for (i=0; ino; i++) + for (i=0; ino_states; i++) { int j; - DFA_state *state = dfas->sortarray[i]; + struct DFA_state *state = dfa->states[i]; for (j=0; jtran_no; j++) { @@ -93,7 +103,7 @@ static MatchContext *mk_MatchContext (DFA_states *dfas, int range) static void mask_shift (MatchContext *mc, MatchWord *Rdst, MatchWord *Rsrc, - DFA_states *dfas, int ch) + struct DFA *dfa, int ch) { int j, s = 0; MatchWord *Rsrc_p = Rsrc, mask; @@ -110,7 +120,7 @@ static void mask_shift (MatchContext *mc, MatchWord *Rdst, MatchWord *Rsrc, { if (mask & 1) { - DFA_state *state = dfas->sortarray[s]; + struct DFA_state *state = dfa->states[s]; int i = state->tran_no; while (--i >= 0) if (ch >= state->trans[i].ch[0] && @@ -119,7 +129,7 @@ static void mask_shift (MatchContext *mc, MatchWord *Rdst, MatchWord *Rsrc, } if (mask & 2) { - DFA_state *state = dfas->sortarray[s+1]; + struct DFA_state *state = dfa->states[s+1]; int i = state->tran_no; while (--i >= 0) if (ch >= state->trans[i].ch[0] && @@ -128,7 +138,7 @@ static void mask_shift (MatchContext *mc, MatchWord *Rdst, MatchWord *Rsrc, } if (mask & 4) { - DFA_state *state = dfas->sortarray[s+2]; + struct DFA_state *state = dfa->states[s+2]; int i = state->tran_no; while (--i >= 0) if (ch >= state->trans[i].ch[0] && @@ -137,7 +147,7 @@ static void mask_shift (MatchContext *mc, MatchWord *Rdst, MatchWord *Rsrc, } if (mask & 8) { - DFA_state *state = dfas->sortarray[s+3]; + struct DFA_state *state = dfa->states[s+3]; int i = state->tran_no; while (--i >= 0) if (ch >= state->trans[i].ch[0] && @@ -146,7 +156,7 @@ static void mask_shift (MatchContext *mc, MatchWord *Rdst, MatchWord *Rsrc, } } s += 4; - if (s >= dfas->no) + if (s >= dfa->no_states) return; mask >>= 4; } @@ -154,7 +164,7 @@ static void mask_shift (MatchContext *mc, MatchWord *Rdst, MatchWord *Rsrc, } static void shift (MatchContext *mc, MatchWord *Rdst, MatchWord *Rsrc, - DFA_states *dfas) + struct DFA *dfa) { int j, s = 0; MatchWord *Rsrc_p = Rsrc, mask; @@ -169,35 +179,35 @@ static void shift (MatchContext *mc, MatchWord *Rdst, MatchWord *Rsrc, { if (mask & 1) { - DFA_state *state = dfas->sortarray[s]; + struct DFA_state *state = dfa->states[s]; int i = state->tran_no; while (--i >= 0) set_bit (mc, Rdst, 0, state->trans[i].to); } if (mask & 2) { - DFA_state *state = dfas->sortarray[s+1]; + struct DFA_state *state = dfa->states[s+1]; int i = state->tran_no; while (--i >= 0) set_bit (mc, Rdst, 0, state->trans[i].to); } if (mask & 4) { - DFA_state *state = dfas->sortarray[s+2]; + struct DFA_state *state = dfa->states[s+2]; int i = state->tran_no; while (--i >= 0) set_bit (mc, Rdst, 0, state->trans[i].to); } if (mask & 8) { - DFA_state *state = dfas->sortarray[s+3]; + struct DFA_state *state = dfa->states[s+3]; int i = state->tran_no; while (--i >= 0) set_bit (mc, Rdst, 0, state->trans[i].to); } } s += 4; - if (s >= dfas->no) + if (s >= dfa->no_states) return; mask >>= 4; } @@ -213,7 +223,7 @@ static void or (MatchContext *mc, MatchWord *Rdst, } -static int go (MatchContext *mc, DFA_states *dfas, FILE *inf) +static int go (MatchContext *mc, struct DFA *dfa, FILE *inf) { MatchWord *Rj, *Rj1, *Rj_a, *Rj_b, *Rj_c; int s, d, ch; @@ -235,11 +245,11 @@ static int go (MatchContext *mc, DFA_states *dfas, FILE *inf) { int s; memcpy (Rj + mc->n * d, Rj + mc->n * (d-1), mc->n * sizeof(*Rj)); - for (s = 0; sno; s++) + for (s = 0; sno_states; s++) { if (get_bit (mc, Rj, d-1, s)) { - DFA_state *state = dfas->sortarray[s]; + struct DFA_state *state = dfa->states[s]; int i = state->tran_no; while (--i >= 0) set_bit (mc, Rj, d, state->trans[i].to); @@ -275,27 +285,27 @@ static int go (MatchContext *mc, DFA_states *dfas, FILE *inf) } if (++inf_ptr == INFBUF_SIZE) inf_ptr = 0; - mask_shift (mc, Rj1, Rj, dfas, ch); + mask_shift (mc, Rj1, Rj, dfa, ch); for (d = 1; d <= mc->range; d++) { - mask_shift (mc, Rj_b, Rj+d*mc->n, dfas, ch); /* 1 */ + mask_shift (mc, Rj_b, Rj+d*mc->n, dfa, ch); /* 1 */ or (mc, Rj_a, Rj+(d-1)*mc->n, Rj1+(d-1)*mc->n); /* 2,3 */ - shift (mc, Rj_c, Rj_a, dfas); + shift (mc, Rj_c, Rj_a, dfa); or (mc, Rj_a, Rj_b, Rj_c); /* 1,2,3*/ or (mc, Rj1+d*mc->n, Rj_a, Rj+(d-1)*mc->n); /* 1,2,3,4 */ } - for (s = 0; sno; s++) + for (s = 0; sno_states; s++) { - if (dfas->sortarray[s]->rule_no) + if (dfa->states[s]->rule_no) if (get_bit (mc, Rj1+mc->range*mc->n, 0, s)) no_match++; } for (d = 0; d <= mc->range; d++) - reset_bit (mc, Rj1+d*mc->n, 0, dfas->no); + reset_bit (mc, Rj1+d*mc->n, 0, dfa->no_states); Rj_t = Rj1; Rj1 = Rj; Rj = Rj_t; @@ -309,7 +319,7 @@ static int go (MatchContext *mc, DFA_states *dfas, FILE *inf) return 0; } -static int grep_file (DFA_states *dfas, const char *fname, int range) +static int grep_file (struct DFA *dfa, const char *fname, int range) { FILE *inf; MatchContext *mc; @@ -319,16 +329,16 @@ static int grep_file (DFA_states *dfas, const char *fname, int range) inf = fopen (fname, "r"); if (!inf) { - log (LOG_FATAL|LOG_ERRNO, "cannot open `%s'", fname); + logf (LOG_FATAL|LOG_ERRNO, "cannot open `%s'", fname); exit (1); } } else inf = stdin; - mc = mk_MatchContext (dfas, range); + mc = mk_MatchContext (dfa, range); - go (mc, dfas, inf); + go (mc, dfa, inf); if (fname) fclose (inf); @@ -340,9 +350,9 @@ int main (int argc, char **argv) int ret; int range = 0; char *arg; - char *pattern = NULL; - DFA_states *dfas = NULL; + const char *pattern = NULL; int no_files = 0; + struct DFA *dfa = dfa_init(); prog = argv[0]; while ((ret = options ("nr:dsv:", argv, argc, &arg)) != -2) @@ -352,27 +362,24 @@ int main (int argc, char **argv) if (!pattern) { int i; - DFA *dfa = init_dfa(); pattern = arg; - i = parse_dfa (dfa, &pattern, dfa_thompson_chars); + i = dfa_parse (dfa, &pattern); if (i || *pattern) { fprintf (stderr, "%s: illegal pattern\n", prog); return 1; } - dfa->root = dfa->top; - dfas = mk_dfas (dfa, 200); - rm_dfa (&dfa); + dfa_mkstate (dfa); } else { no_files++; - grep_file (dfas, arg, range); + grep_file (dfa, arg, range); } } else if (ret == 'v') { - log_init (log_mask_str(arg), prog, NULL); + yaz_log_init (yaz_log_mask_str(arg), prog, NULL); } else if (ret == 's') { @@ -394,7 +401,7 @@ int main (int argc, char **argv) } else { - log (LOG_FATAL, "unknown option"); + logf (LOG_FATAL, "Unknown option '-%s'", arg); exit (1); } } @@ -406,7 +413,8 @@ int main (int argc, char **argv) } else if (no_files == 0) { - grep_file (dfas, NULL, range); + grep_file (dfa, NULL, range); } + dfa_delete (&dfa); return 0; }