# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1356906535 28800
# Node ID 551d91bcca65cbd2be99056486bdd4df9fca9d76
# Parent  7f224c8f6c754c54b14502bedfa64d006cf949bb
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>.

diff -r 7f224c8f6c75 -r 551d91bcca65 ChangeLog
--- a/ChangeLog	Sun Dec 30 09:12:05 2012 -0800
+++ b/ChangeLog	Sun Dec 30 14:28:55 2012 -0800
@@ -1,3 +1,10 @@
+2012-12-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+	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  <eggert@cs.ucla.edu>
 
 	regex: check that pattern char is single-byte
diff -r 7f224c8f6c75 -r 551d91bcca65 lib/regex_internal.c
--- a/lib/regex_internal.c	Sun Dec 30 09:12:05 2012 -0800
+++ b/lib/regex_internal.c	Sun Dec 30 14:28:55 2012 -0800
@@ -1443,11 +1443,9 @@
   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);