diff options
| -rw-r--r-- | embedvar.h | 4 | ||||
| -rw-r--r-- | perlapi.h | 4 | ||||
| -rw-r--r-- | perlvars.h | 2 | ||||
| -rw-r--r-- | regcomp.c | 5 |
4 files changed, 7 insertions, 8 deletions
diff --git a/embedvar.h b/embedvar.h index db3e8aafb9..539fc5a32e 100644 --- a/embedvar.h +++ b/embedvar.h @@ -365,8 +365,8 @@ #define PL_GLB_invlist (my_vars->GLB_invlist) #define PL_Latin1 (my_vars->GLatin1) #define PL_GLatin1 (my_vars->GLatin1) -#define PL_NonL1NonFinalFold (my_vars->GNonL1NonFinalFold) -#define PL_GNonL1NonFinalFold (my_vars->GNonL1NonFinalFold) +#define PL_NonFinalFold (my_vars->GNonFinalFold) +#define PL_GNonFinalFold (my_vars->GNonFinalFold) #define PL_Posix_ptrs (my_vars->GPosix_ptrs) #define PL_GPosix_ptrs (my_vars->GPosix_ptrs) #define PL_SB_invlist (my_vars->GSB_invlist) @@ -117,8 +117,8 @@ END_EXTERN_C #define PL_LB_invlist (*Perl_GLB_invlist_ptr(NULL)) #undef PL_Latin1 #define PL_Latin1 (*Perl_GLatin1_ptr(NULL)) -#undef PL_NonL1NonFinalFold -#define PL_NonL1NonFinalFold (*Perl_GNonL1NonFinalFold_ptr(NULL)) +#undef PL_NonFinalFold +#define PL_NonFinalFold (*Perl_GNonFinalFold_ptr(NULL)) #undef PL_Posix_ptrs #define PL_Posix_ptrs (*Perl_GPosix_ptrs_ptr(NULL)) #undef PL_SB_invlist diff --git a/perlvars.h b/perlvars.h index b94bf3385e..2a4696bbcb 100644 --- a/perlvars.h +++ b/perlvars.h @@ -279,7 +279,7 @@ PERLVAR(G, HasMultiCharFold, SV *) PERLVAR(G, InMultiCharFold, SV *) PERLVAR(G, Latin1, SV *) PERLVAR(G, LB_invlist, SV *) -PERLVAR(G, NonL1NonFinalFold, SV *) +PERLVAR(G, NonFinalFold, SV *) PERLVAR(G, SB_invlist, SV *) PERLVAR(G, SCX_invlist, SV *) PERLVAR(G, UpperLatin1, SV *) /* Code points 128 - 255 */ @@ -14563,7 +14563,7 @@ S_regatom(pTHX_ RExC_state_t *pRExC_state, I32 *flagp, U32 depth) } } else if (! _invlist_contains_cp( - PL_NonL1NonFinalFold, + PL_NonFinalFold, valid_utf8_to_uvchr((U8 *) s, NULL))) { break; @@ -21639,8 +21639,7 @@ Perl_init_uniprops(pTHX) PL_HasMultiCharFold = _new_invlist_C_array(uni_prop_ptrs[ UNI__PERL_FOLDS_TO_MULTI_CHAR]); PL_InMultiCharFold = _new_invlist_C_array(UNI__PERL_IS_IN_MULTI_CHAR_FOLD_invlist); - PL_NonL1NonFinalFold = _new_invlist_C_array( - UNI__PERL_NON_FINAL_FOLDS_invlist); + PL_NonFinalFold = _new_invlist_C_array(UNI__PERL_NON_FINAL_FOLDS_invlist); PL_utf8_toupper = _new_invlist_C_array(Uppercase_Mapping_invlist); PL_utf8_tolower = _new_invlist_C_array(Lowercase_Mapping_invlist); |