wip

Author: SakiTakamachi

ext/bcmath/bcmath.c

@@ -2,39 +2,80 @@
 
 /** @generate-class-entries */
 
-/** @refcount 1 */
-function bcadd(string $num1, string $num2, ?int $scale = null): string {}
+namespace {
+    /** @refcount 1 */
+    function bcadd(string $num1, string $num2, ?int $scale = null): string {}
 
-/** @refcount 1 */
-function bcsub(string $num1, string $num2, ?int $scale = null): string {}
+    /** @refcount 1 */
+    function bcsub(string $num1, string $num2, ?int $scale = null): string {}
 
-/** @refcount 1 */
-function bcmul(string $num1, string $num2, ?int $scale = null): string {}
+    /** @refcount 1 */
+    function bcmul(string $num1, string $num2, ?int $scale = null): string {}
 
-/** @refcount 1 */
-function bcdiv(string $num1, string $num2, ?int $scale = null): string {}
+    /** @refcount 1 */
+    function bcdiv(string $num1, string $num2, ?int $scale = null): string {}
 
-/** @refcount 1 */
-function bcmod(string $num1, string $num2, ?int $scale = null): string {}
+    /** @refcount 1 */
+    function bcmod(string $num1, string $num2, ?int $scale = null): string {}
 
-/** @refcount 1 */
-function bcpowmod(string $num, string $exponent, string $modulus, ?int $scale = null): string {}
+    /** @refcount 1 */
+    function bcpowmod(string $num, string $exponent, string $modulus, ?int $scale = null): string {}
 
-/** @refcount 1 */
-function bcpow(string $num, string $exponent, ?int $scale = null): string {}
+    /** @refcount 1 */
+    function bcpow(string $num, string $exponent, ?int $scale = null): string {}
 
-/** @refcount 1 */
-function bcsqrt(string $num, ?int $scale = null): string {}
+    /** @refcount 1 */
+    function bcsqrt(string $num, ?int $scale = null): string {}
 
-function bccomp(string $num1, string $num2, ?int $scale = null): int {}
+    function bccomp(string $num1, string $num2, ?int $scale = null): int {}
 
-function bcscale(?int $scale = null): int {}
+    function bcscale(?int $scale = null): int {}
 
-/** @refcount 1 */
-function bcfloor(string $num): string {}
+    /** @refcount 1 */
+    function bcfloor(string $num): string {}
 
-/** @refcount 1 */
-function bcceil(string $num): string {}
+    /** @refcount 1 */
+    function bcceil(string $num): string {}
 
-/** @refcount 1 */
-function bcround(string $num, int $precision = 0, int $mode = PHP_ROUND_HALF_UP): string {}
+    /** @refcount 1 */
+    function bcround(string $num, int $precision = 0, int $mode = PHP_ROUND_HALF_UP): string {}
+}
+
+namespace BcMath {
+    final readonly class Number implements \Stringable {
+        public string $value;
+        public int $scale;
+
+        public function __construct(string|int $num) {}
+
+        public function add(Number|string|int $num, ?int $scale = null): Number {}
+
+        public function sub(Number|string|int $num, ?int $scale = null): Number {}
+
+        public function mul(Number|string|int $num, ?int $scale = null): Number {}
+
+        public function div(Number|string|int $num, ?int $scale = null): Number {}
+
+        public function mod(Number|string|int $num, ?int $scale = null): Number {}
+
+        public function powmod(Number|string|int $exponent, Number|string|int $modulus, ?int $scale = null): Number {}
+
+        public function pow(Number|string|int $exponent, ?int $scale = null): Number {}
+
+        public function sqrt(?int $scale = null): Number {}
+
+        public function floor(): Number {}
+
+        public function ceil(): Number {}
+
+        public function round(int $precision = 0, int $mode = PHP_ROUND_HALF_UP): Number {}
+
+        public function comp(Number|string|int $num, ?int $scale = null): int {}
+
+        public function __toString(): string {}
+
+        public function __serialize(): array {}
+
+        public function __unserialize(array $data): void {}
+    }
+}

ext/bcmath/bcmath.stub.php

@@ -13,6 +13,7 @@ if test "$PHP_BCMATH" != "no"; then
     libbcmath/src/divmod.c
     libbcmath/src/doaddsub.c
     libbcmath/src/floor_or_ceil.c
+    libbcmath/src/long2num.c
     libbcmath/src/init.c
     libbcmath/src/int2num.c
     libbcmath/src/nearzero.c

ext/bcmath/bcmath_arginfo.h

@@ -5,7 +5,7 @@ ARG_ENABLE("bcmath", "bc style precision math functions", "yes");
 if (PHP_BCMATH == "yes") {
 	EXTENSION("bcmath", "bcmath.c",	null, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
 	ADD_SOURCES("ext/bcmath/libbcmath/src", "add.c div.c init.c neg.c \
-		raisemod.c sub.c compare.c divmod.c int2num.c \
+		raisemod.c sub.c compare.c divmod.c int2num.c long2num.c \
 		num2long.c recmul.c sqrt.c zero.c doaddsub.c \
 		floor_or_ceil.c nearzero.c num2str.c raise.c rmzero.c str2num.c \
 		round.c convert.c", "bcmath");

ext/bcmath/config.m4

@@ -98,7 +98,9 @@ static inline bc_num bc_copy_num(bc_num num)
 
 void bc_init_num(bc_num *num);
 
-bool bc_str2num(bc_num *num, const char *str, const char *end, size_t scale, bool auto_scale);
+bool bc_str2num(bc_num *num, const char *str, const char *end, size_t scale, size_t *full_scale, bool auto_scale);
+
+void bc_long2num(bc_num *num, zend_long lval);
 
 zend_string *bc_num2str_ex(bc_num num, size_t scale);
 
@@ -122,6 +124,8 @@ bool bc_is_near_zero(bc_num num, size_t scale);
 
 bool bc_is_neg(bc_num num);
 
+void bc_rm_trailing_zeros(bc_num num);
+
 bc_num bc_add(bc_num n1, bc_num n2, size_t scale_min);
 
 #define bc_add_ex(n1, n2, result, scale_min) do {	\
@@ -146,7 +150,7 @@ bc_num bc_multiply(bc_num n1, bc_num n2, size_t scale);
 	*(result) = mul_ex;                             \
 } while (0)
 
-bool bc_divide(bc_num n1, bc_num n2, bc_num *quot, int scale);
+bool bc_divide(bc_num n1, bc_num n2, bc_num *quot, size_t scale);
 
 bool bc_modulo(bc_num num1, bc_num num2, bc_num *resul, size_t scale);
 

ext/bcmath/config.w32

@@ -295,7 +295,7 @@ static void bc_do_div(char *n1, size_t n1_readable_len, size_t n1_bottom_extensi
 	efree(n1_vector);
 }
 
-bool bc_divide(bc_num n1, bc_num n2, bc_num *quot, int scale)
+bool bc_divide(bc_num n1, bc_num n2, bc_num *quot, size_t scale)
 {
 	/* divide by zero */
 	if (bc_is_zero(n2)) {