This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
https://perl5.git.perl.org / perl5.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[patch] typemap =~ s/croak/Perl_croak/
[perl5.git] / lib / ExtUtils / typemap
diff --git a/lib/ExtUtils/typemap b/lib/ExtUtils/typemap
index c65b1cf..a5d06ca 100644 (file)
--- a/lib/ExtUtils/typemap
+++ b/lib/ExtUtils/typemap
@@ -1,12 +1,11 @@
-# $Header$ 
 # basic C types
 int                    T_IV
-unsigned               T_IV
-unsigned int           T_IV
+unsigned               T_UV
+unsigned int           T_UV
 long                   T_IV
-unsigned long          T_IV
+unsigned long          T_UV
 short                  T_IV
-unsigned short         T_IV
+unsigned short         T_UV
 char                   T_CHAR
 unsigned char          T_U_CHAR
 char *                 T_PV
@@ -29,12 +28,13 @@ HV *                        T_HVREF
 CV *                   T_CVREF
 
 IV                     T_IV
+UV                     T_UV
 I32                    T_IV
 I16                    T_IV
 I8                     T_IV
 U32                    T_U_LONG
 U16                    T_U_SHORT
-U8                     T_IV
+U8                     T_UV
 Result                 T_U_CHAR
 Boolean                        T_IV
 double                 T_DOUBLE
