[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard math.c
iliaa Wed Oct 29 20:03:34 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard math.c
Log:
Fixed bug #42294 (Unified solution for round() based on C99 round)
[DOC] New implementation of round() to work-around inconsistencies for win32
and 64 bit platforms.
This solution is very roughly based on BSD's implmentation of round(), which
itself is an implementation of C99 standard. We take the absolute value of
number
we want to round time the 10 to the power of the number of decimal spaces we
are
rounding to. The resulting value is rounded up and the pre-rounded value is
subtracted from it. If the difference is greater then 0.51 we round
up,
otherwise we round down.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/math.c?r1=1.131.2.2.2.6.2.9&r2=1.131.2.2.2.6.2.10&diff_format=u
Index: php-src/ext/standard/math.c
diff -u php-src/ext/standard/math.c:1.131.2.2.2.6.2.9
php-src/ext/standard/math.c:1.131.2.2.2.6.2.10
--- php-src/ext/standard/math.c:1.131.2.2.2.6.2.9 Tue Oct 21 22:08:37 2008
+++ php-src/ext/standard/math.c Wed Oct 29 20:03:34 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: math.c,v 1.131.2.2.2.6.2.9 2008/10/21 22:08:37 lbarnaud Exp $ */
+/* $Id: math.c,v 1.131.2.2.2.6.2.10 2008/10/29 20:03:34 iliaa Exp $ */
#include "php.h"
#include "php_math.h"
@@ -29,26 +29,60 @@
#include
#include
-#ifndef PHP_ROUND_FUZZ
-# ifndef PHP_WIN32
-# define PHP_ROUND_FUZZ 0.501
-# else
-# define PHP_ROUND_FUZZ 0.5
-# endif
-#endif
-#define PHP_ROUND_WITH_FUZZ(val, places) { \
- double tmp_val=val, f = pow(10.0, (double) places); \
- tmp_val *= f; \
- if (tmp_val >= 0.0) { \
- tmp_val = floor(tmp_val + PHP_ROUND_FUZZ); \
- } else {\
- tmp_val = ceil(tmp_val - PHP_ROUND_FUZZ); \
- } \
- tmp_val /= f; \
- val = !zend_isnan(tmp_val) ? tmp_val : val; \
-} \
+/*
+ * Pertains to some of the code found in the php_round() function
+ * Ref: http://www.freebsd.org/cgi/query-pr.cgi?pr=59797
+ *
+ * Copyright (c) 2003, Steven G. Kargl
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice unmodified, this list of conditions, and the following
+ *disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+static double php_round(double val, int places) {
+ double t;
+ double f = pow(10.0, (double) places);
+ double x = val * f;
+
+ if (zend_isinf(x) || zend_isnan(x)) {
+ return val;
+ }
+
+ if (x >= 0.0) {
+ t = ceil(x);
+ if ((t - x) > 0.501) {
+ t -= 1.0;
+ }
+ } else {
+ t = ceil(-x);
+ if ((t + x) > 0.501) {
+ t -= 1.0;
+ }
+ t = -t;
+ }
+ x = t / f;
+ return !zend_isnan(x) ? x : t;
+}
/* {{{ php_asinh
*/
@@ -204,7 +238,7 @@
case IS_DOUBLE:
return_val = (Z_TYPE_PP(value) == IS_LONG) ?
(double)Z_LVAL_PP(value) : Z_DVAL_PP(value);
- PHP_ROUND_WITH_FUZZ(return_val, places);
+ return_val = php_round(return_val, places);
RETURN_DOUBLE(return_val);
break;
@@ -941,7 +975,7 @@
}
dec = MAX(0, dec);
- PHP_ROUND_WITH_FUZZ(d, dec);
+ d = php_round(d, dec);
tmplen = spprintf(&tmpbuf, 0, "%.*F
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard math.c
Thank you Hannes. :-)
- Matt
- Original Message -
From: "Hannes Magnusson"
Sent: Thursday, May 08, 2008
> Congrats on your first commit \o/
> Looking forward to a bunch more :)
>
> -Hannes
>
>
> On Thu, May 8, 2008 at 6:23 AM, Matt Wilmas <[EMAIL PROTECTED]> wrote:
> > mattwil Thu May 8 04:23:26 2008 UTC
> >
> > Modified files: (Branch: PHP_5_3)
> > /php-src/ext/standard math.c
> > Log:
> > Fix build
> >
> >
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/math.c?r1=1.131.2.2.2.6.2.7&r2=1.131.2.2.2.6.2.8&diff_format=u
> > Index: php-src/ext/standard/math.c
> > diff -u php-src/ext/standard/math.c:1.131.2.2.2.6.2.7
php-src/ext/standard/math.c:1.131.2.2.2.6.2.8
> > --- php-src/ext/standard/math.c:1.131.2.2.2.6.2.7 Tue May 6
10:55:49 2008
> > +++ php-src/ext/standard/math.c Thu May 8 04:23:26 2008
> > @@ -19,7 +19,7 @@
> >
+--+
> > */
> >
> > -/* $Id: math.c,v 1.131.2.2.2.6.2.7 2008/05/06 10:55:49 kalle Exp $ */
> > +/* $Id: math.c,v 1.131.2.2.2.6.2.8 2008/05/08 04:23:26 mattwil Exp $
*/
> >
> > #include "php.h"
> > #include "php_math.h"
> > @@ -354,7 +354,7 @@
> > if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &num)
== FAILURE) {
> > return;
> > }
> > - RETURN_DOUBLE(asinh(num));
> > + RETURN_DOUBLE(php_asinh(num));
> > }
> > /* }}} */
> >
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard math.c
Congrats on your first commit \o/
Looking forward to a bunch more :)
-Hannes
On Thu, May 8, 2008 at 6:23 AM, Matt Wilmas <[EMAIL PROTECTED]> wrote:
> mattwil Thu May 8 04:23:26 2008 UTC
>
> Modified files: (Branch: PHP_5_3)
> /php-src/ext/standard math.c
> Log:
> Fix build
>
>
> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/math.c?r1=1.131.2.2.2.6.2.7&r2=1.131.2.2.2.6.2.8&diff_format=u
> Index: php-src/ext/standard/math.c
> diff -u php-src/ext/standard/math.c:1.131.2.2.2.6.2.7
> php-src/ext/standard/math.c:1.131.2.2.2.6.2.8
> --- php-src/ext/standard/math.c:1.131.2.2.2.6.2.7 Tue May 6 10:55:49
> 2008
> +++ php-src/ext/standard/math.c Thu May 8 04:23:26 2008
> @@ -19,7 +19,7 @@
> +--+
> */
>
> -/* $Id: math.c,v 1.131.2.2.2.6.2.7 2008/05/06 10:55:49 kalle Exp $ */
> +/* $Id: math.c,v 1.131.2.2.2.6.2.8 2008/05/08 04:23:26 mattwil Exp $ */
>
> #include "php.h"
> #include "php_math.h"
> @@ -354,7 +354,7 @@
> if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &num) ==
> FAILURE) {
> return;
> }
> - RETURN_DOUBLE(asinh(num));
> + RETURN_DOUBLE(php_asinh(num));
> }
> /* }}} */
>
>
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard math.c
mattwil Thu May 8 04:23:26 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard math.c
Log:
Fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/math.c?r1=1.131.2.2.2.6.2.7&r2=1.131.2.2.2.6.2.8&diff_format=u
Index: php-src/ext/standard/math.c
diff -u php-src/ext/standard/math.c:1.131.2.2.2.6.2.7
php-src/ext/standard/math.c:1.131.2.2.2.6.2.8
--- php-src/ext/standard/math.c:1.131.2.2.2.6.2.7 Tue May 6 10:55:49 2008
+++ php-src/ext/standard/math.c Thu May 8 04:23:26 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: math.c,v 1.131.2.2.2.6.2.7 2008/05/06 10:55:49 kalle Exp $ */
+/* $Id: math.c,v 1.131.2.2.2.6.2.8 2008/05/08 04:23:26 mattwil Exp $ */
#include "php.h"
#include "php_math.h"
@@ -354,7 +354,7 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &num) ==
FAILURE) {
return;
}
- RETURN_DOUBLE(asinh(num));
+ RETURN_DOUBLE(php_asinh(num));
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard math.c
derick Mon May 5 10:09:54 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard math.c
Log:
- Fixed build.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/math.c?r1=1.131.2.2.2.6.2.5&r2=1.131.2.2.2.6.2.6&diff_format=u
Index: php-src/ext/standard/math.c
diff -u php-src/ext/standard/math.c:1.131.2.2.2.6.2.5
php-src/ext/standard/math.c:1.131.2.2.2.6.2.6
--- php-src/ext/standard/math.c:1.131.2.2.2.6.2.5 Mon May 5 07:29:41 2008
+++ php-src/ext/standard/math.c Mon May 5 10:09:54 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: math.c,v 1.131.2.2.2.6.2.5 2008/05/05 07:29:41 kalle Exp $ */
+/* $Id: math.c,v 1.131.2.2.2.6.2.6 2008/05/05 10:09:54 derick Exp $ */
#include "php.h"
#include "php_math.h"
@@ -360,7 +360,7 @@
/* {{{ proto float acosh(float number)
Returns the inverse hyperbolic cosine of the number, i.e. the value whose
hyperbolic cosine is number */
-PHP_FUNCTION(php_acosh)
+PHP_FUNCTION(acosh)
{
double num;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard math.c
felipe Thu Feb 21 17:50:03 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard math.c
Log:
New parameter parsing [DOC]
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/math.c?r1=1.131.2.2.2.6.2.3&r2=1.131.2.2.2.6.2.4&diff_format=u
Index: php-src/ext/standard/math.c
diff -u php-src/ext/standard/math.c:1.131.2.2.2.6.2.3
php-src/ext/standard/math.c:1.131.2.2.2.6.2.4
--- php-src/ext/standard/math.c:1.131.2.2.2.6.2.3 Thu Feb 21 11:53:34 2008
+++ php-src/ext/standard/math.c Thu Feb 21 17:50:03 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: math.c,v 1.131.2.2.2.6.2.3 2008/02/21 11:53:34 tony2001 Exp $ */
+/* $Id: math.c,v 1.131.2.2.2.6.2.4 2008/02/21 17:50:03 felipe Exp $ */
#include "php.h"
#include "php_math.h"
@@ -55,10 +55,9 @@
{
zval **value;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &value) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &value) ==
FAILURE) {
+ return;
}
-
convert_scalar_to_number_ex(value);
if (Z_TYPE_PP(value) == IS_DOUBLE) {
@@ -80,10 +79,9 @@
{
zval **value;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &value) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &value) ==
FAILURE) {
+ return;
}
-
convert_scalar_to_number_ex(value);
if (Z_TYPE_PP(value) == IS_DOUBLE) {
@@ -92,7 +90,6 @@
convert_to_double_ex(value);
RETURN_DOUBLE(Z_DVAL_PP(value));
}
-
RETURN_FALSE;
}
/* }}} */
@@ -103,10 +100,9 @@
{
zval **value;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &value) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z", &value) ==
FAILURE) {
+ return;
}
-
convert_scalar_to_number_ex(value);
if (Z_TYPE_PP(value) == IS_DOUBLE) {
@@ -115,7 +111,6 @@
convert_to_double_ex(value);
RETURN_DOUBLE(Z_DVAL_PP(value));
}
-
RETURN_FALSE;
}
/* }}} */
@@ -124,20 +119,18 @@
Returns the number rounded to specified precision */
PHP_FUNCTION(round)
{
- zval **value, **precision;
+ zval **value;
int places = 0;
+ long precision = 0;
double return_val;
- if (ZEND_NUM_ARGS() < 1 || ZEND_NUM_ARGS() > 2 ||
- zend_get_parameters_ex(ZEND_NUM_ARGS(), &value, &precision) ==
FAILURE) {
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z|l", &value,
&precision) == FAILURE) {
+ return;
}
if (ZEND_NUM_ARGS() == 2) {
- convert_to_long_ex(precision);
- places = (int) Z_LVAL_PP(precision);
+ places = (int) precision;
}
-
convert_scalar_to_number_ex(value);
switch (Z_TYPE_PP(value)) {
@@ -149,11 +142,8 @@
/* break omitted intentionally */
case IS_DOUBLE:
- return_val = (Z_TYPE_PP(value) == IS_LONG) ?
-
(double)Z_LVAL_PP(value) : Z_DVAL_PP(value);
-
+ return_val = (Z_TYPE_PP(value) == IS_LONG) ?
(double)Z_LVAL_PP(value) : Z_DVAL_PP(value);
PHP_ROUND_WITH_FUZZ(return_val, places);
-
RETURN_DOUBLE(return_val);
break;
@@ -168,14 +158,12 @@
Returns the sine of the number in radians */
PHP_FUNCTION(sin)
{
- zval **num;
+ double num;
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &num) == FAILURE)
{
- WRONG_PARAM_COUNT;
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &num) ==
FAILURE) {
+ return;
}
- convert_to_double_ex(num);
- Z_DVAL_P(return_value) = sin(Z_DVAL_PP(num));
- Z_TYPE_P(return_value) = IS_DOUBLE;
+ RETURN_DOUBLE(sin(num));
}
/* }}} */
@@ -183,14 +171,12 @@
Returns the cosine of the number in radians */
PHP_FUNCTION(cos)
{
- zval **num;
-
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &num) == FAILURE)
{
- WRONG_PARAM_COUNT;
+ double num;
+
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &num) ==
FAILURE) {
+ return;
}
- convert_to_double_ex(num);
- Z_DVAL_P(return_value) = cos(Z_DVAL_PP(num));
- Z_TYPE_P(return_value) = IS_DOUBLE;
+ RETURN_DOUBLE(cos(num));
}
/* }}} */
@@ -198,14 +184,12 @@
Returns the tangent of the number in radians */
PHP_FUNCTION(tan)
{
- zval **num;
+ double
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard math.c
tony2001Thu Feb 21 11:53:35 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard math.c
Log:
ws->tab fixes
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/math.c?r1=1.131.2.2.2.6.2.2&r2=1.131.2.2.2.6.2.3&diff_format=u
Index: php-src/ext/standard/math.c
diff -u php-src/ext/standard/math.c:1.131.2.2.2.6.2.2
php-src/ext/standard/math.c:1.131.2.2.2.6.2.3
--- php-src/ext/standard/math.c:1.131.2.2.2.6.2.2 Tue Feb 12 07:15:40 2008
+++ php-src/ext/standard/math.c Thu Feb 21 11:53:34 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: math.c,v 1.131.2.2.2.6.2.2 2008/02/12 07:15:40 zoe Exp $ */
+/* $Id: math.c,v 1.131.2.2.2.6.2.3 2008/02/21 11:53:34 tony2001 Exp $ */
#include "php.h"
#include "php_math.h"
@@ -471,14 +471,13 @@
Returns e raised to the power of the number */
PHP_FUNCTION(exp)
{
-double num;
+ double num;
-if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &num) ==
FAILURE) {
-return;
-}
-
-RETURN_DOUBLE(exp(num));
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &num) ==
FAILURE) {
+ return;
+ }
+ RETURN_DOUBLE(exp(num));
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard math.c /ext/standard/tests/math exp_error.phpt
@@ -471,14 +471,14 @@
Returns e raised to the power of the number */
PHP_FUNCTION(exp)
{
- zval **num;
+double num;
+
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &num)
== FAILURE) {
+return;
+}
+
+RETURN_DOUBLE(exp(num));
you have spaces there instead of tabs.
Nuno
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard math.c /ext/standard/tests/math exp_error.phpt
zoe Tue Feb 12 07:15:41 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard math.c
/php-src/ext/standard/tests/mathexp_error.phpt
Log:
Fixing 44092
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/math.c?r1=1.131.2.2.2.6.2.1&r2=1.131.2.2.2.6.2.2&diff_format=u
Index: php-src/ext/standard/math.c
diff -u php-src/ext/standard/math.c:1.131.2.2.2.6.2.1
php-src/ext/standard/math.c:1.131.2.2.2.6.2.2
--- php-src/ext/standard/math.c:1.131.2.2.2.6.2.1 Mon Dec 31 07:17:15 2007
+++ php-src/ext/standard/math.c Tue Feb 12 07:15:40 2008
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: math.c,v 1.131.2.2.2.6.2.1 2007/12/31 07:17:15 sebastian Exp $ */
+/* $Id: math.c,v 1.131.2.2.2.6.2.2 2008/02/12 07:15:40 zoe Exp $ */
#include "php.h"
#include "php_math.h"
@@ -471,14 +471,14 @@
Returns e raised to the power of the number */
PHP_FUNCTION(exp)
{
- zval **num;
+double num;
+
+if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &num) ==
FAILURE) {
+return;
+}
+
+RETURN_DOUBLE(exp(num));
- if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &num) == FAILURE)
{
- WRONG_PARAM_COUNT;
- }
- convert_to_double_ex(num);
- Z_DVAL_P(return_value) = exp(Z_DVAL_PP(num));
- Z_TYPE_P(return_value) = IS_DOUBLE;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/math/exp_error.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/math/exp_error.phpt
diff -u php-src/ext/standard/tests/math/exp_error.phpt:1.1.2.2
php-src/ext/standard/tests/math/exp_error.phpt:1.1.2.3
--- php-src/ext/standard/tests/math/exp_error.phpt:1.1.2.2 Wed Feb 6
08:44:24 2008
+++ php-src/ext/standard/tests/math/exp_error.phpt Tue Feb 12 07:15:40 2008
@@ -9,6 +9,6 @@
?>
--EXPECTF--
-Warning: Wrong parameter count for exp() in %s on line 2
+Warning: exp() expects exactly 1 parameter, 0 given in %s on line %d
-Warning: Wrong parameter count for exp() in %s on line 3
+Warning: exp() expects exactly 1 parameter, 2 given in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
