Retract the #8838 and #8840 for now because of

the DB_File tie problem.

p4raw-id: //depot/perl@8846

diff --git a/embed.h b/embed.h
index a101d23..9a8e442 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -698,7 +698,6 @@
 #define sv_setuv               Perl_sv_setuv
 #define sv_setnv               Perl_sv_setnv
 #define sv_setref_iv           Perl_sv_setref_iv
-#define sv_setref_uv           Perl_sv_setref_uv
 #define sv_setref_nv           Perl_sv_setref_nv
 #define sv_setref_pv           Perl_sv_setref_pv
 #define sv_setref_pvn          Perl_sv_setref_pvn
@@ -2187,7 +2186,6 @@
 #define sv_setuv(a,b)          Perl_sv_setuv(aTHX_ a,b)
 #define sv_setnv(a,b)          Perl_sv_setnv(aTHX_ a,b)
 #define sv_setref_iv(a,b,c)    Perl_sv_setref_iv(aTHX_ a,b,c)
-#define sv_setref_uv(a,b,c)    Perl_sv_setref_uv(aTHX_ a,b,c)
 #define sv_setref_nv(a,b,c)    Perl_sv_setref_nv(aTHX_ a,b,c)
 #define sv_setref_pv(a,b,c)    Perl_sv_setref_pv(aTHX_ a,b,c)
 #define sv_setref_pvn(a,b,c,d) Perl_sv_setref_pvn(aTHX_ a,b,c,d)
@@ -4292,8 +4290,6 @@
 #define sv_setnv               Perl_sv_setnv
 #define Perl_sv_setref_iv      CPerlObj::Perl_sv_setref_iv
 #define sv_setref_iv           Perl_sv_setref_iv
-#define Perl_sv_setref_uv      CPerlObj::Perl_sv_setref_uv
-#define sv_setref_uv           Perl_sv_setref_uv
 #define Perl_sv_setref_nv      CPerlObj::Perl_sv_setref_nv
 #define sv_setref_nv           Perl_sv_setref_nv
 #define Perl_sv_setref_pv      CPerlObj::Perl_sv_setref_pv

diff --git a/embed.pl b/embed.pl
index f1bfd41..1cdc4a2 100755 (executable)
--- a/embed.pl
+++ b/embed.pl
@@ -2045,7 +2045,6 @@ Apd       |void   |sv_setpviv     |SV* sv|IV num
 Apd    |void   |sv_setuv       |SV* sv|UV num
 Apd    |void   |sv_setnv       |SV* sv|NV num
 Apd    |SV*    |sv_setref_iv   |SV* rv|const char* classname|IV iv
-Apd    |SV*    |sv_setref_uv   |SV* rv|const char* classname|UV uv
 Apd    |SV*    |sv_setref_nv   |SV* rv|const char* classname|NV nv
 Apd    |SV*    |sv_setref_pv   |SV* rv|const char* classname|void* pv
 Apd    |SV*    |sv_setref_pvn  |SV* rv|const char* classname|char* pv \

diff --git a/global.sym b/global.sym
index cdc36aa..5ab9c71 100644 (file)
--- a/global.sym
+++ b/global.sym
@@ -437,7 +437,6 @@ Perl_sv_setpviv
 Perl_sv_setuv
 Perl_sv_setnv
 Perl_sv_setref_iv
-Perl_sv_setref_uv
 Perl_sv_setref_nv
 Perl_sv_setref_pv
 Perl_sv_setref_pvn

