From: Karl Williamson <public@khwilliamson.com>
Date: Mon, 31 Dec 2012 17:00:55 +0000 (-0700)
Subject: regcomp.c: Collapse switch cases
X-Git-Tag: upstream/5.20.0~4314
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f16cee58db950a496b57c484182664be6e57ae9a;p=platform%2Fupstream%2Fperl.git

regcomp.c: Collapse switch cases

These cases differ only in that the union is of the complement in one of
them.  There is a function that provides both possibilities.
---

diff --git a/regcomp.c b/regcomp.c
index 6d64c31..d88dcb9 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -11920,8 +11920,8 @@ parseit:
                                 namedclass % 2, /* Complement if odd (NASCII) */
                                 &posixes);
 		    break;
-
 		case ANYOF_HORIZWS:
+		case ANYOF_NHORIZWS:
                     /* For these, we use the cp_list, as neither /d nor /l make
                      * a difference in what these match.  There would be
                      * problems if these characters had folds other than
@@ -11930,19 +11930,14 @@ parseit:
                      * It turns out that \h is just a synonym for XPosixBlank */
                     classnum = _CC_BLANK;
 		    /* FALL THROUGH */
-
 		case ANYOF_VERTWS:
-		    _invlist_union(cp_list, PL_XPosix_ptrs[classnum], &cp_list);
-		    break;
-
-		case ANYOF_NHORIZWS:
-                    classnum = _CC_BLANK;
-		    /* FALL THROUGH */
-
 		case ANYOF_NVERTWS:
-                    _invlist_union_complement_2nd(cp_list,
-                                                  PL_XPosix_ptrs[classnum],
-                                                  &cp_list);
+                   _invlist_union_maybe_complement_2nd(
+                                cp_list,
+                                PL_XPosix_ptrs[classnum],
+                                namedclass % 2,  /* Complement if odd
+                                                    (NHORIZWS, NVERTWS) */
+                                &cp_list);
 		    break;
 
 		case ANYOF_UNIPROP: /* this is to handle \p and \P */