From: Karl Williamson <public@khwilliamson.com>
Date: Thu, 3 Mar 2011 05:02:12 +0000 (-0700)
Subject: regexec.c: Remove '#if 0' code
X-Git-Tag: accepted/trunk/20130322.191538~5212
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2dc08f34d0ec5248bad6b2313fd1d77cdd5c0d9b;p=platform%2Fupstream%2Fperl.git

regexec.c: Remove '#if 0' code

This code was retained for a while until it was clear that the replacement
code worked.
---

diff --git a/regexec.c b/regexec.c
index 45c1b3b..739eba6 100644
--- a/regexec.c
+++ b/regexec.c
@@ -6760,76 +6760,6 @@ S_reginclass(pTHX_ const regexp * const prog, register const regnode * const n,
 			    }
 			}
 		    }
-#if 0
-		    if (!match) { /* See if the folded version matches */
-			SV** listp;
-
-			/* Consider "k" =~ /[K]/i.  The line above would have
-			 * just folded the 'k' to itself, and that isn't going
-			 * to match 'K'.  So we look through the closure of
-			 * everything that folds to 'k'.  That will find the
-			 * 'K'.  Initialize the list, if necessary */
-			if (! PL_utf8_foldclosures) {
-
-			    /* If the folds haven't been read in, call a fold
-			     * function to force that */
-			    if (! PL_utf8_tofold) {
-				U8 dummy[UTF8_MAXBYTES+1];
-				STRLEN dummy_len;
-				to_utf8_fold((U8*) "A", dummy, &dummy_len);
-			    }
-			    PL_utf8_foldclosures =
-				  _swash_inversion_hash(PL_utf8_tofold);
-			}
-
-			/* The data structure is a hash with the keys every
-			 * character that is folded to, like 'k', and the
-			 * values each an array of everything that folds to its
-			 * key.  e.g. [ 'k', 'K', KELVIN_SIGN ] */
-			if ((listp = hv_fetch(PL_utf8_foldclosures,
-				      (char *) folded, foldlen, FALSE)))
-			{
-			    AV* list = (AV*) *listp;
-			    IV i;
-			    for (i = 0; i <= av_len(list); i++) {
-				SV** try_p = av_fetch(list, i, FALSE);
-				char* try_c;
-				if (try_p == NULL) {
-				    Perl_croak(aTHX_ "panic: invalid PL_utf8_foldclosures structure");
-				}
-				/* Don't have to worry about embedded nulls
-				 * since NULL isn't folded or foldable */
-				try_c = SvPVX(*try_p);
-
-				/* The fold in a few cases  of an above Latin1
-				 * char is in the Latin1 range, and hence may
-				 * be in the bitmap */
-				if (UTF8_IS_INVARIANT(*try_c)
-				    && ANYOF_BITMAP_TEST(n,
-						    UNI_TO_NATIVE(*try_c)))
-				{
-				    match = TRUE;
-				    break;
-				}
-				else if
-				    (UTF8_IS_DOWNGRADEABLE_START(*try_c)
-				     && ANYOF_BITMAP_TEST(n, UNI_TO_NATIVE(
-						TWO_BYTE_UTF8_TO_UNI(try_c[0],
-								    try_c[1]))))
-				{
-				   /* Since the fold comes from internally
-				    * generated data, we can safely assume it
-				    * is valid utf8 in the test above */
-				    match = TRUE;
-				    break;
-				} else if (swash_fetch(sw, (U8*) try_c, TRUE)) {
-				    match = TRUE;
-				    break;
-				}
-			    }
-			}
-		    }
-#endif
 		}
 
 		/* If we allocated a string above, free it */