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
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove no longer used magic vtable
[perl5.git]
/
numeric.c
diff --git
a/numeric.c
b/numeric.c
index
77e10e3
..
6720726
100644
(file)
--- a/
numeric.c
+++ b/
numeric.c
@@
-1,7
+1,7
@@
/* numeric.c
*
* Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999,
/* numeric.c
*
* Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- * 2000, 2001, 2002, 2003, 200
5
by Larry Wall and others
+ * 2000, 2001, 2002, 2003, 200
4, 2005, 2006,
by Larry Wall and others
*
* You may distribute under the terms of either the GNU General Public
* License or the Artistic License, as specified in the README file.
*
* You may distribute under the terms of either the GNU General Public
* License or the Artistic License, as specified in the README file.
@@
-30,6
+30,7
@@
values, including such things as replacements for the OS's atof() function
U32
Perl_cast_ulong(pTHX_ NV f)
{
U32
Perl_cast_ulong(pTHX_ NV f)
{
+ PERL_UNUSED_CONTEXT;
if (f < 0.0)
return f < I32_MIN ? (U32) I32_MIN : (U32)(I32) f;
if (f < U32_MAX_P1) {
if (f < 0.0)
return f < I32_MIN ? (U32) I32_MIN : (U32)(I32) f;
if (f < U32_MAX_P1) {
@@
-48,6
+49,7
@@
Perl_cast_ulong(pTHX_ NV f)
I32
Perl_cast_i32(pTHX_ NV f)
{
I32
Perl_cast_i32(pTHX_ NV f)
{
+ PERL_UNUSED_CONTEXT;
if (f < I32_MAX_P1)
return f < I32_MIN ? I32_MIN : (I32) f;
if (f < U32_MAX_P1) {
if (f < I32_MAX_P1)
return f < I32_MIN ? I32_MIN : (I32) f;
if (f < U32_MAX_P1) {
@@
-66,6
+68,7
@@
Perl_cast_i32(pTHX_ NV f)
IV
Perl_cast_iv(pTHX_ NV f)
{
IV
Perl_cast_iv(pTHX_ NV f)
{
+ PERL_UNUSED_CONTEXT;
if (f < IV_MAX_P1)
return f < IV_MIN ? IV_MIN : (IV) f;
if (f < UV_MAX_P1) {
if (f < IV_MAX_P1)
return f < IV_MIN ? IV_MIN : (IV) f;
if (f < UV_MAX_P1) {
@@
-85,6
+88,7
@@
Perl_cast_iv(pTHX_ NV f)
UV
Perl_cast_uv(pTHX_ NV f)
{
UV
Perl_cast_uv(pTHX_ NV f)
{
+ PERL_UNUSED_CONTEXT;
if (f < 0.0)
return f < IV_MIN ? (UV) IV_MIN : (UV)(IV) f;
if (f < UV_MAX_P1) {
if (f < 0.0)
return f < IV_MIN ? (UV) IV_MIN : (UV)(IV) f;
if (f < UV_MAX_P1) {
@@
-498,9
+502,10
@@
bool
Perl_grok_numeric_radix(pTHX_ const char **sp, const char *send)
{
#ifdef USE_LOCALE_NUMERIC
Perl_grok_numeric_radix(pTHX_ const char **sp, const char *send)
{
#ifdef USE_LOCALE_NUMERIC
+ dVAR;
if (PL_numeric_radix_sv && IN_LOCALE) {
STRLEN len;
if (PL_numeric_radix_sv && IN_LOCALE) {
STRLEN len;
- const char
*
radix = SvPV(PL_numeric_radix_sv, len);
+ const char
* const
radix = SvPV(PL_numeric_radix_sv, len);
if (*sp + len <= send && memEQ(*sp, radix, len)) {
*sp += len;
return TRUE;
if (*sp + len <= send && memEQ(*sp, radix, len)) {
*sp += len;
return TRUE;
@@
-543,7
+548,7
@@
int
Perl_grok_number(pTHX_ const char *pv, STRLEN len, UV *valuep)
{
const char *s = pv;
Perl_grok_number(pTHX_ const char *pv, STRLEN len, UV *valuep)
{
const char *s = pv;
- const char *send = pv + len;
+ const char *
const
send = pv + len;
const UV max_div_10 = UV_MAX / 10;
const char max_mod_10 = UV_MAX % 10;
int numtype = 0;
const UV max_div_10 = UV_MAX / 10;
const char max_mod_10 = UV_MAX % 10;
int numtype = 0;
@@
-765,7
+770,7
@@
S_mulexp10(NV value, I32 exponent)
#if ((defined(VMS) && !defined(__IEEE_FP)) || defined(_UNICOS)) && defined(NV_MAX_10_EXP)
STMT_START {
#if ((defined(VMS) && !defined(__IEEE_FP)) || defined(_UNICOS)) && defined(NV_MAX_10_EXP)
STMT_START {
- NV exp_v = log10(value);
+
const
NV exp_v = log10(value);
if (exponent >= NV_MAX_10_EXP || exponent + exp_v >= NV_MAX_10_EXP)
return NV_MAX;
if (exponent < 0) {
if (exponent >= NV_MAX_10_EXP || exponent + exp_v >= NV_MAX_10_EXP)
return NV_MAX;
if (exponent < 0) {
@@
-803,6
+808,7
@@
Perl_my_atof(pTHX_ const char* s)
{
NV x = 0.0;
#ifdef USE_LOCALE_NUMERIC
{
NV x = 0.0;
#ifdef USE_LOCALE_NUMERIC
+ dVAR;
if (PL_numeric_local && IN_LOCALE) {
NV y;
if (PL_numeric_local && IN_LOCALE) {
NV y;