Bcnumber test

ext/bcmath/bcmath.stub.php

@@ -2,39 +2,86 @@
 
 /** @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, RoundingMode $mode = RoundingMode::HalfAwayFromZero): string {}
+    /** @refcount 1 */
+    function bcround(string $num, int $precision = 0, RoundingMode $mode = RoundingMode::HalfAwayFromZero): string {}
+}
+
+namespace BcMath
+{
+    /** @strict-properties */
+    final readonly class Number implements \Stringable
+    {
+        /** @virtual */
+        public string $value;
+        /** @virtual */
+        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, \RoundingMode $mode = \RoundingMode::HalfAwayFromZero): Number {}
+
+        public function compare(Number|string|int $num, ?int $scale = null): int {}
+
+        public function __toString(): string {}
+
+        public function __serialize(): array {}
+
+        public function __unserialize(array $data): void {}
+    }
+}

ext/bcmath/config.m4

@@ -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/config.w32

@@ -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/libbcmath/src/bcmath.h

@@ -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);
+
+bc_num bc_long2num(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 {	\

ext/bcmath/libbcmath/src/divmod.c

@@ -70,6 +70,12 @@ bool bc_divmod(bc_num num1, bc_num num2, bc_num *quot, bc_num *rem, size_t scale
 		*quot = quotient;
 	}
 
+	/* The value of rscale changes during processing. Here we use the value of scale. It's not a typo. */
+	(*rem)->n_scale = MIN(scale, (*rem)->n_scale);
+	if (bc_is_zero(*rem)) {
+		(*rem)->n_sign = PLUS;
+	}
+
 	return true;
 }
 

ext/bcmath/libbcmath/src/long2num.c

@@ -0,0 +1,59 @@
+/*
+   +----------------------------------------------------------------------+
+   | Copyright (c) The PHP Group                                          |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | https://www.php.net/license/3_01.txt                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Saki Takamachi <saki@php.net>                               |
+   +----------------------------------------------------------------------+
+*/
+
+#include "bcmath.h"
+#include <stdbool.h>
+#include "convert.h"
+
+#define BC_LONG_MAX_DIGITS (sizeof(LONG_MIN_DIGITS) - 1)
+
+bc_num bc_long2num(zend_long lval)
+{
+	bc_num num;
+
+	if (UNEXPECTED(lval == 0)) {
+		num = bc_copy_num(BCG(_one_));
+		return num;
+	}
+
+	bool negative = lval < 0;
+	if (UNEXPECTED(lval == LONG_MIN)) {
+		num = bc_new_num_nonzeroed(BC_LONG_MAX_DIGITS, 0);
+		const char *ptr = LONG_MIN_DIGITS;
+		bc_copy_and_toggle_bcd(num->n_value, ptr, ptr + BC_LONG_MAX_DIGITS);
+		num->n_sign = MINUS;
+		return num;
+	} else if (negative) {
+		lval = -lval;
+	}
+
+	zend_long tmp = lval;
+	size_t len = 0;
+	while (tmp > 0) {
+		tmp /= BASE;
+		len++;
+	}
+
+	num = bc_new_num_nonzeroed(len, 0);
+	char *ptr = num->n_value + len - 1;
+	for (; len > 0; len--) {
+		*ptr-- = lval % BASE;
+		lval /= BASE;
+	}
+	num->n_sign = negative ? MINUS : PLUS;
+
+	return num;
+}

ext/bcmath/libbcmath/src/raise.c

@@ -94,9 +94,7 @@ void bc_raise(bc_num num1, long exponent, bc_num *result, size_t scale)
 	} else {
 		bc_free_num (result);
 		*result = temp;
-		if ((*result)->n_scale > rscale) {
-			(*result)->n_scale = rscale;
-		}
+		(*result)->n_scale = MIN(scale, (*result)->n_scale);
 	}
 	bc_free_num (&power);
 }

ext/bcmath/libbcmath/src/rmzero.c

@@ -44,3 +44,16 @@ void _bc_rm_leading_zeros(bc_num num)
 		num->n_len--;
 	}
 }
+
+void bc_rm_trailing_zeros(bc_num num)
+{
+	if (num->n_scale == 0) {
+		return;
+	}
+
+	char *end = num->n_value + num->n_len + num->n_scale - 1;
+	while (*end == 0 && num->n_scale > 0) {
+		num->n_scale--;
+		end--;
+	}
+}