From 0c6e428816c9fc830e8f3aa459846f5f81980878 Mon Sep 17 00:00:00 2001 From: Karl Williamson Date: Mon, 28 Feb 2011 08:40:30 -0700 Subject: [PATCH] regcomp.c: collapse two blocks An earlier commit removed code so that these two blocks can be written as one. --- regcomp.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/regcomp.c b/regcomp.c index 5d58e08..d48ac48 100644 --- a/regcomp.c +++ b/regcomp.c @@ -10051,13 +10051,11 @@ parseit: return ret; /****** !SIZE_ONLY AFTER HERE *********/ - /* Finish up the non-bitmap entries */ - if (nonbitmap) { + /* If folding and there are code points above 255, we calculate all + * characters that could fold to or from the ones already on the list */ + if (FOLD && nonbitmap) { UV i; - /* If folding, we add to the list all characters that could fold to or - * from the ones already on the list */ - if (FOLD) { HV* fold_intersection; UV* fold_list; @@ -10218,7 +10216,6 @@ parseit: } } invlist_destroy(fold_intersection); - } /* End of processing all the folds */ } /* Combine the two lists into one. */ -- 2.7.4