[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
grep branch, master, updated. v2.12-5-g542b0b1
|
From: |
Paolo Bonzini |
|
Subject: |
grep branch, master, updated. v2.12-5-g542b0b1 |
|
Date: |
Fri, 27 Apr 2012 12:25:12 +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 542b0b1988681b10e7d1515e2e14d414bb98790f (commit)
via 55f1d964acc48273394020c55e91ca11a74530b9 (commit)
via 7311894799583626ec1208039abd13d430c8a452 (commit)
via 745a157e8ac3630907defe0b5da7381e9c9aadc1 (commit)
from 8a878078d83885d71ff1a242fafa48190e134e9e (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=542b0b1988681b10e7d1515e2e14d414bb98790f
commit 542b0b1988681b10e7d1515e2e14d414bb98790f
Author: Paolo Bonzini <address@hidden>
Date: Fri Apr 27 12:34:08 2012 +0200
dfa: do not use hard-locale
* bootstrap.conf (gnulib_modules): Remove hard-locale.
* src/dfa.c (hard_LC_COLLATE): Remove.
(dfaparse): Do not initialize it.
(parse_bracket_exp): Always go through system regex matcher to find
single byte characters matching a range.
diff --git a/bootstrap.conf b/bootstrap.conf
index 8c9270c..a7853c9 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -42,7 +42,6 @@ git-version-gen
gitlog-to-changelog
gnu-web-doc-update
gnupload
-hard-locale
ignore-value
intprops
inttypes
diff --git a/src/dfa.c b/src/dfa.c
index 39ca604..eefc817 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -57,7 +57,6 @@
#include "regex.h"
#include "dfa.h"
-#include "hard-locale.h"
#include "xalloc.h"
/* HPUX, define those as macros in sys/param.h */
@@ -778,7 +777,6 @@ static int laststart; /* True if we're separated
from beginning or (,
only by zero-width characters. */
static size_t parens; /* Count of outstanding left parens. */
static int minrep, maxrep; /* Repeat counts for {m,n}. */
-static int hard_LC_COLLATE; /* Nonzero if LC_COLLATE is hard. */
static int cur_mb_len = 1; /* Length of the multibyte representation of
wctok. */
@@ -1112,26 +1110,21 @@ parse_bracket_exp (void)
c1 = tolower (c1);
c2 = tolower (c2);
}
- if (!hard_LC_COLLATE)
- for (c = c1; c <= c2; c++)
- setbit_case_fold_c (c, ccl);
- else
+
+ /* Defer to the system regex library about the meaning
+ of range expressions. */
+ regex_t re;
+ char pattern[6] = { '[', c1, '-', c2, ']', 0 };
+ char subject[2] = { 0, 0 };
+ regcomp (&re, pattern, REG_NOSUB);
+ for (c = 0; c < NOTCHAR; ++c)
{
- /* Defer to the system regex library about the meaning
- of range expressions. */
- regex_t re;
- char pattern[6] = { '[', c1, '-', c2, ']', 0 };
- char subject[2] = { 0, 0 };
- regcomp (&re, pattern, REG_NOSUB);
- for (c = 0; c < NOTCHAR; ++c)
- {
- subject[0] = c;
- if (!(case_fold && isupper (c))
- && regexec (&re, subject, 0, NULL, 0) != REG_NOMATCH)
- setbit_case_fold_c (c, ccl);
- }
- regfree (&re);
+ subject[0] = c;
+ if (!(case_fold && isupper (c))
+ && regexec (&re, subject, 0, NULL, 0) != REG_NOMATCH)
+ setbit_case_fold_c (c, ccl);
}
+ regfree (&re);
}
colon_warning_state |= 8;
@@ -1879,9 +1872,6 @@ dfaparse (char const *s, size_t len, struct dfa *d)
lasttok = END;
laststart = 1;
parens = 0;
-#ifdef LC_COLLATE
- hard_LC_COLLATE = hard_locale (LC_COLLATE);
-#endif
if (MB_CUR_MAX > 1)
{
cur_mb_len = 0;
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=55f1d964acc48273394020c55e91ca11a74530b9
commit 542b0b1988681b10e7d1515e2e14d414bb98790f
Author: Paolo Bonzini <address@hidden>
Date: Fri Apr 27 12:34:08 2012 +0200
dfa: do not use hard-locale
* bootstrap.conf (gnulib_modules): Remove hard-locale.
* src/dfa.c (hard_LC_COLLATE): Remove.
(dfaparse): Do not initialize it.
(parse_bracket_exp): Always go through system regex matcher to find
single byte characters matching a range.
diff --git a/bootstrap.conf b/bootstrap.conf
index 8c9270c..a7853c9 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -42,7 +42,6 @@ git-version-gen
gitlog-to-changelog
gnu-web-doc-update
gnupload
-hard-locale
ignore-value
intprops
inttypes
diff --git a/src/dfa.c b/src/dfa.c
index 39ca604..eefc817 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -57,7 +57,6 @@
#include "regex.h"
#include "dfa.h"
-#include "hard-locale.h"
#include "xalloc.h"
/* HPUX, define those as macros in sys/param.h */
@@ -778,7 +777,6 @@ static int laststart; /* True if we're separated
from beginning or (,
only by zero-width characters. */
static size_t parens; /* Count of outstanding left parens. */
static int minrep, maxrep; /* Repeat counts for {m,n}. */
-static int hard_LC_COLLATE; /* Nonzero if LC_COLLATE is hard. */
static int cur_mb_len = 1; /* Length of the multibyte representation of
wctok. */
@@ -1112,26 +1110,21 @@ parse_bracket_exp (void)
c1 = tolower (c1);
c2 = tolower (c2);
}
- if (!hard_LC_COLLATE)
- for (c = c1; c <= c2; c++)
- setbit_case_fold_c (c, ccl);
- else
+
+ /* Defer to the system regex library about the meaning
+ of range expressions. */
+ regex_t re;
+ char pattern[6] = { '[', c1, '-', c2, ']', 0 };
+ char subject[2] = { 0, 0 };
+ regcomp (&re, pattern, REG_NOSUB);
+ for (c = 0; c < NOTCHAR; ++c)
{
- /* Defer to the system regex library about the meaning
- of range expressions. */
- regex_t re;
- char pattern[6] = { '[', c1, '-', c2, ']', 0 };
- char subject[2] = { 0, 0 };
- regcomp (&re, pattern, REG_NOSUB);
- for (c = 0; c < NOTCHAR; ++c)
- {
- subject[0] = c;
- if (!(case_fold && isupper (c))
- && regexec (&re, subject, 0, NULL, 0) != REG_NOMATCH)
- setbit_case_fold_c (c, ccl);
- }
- regfree (&re);
+ subject[0] = c;
+ if (!(case_fold && isupper (c))
+ && regexec (&re, subject, 0, NULL, 0) != REG_NOMATCH)
+ setbit_case_fold_c (c, ccl);
}
+ regfree (&re);
}
colon_warning_state |= 8;
@@ -1879,9 +1872,6 @@ dfaparse (char const *s, size_t len, struct dfa *d)
lasttok = END;
laststart = 1;
parens = 0;
-#ifdef LC_COLLATE
- hard_LC_COLLATE = hard_locale (LC_COLLATE);
-#endif
if (MB_CUR_MAX > 1)
{
cur_mb_len = 0;
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=7311894799583626ec1208039abd13d430c8a452
commit 542b0b1988681b10e7d1515e2e14d414bb98790f
Author: Paolo Bonzini <address@hidden>
Date: Fri Apr 27 12:34:08 2012 +0200
dfa: do not use hard-locale
* bootstrap.conf (gnulib_modules): Remove hard-locale.
* src/dfa.c (hard_LC_COLLATE): Remove.
(dfaparse): Do not initialize it.
(parse_bracket_exp): Always go through system regex matcher to find
single byte characters matching a range.
diff --git a/bootstrap.conf b/bootstrap.conf
index 8c9270c..a7853c9 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -42,7 +42,6 @@ git-version-gen
gitlog-to-changelog
gnu-web-doc-update
gnupload
-hard-locale
ignore-value
intprops
inttypes
diff --git a/src/dfa.c b/src/dfa.c
index 39ca604..eefc817 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -57,7 +57,6 @@
#include "regex.h"
#include "dfa.h"
-#include "hard-locale.h"
#include "xalloc.h"
/* HPUX, define those as macros in sys/param.h */
@@ -778,7 +777,6 @@ static int laststart; /* True if we're separated
from beginning or (,
only by zero-width characters. */
static size_t parens; /* Count of outstanding left parens. */
static int minrep, maxrep; /* Repeat counts for {m,n}. */
-static int hard_LC_COLLATE; /* Nonzero if LC_COLLATE is hard. */
static int cur_mb_len = 1; /* Length of the multibyte representation of
wctok. */
@@ -1112,26 +1110,21 @@ parse_bracket_exp (void)
c1 = tolower (c1);
c2 = tolower (c2);
}
- if (!hard_LC_COLLATE)
- for (c = c1; c <= c2; c++)
- setbit_case_fold_c (c, ccl);
- else
+
+ /* Defer to the system regex library about the meaning
+ of range expressions. */
+ regex_t re;
+ char pattern[6] = { '[', c1, '-', c2, ']', 0 };
+ char subject[2] = { 0, 0 };
+ regcomp (&re, pattern, REG_NOSUB);
+ for (c = 0; c < NOTCHAR; ++c)
{
- /* Defer to the system regex library about the meaning
- of range expressions. */
- regex_t re;
- char pattern[6] = { '[', c1, '-', c2, ']', 0 };
- char subject[2] = { 0, 0 };
- regcomp (&re, pattern, REG_NOSUB);
- for (c = 0; c < NOTCHAR; ++c)
- {
- subject[0] = c;
- if (!(case_fold && isupper (c))
- && regexec (&re, subject, 0, NULL, 0) != REG_NOMATCH)
- setbit_case_fold_c (c, ccl);
- }
- regfree (&re);
+ subject[0] = c;
+ if (!(case_fold && isupper (c))
+ && regexec (&re, subject, 0, NULL, 0) != REG_NOMATCH)
+ setbit_case_fold_c (c, ccl);
}
+ regfree (&re);
}
colon_warning_state |= 8;
@@ -1879,9 +1872,6 @@ dfaparse (char const *s, size_t len, struct dfa *d)
lasttok = END;
laststart = 1;
parens = 0;
-#ifdef LC_COLLATE
- hard_LC_COLLATE = hard_locale (LC_COLLATE);
-#endif
if (MB_CUR_MAX > 1)
{
cur_mb_len = 0;
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=745a157e8ac3630907defe0b5da7381e9c9aadc1
commit 542b0b1988681b10e7d1515e2e14d414bb98790f
Author: Paolo Bonzini <address@hidden>
Date: Fri Apr 27 12:34:08 2012 +0200
dfa: do not use hard-locale
* bootstrap.conf (gnulib_modules): Remove hard-locale.
* src/dfa.c (hard_LC_COLLATE): Remove.
(dfaparse): Do not initialize it.
(parse_bracket_exp): Always go through system regex matcher to find
single byte characters matching a range.
diff --git a/bootstrap.conf b/bootstrap.conf
index 8c9270c..a7853c9 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -42,7 +42,6 @@ git-version-gen
gitlog-to-changelog
gnu-web-doc-update
gnupload
-hard-locale
ignore-value
intprops
inttypes
diff --git a/src/dfa.c b/src/dfa.c
index 39ca604..eefc817 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -57,7 +57,6 @@
#include "regex.h"
#include "dfa.h"
-#include "hard-locale.h"
#include "xalloc.h"
/* HPUX, define those as macros in sys/param.h */
@@ -778,7 +777,6 @@ static int laststart; /* True if we're separated
from beginning or (,
only by zero-width characters. */
static size_t parens; /* Count of outstanding left parens. */
static int minrep, maxrep; /* Repeat counts for {m,n}. */
-static int hard_LC_COLLATE; /* Nonzero if LC_COLLATE is hard. */
static int cur_mb_len = 1; /* Length of the multibyte representation of
wctok. */
@@ -1112,26 +1110,21 @@ parse_bracket_exp (void)
c1 = tolower (c1);
c2 = tolower (c2);
}
- if (!hard_LC_COLLATE)
- for (c = c1; c <= c2; c++)
- setbit_case_fold_c (c, ccl);
- else
+
+ /* Defer to the system regex library about the meaning
+ of range expressions. */
+ regex_t re;
+ char pattern[6] = { '[', c1, '-', c2, ']', 0 };
+ char subject[2] = { 0, 0 };
+ regcomp (&re, pattern, REG_NOSUB);
+ for (c = 0; c < NOTCHAR; ++c)
{
- /* Defer to the system regex library about the meaning
- of range expressions. */
- regex_t re;
- char pattern[6] = { '[', c1, '-', c2, ']', 0 };
- char subject[2] = { 0, 0 };
- regcomp (&re, pattern, REG_NOSUB);
- for (c = 0; c < NOTCHAR; ++c)
- {
- subject[0] = c;
- if (!(case_fold && isupper (c))
- && regexec (&re, subject, 0, NULL, 0) != REG_NOMATCH)
- setbit_case_fold_c (c, ccl);
- }
- regfree (&re);
+ subject[0] = c;
+ if (!(case_fold && isupper (c))
+ && regexec (&re, subject, 0, NULL, 0) != REG_NOMATCH)
+ setbit_case_fold_c (c, ccl);
}
+ regfree (&re);
}
colon_warning_state |= 8;
@@ -1879,9 +1872,6 @@ dfaparse (char const *s, size_t len, struct dfa *d)
lasttok = END;
laststart = 1;
parens = 0;
-#ifdef LC_COLLATE
- hard_LC_COLLATE = hard_locale (LC_COLLATE);
-#endif
if (MB_CUR_MAX > 1)
{
cur_mb_len = 0;
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 2 -
Makefile.boot | 156 --------------------------------------------------------
NEWS | 4 ++
README-alpha | 3 +-
README-boot | 16 ------
bootstrap.conf | 1 -
src/dfa.c | 47 ++++++-----------
7 files changed, 21 insertions(+), 208 deletions(-)
delete mode 100644 Makefile.boot
delete mode 100644 README-boot
hooks/post-receive
--
grep
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- grep branch, master, updated. v2.12-5-g542b0b1,
Paolo Bonzini <=