From: Jarkko Hietaniemi Date: Fri, 12 Jan 2001 21:20:43 +0000 (+0000) Subject: Use UVXf. X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=159fae8683b83dc912387cb2a410104f03ac93ef;hp=0844c848650aa2551dce1a55f02e43855fb98df9;p=p5sagit%2Fp5-mst-13.2.git Use UVXf. p4raw-id: //depot/perl@8426 --- diff --git a/Configure b/Configure index 300425a..3e845c5 100755 --- a/Configure +++ b/Configure @@ -20,7 +20,7 @@ # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $ # -# Generated on Fri Jan 12 18:19:36 EET 2001 [metaconfig 3.0 PL70] +# Generated on Fri Jan 12 22:28:01 EET 2001 [metaconfig 3.0 PL70] # (with additional metaconfig patches by perlbug@perl.org) cat >c1$$ <$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un * This symbol defines the format string used for printing a Perl UV * as an unsigned hexadecimal integer in lowercase abcdef. */ +/* UVXf: + * This symbol defines the format string used for printing a Perl UV + * as an unsigned hexadecimal integer in uppercase ABCDEF. + */ /* NVef: * This symbol defines the format string used for printing a Perl NV * using %e-ish floating point format. @@ -2850,6 +2854,7 @@ sed <$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un #define UVuf $uvuformat /**/ #define UVof $uvoformat /**/ #define UVxf $uvxformat /**/ +#define UVXf $uvXUformat /**/ #define NVef $nveformat /**/ #define NVff $nvfformat /**/ #define NVgf $nvgformat /**/ diff --git a/configure.com b/configure.com index 8417cce..7a58a2a 100644 --- a/configure.com +++ b/configure.com @@ -4785,6 +4785,7 @@ $ ivdformat="""ld""" $ uvuformat="""lu""" $ uvoformat="""lo""" $ uvxformat="""lx""" +$ uvxuformat="""lX""" $! uselongdouble? $ nveformat="""e""" $ nvfformat="""f""" @@ -5440,6 +5441,7 @@ $ WC "uvsize='" + uvsize + "'" $ WC "uvtype='" + uvtype + "'" $ WC "uvuformat='" + uvuformat + "'" $ WC "uvxformat='" + uvxformat + "'" +$ WC "uvxuformat='" + uvxuformat + "'" $ WC "vendorarchexp='" + "'" $ WC "vendorlib_stem='" + "'" $ WC "vendorlibexp='" + "'" diff --git a/epoc/config.sh b/epoc/config.sh index 42da616..36bfc89 100644 --- a/epoc/config.sh +++ b/epoc/config.sh @@ -805,6 +805,7 @@ ivdformat='"ld"' uvuformat='"lu"' uvoformat='"lo"' uvxformat='"lx"' +uvXUformat='"lX"' uidformat='"hu"' gidformat='"hu"' d_strtold='undef' diff --git a/sv.c b/sv.c index 2eb34f5..58c6434 100644 --- a/sv.c +++ b/sv.c @@ -1567,7 +1567,7 @@ STATIC int S_sv_2inuv_non_preserve (pTHX_ register SV *sv, I32 numtype) { NV nv = SvNVX(sv); /* Code simpler and had compiler problems if */ UV nv_as_uv = U_V(nv); /* these are not in simple variables. */ - DEBUG_c(PerlIO_printf(Perl_debug_log,"sv_2inuv_non '%s', IV=0x%"UVxf" NV=%g inttype=%"UVxf"\n", SvPVX(sv), SvIVX(sv), nv, (UV)numtype)); + DEBUG_c(PerlIO_printf(Perl_debug_log,"sv_2inuv_non '%s', IV=0x%"UVxf" NV=%g inttype=%"UVXf"\n", SvPVX(sv), SvIVX(sv), nv, (UV)numtype)); if (nv_as_uv <= (UV)IV_MAX) { (void)SvIOKp_on(sv); (void)SvNOKp_on(sv); @@ -1625,7 +1625,7 @@ S_sv_2inuv_non_preserve (pTHX_ register SV *sv, I32 numtype) { #else /* We've just lost integer precision, nothing we could do. */ SvUVX(sv) = nv_as_uv; - DEBUG_c(PerlIO_printf(Perl_debug_log,"sv_2niuv_non UV? '%s', UV=0x%"UVxf" NV=%g U_V(NV)=0x%"UVxf" inttype=%"UVxf"\n", SvPVX(sv), SvIVX(sv), nv, nv_as_uv, (UV)numtype)); + DEBUG_c(PerlIO_printf(Perl_debug_log,"sv_2niuv_non UV? '%s', UV=0x%"UVxf" NV=%g U_V(NV)=0x%"UVxf" inttype=%"UVXf"\n", SvPVX(sv), SvIVX(sv), nv, nv_as_uv, (UV)numtype)); /* UV and NV slots equally valid only if we have casting symmetry. */ if (numtype & IS_NUMBER_NOT_INT) { SvIsUV_on(sv); @@ -1648,7 +1648,7 @@ S_sv_2inuv_non_preserve (pTHX_ register SV *sv, I32 numtype) { STATIC int S_sv_2iuv_non_preserve (pTHX_ register SV *sv, I32 numtype) { - DEBUG_c(PerlIO_printf(Perl_debug_log,"sv_2iuv_non '%s', IV=0x%"UVxf" NV=%g inttype=%"UVxf"\n", SvPVX(sv), SvIVX(sv), SvNVX(sv), (UV)numtype)); + DEBUG_c(PerlIO_printf(Perl_debug_log,"sv_2iuv_non '%s', IV=0x%"UVxf" NV=%g inttype=%"UVXf"\n", SvPVX(sv), SvIVX(sv), SvNVX(sv), (UV)numtype)); if (SvNVX(sv) < (NV)IV_MIN) { (void)SvIOKp_on(sv); (void)SvNOK_on(sv); diff --git a/uconfig.h b/uconfig.h index 03bffe2..93b7d35 100644 --- a/uconfig.h +++ b/uconfig.h @@ -2810,6 +2810,10 @@ * This symbol defines the format string used for printing a Perl UV * as an unsigned hexadecimal integer in lowercase abcdef. */ +/* UVXf: + * This symbol defines the format string used for printing a Perl UV + * as an unsigned hexadecimal integer in uppercase ABCDEF. + */ /* NVef: * This symbol defines the format string used for printing a Perl NV * using %e-ish floating point format. @@ -2826,6 +2830,7 @@ #define UVuf "lu" /**/ #define UVof "lo" /**/ #define UVxf "lx" /**/ +#define UVXf "lX" /**/ #define NVef "e" /**/ #define NVff "f" /**/ #define NVgf "g" /**/ diff --git a/uconfig.sh b/uconfig.sh index 05b633f..e97222a 100755 --- a/uconfig.sh +++ b/uconfig.sh @@ -560,6 +560,7 @@ uvsize='4' uvtype='unsigned long' uvuformat='"lu"' uvxformat='"lx"' +uvXUformat='"lX"' versiononly='undef' voidflags=1 xs_apiversion='5.005' diff --git a/vos/config.alpha.def b/vos/config.alpha.def index b5d5323..1ec2d91 100644 --- a/vos/config.alpha.def +++ b/vos/config.alpha.def @@ -488,6 +488,7 @@ $uvsize='4' $uvtype='unsigned int' $uvuformat='"u"' $uvxformat='"x"' +$uvXUformat='"X"' $vendorarch='' $vendorarchexp='' $vendorlib_stem='' diff --git a/vos/config.alpha.h b/vos/config.alpha.h index 51488ab..7b21420 100644 --- a/vos/config.alpha.h +++ b/vos/config.alpha.h @@ -2795,6 +2795,10 @@ * This symbol defines the format string used for printing a Perl UV * as an unsigned hexadecimal integer in lowercase abcdef. */ +/* UVXf: + * This symbol defines the format string used for printing a Perl UV + * as an unsigned hexadecimal integer in uppercase ABCDEF. + */ /* NVef: * This symbol defines the format string used for printing a Perl NV * using %e-ish floating point format. @@ -2811,6 +2815,7 @@ #define UVuf "u" /**/ #define UVof "o" /**/ #define UVxf "x" /**/ +#define UVXf "X" /**/ #define NVef "e" /**/ #define NVff "f" /**/ #define NVgf "g" /**/ diff --git a/vos/config.ga.def b/vos/config.ga.def index 51a90a4..ab57e08 100644 --- a/vos/config.ga.def +++ b/vos/config.ga.def @@ -488,6 +488,7 @@ $uvsize='4' $uvtype='unsigned int' $uvuformat='"u"' $uvxformat='"x"' +$uvXUformat='"X"' $vendorarch='' $vendorarchexp='' $vendorlib_stem='' diff --git a/vos/config.ga.h b/vos/config.ga.h index 5ba21bb..2a89a1e 100644 --- a/vos/config.ga.h +++ b/vos/config.ga.h @@ -2795,6 +2795,10 @@ * This symbol defines the format string used for printing a Perl UV * as an unsigned hexadecimal integer in lowercase abcdef. */ +/* UVXf: + * This symbol defines the format string used for printing a Perl UV + * as an unsigned hexadecimal integer in uppercase ABCDEF. + */ /* NVef: * This symbol defines the format string used for printing a Perl NV * using %e-ish floating point format. @@ -2811,6 +2815,7 @@ #define UVuf "u" /**/ #define UVof "o" /**/ #define UVxf "x" /**/ +#define UVXf "X" /**/ #define NVef "e" /**/ #define NVff "f" /**/ #define NVgf "g" /**/ diff --git a/win32/config.bc b/win32/config.bc index b535c1a..6e27579 100644 --- a/win32/config.bc +++ b/win32/config.bc @@ -785,6 +785,7 @@ uvsize='4' uvtype='unsigned long' uvuformat='"lu"' uvxformat='"lx"' +uvXUformat='"lX"' vendorarch='' vendorarchexp='' vendorbin='' diff --git a/win32/config.gc b/win32/config.gc index b16032f..14a112e 100644 --- a/win32/config.gc +++ b/win32/config.gc @@ -785,6 +785,7 @@ uvsize='4' uvtype='unsigned long' uvuformat='"lu"' uvxformat='"lx"' +uvXUformat='"lX"' vendorarch='' vendorarchexp='' vendorbin='' diff --git a/win32/config.vc b/win32/config.vc index 34c54db..969b9d4 100644 --- a/win32/config.vc +++ b/win32/config.vc @@ -785,6 +785,7 @@ uvsize='4' uvtype='unsigned long' uvuformat='"lu"' uvxformat='"lx"' +uvXUformat='"lX"' vendorarch='' vendorarchexp='' vendorbin=''