Move an inversion list generation to mktables

Prior to this patch, this was in regen/mk_invlists.pl, but future
commits will want it to also be used by the header generated by
regen/regcharclass.pl, so use a common source so the logic doesn't have
to be duplicated.

2 files changed, 5 insertions, 6 deletions

diff --git a/regen/mk_invlists.pl b/regen/mk_invlists.pl
index d112b3059c..c9432a3d8d 100644
--- a/regen/mk_invlists.pl
+++ b/regen/mk_invlists.pl
@@ -111,11 +111,6 @@ for my $i (0 .. @$folds_ref - 1) {
     }
 }
 
-sub _Perl_Multi_Char_Folds {
-    @has_multi_char_fold = sort { $a <=> $b } @has_multi_char_fold;
-    return mk_invlist_from_cp_list(\@has_multi_char_fold);
-}
-
 sub _Perl_Non_Final_Folds {
     @is_non_final_fold = sort { $a <=> $b } @is_non_final_fold;
     return mk_invlist_from_cp_list(\@is_non_final_fold);
@@ -175,7 +170,7 @@ for my $prop (qw(
                 XPosixXDigit
                 _Perl_Any_Folds
                 &NonL1_Perl_Non_Final_Folds
-                &_Perl_Multi_Char_Folds
+                _Perl_Folds_To_Multi_Char
                 &UpperLatin1
                 _Perl_IDStart
                 _Perl_IDCont
diff --git a/regen/regcharclass.pl b/regen/regcharclass.pl
index 61cd2109a1..959b7a5c47 100755
--- a/regen/regcharclass.pl
+++ b/regen/regcharclass.pl
@@ -1513,6 +1513,10 @@ MULTI_CHAR_FOLD: multi-char strings that are folded to by a single character
 &regcharclass_multi_char_folds::multi_char_folds(0)
 # 0 => Latin1-only
 
+FOLDS_TO_MULTI: characters that fold to multi-char strings
+=> UTF8 :fast
+\p{_Perl_Folds_To_Multi_Char}
+
 PATWS: pattern white space
 => generic generic_non_low cp : fast safe
 \p{PatWS}