Some bincompat clawbacks.

p4raw-id: //depot/perl@13813

diff --git a/embed.h b/embed.h
index ea261bf..a748737 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -273,6 +273,9 @@
 #define invert                 Perl_invert
 #define is_gv_magical          Perl_is_gv_magical
 #define is_lvalue_sub          Perl_is_lvalue_sub
+#define to_uni_upper_lc                Perl_to_uni_upper_lc
+#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
@@ -1794,6 +1797,9 @@
 #define invert(a)              Perl_invert(aTHX_ a)
 #define is_gv_magical(a,b,c)   Perl_is_gv_magical(aTHX_ a,b,c)
 #define is_lvalue_sub()                Perl_is_lvalue_sub(aTHX)
+#define to_uni_upper_lc(a)     Perl_to_uni_upper_lc(aTHX_ a)
+#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)

diff --git a/embed.pl b/embed.pl
index 91c2ac0..74fd9a5 100755 (executable)
--- a/embed.pl
+++ b/embed.pl
@@ -1344,7 +1344,10 @@ Ap       |char*  |instr          |const char* big|const char* little
 p      |bool   |io_close       |IO* io|bool not_implicit
 p      |OP*    |invert         |OP* cmd
 dp     |bool   |is_gv_magical  |char *name|STRLEN len|U32 flags
-p      |I32    |is_lvalue_sub
+Ap     |I32    |is_lvalue_sub
+Ap     |U32    |to_uni_upper_lc|U32 c
+Ap     |U32    |to_uni_title_lc|U32 c
+Ap     |U32    |to_uni_lower_lc|U32 c
 Ap     |bool   |is_uni_alnum   |UV c
 Ap     |bool   |is_uni_alnumc  |UV c
 Ap     |bool   |is_uni_idfirst |UV c

diff --git a/embedvar.h b/embedvar.h
index 47d608c..16c8e46 100644 (file)
--- a/embedvar.h
+++ b/embedvar.h
@@ -68,6 +68,7 @@
 #define PL_maxscream           (vTHX->Tmaxscream)
 #define PL_modcount            (vTHX->Tmodcount)
 #define PL_na                  (vTHX->Tna)
+#define PL_nrs                 (vTHX->Tnrs)
 #define PL_ofs_sv              (vTHX->Tofs_sv)
 #define PL_op                  (vTHX->Top)
 #define PL_opsave              (vTHX->Topsave)
@@ -161,7 +162,6 @@
 #define PL_tmps_stack          (vTHX->Ttmps_stack)
 #define PL_top_env             (vTHX->Ttop_env)
 #define PL_toptarget           (vTHX->Ttoptarget)
-#define PL_unused_1            (vTHX->Tunused_1)
 #define PL_watchaddr           (vTHX->Twatchaddr)
 #define PL_watchok             (vTHX->Twatchok)
 
@@ -1095,6 +1095,7 @@
 #define PL_maxscream           (aTHX->Tmaxscream)
 #define PL_modcount            (aTHX->Tmodcount)
 #define PL_na                  (aTHX->Tna)
+#define PL_nrs                 (aTHX->Tnrs)
 #define PL_ofs_sv              (aTHX->Tofs_sv)
 #define PL_op                  (aTHX->Top)
 #define PL_opsave              (aTHX->Topsave)
@@ -1188,7 +1189,6 @@
 #define PL_tmps_stack          (aTHX->Ttmps_stack)
 #define PL_top_env             (aTHX->Ttop_env)
 #define PL_toptarget           (aTHX->Ttoptarget)
-#define PL_unused_1            (aTHX->Tunused_1)
 #define PL_watchaddr           (aTHX->Twatchaddr)
 #define PL_watchok             (aTHX->Twatchok)
 
@@ -1234,6 +1234,7 @@
 #define PL_Tmaxscream          PL_maxscream
 #define PL_Tmodcount           PL_modcount
 #define PL_Tna                 PL_na
+#define PL_Tnrs                        PL_nrs
 #define PL_Tofs_sv             PL_ofs_sv
 #define PL_Top                 PL_op
 #define PL_Topsave             PL_opsave
@@ -1327,7 +1328,6 @@
 #define PL_Ttmps_stack         PL_tmps_stack
 #define PL_Ttop_env            PL_top_env
 #define PL_Ttoptarget          PL_toptarget
-#define PL_Tunused_1           PL_unused_1
 #define PL_Twatchaddr          PL_watchaddr
 #define PL_Twatchok            PL_watchok
 