diff --git a/lib/ExtUtils/xsubpp b/lib/ExtUtils/xsubpp
index 0f3d1e6..2093633 100755 (executable)
--- a/lib/ExtUtils/xsubpp
+++ b/lib/ExtUtils/xsubpp
@@ -274,7 +274,7 @@ foreach $key (keys %output_expr) {
 
     my ($t, $with_size, $arg, $sarg) =
       ($output_expr{$key} =~
-        m[^ \s+ sv_set ( [iunp] | ref_[iunp] ) v (n)?  # Type, is_setpvn
+        m[^ \s+ sv_set ( [iunp] ) v (n)?       # Type, is_setpvn
             \s* \( \s* $cast \$arg \s* ,
             \s* ( (??{ $bal }) )               # Set from
             ( (??{ $size }) )?                 # Possible sizeof set-from
@@ -1354,18 +1354,6 @@ EOF
                print "\tsv_setpv(TARG, $what); XSprePUSH; PUSHTARG;\n";
                $prepush_done = 1;
            }
-           elsif ($t and $t->[0] =~ /^ref_/) {
-               local $ntype = $ret_type;
-               my $what = eval qq("$t->[2]");
-               warn $@ if $@;
-               my $size = $t->[3];
-               $size = '' unless defined $size;
-               $size = eval qq("$size");
-               my $n = $t->[1] || '';
-               warn $@ if $@;
-               print "\tXSprePUSH; sv_set$t->[0]v$n(TARG, $what$size); PUSHTARG;\n";
-               $prepush_done = 1;
-           }
            elsif ($t) {
                my $what = eval qq("$t->[2]");
                warn $@ if $@;

diff --git a/objXSUB.h b/objXSUB.h
index 2549344..1fd1839 100644 (file)
--- a/objXSUB.h
+++ b/objXSUB.h
@@ -1753,10 +1753,6 @@
 #define Perl_sv_setref_iv      pPerl->Perl_sv_setref_iv
 #undef  sv_setref_iv
 #define sv_setref_iv           Perl_sv_setref_iv
-#undef  Perl_sv_setref_uv
-#define Perl_sv_setref_uv      pPerl->Perl_sv_setref_uv
-#undef  sv_setref_uv
-#define sv_setref_uv           Perl_sv_setref_uv
 #undef  Perl_sv_setref_nv
 #define Perl_sv_setref_nv      pPerl->Perl_sv_setref_nv
 #undef  sv_setref_nv

diff --git a/perlapi.c b/perlapi.c
index 644bef8..726be51 100644 (file)
--- a/perlapi.c
+++ b/perlapi.c
@@ -3178,13 +3178,6 @@ Perl_sv_setref_iv(pTHXo_ SV* rv, const char* classname, IV iv)
     return ((CPerlObj*)pPerl)->Perl_sv_setref_iv(rv, classname, iv);
 }
 
-#undef  Perl_sv_setref_uv
-SV*
-Perl_sv_setref_uv(pTHXo_ SV* rv, const char* classname, UV uv)
-{
-    return ((CPerlObj*)pPerl)->Perl_sv_setref_uv(rv, classname, uv);
-}
-
 #undef  Perl_sv_setref_nv
 SV*
 Perl_sv_setref_nv(pTHXo_ SV* rv, const char* classname, NV nv)

diff --git a/pod/perlapi.pod b/pod/perlapi.pod
index 7b6ad4a..ef3a260 100644 (file)
--- a/pod/perlapi.pod
+++ b/pod/perlapi.pod
@@ -2368,19 +2368,19 @@ false, defined or undefined.  Does not handle 'get' magic.
 =for hackers
 Found in file sv.h
 
-=item SvTYPE
-
-Returns the type of the SV.  See C<svtype>.
+=item svtype
 
-       svtype  SvTYPE(SV* sv)
+An enum of flags for Perl types.  These are found in the file B<sv.h> 
+in the C<svtype> enum.  Test these flags with the C<SvTYPE> macro.
 
 =for hackers
 Found in file sv.h
 
-=item svtype
+=item SvTYPE
 
-An enum of flags for Perl types.  These are found in the file B<sv.h> 
-in the C<svtype> enum.  Test these flags with the C<SvTYPE> macro.
+Returns the type of the SV.  See C<svtype>.
+
+       svtype  SvTYPE(SV* sv)
 
 =for hackers
 Found in file sv.h
@@ -3011,19 +3011,6 @@ Note that C<sv_setref_pv> copies the pointer while this copies the string.
 =for hackers
 Found in file sv.c
 
-=item sv_setref_uv
-
-Copies an unsigned integer into a new SV, optionally blessing the SV.  The C<rv>
-argument will be upgraded to an RV.  That RV will be modified to point to
-the new SV.  The C<classname> argument indicates the package for the
-blessing.  Set C<classname> to C<Nullch> to avoid the blessing.  The new SV
-will be returned and will have a reference count of 1.
-
-       SV*     sv_setref_uv(SV* rv, const char* classname, UV uv)
-
-=for hackers
-Found in file sv.c
-
 =item sv_setsv
 
 Copies the contents of the source SV C<ssv> into the destination SV C<dsv>.

diff --git a/pod/perlguts.pod b/pod/perlguts.pod
index 557dbaf..54d0715 100644 (file)
--- a/pod/perlguts.pod
+++ b/pod/perlguts.pod
@@ -530,11 +530,10 @@ class.  SV is returned.
 
        SV* newSVrv(SV* rv, const char* classname);
 
-Copies integer, unsigned integer or double into an SV whose reference is C<rv>.  SV is blessed
+Copies integer or double into an SV whose reference is C<rv>.  SV is blessed
 if C<classname> is non-null.
 
        SV* sv_setref_iv(SV* rv, const char* classname, IV iv);
-       SV* sv_setref_uv(SV* rv, const char* classname, UV uv);
        SV* sv_setref_nv(SV* rv, const char* classname, NV iv);
 
 Copies the pointer value (I<the address, not the string!>) into an SV whose

diff --git a/proto.h b/proto.h
index a33e8b7..10ef21a 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -779,7 +779,6 @@ PERL_CALLCONV void  Perl_sv_setpviv(pTHX_ SV* sv, IV num);
 PERL_CALLCONV void     Perl_sv_setuv(pTHX_ SV* sv, UV num);
 PERL_CALLCONV void     Perl_sv_setnv(pTHX_ SV* sv, NV num);
 PERL_CALLCONV SV*      Perl_sv_setref_iv(pTHX_ SV* rv, const char* classname, IV iv);
-PERL_CALLCONV SV*      Perl_sv_setref_uv(pTHX_ SV* rv, const char* classname, UV uv);
 PERL_CALLCONV SV*      Perl_sv_setref_nv(pTHX_ SV* rv, const char* classname, NV nv);
 PERL_CALLCONV SV*      Perl_sv_setref_pv(pTHX_ SV* rv, const char* classname, void* pv);
 PERL_CALLCONV SV*      Perl_sv_setref_pvn(pTHX_ SV* rv, const char* classname, char* pv, STRLEN n);

diff --git a/sv.c b/sv.c
index eeda889..ea360c3 100644 (file)
--- a/sv.c
+++ b/sv.c
@@ -6349,25 +6349,6 @@ Perl_sv_setref_iv(pTHX_ SV *rv, const char *classname, IV iv)
 }
 
 /*
-=for apidoc sv_setref_uv
-
-Copies an unsigned integer into a new SV, optionally blessing the SV.  The C<rv>
-argument will be upgraded to an RV.  That RV will be modified to point to
-the new SV.  The C<classname> argument indicates the package for the
-blessing.  Set C<classname> to C<Nullch> to avoid the blessing.  The new SV
-will be returned and will have a reference count of 1.
-
-=cut
-*/
-
-SV*
-Perl_sv_setref_uv(pTHX_ SV *rv, const char *classname, UV uv)
-{
-    sv_setuv(newSVrv(rv,classname), uv);
-    return rv;
-}
-
-/*
 =for apidoc sv_setref_nv
 
 Copies a double into a new SV, optionally blessing the SV.  The C<rv>