[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
grep branch, master, updated. v2.18-77-g28f6eed
|
From: |
Paul Eggert |
|
Subject: |
grep branch, master, updated. v2.18-77-g28f6eed |
|
Date: |
Fri, 18 Apr 2014 05:51:44 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".
The branch, master has been updated
via 28f6eed8db830ec2a92a560ef25cc93c6361b12c (commit)
via 689f51d3a2427134d6487d973757a1b7e38ec46c (commit)
via 78d62ecc5a4e90c398dae525e9d74b78badf7060 (commit)
via 4dee094c29725f4492fe45b61588e6bbdbdd53f7 (commit)
via c49f3cb06b6a917f69e945ba30eb21c641ce7085 (commit)
via 7cb640ae558d716820ce974e7e6b493399be815f (commit)
via a26989f8ee58569d2e732d67c6afca9fd88454c6 (commit)
via d3d96123274d519b18f56b68423c26c5474e79be (commit)
via 730a5b80b211ee0ae40722f3924a1a6df7b67c72 (commit)
via 0a8b75ef73ae3e841f57d93802fbed1613eda3e2 (commit)
via 26cb9008c855fbda3bf7e0dc377d1f6e95a9e68e (commit)
via 6a60fd53ef09c2403f7e70ceff2bbbc0f7325234 (commit)
from 4965c7942ee355587d47624b226725184fea73c3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=28f6eed8db830ec2a92a560ef25cc93c6361b12c
commit 28f6eed8db830ec2a92a560ef25cc93c6361b12c
Author: Paul Eggert <address@hidden>
Date: Thu Apr 17 22:30:10 2014 -0700
dfa: trans reallocation microoptimization
* src/dfa.c (realloc_trans_if_necessary):
Help the compiler avoid unnecessary reloads.
diff --git a/src/dfa.c b/src/dfa.c
index 618a8bc..24355d8 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2799,19 +2799,20 @@ dfastate (state_num s, struct dfa *d, state_num trans[])
static void
realloc_trans_if_necessary (struct dfa *d, state_num new_state)
{
- if (d->tralloc <= new_state)
+ state_num oldalloc = d->tralloc;
+ if (oldalloc <= new_state)
{
state_num **realtrans = d->trans ? d->trans - 1 : NULL;
- state_num oldalloc = d->tralloc;
+ size_t newalloc;
d->tralloc = new_state + 1;
realtrans = x2nrealloc (realtrans, &d->tralloc, sizeof *realtrans);
realtrans[0] = NULL;
d->trans = realtrans + 1;
- d->tralloc--;
- d->fails = xnrealloc (d->fails, d->tralloc, sizeof *d->fails);
- d->success = xnrealloc (d->success, d->tralloc, sizeof *d->success);
- d->newlines = xnrealloc (d->newlines, d->tralloc, sizeof *d->newlines);
- for (; oldalloc < d->tralloc; oldalloc++)
+ newalloc = --d->tralloc;
+ d->fails = xnrealloc (d->fails, newalloc, sizeof *d->fails);
+ d->success = xnrealloc (d->success, newalloc, sizeof *d->success);
+ d->newlines = xnrealloc (d->newlines, newalloc, sizeof *d->newlines);
+ for (; oldalloc < newalloc; oldalloc++)
{
d->trans[oldalloc] = NULL;
d->fails[oldalloc] = NULL;
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=689f51d3a2427134d6487d973757a1b7e38ec46c
commit 28f6eed8db830ec2a92a560ef25cc93c6361b12c
Author: Paul Eggert <address@hidden>
Date: Thu Apr 17 22:30:10 2014 -0700
dfa: trans reallocation microoptimization
* src/dfa.c (realloc_trans_if_necessary):
Help the compiler avoid unnecessary reloads.
diff --git a/src/dfa.c b/src/dfa.c
index 618a8bc..24355d8 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2799,19 +2799,20 @@ dfastate (state_num s, struct dfa *d, state_num trans[])
static void
realloc_trans_if_necessary (struct dfa *d, state_num new_state)
{
- if (d->tralloc <= new_state)
+ state_num oldalloc = d->tralloc;
+ if (oldalloc <= new_state)
{
state_num **realtrans = d->trans ? d->trans - 1 : NULL;
- state_num oldalloc = d->tralloc;
+ size_t newalloc;
d->tralloc = new_state + 1;
realtrans = x2nrealloc (realtrans, &d->tralloc, sizeof *realtrans);
realtrans[0] = NULL;
d->trans = realtrans + 1;
- d->tralloc--;
- d->fails = xnrealloc (d->fails, d->tralloc, sizeof *d->fails);
- d->success = xnrealloc (d->success, d->tralloc, sizeof *d->success);
- d->newlines = xnrealloc (d->newlines, d->tralloc, sizeof *d->newlines);
- for (; oldalloc < d->tralloc; oldalloc++)
+ newalloc = --d->tralloc;
+ d->fails = xnrealloc (d->fails, newalloc, sizeof *d->fails);
+ d->success = xnrealloc (d->success, newalloc, sizeof *d->success);
+ d->newlines = xnrealloc (d->newlines, newalloc, sizeof *d->newlines);
+ for (; oldalloc < newalloc; oldalloc++)
{
d->trans[oldalloc] = NULL;
d->fails[oldalloc] = NULL;
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=78d62ecc5a4e90c398dae525e9d74b78badf7060
commit 28f6eed8db830ec2a92a560ef25cc93c6361b12c
Author: Paul Eggert <address@hidden>
Date: Thu Apr 17 22:30:10 2014 -0700
dfa: trans reallocation microoptimization
* src/dfa.c (realloc_trans_if_necessary):
Help the compiler avoid unnecessary reloads.
diff --git a/src/dfa.c b/src/dfa.c
index 618a8bc..24355d8 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2799,19 +2799,20 @@ dfastate (state_num s, struct dfa *d, state_num trans[])
static void
realloc_trans_if_necessary (struct dfa *d, state_num new_state)
{
- if (d->tralloc <= new_state)
+ state_num oldalloc = d->tralloc;
+ if (oldalloc <= new_state)
{
state_num **realtrans = d->trans ? d->trans - 1 : NULL;
- state_num oldalloc = d->tralloc;
+ size_t newalloc;
d->tralloc = new_state + 1;
realtrans = x2nrealloc (realtrans, &d->tralloc, sizeof *realtrans);
realtrans[0] = NULL;
d->trans = realtrans + 1;
- d->tralloc--;
- d->fails = xnrealloc (d->fails, d->tralloc, sizeof *d->fails);
- d->success = xnrealloc (d->success, d->tralloc, sizeof *d->success);
- d->newlines = xnrealloc (d->newlines, d->tralloc, sizeof *d->newlines);
- for (; oldalloc < d->tralloc; oldalloc++)
+ newalloc = --d->tralloc;
+ d->fails = xnrealloc (d->fails, newalloc, sizeof *d->fails);
+ d->success = xnrealloc (d->success, newalloc, sizeof *d->success);
+ d->newlines = xnrealloc (d->newlines, newalloc, sizeof *d->newlines);
+ for (; oldalloc < newalloc; oldalloc++)
{
d->trans[oldalloc] = NULL;
d->fails[oldalloc] = NULL;
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=4dee094c29725f4492fe45b61588e6bbdbdd53f7
commit 28f6eed8db830ec2a92a560ef25cc93c6361b12c
Author: Paul Eggert <address@hidden>
Date: Thu Apr 17 22:30:10 2014 -0700
dfa: trans reallocation microoptimization
* src/dfa.c (realloc_trans_if_necessary):
Help the compiler avoid unnecessary reloads.
diff --git a/src/dfa.c b/src/dfa.c
index 618a8bc..24355d8 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2799,19 +2799,20 @@ dfastate (state_num s, struct dfa *d, state_num trans[])
static void
realloc_trans_if_necessary (struct dfa *d, state_num new_state)
{
- if (d->tralloc <= new_state)
+ state_num oldalloc = d->tralloc;
+ if (oldalloc <= new_state)
{
state_num **realtrans = d->trans ? d->trans - 1 : NULL;
- state_num oldalloc = d->tralloc;
+ size_t newalloc;
d->tralloc = new_state + 1;
realtrans = x2nrealloc (realtrans, &d->tralloc, sizeof *realtrans);
realtrans[0] = NULL;
d->trans = realtrans + 1;
- d->tralloc--;
- d->fails = xnrealloc (d->fails, d->tralloc, sizeof *d->fails);
- d->success = xnrealloc (d->success, d->tralloc, sizeof *d->success);
- d->newlines = xnrealloc (d->newlines, d->tralloc, sizeof *d->newlines);
- for (; oldalloc < d->tralloc; oldalloc++)
+ newalloc = --d->tralloc;
+ d->fails = xnrealloc (d->fails, newalloc, sizeof *d->fails);
+ d->success = xnrealloc (d->success, newalloc, sizeof *d->success);
+ d->newlines = xnrealloc (d->newlines, newalloc, sizeof *d->newlines);
+ for (; oldalloc < newalloc; oldalloc++)
{
d->trans[oldalloc] = NULL;
d->fails[oldalloc] = NULL;
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=c49f3cb06b6a917f69e945ba30eb21c641ce7085
commit 28f6eed8db830ec2a92a560ef25cc93c6361b12c
Author: Paul Eggert <address@hidden>
Date: Thu Apr 17 22:30:10 2014 -0700
dfa: trans reallocation microoptimization
* src/dfa.c (realloc_trans_if_necessary):
Help the compiler avoid unnecessary reloads.
diff --git a/src/dfa.c b/src/dfa.c
index 618a8bc..24355d8 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2799,19 +2799,20 @@ dfastate (state_num s, struct dfa *d, state_num trans[])
static void
realloc_trans_if_necessary (struct dfa *d, state_num new_state)
{
- if (d->tralloc <= new_state)
+ state_num oldalloc = d->tralloc;
+ if (oldalloc <= new_state)
{
state_num **realtrans = d->trans ? d->trans - 1 : NULL;
- state_num oldalloc = d->tralloc;
+ size_t newalloc;
d->tralloc = new_state + 1;
realtrans = x2nrealloc (realtrans, &d->tralloc, sizeof *realtrans);
realtrans[0] = NULL;
d->trans = realtrans + 1;
- d->tralloc--;
- d->fails = xnrealloc (d->fails, d->tralloc, sizeof *d->fails);
- d->success = xnrealloc (d->success, d->tralloc, sizeof *d->success);
- d->newlines = xnrealloc (d->newlines, d->tralloc, sizeof *d->newlines);
- for (; oldalloc < d->tralloc; oldalloc++)
+ newalloc = --d->tralloc;
+ d->fails = xnrealloc (d->fails, newalloc, sizeof *d->fails);
+ d->success = xnrealloc (d->success, newalloc, sizeof *d->success);
+ d->newlines = xnrealloc (d->newlines, newalloc, sizeof *d->newlines);
+ for (; oldalloc < newalloc; oldalloc++)
{
d->trans[oldalloc] = NULL;
d->fails[oldalloc] = NULL;
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=7cb640ae558d716820ce974e7e6b493399be815f
commit 28f6eed8db830ec2a92a560ef25cc93c6361b12c
Author: Paul Eggert <address@hidden>
Date: Thu Apr 17 22:30:10 2014 -0700
dfa: trans reallocation microoptimization
* src/dfa.c (realloc_trans_if_necessary):
Help the compiler avoid unnecessary reloads.
diff --git a/src/dfa.c b/src/dfa.c
index 618a8bc..24355d8 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2799,19 +2799,20 @@ dfastate (state_num s, struct dfa *d, state_num trans[])
static void
realloc_trans_if_necessary (struct dfa *d, state_num new_state)
{
- if (d->tralloc <= new_state)
+ state_num oldalloc = d->tralloc;
+ if (oldalloc <= new_state)
{
state_num **realtrans = d->trans ? d->trans - 1 : NULL;
- state_num oldalloc = d->tralloc;
+ size_t newalloc;
d->tralloc = new_state + 1;
realtrans = x2nrealloc (realtrans, &d->tralloc, sizeof *realtrans);
realtrans[0] = NULL;
d->trans = realtrans + 1;
- d->tralloc--;
- d->fails = xnrealloc (d->fails, d->tralloc, sizeof *d->fails);
- d->success = xnrealloc (d->success, d->tralloc, sizeof *d->success);
- d->newlines = xnrealloc (d->newlines, d->tralloc, sizeof *d->newlines);
- for (; oldalloc < d->tralloc; oldalloc++)
+ newalloc = --d->tralloc;
+ d->fails = xnrealloc (d->fails, newalloc, sizeof *d->fails);
+ d->success = xnrealloc (d->success, newalloc, sizeof *d->success);
+ d->newlines = xnrealloc (d->newlines, newalloc, sizeof *d->newlines);
+ for (; oldalloc < newalloc; oldalloc++)
{
d->trans[oldalloc] = NULL;
d->fails[oldalloc] = NULL;
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=a26989f8ee58569d2e732d67c6afca9fd88454c6
commit 28f6eed8db830ec2a92a560ef25cc93c6361b12c
Author: Paul Eggert <address@hidden>
Date: Thu Apr 17 22:30:10 2014 -0700
dfa: trans reallocation microoptimization
* src/dfa.c (realloc_trans_if_necessary):
Help the compiler avoid unnecessary reloads.
diff --git a/src/dfa.c b/src/dfa.c
index 618a8bc..24355d8 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2799,19 +2799,20 @@ dfastate (state_num s, struct dfa *d, state_num trans[])
static void
realloc_trans_if_necessary (struct dfa *d, state_num new_state)
{
- if (d->tralloc <= new_state)
+ state_num oldalloc = d->tralloc;
+ if (oldalloc <= new_state)
{
state_num **realtrans = d->trans ? d->trans - 1 : NULL;
- state_num oldalloc = d->tralloc;
+ size_t newalloc;
d->tralloc = new_state + 1;
realtrans = x2nrealloc (realtrans, &d->tralloc, sizeof *realtrans);
realtrans[0] = NULL;
d->trans = realtrans + 1;
- d->tralloc--;
- d->fails = xnrealloc (d->fails, d->tralloc, sizeof *d->fails);
- d->success = xnrealloc (d->success, d->tralloc, sizeof *d->success);
- d->newlines = xnrealloc (d->newlines, d->tralloc, sizeof *d->newlines);
- for (; oldalloc < d->tralloc; oldalloc++)
+ newalloc = --d->tralloc;
+ d->fails = xnrealloc (d->fails, newalloc, sizeof *d->fails);
+ d->success = xnrealloc (d->success, newalloc, sizeof *d->success);
+ d->newlines = xnrealloc (d->newlines, newalloc, sizeof *d->newlines);
+ for (; oldalloc < newalloc; oldalloc++)
{
d->trans[oldalloc] = NULL;
d->fails[oldalloc] = NULL;
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=d3d96123274d519b18f56b68423c26c5474e79be
commit 28f6eed8db830ec2a92a560ef25cc93c6361b12c
Author: Paul Eggert <address@hidden>
Date: Thu Apr 17 22:30:10 2014 -0700
dfa: trans reallocation microoptimization
* src/dfa.c (realloc_trans_if_necessary):
Help the compiler avoid unnecessary reloads.
diff --git a/src/dfa.c b/src/dfa.c
index 618a8bc..24355d8 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2799,19 +2799,20 @@ dfastate (state_num s, struct dfa *d, state_num trans[])
static void
realloc_trans_if_necessary (struct dfa *d, state_num new_state)
{
- if (d->tralloc <= new_state)
+ state_num oldalloc = d->tralloc;
+ if (oldalloc <= new_state)
{
state_num **realtrans = d->trans ? d->trans - 1 : NULL;
- state_num oldalloc = d->tralloc;
+ size_t newalloc;
d->tralloc = new_state + 1;
realtrans = x2nrealloc (realtrans, &d->tralloc, sizeof *realtrans);
realtrans[0] = NULL;
d->trans = realtrans + 1;
- d->tralloc--;
- d->fails = xnrealloc (d->fails, d->tralloc, sizeof *d->fails);
- d->success = xnrealloc (d->success, d->tralloc, sizeof *d->success);
- d->newlines = xnrealloc (d->newlines, d->tralloc, sizeof *d->newlines);
- for (; oldalloc < d->tralloc; oldalloc++)
+ newalloc = --d->tralloc;
+ d->fails = xnrealloc (d->fails, newalloc, sizeof *d->fails);
+ d->success = xnrealloc (d->success, newalloc, sizeof *d->success);
+ d->newlines = xnrealloc (d->newlines, newalloc, sizeof *d->newlines);
+ for (; oldalloc < newalloc; oldalloc++)
{
d->trans[oldalloc] = NULL;
d->fails[oldalloc] = NULL;
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=730a5b80b211ee0ae40722f3924a1a6df7b67c72
commit 28f6eed8db830ec2a92a560ef25cc93c6361b12c
Author: Paul Eggert <address@hidden>
Date: Thu Apr 17 22:30:10 2014 -0700
dfa: trans reallocation microoptimization
* src/dfa.c (realloc_trans_if_necessary):
Help the compiler avoid unnecessary reloads.
diff --git a/src/dfa.c b/src/dfa.c
index 618a8bc..24355d8 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2799,19 +2799,20 @@ dfastate (state_num s, struct dfa *d, state_num trans[])
static void
realloc_trans_if_necessary (struct dfa *d, state_num new_state)
{
- if (d->tralloc <= new_state)
+ state_num oldalloc = d->tralloc;
+ if (oldalloc <= new_state)
{
state_num **realtrans = d->trans ? d->trans - 1 : NULL;
- state_num oldalloc = d->tralloc;
+ size_t newalloc;
d->tralloc = new_state + 1;
realtrans = x2nrealloc (realtrans, &d->tralloc, sizeof *realtrans);
realtrans[0] = NULL;
d->trans = realtrans + 1;
- d->tralloc--;
- d->fails = xnrealloc (d->fails, d->tralloc, sizeof *d->fails);
- d->success = xnrealloc (d->success, d->tralloc, sizeof *d->success);
- d->newlines = xnrealloc (d->newlines, d->tralloc, sizeof *d->newlines);
- for (; oldalloc < d->tralloc; oldalloc++)
+ newalloc = --d->tralloc;
+ d->fails = xnrealloc (d->fails, newalloc, sizeof *d->fails);
+ d->success = xnrealloc (d->success, newalloc, sizeof *d->success);
+ d->newlines = xnrealloc (d->newlines, newalloc, sizeof *d->newlines);
+ for (; oldalloc < newalloc; oldalloc++)
{
d->trans[oldalloc] = NULL;
d->fails[oldalloc] = NULL;
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=0a8b75ef73ae3e841f57d93802fbed1613eda3e2
commit 28f6eed8db830ec2a92a560ef25cc93c6361b12c
Author: Paul Eggert <address@hidden>
Date: Thu Apr 17 22:30:10 2014 -0700
dfa: trans reallocation microoptimization
* src/dfa.c (realloc_trans_if_necessary):
Help the compiler avoid unnecessary reloads.
diff --git a/src/dfa.c b/src/dfa.c
index 618a8bc..24355d8 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2799,19 +2799,20 @@ dfastate (state_num s, struct dfa *d, state_num trans[])
static void
realloc_trans_if_necessary (struct dfa *d, state_num new_state)
{
- if (d->tralloc <= new_state)
+ state_num oldalloc = d->tralloc;
+ if (oldalloc <= new_state)
{
state_num **realtrans = d->trans ? d->trans - 1 : NULL;
- state_num oldalloc = d->tralloc;
+ size_t newalloc;
d->tralloc = new_state + 1;
realtrans = x2nrealloc (realtrans, &d->tralloc, sizeof *realtrans);
realtrans[0] = NULL;
d->trans = realtrans + 1;
- d->tralloc--;
- d->fails = xnrealloc (d->fails, d->tralloc, sizeof *d->fails);
- d->success = xnrealloc (d->success, d->tralloc, sizeof *d->success);
- d->newlines = xnrealloc (d->newlines, d->tralloc, sizeof *d->newlines);
- for (; oldalloc < d->tralloc; oldalloc++)
+ newalloc = --d->tralloc;
+ d->fails = xnrealloc (d->fails, newalloc, sizeof *d->fails);
+ d->success = xnrealloc (d->success, newalloc, sizeof *d->success);
+ d->newlines = xnrealloc (d->newlines, newalloc, sizeof *d->newlines);
+ for (; oldalloc < newalloc; oldalloc++)
{
d->trans[oldalloc] = NULL;
d->fails[oldalloc] = NULL;
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=26cb9008c855fbda3bf7e0dc377d1f6e95a9e68e
commit 28f6eed8db830ec2a92a560ef25cc93c6361b12c
Author: Paul Eggert <address@hidden>
Date: Thu Apr 17 22:30:10 2014 -0700
dfa: trans reallocation microoptimization
* src/dfa.c (realloc_trans_if_necessary):
Help the compiler avoid unnecessary reloads.
diff --git a/src/dfa.c b/src/dfa.c
index 618a8bc..24355d8 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2799,19 +2799,20 @@ dfastate (state_num s, struct dfa *d, state_num trans[])
static void
realloc_trans_if_necessary (struct dfa *d, state_num new_state)
{
- if (d->tralloc <= new_state)
+ state_num oldalloc = d->tralloc;
+ if (oldalloc <= new_state)
{
state_num **realtrans = d->trans ? d->trans - 1 : NULL;
- state_num oldalloc = d->tralloc;
+ size_t newalloc;
d->tralloc = new_state + 1;
realtrans = x2nrealloc (realtrans, &d->tralloc, sizeof *realtrans);
realtrans[0] = NULL;
d->trans = realtrans + 1;
- d->tralloc--;
- d->fails = xnrealloc (d->fails, d->tralloc, sizeof *d->fails);
- d->success = xnrealloc (d->success, d->tralloc, sizeof *d->success);
- d->newlines = xnrealloc (d->newlines, d->tralloc, sizeof *d->newlines);
- for (; oldalloc < d->tralloc; oldalloc++)
+ newalloc = --d->tralloc;
+ d->fails = xnrealloc (d->fails, newalloc, sizeof *d->fails);
+ d->success = xnrealloc (d->success, newalloc, sizeof *d->success);
+ d->newlines = xnrealloc (d->newlines, newalloc, sizeof *d->newlines);
+ for (; oldalloc < newalloc; oldalloc++)
{
d->trans[oldalloc] = NULL;
d->fails[oldalloc] = NULL;
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=6a60fd53ef09c2403f7e70ceff2bbbc0f7325234
commit 28f6eed8db830ec2a92a560ef25cc93c6361b12c
Author: Paul Eggert <address@hidden>
Date: Thu Apr 17 22:30:10 2014 -0700
dfa: trans reallocation microoptimization
* src/dfa.c (realloc_trans_if_necessary):
Help the compiler avoid unnecessary reloads.
diff --git a/src/dfa.c b/src/dfa.c
index 618a8bc..24355d8 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2799,19 +2799,20 @@ dfastate (state_num s, struct dfa *d, state_num trans[])
static void
realloc_trans_if_necessary (struct dfa *d, state_num new_state)
{
- if (d->tralloc <= new_state)
+ state_num oldalloc = d->tralloc;
+ if (oldalloc <= new_state)
{
state_num **realtrans = d->trans ? d->trans - 1 : NULL;
- state_num oldalloc = d->tralloc;
+ size_t newalloc;
d->tralloc = new_state + 1;
realtrans = x2nrealloc (realtrans, &d->tralloc, sizeof *realtrans);
realtrans[0] = NULL;
d->trans = realtrans + 1;
- d->tralloc--;
- d->fails = xnrealloc (d->fails, d->tralloc, sizeof *d->fails);
- d->success = xnrealloc (d->success, d->tralloc, sizeof *d->success);
- d->newlines = xnrealloc (d->newlines, d->tralloc, sizeof *d->newlines);
- for (; oldalloc < d->tralloc; oldalloc++)
+ newalloc = --d->tralloc;
+ d->fails = xnrealloc (d->fails, newalloc, sizeof *d->fails);
+ d->success = xnrealloc (d->success, newalloc, sizeof *d->success);
+ d->newlines = xnrealloc (d->newlines, newalloc, sizeof *d->newlines);
+ for (; oldalloc < newalloc; oldalloc++)
{
d->trans[oldalloc] = NULL;
d->fails[oldalloc] = NULL;
-----------------------------------------------------------------------
Summary of changes:
src/dfa.c | 600 ++++++++++++++++++++++++-------------------------------------
1 files changed, 236 insertions(+), 364 deletions(-)
hooks/post-receive
--
grep
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- grep branch, master, updated. v2.18-77-g28f6eed,
Paul Eggert <=