diff --git a/perlapi.h b/perlapi.h
index 4eb2c4b..3d74ecd 100644 (file)
--- a/perlapi.h
+++ b/perlapi.h
@@ -733,6 +733,8 @@ END_EXTERN_C
 #define PL_modcount            (*Perl_Tmodcount_ptr(aTHX))
 #undef  PL_na
 #define PL_na                  (*Perl_Tna_ptr(aTHX))
+#undef  PL_nrs
+#define PL_nrs                 (*Perl_Tnrs_ptr(aTHX))
 #undef  PL_ofs_sv
 #define PL_ofs_sv              (*Perl_Tofs_sv_ptr(aTHX))
 #undef  PL_op
@@ -919,8 +921,6 @@ END_EXTERN_C
 #define PL_top_env             (*Perl_Ttop_env_ptr(aTHX))
 #undef  PL_toptarget
 #define PL_toptarget           (*Perl_Ttoptarget_ptr(aTHX))
-#undef  PL_unused_1
-#define PL_unused_1            (*Perl_Tunused_1_ptr(aTHX))
 #undef  PL_watchaddr
 #define PL_watchaddr           (*Perl_Twatchaddr_ptr(aTHX))
 #undef  PL_watchok

diff --git a/proto.h b/proto.h
index f9161bb..33e8b82 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -327,6 +327,9 @@ PERL_CALLCONV bool  Perl_io_close(pTHX_ IO* io, bool not_implicit);
 PERL_CALLCONV OP*      Perl_invert(pTHX_ OP* cmd);
 PERL_CALLCONV bool     Perl_is_gv_magical(pTHX_ char *name, STRLEN len, U32 flags);
 PERL_CALLCONV I32      Perl_is_lvalue_sub(pTHX);
+PERL_CALLCONV U32      Perl_to_uni_upper_lc(pTHX_ U32 c);
+PERL_CALLCONV U32      Perl_to_uni_title_lc(pTHX_ U32 c);
+PERL_CALLCONV U32      Perl_to_uni_lower_lc(pTHX_ U32 c);
 PERL_CALLCONV bool     Perl_is_uni_alnum(pTHX_ UV c);
 PERL_CALLCONV bool     Perl_is_uni_alnumc(pTHX_ UV c);
 PERL_CALLCONV bool     Perl_is_uni_idfirst(pTHX_ UV c);

diff --git a/thrdvar.h b/thrdvar.h
index b35e735..e517c1e 100644 (file)
--- a/thrdvar.h
+++ b/thrdvar.h
@@ -81,7 +81,7 @@ PERLVAR(Ttimesbuf,    struct tms)
 /* Fields used by magic variables such as $@, $/ and so on */
 PERLVAR(Ttainted,      bool)           /* using variables controlled by $< */
 PERLVAR(Tcurpm,                PMOP *)         /* what to do \ interps in REs from */
-PERLVAR(Tunused_1,     SV *)           /* placeholder: was Tnrs */
+PERLVAR(Tnrs,          SV *)           /* placeholder: unused since 5.8.0 (5.7.2 patch #12027 for bug ID 20010815.012) */
 
 /*
 =for apidoc mn|SV*|PL_rs

diff --git a/utf8.c b/utf8.c
index b3acd0c..037b1df 100644 (file)
--- a/utf8.c
+++ b/utf8.c
@@ -1041,6 +1041,24 @@ Perl_is_uni_xdigit_lc(pTHX_ UV c)
     return is_uni_xdigit(c);   /* XXX no locale support yet */
 }
 
+U32
+Perl_to_uni_upper_lc(pTHX_ U32 c)
+{
+    return to_uni_upper(c);    /* XXX no locale support yet */
+}
+
+U32
+Perl_to_uni_title_lc(pTHX_ U32 c)
+{
+    return to_uni_title(c);    /* XXX no locale support yet */
+}
+
+U32
+Perl_to_uni_lower_lc(pTHX_ U32 c)
+{
+    return to_uni_lower(c);    /* XXX no locale support yet */
+}
+
 bool
 Perl_is_utf8_alnum(pTHX_ U8 *p)
 {

diff --git a/wince/perldll.def b/wince/perldll.def
index 01ed086..f7b7eb4 100644 (file)
--- a/wince/perldll.def
+++ b/wince/perldll.def
@@ -184,6 +184,7 @@ EXPORTS
        PL_no_usym
        PL_no_wrongref
        PL_nomemok
+       PL_nrs
        PL_ofmt
        PL_oldbufptr
        PL_oldname