In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/5fba0dddeee4e48144ce1f17a6e372ca4c980087?hp=7a12ca83130de638aaff52760e22216d31cfe4db>
- Log ----------------------------------------------------------------- commit 5fba0dddeee4e48144ce1f17a6e372ca4c980087 Author: Rafael Garcia-Suarez <[email protected]> Date: Sun Sep 13 12:45:47 2009 +0200 Remove obsolete interpreter variable PL_utf8_alnumc M embedvar.h M intrpvar.h M perl.c M perlapi.h M sv.c commit 334b0924e9cb80a0a1a60e44bb69faef523ef01c Author: Rafael Garcia-Suarez <[email protected]> Date: Sun Sep 13 12:43:40 2009 +0200 Remove obsolete functions is_uni_alnumc, is_uni_alnumc_lc, is_utf8_alnumc M embed.fnc M embed.h M global.sym M handy.h M proto.h M utf8.c ----------------------------------------------------------------------- Summary of changes: embed.fnc | 3 --- embed.h | 6 ------ embedvar.h | 2 -- global.sym | 3 --- handy.h | 3 --- intrpvar.h | 1 - perl.c | 2 -- perlapi.h | 2 -- proto.h | 14 -------------- sv.c | 1 - utf8.c | 24 ------------------------ 11 files changed, 0 insertions(+), 61 deletions(-) diff --git a/embed.fnc b/embed.fnc index 9591a8c..ee4ab7d 100644 --- a/embed.fnc +++ b/embed.fnc @@ -453,7 +453,6 @@ ApPR |U32 |to_uni_upper_lc|U32 c ApPR |U32 |to_uni_title_lc|U32 c ApPR |U32 |to_uni_lower_lc|U32 c ApPR |bool |is_uni_alnum |UV c -ApPR |bool |is_uni_alnumc |UV c ApPR |bool |is_uni_idfirst |UV c ApPR |bool |is_uni_alpha |UV c ApPR |bool |is_uni_ascii |UV c @@ -471,7 +470,6 @@ Ap |UV |to_uni_title |UV c|NN U8 *p|NN STRLEN *lenp Ap |UV |to_uni_lower |UV c|NN U8 *p|NN STRLEN *lenp Ap |UV |to_uni_fold |UV c|NN U8 *p|NN STRLEN *lenp ApPR |bool |is_uni_alnum_lc|UV c -ApPR |bool |is_uni_alnumc_lc|UV c ApPR |bool |is_uni_idfirst_lc|UV c ApPR |bool |is_uni_alpha_lc|UV c ApPR |bool |is_uni_ascii_lc|UV c @@ -490,7 +488,6 @@ Anpd |bool |is_utf8_string |NN const U8 *s|STRLEN len Anpdmb |bool |is_utf8_string_loc|NN const U8 *s|STRLEN len|NULLOK const U8 **p Anpd |bool |is_utf8_string_loclen|NN const U8 *s|STRLEN len|NULLOK const U8 **ep|NULLOK STRLEN *el ApR |bool |is_utf8_alnum |NN const U8 *p -ApR |bool |is_utf8_alnumc |NN const U8 *p ApR |bool |is_utf8_idfirst|NN const U8 *p ApR |bool |is_utf8_idcont |NN const U8 *p ApR |bool |is_utf8_alpha |NN const U8 *p diff --git a/embed.h b/embed.h index 817c291..7410dd1 100644 --- a/embed.h +++ b/embed.h @@ -341,7 +341,6 @@ #define to_uni_title_lc Perl_to_uni_title_lc #define to_uni_lower_lc Perl_to_uni_lower_lc #define is_uni_alnum Perl_is_uni_alnum -#define is_uni_alnumc Perl_is_uni_alnumc #define is_uni_idfirst Perl_is_uni_idfirst #define is_uni_alpha Perl_is_uni_alpha #define is_uni_ascii Perl_is_uni_ascii @@ -359,7 +358,6 @@ #define to_uni_lower Perl_to_uni_lower #define to_uni_fold Perl_to_uni_fold #define is_uni_alnum_lc Perl_is_uni_alnum_lc -#define is_uni_alnumc_lc Perl_is_uni_alnumc_lc #define is_uni_idfirst_lc Perl_is_uni_idfirst_lc #define is_uni_alpha_lc Perl_is_uni_alpha_lc #define is_uni_ascii_lc Perl_is_uni_ascii_lc @@ -377,7 +375,6 @@ #define is_utf8_string Perl_is_utf8_string #define is_utf8_string_loclen Perl_is_utf8_string_loclen #define is_utf8_alnum Perl_is_utf8_alnum -#define is_utf8_alnumc Perl_is_utf8_alnumc #define is_utf8_idfirst Perl_is_utf8_idfirst #define is_utf8_idcont Perl_is_utf8_idcont #define is_utf8_alpha Perl_is_utf8_alpha @@ -2693,7 +2690,6 @@ #define to_uni_title_lc(a) Perl_to_uni_title_lc(aTHX_ a) #define to_uni_lower_lc(a) Perl_to_uni_lower_lc(aTHX_ a) #define is_uni_alnum(a) Perl_is_uni_alnum(aTHX_ a) -#define is_uni_alnumc(a) Perl_is_uni_alnumc(aTHX_ a) #define is_uni_idfirst(a) Perl_is_uni_idfirst(aTHX_ a) #define is_uni_alpha(a) Perl_is_uni_alpha(aTHX_ a) #define is_uni_ascii(a) Perl_is_uni_ascii(aTHX_ a) @@ -2711,7 +2707,6 @@ #define to_uni_lower(a,b,c) Perl_to_uni_lower(aTHX_ a,b,c) #define to_uni_fold(a,b,c) Perl_to_uni_fold(aTHX_ a,b,c) #define is_uni_alnum_lc(a) Perl_is_uni_alnum_lc(aTHX_ a) -#define is_uni_alnumc_lc(a) Perl_is_uni_alnumc_lc(aTHX_ a) #define is_uni_idfirst_lc(a) Perl_is_uni_idfirst_lc(aTHX_ a) #define is_uni_alpha_lc(a) Perl_is_uni_alpha_lc(aTHX_ a) #define is_uni_ascii_lc(a) Perl_is_uni_ascii_lc(aTHX_ a) @@ -2729,7 +2724,6 @@ #define is_utf8_string Perl_is_utf8_string #define is_utf8_string_loclen Perl_is_utf8_string_loclen #define is_utf8_alnum(a) Perl_is_utf8_alnum(aTHX_ a) -#define is_utf8_alnumc(a) Perl_is_utf8_alnumc(aTHX_ a) #define is_utf8_idfirst(a) Perl_is_utf8_idfirst(aTHX_ a) #define is_utf8_idcont(a) Perl_is_utf8_idcont(aTHX_ a) #define is_utf8_alpha(a) Perl_is_utf8_alpha(aTHX_ a) diff --git a/embedvar.h b/embedvar.h index 024b6c1..2a9866f 100644 --- a/embedvar.h +++ b/embedvar.h @@ -324,7 +324,6 @@ #define PL_unlockhook (vTHX->Iunlockhook) #define PL_unsafe (vTHX->Iunsafe) #define PL_utf8_alnum (vTHX->Iutf8_alnum) -#define PL_utf8_alnumc (vTHX->Iutf8_alnumc) #define PL_utf8_alpha (vTHX->Iutf8_alpha) #define PL_utf8_ascii (vTHX->Iutf8_ascii) #define PL_utf8_cntrl (vTHX->Iutf8_cntrl) @@ -638,7 +637,6 @@ #define PL_Iunlockhook PL_unlockhook #define PL_Iunsafe PL_unsafe #define PL_Iutf8_alnum PL_utf8_alnum -#define PL_Iutf8_alnumc PL_utf8_alnumc #define PL_Iutf8_alpha PL_utf8_alpha #define PL_Iutf8_ascii PL_utf8_ascii #define PL_Iutf8_cntrl PL_utf8_cntrl diff --git a/global.sym b/global.sym index a5c9f93..222ea71 100644 --- a/global.sym +++ b/global.sym @@ -189,7 +189,6 @@ Perl_to_uni_upper_lc Perl_to_uni_title_lc Perl_to_uni_lower_lc Perl_is_uni_alnum -Perl_is_uni_alnumc Perl_is_uni_idfirst Perl_is_uni_alpha Perl_is_uni_ascii @@ -207,7 +206,6 @@ Perl_to_uni_title Perl_to_uni_lower Perl_to_uni_fold Perl_is_uni_alnum_lc -Perl_is_uni_alnumc_lc Perl_is_uni_idfirst_lc Perl_is_uni_alpha_lc Perl_is_uni_ascii_lc @@ -226,7 +224,6 @@ Perl_is_utf8_string Perl_is_utf8_string_loc Perl_is_utf8_string_loclen Perl_is_utf8_alnum -Perl_is_utf8_alnumc Perl_is_utf8_idfirst Perl_is_utf8_idcont Perl_is_utf8_alpha diff --git a/handy.h b/handy.h index d390667..bd58bfe 100644 --- a/handy.h +++ b/handy.h @@ -557,7 +557,6 @@ US-ASCII (Basic Latin) range are viewed as not having any case. #define isDIGIT_uni(c) is_uni_digit(c) #define isUPPER_uni(c) is_uni_upper(c) #define isLOWER_uni(c) is_uni_lower(c) -#define isALNUMC_uni(c) is_uni_alnumc(c) #define isASCII_uni(c) is_uni_ascii(c) #define isCNTRL_uni(c) is_uni_cntrl(c) #define isGRAPH_uni(c) is_uni_graph(c) @@ -579,7 +578,6 @@ US-ASCII (Basic Latin) range are viewed as not having any case. #define isDIGIT_LC_uvchr(c) (c < 256 ? isDIGIT_LC(c) : is_uni_digit_lc(c)) #define isUPPER_LC_uvchr(c) (c < 256 ? isUPPER_LC(c) : is_uni_upper_lc(c)) #define isLOWER_LC_uvchr(c) (c < 256 ? isLOWER_LC(c) : is_uni_lower_lc(c)) -#define isALNUMC_LC_uvchr(c) (c < 256 ? isALNUMC_LC(c) : is_uni_alnumc_lc(c)) #define isCNTRL_LC_uvchr(c) (c < 256 ? isCNTRL_LC(c) : is_uni_cntrl_lc(c)) #define isGRAPH_LC_uvchr(c) (c < 256 ? isGRAPH_LC(c) : is_uni_graph_lc(c)) #define isPRINT_LC_uvchr(c) (c < 256 ? isPRINT_LC(c) : is_uni_print_lc(c)) @@ -598,7 +596,6 @@ US-ASCII (Basic Latin) range are viewed as not having any case. #define isDIGIT_utf8(p) is_utf8_digit(p) #define isUPPER_utf8(p) is_utf8_upper(p) #define isLOWER_utf8(p) is_utf8_lower(p) -#define isALNUMC_utf8(p) is_utf8_alnumc(p) #define isASCII_utf8(p) is_utf8_ascii(p) #define isCNTRL_utf8(p) is_utf8_cntrl(p) #define isGRAPH_utf8(p) is_utf8_graph(p) diff --git a/intrpvar.h b/intrpvar.h index 9f8e443..02d6515 100644 --- a/intrpvar.h +++ b/intrpvar.h @@ -513,7 +513,6 @@ PERLVAR(Inumeric_name, char *) /* Name of current numeric locale */ /* utf8 character classes */ PERLVAR(Iutf8_alnum, SV *) -PERLVAR(Iutf8_alnumc, SV *) PERLVAR(Iutf8_ascii, SV *) PERLVAR(Iutf8_alpha, SV *) PERLVAR(Iutf8_space, SV *) diff --git a/perl.c b/perl.c index 3c80c97..7876adf 100644 --- a/perl.c +++ b/perl.c @@ -985,7 +985,6 @@ perl_destruct(pTHXx) /* clear utf8 character classes */ SvREFCNT_dec(PL_utf8_alnum); - SvREFCNT_dec(PL_utf8_alnumc); SvREFCNT_dec(PL_utf8_ascii); SvREFCNT_dec(PL_utf8_alpha); SvREFCNT_dec(PL_utf8_space); @@ -1005,7 +1004,6 @@ perl_destruct(pTHXx) SvREFCNT_dec(PL_utf8_idstart); SvREFCNT_dec(PL_utf8_idcont); PL_utf8_alnum = NULL; - PL_utf8_alnumc = NULL; PL_utf8_ascii = NULL; PL_utf8_alpha = NULL; PL_utf8_space = NULL; diff --git a/perlapi.h b/perlapi.h index 3c0df25..1d65db5 100644 --- a/perlapi.h +++ b/perlapi.h @@ -684,8 +684,6 @@ END_EXTERN_C #define PL_unsafe (*Perl_Iunsafe_ptr(aTHX)) #undef PL_utf8_alnum #define PL_utf8_alnum (*Perl_Iutf8_alnum_ptr(aTHX)) -#undef PL_utf8_alnumc -#define PL_utf8_alnumc (*Perl_Iutf8_alnumc_ptr(aTHX)) #undef PL_utf8_alpha #define PL_utf8_alpha (*Perl_Iutf8_alpha_ptr(aTHX)) #undef PL_utf8_ascii diff --git a/proto.h b/proto.h index 724a347..6c7498e 100644 --- a/proto.h +++ b/proto.h @@ -1160,10 +1160,6 @@ PERL_CALLCONV bool Perl_is_uni_alnum(pTHX_ UV c) __attribute__warn_unused_result__ __attribute__pure__; -PERL_CALLCONV bool Perl_is_uni_alnumc(pTHX_ UV c) - __attribute__warn_unused_result__ - __attribute__pure__; - PERL_CALLCONV bool Perl_is_uni_idfirst(pTHX_ UV c) __attribute__warn_unused_result__ __attribute__pure__; @@ -1240,10 +1236,6 @@ PERL_CALLCONV bool Perl_is_uni_alnum_lc(pTHX_ UV c) __attribute__warn_unused_result__ __attribute__pure__; -PERL_CALLCONV bool Perl_is_uni_alnumc_lc(pTHX_ UV c) - __attribute__warn_unused_result__ - __attribute__pure__; - PERL_CALLCONV bool Perl_is_uni_idfirst_lc(pTHX_ UV c) __attribute__warn_unused_result__ __attribute__pure__; @@ -1323,12 +1315,6 @@ PERL_CALLCONV bool Perl_is_utf8_alnum(pTHX_ const U8 *p) #define PERL_ARGS_ASSERT_IS_UTF8_ALNUM \ assert(p) -PERL_CALLCONV bool Perl_is_utf8_alnumc(pTHX_ const U8 *p) - __attribute__warn_unused_result__ - __attribute__nonnull__(pTHX_1); -#define PERL_ARGS_ASSERT_IS_UTF8_ALNUMC \ - assert(p) - PERL_CALLCONV bool Perl_is_utf8_idfirst(pTHX_ const U8 *p) __attribute__warn_unused_result__ __attribute__nonnull__(pTHX_1); diff --git a/sv.c b/sv.c index 6e9db73..ee78fbc 100644 --- a/sv.c +++ b/sv.c @@ -12168,7 +12168,6 @@ perl_clone_using(PerlInterpreter *proto_perl, UV flags, /* utf8 character classes */ PL_utf8_alnum = sv_dup_inc(proto_perl->Iutf8_alnum, param); - PL_utf8_alnumc = sv_dup_inc(proto_perl->Iutf8_alnumc, param); PL_utf8_ascii = sv_dup_inc(proto_perl->Iutf8_ascii, param); PL_utf8_alpha = sv_dup_inc(proto_perl->Iutf8_alpha, param); PL_utf8_space = sv_dup_inc(proto_perl->Iutf8_space, param); diff --git a/utf8.c b/utf8.c index 9a242e0..a68af53 100644 --- a/utf8.c +++ b/utf8.c @@ -1042,14 +1042,6 @@ Perl_is_uni_alnum(pTHX_ UV c) } bool -Perl_is_uni_alnumc(pTHX_ UV c) -{ - U8 tmpbuf[UTF8_MAXBYTES+1]; - uvchr_to_utf8(tmpbuf, c); - return is_utf8_alnumc(tmpbuf); -} - -bool Perl_is_uni_idfirst(pTHX_ UV c) { U8 tmpbuf[UTF8_MAXBYTES+1]; @@ -1190,12 +1182,6 @@ Perl_is_uni_alnum_lc(pTHX_ UV c) } bool -Perl_is_uni_alnumc_lc(pTHX_ UV c) -{ - return is_uni_alnumc(c); /* XXX no locale support yet */ -} - -bool Perl_is_uni_idfirst_lc(pTHX_ UV c) { return is_uni_idfirst(c); /* XXX no locale support yet */ @@ -1326,16 +1312,6 @@ Perl_is_utf8_alnum(pTHX_ const U8 *p) } bool -Perl_is_utf8_alnumc(pTHX_ const U8 *p) -{ - dVAR; - - PERL_ARGS_ASSERT_IS_UTF8_ALNUMC; - - return is_utf8_common(p, &PL_utf8_alnumc, "IsAlnumC"); -} - -bool Perl_is_utf8_idfirst(pTHX_ const U8 *p) /* The naming is historical. */ { dVAR; -- Perl5 Master Repository
