25
25
#if HAVE_BCMATH
26
26
27
27
#include "php_ini.h"
28
+ #include "bcmath_arginfo.h"
28
29
#include "ext/standard/info.h"
29
30
#include "php_bcmath.h"
30
31
#include "libbcmath/src/bcmath.h"
@@ -33,67 +34,6 @@ ZEND_DECLARE_MODULE_GLOBALS(bcmath)
33
34
static PHP_GINIT_FUNCTION (bcmath );
34
35
static PHP_GSHUTDOWN_FUNCTION (bcmath );
35
36
36
- /* {{{ arginfo */
37
- ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX (arginfo_bcadd , 0 , 2 , IS_STRING , 0 )
38
- ZEND_ARG_INFO (0 , left_operand )
39
- ZEND_ARG_INFO (0 , right_operand )
40
- ZEND_ARG_INFO (0 , scale )
41
- ZEND_END_ARG_INFO ()
42
-
43
- ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX (arginfo_bcsub , 0 , 2 , IS_STRING , 0 )
44
- ZEND_ARG_INFO (0 , left_operand )
45
- ZEND_ARG_INFO (0 , right_operand )
46
- ZEND_ARG_INFO (0 , scale )
47
- ZEND_END_ARG_INFO ()
48
-
49
- ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX (arginfo_bcmul , 0 , 2 , IS_STRING , 0 )
50
- ZEND_ARG_INFO (0 , left_operand )
51
- ZEND_ARG_INFO (0 , right_operand )
52
- ZEND_ARG_INFO (0 , scale )
53
- ZEND_END_ARG_INFO ()
54
-
55
- ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX (arginfo_bcdiv , 0 , 2 , IS_STRING , 1 )
56
- ZEND_ARG_INFO (0 , left_operand )
57
- ZEND_ARG_INFO (0 , right_operand )
58
- ZEND_ARG_INFO (0 , scale )
59
- ZEND_END_ARG_INFO ()
60
-
61
- ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX (arginfo_bcmod , 0 , 2 , IS_STRING , 1 )
62
- ZEND_ARG_INFO (0 , left_operand )
63
- ZEND_ARG_INFO (0 , right_operand )
64
- ZEND_ARG_INFO (0 , scale )
65
- ZEND_END_ARG_INFO ()
66
-
67
- ZEND_BEGIN_ARG_INFO_EX (arginfo_bcpowmod , 0 , 0 , 3 )
68
- ZEND_ARG_INFO (0 , x )
69
- ZEND_ARG_INFO (0 , y )
70
- ZEND_ARG_INFO (0 , mod )
71
- ZEND_ARG_INFO (0 , scale )
72
- ZEND_END_ARG_INFO ()
73
-
74
- ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX (arginfo_bcpow , 0 , 2 , IS_STRING , 0 )
75
- ZEND_ARG_INFO (0 , x )
76
- ZEND_ARG_INFO (0 , y )
77
- ZEND_ARG_INFO (0 , scale )
78
- ZEND_END_ARG_INFO ()
79
-
80
- ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX (arginfo_bcsqrt , 0 , 1 , IS_STRING , 1 )
81
- ZEND_ARG_INFO (0 , operand )
82
- ZEND_ARG_INFO (0 , scale )
83
- ZEND_END_ARG_INFO ()
84
-
85
- ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX (arginfo_bccomp , 0 , 2 , IS_LONG , 0 )
86
- ZEND_ARG_INFO (0 , left_operand )
87
- ZEND_ARG_INFO (0 , right_operand )
88
- ZEND_ARG_INFO (0 , scale )
89
- ZEND_END_ARG_INFO ()
90
-
91
- ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX (arginfo_bcscale , 0 , 0 , IS_LONG , 0 )
92
- ZEND_ARG_INFO (0 , scale )
93
- ZEND_END_ARG_INFO ()
94
-
95
- /* }}} */
96
-
97
37
static const zend_function_entry bcmath_functions [] = {
98
38
PHP_FE (bcadd , arginfo_bcadd )
99
39
PHP_FE (bcsub , arginfo_bcsub )
@@ -400,18 +340,18 @@ PHP_FUNCTION(bcmod)
400
340
/* }}} */
401
341
402
342
/* {{{ proto string bcpowmod(string x, string y, string mod [, int scale])
403
- Returns the value of an arbitrary precision number raised to the power of another reduced by a modulous */
343
+ Returns the value of an arbitrary precision number raised to the power of another reduced by a modulus */
404
344
PHP_FUNCTION (bcpowmod )
405
345
{
406
- zend_string * left , * right , * modulous ;
346
+ zend_string * left , * right , * modulus ;
407
347
bc_num first , second , mod , result ;
408
348
zend_long scale = BCG (bc_precision );
409
349
int scale_int ;
410
350
411
351
ZEND_PARSE_PARAMETERS_START (3 , 4 )
412
352
Z_PARAM_STR (left )
413
353
Z_PARAM_STR (right )
414
- Z_PARAM_STR (modulous )
354
+ Z_PARAM_STR (modulus )
415
355
Z_PARAM_OPTIONAL
416
356
Z_PARAM_LONG (scale )
417
357
ZEND_PARSE_PARAMETERS_END ();
@@ -422,7 +362,7 @@ PHP_FUNCTION(bcpowmod)
422
362
bc_init_num (& result );
423
363
php_str2num (& first , ZSTR_VAL (left ));
424
364
php_str2num (& second , ZSTR_VAL (right ));
425
- php_str2num (& mod , ZSTR_VAL (modulous ));
365
+ php_str2num (& mod , ZSTR_VAL (modulus ));
426
366
427
367
scale_int = (int ) ((int )scale < 0 ? 0 : scale );
428
368
0 commit comments