diff options
| author | dgp <dgp@users.sourceforge.net> | 2015-10-20 20:21:44 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2015-10-20 20:21:44 (GMT) |
| commit | bc85f89c10afaf5368f4c41a235e11955886a1a3 (patch) | |
| tree | a4b1253b0b21a324ac93ecaa8709fcdeca12e2dc /generic/regcomp.c | |
| parent | 75ed02d88822dad90ad256551f2df875aa884975 (diff) | |
| download | tcl-bc85f89c10afaf5368f4c41a235e11955886a1a3.zip tcl-bc85f89c10afaf5368f4c41a235e11955886a1a3.tar.gz tcl-bc85f89c10afaf5368f4c41a235e11955886a1a3.tar.bz2 | |
Adaptation of most of the re-mopup.patch from Tom Lane @ postgress.
Still should add the new tests.
Diffstat (limited to 'generic/regcomp.c')
| -rw-r--r-- | generic/regcomp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/regcomp.c b/generic/regcomp.c index 3c91962..8287b7e 100644 --- a/generic/regcomp.c +++ b/generic/regcomp.c @@ -131,10 +131,10 @@ static int sortins_cmp(const void *, const void *); static void sortouts(struct nfa *, struct state *); static int sortouts_cmp(const void *, const void *); static void moveins(struct nfa *, struct state *, struct state *); -static void copyins(struct nfa *, struct state *, struct state *, int); +static void copyins(struct nfa *, struct state *, struct state *); static void mergeins(struct nfa *, struct state *, struct arc **, int); static void moveouts(struct nfa *, struct state *, struct state *); -static void copyouts(struct nfa *, struct state *, struct state *, int); +static void copyouts(struct nfa *, struct state *, struct state *); static void cloneouts(struct nfa *, struct state *, struct state *, struct state *, int); static void delsub(struct nfa *, struct state *, struct state *); static void deltraverse(struct nfa *, struct state *, struct state *); @@ -173,7 +173,6 @@ static void dumpnfa(struct nfa *, FILE *); #ifdef REG_DEBUG static void dumpstate(struct state *, FILE *); static void dumparcs(struct state *, FILE *); -static int dumprarcs(struct arc *, struct state *, FILE *, int); static void dumparc(struct arc *, struct state *, FILE *); #endif static void dumpcnfa(struct cnfa *, FILE *); @@ -627,8 +626,9 @@ makesearch( for (s=slist ; s!=NULL ; s=s2) { s2 = newstate(nfa); - - copyouts(nfa, s, s2, 1); + NOERR(); + copyouts(nfa, s, s2); + NOERR(); for (a=s->ins ; a!=NULL ; a=b) { b = a->inchain; @@ -2061,7 +2061,7 @@ dump( dumpcolors(&g->cmap, f); if (!NULLCNFA(g->search)) { - printf("\nsearch:\n"); + fprintf(f, "\nsearch:\n"); dumpcnfa(&g->search, f); } for (i = 1; i < g->nlacons; i++) { |