database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-25 20:23:07 +03:00
Code Activity

Sync our regex code with upstream changes since last time we did this, which

Browse Source 
was Tcl 8.4.8.  The main changes are to remove the never-fully-implemented
code for multi-character collating elements, and to const-ify some stuff a
bit more fully.  In combination with the recent security patch, this commit
brings us into line with Tcl 8.5.0.

Note that I didn't make any effort to duplicate a lot of cosmetic changes
that they made to bring their copy into line with their own style
guidelines, such as adding braces around single-line IF bodies.  Most of
those we either had done already (such as ANSI-fication of function headers)
or there is no point because pgindent would undo the change anyway.
This commit is contained in:
Tom Lane
2008-02-14 17:33:37 +00:00
parent 423abf4d6a
commit df1e965e12
9 changed files with 165 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/backend/regex/regc_nfa.c
View File

@@ -28,7 +28,7 @@
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $PostgreSQL: pgsql/src/backend/regex/regc_nfa.c,v 1.5 2008/01/03 20:47:55 tgl Exp $
* $PostgreSQL: pgsql/src/backend/regex/regc_nfa.c,v 1.6 2008/02/14 17:33:37 tgl Exp $
*
*
* One or two things that technically ought to be in here
@@ -349,8 +349,6 @@ newarc(struct nfa * nfa,
if (COLORED(a) && nfa->parent == NULL)
colorchain(nfa->cm, a);
return;
}
/*
@@ -361,8 +359,6 @@ allocarc(struct nfa * nfa,
struct state * s)
{
struct arc *a;
struct arcbatch *new;
int i;
/* shortcut */
if (s->free == NULL && s->noas < ABSIZE)
@@ -375,22 +371,25 @@ allocarc(struct nfa * nfa,
/* if none at hand, get more */
if (s->free == NULL)
{
new = (struct arcbatch *) MALLOC(sizeof(struct arcbatch));
if (new == NULL)
struct arcbatch *newAb;
int i;
newAb = (struct arcbatch *) MALLOC(sizeof(struct arcbatch));
if (newAb == NULL)
{
NERR(REG_ESPACE);
return NULL;
}
new->next = s->oas.next;
s->oas.next = new;
newAb->next = s->oas.next;
s->oas.next = newAb;
for (i = 0; i < ABSIZE; i++)
{
new->a[i].type = 0;
new->a[i].freechain = &new->a[i + 1];
newAb->a[i].type = 0;
newAb->a[i].freechain = &newAb->a[i + 1];
}
new->a[ABSIZE - 1].freechain = NULL;
s->free = &new->a[0];
newAb->a[ABSIZE - 1].freechain = NULL;
s->free = &newAb->a[0];
}
assert(s->free != NULL);
@@ -495,20 +494,20 @@ cparc(struct nfa * nfa,
*/
static void
moveins(struct nfa * nfa,
struct state * old,
struct state * new)
struct state * oldState,
struct state * newState)
{
struct arc *a;
assert(old != new);
assert(oldState != newState);
while ((a = old->ins) != NULL)
while ((a = oldState->ins) != NULL)
{
cparc(nfa, a, a->from, new);
cparc(nfa, a, a->from, newState);
freearc(nfa, a);
}
assert(old->nins == 0);
assert(old->ins == NULL);
assert(oldState->nins == 0);
assert(oldState->ins == NULL);
}
/*
@@ -516,15 +515,15 @@ moveins(struct nfa * nfa,
*/
static void
copyins(struct nfa * nfa,
struct state * old,
struct state * new)
struct state * oldState,
struct state * newState)
{
struct arc *a;
assert(old != new);
assert(oldState != newState);
for (a = old->ins; a != NULL; a = a->inchain)
cparc(nfa, a, a->from, new);
for (a = oldState->ins; a != NULL; a = a->inchain)
cparc(nfa, a, a->from, newState);
}
/*
@@ -532,16 +531,16 @@ copyins(struct nfa * nfa,
*/
static void
moveouts(struct nfa * nfa,
struct state * old,
struct state * new)
struct state * oldState,
struct state * newState)
{
struct arc *a;
assert(old != new);
assert(oldState != newState);
while ((a = old->outs) != NULL)
while ((a = oldState->outs) != NULL)
{
cparc(nfa, a, new, a->to);
cparc(nfa, a, newState, a->to);
freearc(nfa, a);
}
}
@@ -551,15 +550,15 @@ moveouts(struct nfa * nfa,
*/
static void
copyouts(struct nfa * nfa,
struct state * old,
struct state * new)
struct state * oldState,
struct state * newState)
{
struct arc *a;
assert(old != new);
assert(oldState != newState);
for (a = old->outs; a != NULL; a = a->outchain)
cparc(nfa, a, new, a->to);
for (a = oldState->outs; a != NULL; a = a->outchain)
cparc(nfa, a, newState, a->to);
}
/*