diff options
Diffstat (limited to 'gnu/usr.bin/perl/cpan/Unicode-Normalize')
5 files changed, 64 insertions, 45 deletions
diff --git a/gnu/usr.bin/perl/cpan/Unicode-Normalize/Changes b/gnu/usr.bin/perl/cpan/Unicode-Normalize/Changes index 88df63cb4d7..fabd3c16a3e 100644 --- a/gnu/usr.bin/perl/cpan/Unicode-Normalize/Changes +++ b/gnu/usr.bin/perl/cpan/Unicode-Normalize/Changes @@ -1,5 +1,13 @@ Revision history for Perl extension Unicode::Normalize. +1.16 Sun Nov 4 17:23:03 2012 + - XSUB: use PERL_NO_GET_CONTEXT (see perlguts) + (see [rt.cpan.org #80312]) + +1.15 Sun Sep 23 10:43:14 2012 + - perl 5.11.0 or later: Install to 'site' instead of 'perl' + (see [rt.cpan.org #79801]) + 1.14 Sat Mar 10 13:34:53 2012 - avoid "use Test". diff --git a/gnu/usr.bin/perl/cpan/Unicode-Normalize/Makefile.PL b/gnu/usr.bin/perl/cpan/Unicode-Normalize/Makefile.PL index f0b94e74963..c2bd32c937a 100644 --- a/gnu/usr.bin/perl/cpan/Unicode-Normalize/Makefile.PL +++ b/gnu/usr.bin/perl/cpan/Unicode-Normalize/Makefile.PL @@ -12,22 +12,23 @@ if (-f "Normalize.xs") { } WriteMakefile( - 'AUTHOR' => 'SADAHIRO Tomoyuki <SADAHIRO@cpan.org>', - 'ABSTRACT' => 'Unicode Normalization Forms', - 'INSTALLDIRS' => $] >= 5.007002 ? 'perl' : 'site', - 'LICENSE' => 'perl', - 'NAME' => 'Unicode::Normalize', - 'VERSION_FROM' => 'Normalize.pm', # finds $VERSION - 'clean' => $clean, - 'PREREQ_PM' => { - bytes => 0, - Carp => 0, - constant => 0, - DynaLoader => 0, - Exporter => 0, - File::Copy => 0, - File::Spec => 0, - strict => 0, - warnings => 0, + 'AUTHOR' => 'SADAHIRO Tomoyuki <SADAHIRO@cpan.org>', + 'ABSTRACT' => 'Unicode Normalization Forms', + 'INSTALLDIRS' => ($] >= 5.007002 && $] < 5.011) ? 'perl' : 'site', + # see perl5110delta, @INC reorganization + 'LICENSE' => 'perl', + 'NAME' => 'Unicode::Normalize', + 'VERSION_FROM' => 'Normalize.pm', # finds $VERSION + 'clean' => $clean, + 'PREREQ_PM' => { + bytes => 0, + Carp => 0, + constant => 0, + DynaLoader => 0, + Exporter => 0, + File::Copy => 0, + File::Spec => 0, + strict => 0, + warnings => 0, }, ); diff --git a/gnu/usr.bin/perl/cpan/Unicode-Normalize/Normalize.pm b/gnu/usr.bin/perl/cpan/Unicode-Normalize/Normalize.pm index c580f4852c6..d0f35a914df 100644 --- a/gnu/usr.bin/perl/cpan/Unicode-Normalize/Normalize.pm +++ b/gnu/usr.bin/perl/cpan/Unicode-Normalize/Normalize.pm @@ -13,7 +13,7 @@ use Carp; no warnings 'utf8'; -our $VERSION = '1.14'; +our $VERSION = '1.16'; our $PACKAGE = __PACKAGE__; our @EXPORT = qw( NFC NFD NFKC NFKD ); @@ -549,8 +549,8 @@ normalization implemented by this module depends on your perl's version. 5.10.0 5.0.0 5.8.9, 5.10.1 5.1.0 5.12.0-5.12.3 5.2.0 - 5.14.0 6.0.0 - 5.16.0 (to be) 6.1.0 + 5.14.x 6.0.0 + 5.16.x 6.1.0 =item Correction of decomposition mapping diff --git a/gnu/usr.bin/perl/cpan/Unicode-Normalize/Normalize.xs b/gnu/usr.bin/perl/cpan/Unicode-Normalize/Normalize.xs index b760dff0b3b..a189a5d38b8 100644 --- a/gnu/usr.bin/perl/cpan/Unicode-Normalize/Normalize.xs +++ b/gnu/usr.bin/perl/cpan/Unicode-Normalize/Normalize.xs @@ -1,4 +1,14 @@ +#define PERL_NO_GET_CONTEXT /* we want efficiency */ + +/* private functions which need pTHX_ and aTHX_ + pv_cat_decompHangul + sv_2pvunicode + pv_utf8_decompose + pv_utf8_reorder + pv_utf8_compose +*/ + #include "EXTERN.h" #include "perl.h" #include "XSUB.h" @@ -177,7 +187,7 @@ static U8 getCombinClass(UV uv) return row ? row[uv & 0xff] : 0; } -static U8* pv_cat_decompHangul(U8* d, UV uv) +static U8* pv_cat_decompHangul(pTHX_ U8* d, UV uv) { UV sindex = uv - Hangul_SBase; UV lindex = sindex / Hangul_NCount; @@ -194,7 +204,7 @@ static U8* pv_cat_decompHangul(U8* d, UV uv) return d; } -static char* sv_2pvunicode(SV *sv, STRLEN *lp) +static char* sv_2pvunicode(pTHX_ SV *sv, STRLEN *lp) { char *s; STRLEN len; @@ -212,7 +222,7 @@ static char* sv_2pvunicode(SV *sv, STRLEN *lp) } static -U8* pv_utf8_decompose(U8* s, STRLEN slen, U8** dp, STRLEN dlen, bool iscompat) +U8* pv_utf8_decompose(pTHX_ U8* s, STRLEN slen, U8** dp, STRLEN dlen, bool iscompat) { U8* p = s; U8* e = s + slen; @@ -228,7 +238,7 @@ U8* pv_utf8_decompose(U8* s, STRLEN slen, U8** dp, STRLEN dlen, bool iscompat) if (Hangul_IsS(uv)) { Renew_d_if_not_enough_to(UTF8_MAXLEN * 3) - d = pv_cat_decompHangul(d, uv); + d = pv_cat_decompHangul(aTHX_ d, uv); } else { U8* r = iscompat ? dec_compat(uv) : dec_canonical(uv); @@ -250,7 +260,7 @@ U8* pv_utf8_decompose(U8* s, STRLEN slen, U8** dp, STRLEN dlen, bool iscompat) } static -U8* pv_utf8_reorder(U8* s, STRLEN slen, U8** dp, STRLEN dlen) +U8* pv_utf8_reorder(pTHX_ U8* s, STRLEN slen, U8** dp, STRLEN dlen) { U8* p = s; U8* e = s + slen; @@ -323,7 +333,7 @@ U8* pv_utf8_reorder(U8* s, STRLEN slen, U8** dp, STRLEN dlen) } static -U8* pv_utf8_compose(U8* s, STRLEN slen, U8** dp, STRLEN dlen, bool iscontig) +U8* pv_utf8_compose(pTHX_ U8* s, STRLEN slen, U8** dp, STRLEN dlen, bool iscontig) { U8* p = s; U8* e = s + slen; @@ -451,11 +461,11 @@ decompose(src, compat = &PL_sv_no) U8 *s, *d, *dend; STRLEN slen, dlen; CODE: - s = (U8*)sv_2pvunicode(src,&slen); + s = (U8*)sv_2pvunicode(aTHX_ src,&slen); dst = newSVpvn("", 0); dlen = slen; New(0, d, dlen+1, U8); - dend = pv_utf8_decompose(s, slen, &d, dlen, (bool)SvTRUE(compat)); + dend = pv_utf8_decompose(aTHX_ s, slen, &d, dlen, (bool)SvTRUE(compat)); sv_setpvn(dst, (char *)d, dend - d); SvUTF8_on(dst); Safefree(d); @@ -473,11 +483,11 @@ reorder(src) U8 *s, *d, *dend; STRLEN slen, dlen; CODE: - s = (U8*)sv_2pvunicode(src,&slen); + s = (U8*)sv_2pvunicode(aTHX_ src,&slen); dst = newSVpvn("", 0); dlen = slen; New(0, d, dlen+1, U8); - dend = pv_utf8_reorder(s, slen, &d, dlen); + dend = pv_utf8_reorder(aTHX_ s, slen, &d, dlen); sv_setpvn(dst, (char *)d, dend - d); SvUTF8_on(dst); Safefree(d); @@ -497,11 +507,11 @@ compose(src) U8 *s, *d, *dend; STRLEN slen, dlen; CODE: - s = (U8*)sv_2pvunicode(src,&slen); + s = (U8*)sv_2pvunicode(aTHX_ src,&slen); dst = newSVpvn("", 0); dlen = slen; New(0, d, dlen+1, U8); - dend = pv_utf8_compose(s, slen, &d, dlen, (bool)ix); + dend = pv_utf8_compose(aTHX_ s, slen, &d, dlen, (bool)ix); sv_setpvn(dst, (char *)d, dend - d); SvUTF8_on(dst); Safefree(d); @@ -521,19 +531,19 @@ NFD(src) U8 *s, *t, *tend, *d, *dend; STRLEN slen, tlen, dlen; CODE: - s = (U8*)sv_2pvunicode(src,&slen); + s = (U8*)sv_2pvunicode(aTHX_ src,&slen); /* decompose */ tlen = slen; New(0, t, tlen+1, U8); - tend = pv_utf8_decompose(s, slen, &t, tlen, (bool)(ix==1)); + tend = pv_utf8_decompose(aTHX_ s, slen, &t, tlen, (bool)(ix==1)); *tend = '\0'; tlen = tend - t; /* no longer know real size of t */ /* reorder */ dlen = tlen; New(0, d, dlen+1, U8); - dend = pv_utf8_reorder(t, tlen, &d, dlen); + dend = pv_utf8_reorder(aTHX_ t, tlen, &d, dlen); *dend = '\0'; dlen = dend - d; /* no longer know real size of d */ @@ -561,26 +571,26 @@ NFC(src) U8 *s, *t, *tend, *u, *uend, *d, *dend; STRLEN slen, tlen, ulen, dlen; CODE: - s = (U8*)sv_2pvunicode(src,&slen); + s = (U8*)sv_2pvunicode(aTHX_ src,&slen); /* decompose */ tlen = slen; New(0, t, tlen+1, U8); - tend = pv_utf8_decompose(s, slen, &t, tlen, (bool)(ix==1)); + tend = pv_utf8_decompose(aTHX_ s, slen, &t, tlen, (bool)(ix==1)); *tend = '\0'; tlen = tend - t; /* no longer know real size of t */ /* reorder */ ulen = tlen; New(0, u, ulen+1, U8); - uend = pv_utf8_reorder(t, tlen, &u, ulen); + uend = pv_utf8_reorder(aTHX_ t, tlen, &u, ulen); *uend = '\0'; ulen = uend - u; /* no longer know real size of u */ /* compose */ dlen = ulen; New(0, d, dlen+1, U8); - dend = pv_utf8_compose(u, ulen, &d, dlen, (bool)(ix==2)); + dend = pv_utf8_compose(aTHX_ u, ulen, &d, dlen, (bool)(ix==2)); *dend = '\0'; dlen = dend - d; /* no longer know real size of d */ @@ -608,7 +618,7 @@ checkNFD(src) U8 *s, *e, *p, curCC, preCC; bool result = TRUE; CODE: - s = (U8*)sv_2pvunicode(src,&srclen); + s = (U8*)sv_2pvunicode(aTHX_ src,&srclen); e = s + srclen; preCC = 0; @@ -645,7 +655,7 @@ checkNFC(src) bool result = TRUE; bool isMAYBE = FALSE; CODE: - s = (U8*)sv_2pvunicode(src,&srclen); + s = (U8*)sv_2pvunicode(aTHX_ src,&srclen); e = s + srclen; preCC = 0; @@ -701,7 +711,7 @@ checkFCD(src) bool result = TRUE; bool isMAYBE = FALSE; CODE: - s = (U8*)sv_2pvunicode(src,&srclen); + s = (U8*)sv_2pvunicode(aTHX_ src,&srclen); e = s + srclen; preCC = 0; for (p = s; p < e; p += retlen) { @@ -858,7 +868,7 @@ getCanon(uv) if (Hangul_IsS(uv)) { U8 tmp[3 * UTF8_MAXLEN + 1]; U8 *t = tmp; - U8 *e = pv_cat_decompHangul(t, uv); + U8 *e = pv_cat_decompHangul(aTHX_ t, uv); RETVAL = newSVpvn((char *)t, e - t); } else { U8* rstr = ix ? dec_compat(uv) : dec_canonical(uv); @@ -879,7 +889,7 @@ splitOnLastStarter(src) STRLEN srclen; U8 *s, *e, *p; PPCODE: - s = (U8*)sv_2pvunicode(src,&srclen); + s = (U8*)sv_2pvunicode(aTHX_ src,&srclen); e = s + srclen; p = e; while (s < p) { diff --git a/gnu/usr.bin/perl/cpan/Unicode-Normalize/README b/gnu/usr.bin/perl/cpan/Unicode-Normalize/README index 958df4e1bd8..1fcde2698e5 100644 --- a/gnu/usr.bin/perl/cpan/Unicode-Normalize/README +++ b/gnu/usr.bin/perl/cpan/Unicode-Normalize/README @@ -1,4 +1,4 @@ -Unicode/Normalize version 1.14 +Unicode/Normalize version 1.16 =================================== Unicode::Normalize - Unicode Normalization Forms |