[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/3] regex: simplify based on Gawk version
From: |
Paul Eggert |
Subject: |
[PATCH 1/3] regex: simplify based on Gawk version |
Date: |
Sun, 30 Dec 2012 19:27:49 -0800 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 |
---
ChangeLog | 7 +++++++
lib/regex_internal.c | 6 ++----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 0c3c7f1..2363f6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-12-30 Paul Eggert <address@hidden>
+
+ regex: simplify based on Gawk version
+ * lib/regex_internal.c (re_dfa_add_node): Simplify.
+ Reported by Aharon Robbins in
+ <http://sourceware.org/ml/libc-alpha/2012-12/msg00456.html>.
+
2012-12-29 Paul Eggert <address@hidden>
regex: check that pattern char is single-byte
diff --git a/lib/regex_internal.c b/lib/regex_internal.c
index cac0190..0042369 100644
--- a/lib/regex_internal.c
+++ b/lib/regex_internal.c
@@ -1443,11 +1443,9 @@ re_dfa_add_node (re_dfa_t *dfa, re_token_t token)
dfa->nodes[dfa->nodes_len] = token;
dfa->nodes[dfa->nodes_len].constraint = 0;
#ifdef RE_ENABLE_I18N
- {
- int type = token.type;
dfa->nodes[dfa->nodes_len].accept_mb =
- (type == OP_PERIOD && dfa->mb_cur_max > 1) || type == COMPLEX_BRACKET;
- }
+ ((token.type == OP_PERIOD && dfa->mb_cur_max > 1)
+ || token.type == COMPLEX_BRACKET);
#endif
dfa->nexts[dfa->nodes_len] = REG_MISSING;
re_node_set_init_empty (dfa->edests + dfa->nodes_len);
--
1.7.11.7
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [PATCH 1/3] regex: simplify based on Gawk version,
Paul Eggert <=