[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
grep branch, master, updated. v2.25-6-g2e06403
|
From: |
Paul Eggert |
|
Subject: |
grep branch, master, updated. v2.25-6-g2e06403 |
|
Date: |
Mon, 02 May 2016 05:56:58 +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 2e0640374ba0c1eaa0ef6258a6c2db747a962643 (commit)
via f1a048c695b60c4188305efd95836ae3e367bc7b (commit)
via 5170412f74920661815584dd9f9ebbeaa8433016 (commit)
via 724ac5564bc8431b28a37e556a2adf27d7b3c74d (commit)
via af6af288eac28951b5eee1eaaf373e22b2193b7b (commit)
from d1060aa9f7d1daca37656a35751241ddce67ae75 (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=2e0640374ba0c1eaa0ef6258a6c2db747a962643
commit 2e0640374ba0c1eaa0ef6258a6c2db747a962643
Author: Paul Eggert <address@hidden>
Date: Sun May 1 22:56:40 2016 -0700
dfa: prefer bool for boolean
* src/dfa.c (syntax_bits_set, dfasyntax, using_utf8, FETCH_WC)
(POP_LEX_STATE, State_transition):
* src/dfa.h (using_utf_8):
Use bool for boolean.
diff --git a/src/dfa.c b/src/dfa.c
index a2aee29..c57b33a 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -641,7 +641,8 @@ charclass_index (charclass const s)
}
/* Syntax bits controlling the behavior of the lexical analyzer. */
-static reg_syntax_t syntax_bits, syntax_bits_set;
+static reg_syntax_t syntax_bits;
+static bool syntax_bits_set;
/* Flag for case-folding letters into sets. */
static bool case_fold;
@@ -693,7 +694,7 @@ void
dfasyntax (reg_syntax_t bits, bool fold, unsigned char eol)
{
int i;
- syntax_bits_set = 1;
+ syntax_bits_set = true;
syntax_bits = bits;
case_fold = fold;
eolbyte = eol;
@@ -757,7 +758,7 @@ setbit_case_fold_c (int b, charclass c)
/* UTF-8 encoding allows some optimizations that we can't otherwise
assume in a multibyte encoding. */
-int
+bool
using_utf8 (void)
{
static int utf8 = -1;
@@ -858,7 +859,7 @@ static wint_t wctok; /* Wide character
representation of the current
lexptr += nbytes; \
lexleft -= nbytes; \
} \
- } while (0)
+ } while (false)
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
@@ -1211,7 +1212,7 @@ parse_bracket_exp (void)
lexptr = lexptr_saved; \
lexleft = lexleft_saved; \
} \
- while (0)
+ while (false)
static token
lex (void)
@@ -3327,7 +3328,7 @@ dfaexec_main (struct dfa *d, char const *begin, char
*end, bool allow_nl,
\
mbp = p; \
trans = d->trans; \
- } while (0)
+ } while (false)
State_transition();
}
diff --git a/src/dfa.h b/src/dfa.h
index ce267ec..60da0e4 100644
--- a/src/dfa.h
+++ b/src/dfa.h
@@ -100,4 +100,4 @@ extern void dfawarn (const char *);
The user must supply a dfaerror. */
extern _Noreturn void dfaerror (const char *);
-extern int using_utf8 (void);
+extern bool using_utf8 (void);
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=f1a048c695b60c4188305efd95836ae3e367bc7b
commit 2e0640374ba0c1eaa0ef6258a6c2db747a962643
Author: Paul Eggert <address@hidden>
Date: Sun May 1 22:56:40 2016 -0700
dfa: prefer bool for boolean
* src/dfa.c (syntax_bits_set, dfasyntax, using_utf8, FETCH_WC)
(POP_LEX_STATE, State_transition):
* src/dfa.h (using_utf_8):
Use bool for boolean.
diff --git a/src/dfa.c b/src/dfa.c
index a2aee29..c57b33a 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -641,7 +641,8 @@ charclass_index (charclass const s)
}
/* Syntax bits controlling the behavior of the lexical analyzer. */
-static reg_syntax_t syntax_bits, syntax_bits_set;
+static reg_syntax_t syntax_bits;
+static bool syntax_bits_set;
/* Flag for case-folding letters into sets. */
static bool case_fold;
@@ -693,7 +694,7 @@ void
dfasyntax (reg_syntax_t bits, bool fold, unsigned char eol)
{
int i;
- syntax_bits_set = 1;
+ syntax_bits_set = true;
syntax_bits = bits;
case_fold = fold;
eolbyte = eol;
@@ -757,7 +758,7 @@ setbit_case_fold_c (int b, charclass c)
/* UTF-8 encoding allows some optimizations that we can't otherwise
assume in a multibyte encoding. */
-int
+bool
using_utf8 (void)
{
static int utf8 = -1;
@@ -858,7 +859,7 @@ static wint_t wctok; /* Wide character
representation of the current
lexptr += nbytes; \
lexleft -= nbytes; \
} \
- } while (0)
+ } while (false)
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
@@ -1211,7 +1212,7 @@ parse_bracket_exp (void)
lexptr = lexptr_saved; \
lexleft = lexleft_saved; \
} \
- while (0)
+ while (false)
static token
lex (void)
@@ -3327,7 +3328,7 @@ dfaexec_main (struct dfa *d, char const *begin, char
*end, bool allow_nl,
\
mbp = p; \
trans = d->trans; \
- } while (0)
+ } while (false)
State_transition();
}
diff --git a/src/dfa.h b/src/dfa.h
index ce267ec..60da0e4 100644
--- a/src/dfa.h
+++ b/src/dfa.h
@@ -100,4 +100,4 @@ extern void dfawarn (const char *);
The user must supply a dfaerror. */
extern _Noreturn void dfaerror (const char *);
-extern int using_utf8 (void);
+extern bool using_utf8 (void);
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=5170412f74920661815584dd9f9ebbeaa8433016
commit 2e0640374ba0c1eaa0ef6258a6c2db747a962643
Author: Paul Eggert <address@hidden>
Date: Sun May 1 22:56:40 2016 -0700
dfa: prefer bool for boolean
* src/dfa.c (syntax_bits_set, dfasyntax, using_utf8, FETCH_WC)
(POP_LEX_STATE, State_transition):
* src/dfa.h (using_utf_8):
Use bool for boolean.
diff --git a/src/dfa.c b/src/dfa.c
index a2aee29..c57b33a 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -641,7 +641,8 @@ charclass_index (charclass const s)
}
/* Syntax bits controlling the behavior of the lexical analyzer. */
-static reg_syntax_t syntax_bits, syntax_bits_set;
+static reg_syntax_t syntax_bits;
+static bool syntax_bits_set;
/* Flag for case-folding letters into sets. */
static bool case_fold;
@@ -693,7 +694,7 @@ void
dfasyntax (reg_syntax_t bits, bool fold, unsigned char eol)
{
int i;
- syntax_bits_set = 1;
+ syntax_bits_set = true;
syntax_bits = bits;
case_fold = fold;
eolbyte = eol;
@@ -757,7 +758,7 @@ setbit_case_fold_c (int b, charclass c)
/* UTF-8 encoding allows some optimizations that we can't otherwise
assume in a multibyte encoding. */
-int
+bool
using_utf8 (void)
{
static int utf8 = -1;
@@ -858,7 +859,7 @@ static wint_t wctok; /* Wide character
representation of the current
lexptr += nbytes; \
lexleft -= nbytes; \
} \
- } while (0)
+ } while (false)
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
@@ -1211,7 +1212,7 @@ parse_bracket_exp (void)
lexptr = lexptr_saved; \
lexleft = lexleft_saved; \
} \
- while (0)
+ while (false)
static token
lex (void)
@@ -3327,7 +3328,7 @@ dfaexec_main (struct dfa *d, char const *begin, char
*end, bool allow_nl,
\
mbp = p; \
trans = d->trans; \
- } while (0)
+ } while (false)
State_transition();
}
diff --git a/src/dfa.h b/src/dfa.h
index ce267ec..60da0e4 100644
--- a/src/dfa.h
+++ b/src/dfa.h
@@ -100,4 +100,4 @@ extern void dfawarn (const char *);
The user must supply a dfaerror. */
extern _Noreturn void dfaerror (const char *);
-extern int using_utf8 (void);
+extern bool using_utf8 (void);
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=724ac5564bc8431b28a37e556a2adf27d7b3c74d
commit 2e0640374ba0c1eaa0ef6258a6c2db747a962643
Author: Paul Eggert <address@hidden>
Date: Sun May 1 22:56:40 2016 -0700
dfa: prefer bool for boolean
* src/dfa.c (syntax_bits_set, dfasyntax, using_utf8, FETCH_WC)
(POP_LEX_STATE, State_transition):
* src/dfa.h (using_utf_8):
Use bool for boolean.
diff --git a/src/dfa.c b/src/dfa.c
index a2aee29..c57b33a 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -641,7 +641,8 @@ charclass_index (charclass const s)
}
/* Syntax bits controlling the behavior of the lexical analyzer. */
-static reg_syntax_t syntax_bits, syntax_bits_set;
+static reg_syntax_t syntax_bits;
+static bool syntax_bits_set;
/* Flag for case-folding letters into sets. */
static bool case_fold;
@@ -693,7 +694,7 @@ void
dfasyntax (reg_syntax_t bits, bool fold, unsigned char eol)
{
int i;
- syntax_bits_set = 1;
+ syntax_bits_set = true;
syntax_bits = bits;
case_fold = fold;
eolbyte = eol;
@@ -757,7 +758,7 @@ setbit_case_fold_c (int b, charclass c)
/* UTF-8 encoding allows some optimizations that we can't otherwise
assume in a multibyte encoding. */
-int
+bool
using_utf8 (void)
{
static int utf8 = -1;
@@ -858,7 +859,7 @@ static wint_t wctok; /* Wide character
representation of the current
lexptr += nbytes; \
lexleft -= nbytes; \
} \
- } while (0)
+ } while (false)
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
@@ -1211,7 +1212,7 @@ parse_bracket_exp (void)
lexptr = lexptr_saved; \
lexleft = lexleft_saved; \
} \
- while (0)
+ while (false)
static token
lex (void)
@@ -3327,7 +3328,7 @@ dfaexec_main (struct dfa *d, char const *begin, char
*end, bool allow_nl,
\
mbp = p; \
trans = d->trans; \
- } while (0)
+ } while (false)
State_transition();
}
diff --git a/src/dfa.h b/src/dfa.h
index ce267ec..60da0e4 100644
--- a/src/dfa.h
+++ b/src/dfa.h
@@ -100,4 +100,4 @@ extern void dfawarn (const char *);
The user must supply a dfaerror. */
extern _Noreturn void dfaerror (const char *);
-extern int using_utf8 (void);
+extern bool using_utf8 (void);
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=af6af288eac28951b5eee1eaaf373e22b2193b7b
commit 2e0640374ba0c1eaa0ef6258a6c2db747a962643
Author: Paul Eggert <address@hidden>
Date: Sun May 1 22:56:40 2016 -0700
dfa: prefer bool for boolean
* src/dfa.c (syntax_bits_set, dfasyntax, using_utf8, FETCH_WC)
(POP_LEX_STATE, State_transition):
* src/dfa.h (using_utf_8):
Use bool for boolean.
diff --git a/src/dfa.c b/src/dfa.c
index a2aee29..c57b33a 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -641,7 +641,8 @@ charclass_index (charclass const s)
}
/* Syntax bits controlling the behavior of the lexical analyzer. */
-static reg_syntax_t syntax_bits, syntax_bits_set;
+static reg_syntax_t syntax_bits;
+static bool syntax_bits_set;
/* Flag for case-folding letters into sets. */
static bool case_fold;
@@ -693,7 +694,7 @@ void
dfasyntax (reg_syntax_t bits, bool fold, unsigned char eol)
{
int i;
- syntax_bits_set = 1;
+ syntax_bits_set = true;
syntax_bits = bits;
case_fold = fold;
eolbyte = eol;
@@ -757,7 +758,7 @@ setbit_case_fold_c (int b, charclass c)
/* UTF-8 encoding allows some optimizations that we can't otherwise
assume in a multibyte encoding. */
-int
+bool
using_utf8 (void)
{
static int utf8 = -1;
@@ -858,7 +859,7 @@ static wint_t wctok; /* Wide character
representation of the current
lexptr += nbytes; \
lexleft -= nbytes; \
} \
- } while (0)
+ } while (false)
#ifndef MIN
# define MIN(a,b) ((a) < (b) ? (a) : (b))
@@ -1211,7 +1212,7 @@ parse_bracket_exp (void)
lexptr = lexptr_saved; \
lexleft = lexleft_saved; \
} \
- while (0)
+ while (false)
static token
lex (void)
@@ -3327,7 +3328,7 @@ dfaexec_main (struct dfa *d, char const *begin, char
*end, bool allow_nl,
\
mbp = p; \
trans = d->trans; \
- } while (0)
+ } while (false)
State_transition();
}
diff --git a/src/dfa.h b/src/dfa.h
index ce267ec..60da0e4 100644
--- a/src/dfa.h
+++ b/src/dfa.h
@@ -100,4 +100,4 @@ extern void dfawarn (const char *);
The user must supply a dfaerror. */
extern _Noreturn void dfaerror (const char *);
-extern int using_utf8 (void);
+extern bool using_utf8 (void);
-----------------------------------------------------------------------
Summary of changes:
NEWS | 2 ++
src/dfa.c | 66 ++++++++++++++++++++++++++++------------------
src/dfa.h | 30 +++++----------------
src/dfasearch.c | 2 +-
src/grep.c | 67 +++++++++++++++++++++++++++--------------------
tests/Makefile.am | 1 +
tests/grep-dev-null-out | 11 ++++++++
tests/status | 4 +--
8 files changed, 104 insertions(+), 79 deletions(-)
create mode 100755 tests/grep-dev-null-out
hooks/post-receive
--
grep
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- grep branch, master, updated. v2.25-6-g2e06403,
Paul Eggert <=