@@ -55,24 +55,26 @@ T_SVREF
        if (sv_isa($arg, \"${ntype}\"))
            $var = (SV*)SvRV($arg);
        else
-           croak(\"$var is not of type ${ntype}\")
+           Perl_croak(aTHX_ \"$var is not of type ${ntype}\")
 T_AVREF
        if (sv_isa($arg, \"${ntype}\"))
            $var = (AV*)SvRV($arg);
        else
-           croak(\"$var is not of type ${ntype}\")
+           Perl_croak(aTHX_ \"$var is not of type ${ntype}\")
 T_HVREF
        if (sv_isa($arg, \"${ntype}\"))
            $var = (HV*)SvRV($arg);
        else
-           croak(\"$var is not of type ${ntype}\")
+           Perl_croak(aTHX_ \"$var is not of type ${ntype}\")
 T_CVREF
        if (sv_isa($arg, \"${ntype}\"))
            $var = (CV*)SvRV($arg);
        else
-           croak(\"$var is not of type ${ntype}\")
+           Perl_croak(aTHX_ \"$var is not of type ${ntype}\")
 T_SYSRET
        $var NOT IMPLEMENTED
+T_UV
+       $var = ($type)SvUV($arg)
 T_IV
        $var = ($type)SvIV($arg)
 T_INT
@@ -82,19 +84,19 @@ T_ENUM
 T_BOOL
        $var = (int)SvIV($arg)
 T_U_INT
-       $var = (unsigned int)SvIV($arg)
+       $var = (unsigned int)SvUV($arg)
 T_SHORT
        $var = (short)SvIV($arg)
 T_U_SHORT
-       $var = (unsigned short)SvIV($arg)
+       $var = (unsigned short)SvUV($arg)
 T_LONG
        $var = (long)SvIV($arg)
 T_U_LONG
-       $var = (unsigned long)SvIV($arg)
+       $var = (unsigned long)SvUV($arg)
 T_CHAR
-       $var = (char)*SvPV($arg,na)
+       $var = (char)*SvPV($arg,PL_na)
 T_U_CHAR
-       $var = (unsigned char)SvIV($arg)
+       $var = (unsigned char)SvUV($arg)
 T_FLOAT
        $var = (float)SvNV($arg)
 T_NV
@@ -102,37 +104,37 @@ T_NV
 T_DOUBLE
        $var = (double)SvNV($arg)
 T_PV
-       $var = ($type)SvPV($arg,na)
+       $var = ($type)SvPV($arg,PL_na)
 T_PTR
-       $var = ($type)SvIV($arg)
+       $var = INT2PTR($type,SvIV($arg))
 T_PTRREF
        if (SvROK($arg)) {
            IV tmp = SvIV((SV*)SvRV($arg));
-           $var = ($type) tmp;
+           $var = INT2PTR($type,tmp);
        }
        else
-           croak(\"$var is not a reference\")
+           Perl_croak(aTHX_ \"$var is not a reference\")
 T_REF_IV_REF
        if (sv_isa($arg, \"${type}\")) {
            IV tmp = SvIV((SV*)SvRV($arg));
            $var = *($type *) tmp;
        }
        else
-           croak(\"$var is not of type ${ntype}\")
+           Perl_croak(aTHX_ \"$var is not of type ${ntype}\")
 T_REF_IV_PTR
        if (sv_isa($arg, \"${type}\")) {
            IV tmp = SvIV((SV*)SvRV($arg));
            $var = ($type) tmp;
        }
        else
-           croak(\"$var is not of type ${ntype}\")
+           Perl_croak(aTHX_ \"$var is not of type ${ntype}\")
 T_PTROBJ
        if (sv_derived_from($arg, \"${ntype}\")) {
            IV tmp = SvIV((SV*)SvRV($arg));
-           $var = ($type) tmp;
+           $var = INT2PTR($type,tmp);
        }
        else
-           croak(\"$var is not of type ${ntype}\")
+           Perl_croak(aTHX_ \"$var is not of type ${ntype}\")
 T_PTRDESC
        if (sv_isa($arg, \"${ntype}\")) {
            IV tmp = SvIV((SV*)SvRV($arg));
@@ -140,25 +142,25 @@ T_PTRDESC
            $var = ${type}_desc->ptr;
        }
        else
-           croak(\"$var is not of type ${ntype}\")
+           Perl_croak(aTHX_ \"$var is not of type ${ntype}\")
 T_REFREF
        if (SvROK($arg)) {
            IV tmp = SvIV((SV*)SvRV($arg));
-           $var = *($type) tmp;
+           $var = *INT2PTR($type,tmp);
        }
        else
-           croak(\"$var is not a reference\")
+           Perl_croak(aTHX_ \"$var is not a reference\")
 T_REFOBJ
        if (sv_isa($arg, \"${ntype}\")) {
            IV tmp = SvIV((SV*)SvRV($arg));
-           $var = *($type) tmp;
+           $var = *INT2PTR($type,tmp);
        }
        else
-           croak(\"$var is not of type ${ntype}\")
+           Perl_croak(aTHX_ \"$var is not of type ${ntype}\")
 T_OPAQUE
        $var NOT IMPLEMENTED
 T_OPAQUEPTR
-       $var = ($type)SvPV($arg,na)
+       $var = ($type)SvPV($arg,PL_na)
 T_PACKED
        $var = XS_unpack_$ntype($arg)
 T_PACKEDARRAY
@@ -191,6 +193,8 @@ T_CVREF
        $arg = newRV((SV*)$var);
 T_IV
        sv_setiv($arg, (IV)$var);
+T_UV
+       sv_setuv($arg, (UV)$var);
 T_INT
        sv_setiv($arg, (IV)$var);
 T_SYSRET
@@ -203,31 +207,31 @@ T_SYSRET
 T_ENUM
        sv_setiv($arg, (IV)$var);
 T_BOOL
-       $arg = $var ? &sv_yes : &sv_no;
+       $arg = boolSV($var);
 T_U_INT
-       sv_setiv($arg, (IV)$var);
+       sv_setuv($arg, (UV)$var);
 T_SHORT
        sv_setiv($arg, (IV)$var);
 T_U_SHORT
-       sv_setiv($arg, (IV)$var);
+       sv_setuv($arg, (UV)$var);
 T_LONG
        sv_setiv($arg, (IV)$var);
 T_U_LONG
-       sv_setiv($arg, (IV)$var);
+       sv_setuv($arg, (UV)$var);
 T_CHAR
        sv_setpvn($arg, (char *)&$var, 1);
 T_U_CHAR
-       sv_setiv($arg, (IV)$var);
+       sv_setuv($arg, (UV)$var);
 T_FLOAT
        sv_setnv($arg, (double)$var);
 T_NV
-       sv_setnv($arg, (double)$var);
+       sv_setnv($arg, (NV)$var);
 T_DOUBLE
        sv_setnv($arg, (double)$var);
 T_PV
        sv_setpv((SV*)$arg, $var);
 T_PTR
-       sv_setiv($arg, (IV)$var);
+       sv_setiv($arg, PTR2IV($var));
 T_PTRREF
        sv_setref_pv($arg, Nullch, (void*)$var);
 T_REF_IV_REF
@@ -246,7 +250,7 @@ T_REFOBJ
 T_OPAQUE
        sv_setpvn($arg, (char *)&$var, sizeof($var));
 T_OPAQUEPTR
-       sv_setpvn($arg, (char *)$var, sizeof(*$var)), XFree((char *)$var);
+       sv_setpvn($arg, (char *)$var, sizeof(*$var));
 T_PACKED
        XS_pack_$ntype($arg, $var);
 T_PACKEDARRAY
@@ -262,14 +266,14 @@ T_ARRAY
                ST(ix_$var) = sv_newmortal();
        DO_ARRAY_ELEM
        }
-       sp += $var.size - 1;
+       SP += $var.size - 1;
 T_IN
        {
            GV *gv = newGVgen("$Package");
            if ( do_open(gv, "<&", 2, FALSE, 0, 0, $var) )
                sv_setsv($arg, sv_bless(newRV((SV*)gv), gv_stashpv("$Package",1)));
            else
-               $arg = &sv_undef;
+               $arg = &PL_sv_undef;
        }
 T_INOUT
        {
@@ -277,7 +281,7 @@ T_INOUT
            if ( do_open(gv, "+<&", 3, FALSE, 0, 0, $var) )
                sv_setsv($arg, sv_bless(newRV((SV*)gv), gv_stashpv("$Package",1)));
            else
-               $arg = &sv_undef;
+               $arg = &PL_sv_undef;
        }
 T_OUT
        {
@@ -285,5 +289,5 @@ T_OUT
            if ( do_open(gv, "+>&", 3, FALSE, 0, 0, $var) )
                sv_setsv($arg, sv_bless(newRV((SV*)gv), gv_stashpv("$Package",1)));
            else
-               $arg = &sv_undef;
+               $arg = &PL_sv_undef;
        }
Unnamed repository; edit this file 'description' to name the repository.