diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-29 13:28:32 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-29 13:28:32 (GMT) |
| commit | 4187ab8e37b22866a8b3a8727b9d661bca6378c8 (patch) | |
| tree | adefcd33b5268f2e85014860b1f8aca78237da6c /generic/regexec.c | |
| parent | 4796062aab8a24df621cf33dbe862f72b36986f8 (diff) | |
| parent | a812c806619d185a0f16bfa431b848006ba98044 (diff) | |
| download | tcl-4187ab8e37b22866a8b3a8727b9d661bca6378c8.zip tcl-4187ab8e37b22866a8b3a8727b9d661bca6378c8.tar.gz tcl-4187ab8e37b22866a8b3a8727b9d661bca6378c8.tar.bz2 | |
Merge tip-548
Diffstat (limited to 'generic/regexec.c')
| -rw-r--r-- | generic/regexec.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/generic/regexec.c b/generic/regexec.c index 24c4eac..b5f161b 100644 --- a/generic/regexec.c +++ b/generic/regexec.c @@ -128,7 +128,7 @@ int exec(regex_t *, const chr *, size_t, rm_detail_t *, size_t, regmatch_t [], i static struct dfa *getsubdfa(struct vars *, struct subre *); static int simpleFind(struct vars *const, struct cnfa *const, struct colormap *const); static int complicatedFind(struct vars *const, struct cnfa *const, struct colormap *const); -static int complicatedFindLoop(struct vars *const, struct cnfa *const, struct colormap *const, struct dfa *const, struct dfa *const, chr **const); +static int complicatedFindLoop(struct vars *const, struct dfa *const, struct dfa *const, chr **const); static void zapallsubs(regmatch_t *const, const size_t); static void zaptreesubs(struct vars *const, struct subre *const); static void subset(struct vars *const, struct subre *const, chr *const, chr *const); @@ -433,7 +433,7 @@ complicatedFind( return v->err; } - ret = complicatedFindLoop(v, cnfa, cm, d, s, &cold); + ret = complicatedFindLoop(v, d, s, &cold); freeDFA(d); freeDFA(s); @@ -452,14 +452,12 @@ complicatedFind( /* - complicatedFindLoop - the heart of complicatedFind - ^ static int complicatedFindLoop(struct vars *, struct cnfa *, struct colormap *, + ^ static int complicatedFindLoop(struct vars *, ^ struct dfa *, struct dfa *, chr **); */ static int complicatedFindLoop( struct vars *const v, - struct cnfa *const cnfa, - struct colormap *const cm, struct dfa *const d, struct dfa *const s, chr **const coldp) /* where to put coldstart pointer */ |