wip

Author: SakiTakamachi

ext/bcmath/bcmath.c

@@ -1008,6 +1008,7 @@ static inline void bcmath_number_add_internal(
 		*scale = MAX(n1_full_scale, n2_full_scale);
 	}
 	*ret = bc_add(n1, n2, *scale);
+	bc_rm_trailing_zeros(*ret);
 }
 
 static inline void bcmath_number_sub_internal(
@@ -1018,6 +1019,7 @@ static inline void bcmath_number_sub_internal(
 		*scale = MAX(n1_full_scale, n2_full_scale);
 	}
 	*ret = bc_sub(n1, n2, *scale);
+	bc_rm_trailing_zeros(*ret);
 }
 
 static inline void bcmath_number_mul_internal(
@@ -1028,6 +1030,7 @@ static inline void bcmath_number_mul_internal(
 		*scale = n1_full_scale + n2_full_scale;
 	}
 	*ret = bc_multiply(n1, n2, *scale);
+	bc_rm_trailing_zeros(*ret);
 }
 
 static inline zend_result bcmath_number_div_internal(
@@ -1041,6 +1044,12 @@ static inline zend_result bcmath_number_div_internal(
 		zend_throw_exception_ex(zend_ce_division_by_zero_error, 0, "Division by zero");
 		return FAILURE;
 	}
+	size_t ret_scale = (*ret)->n_scale;
+	bc_rm_trailing_zeros(*ret);
+	if (auto_scale) {
+		size_t diff = ret_scale - (*ret)->n_scale;
+		*scale -= diff > BC_MATH_NUMBER_MAX_EX_SCALE ? BC_MATH_NUMBER_MAX_EX_SCALE : diff;
+	}
 	return SUCCESS;
 }
 
@@ -1055,6 +1064,7 @@ static inline zend_result bcmath_number_mod_internal(
 		zend_throw_exception_ex(zend_ce_division_by_zero_error, 0, "Modulo by zero");
 		return FAILURE;
 	}
+	bc_rm_trailing_zeros(*ret);
 	return SUCCESS;
 }
 
@@ -1073,11 +1083,13 @@ static inline zend_result bcmath_number_pow_internal(
 	}
 	long exponent = bc_num2long(n2);
 
+	bool scale_expand = false;
 	if (auto_scale) {
 		if (exponent > 0) {
 			*scale = n1_full_scale * exponent;
 		} else if (exponent < 0) {
 			*scale = n1_full_scale + BC_MATH_NUMBER_MAX_EX_SCALE;
+			scale_expand = true;
 		} else {
 			*scale = 0;
 		}
@@ -1092,6 +1104,12 @@ static inline zend_result bcmath_number_pow_internal(
 		return FAILURE;
 	}
 	bc_raise(n1, exponent, ret, *scale);
+	size_t ret_scale = (*ret)->n_scale;
+	bc_rm_trailing_zeros(*ret);
+	if (scale_expand) {
+		size_t diff = ret_scale - (*ret)->n_scale;
+		*scale -= diff > BC_MATH_NUMBER_MAX_EX_SCALE ? BC_MATH_NUMBER_MAX_EX_SCALE : diff;
+	}
 	return SUCCESS;
 }
 
@@ -1382,6 +1400,8 @@ PHP_METHOD(BcMath_Number, powmod)
 		bc_free_num(&modulus_num);
 	}
 
+	bc_rm_trailing_zeros(ret);
+
 	bcmath_number_obj_t *new_intern = bcmath_number_new_obj(ret, scale);
 	RETURN_OBJ(&new_intern->std);
 
@@ -1413,7 +1433,7 @@ PHP_METHOD(BcMath_Number, sqrt)
 
 	size_t scale;
 	if (scale_is_null) {
-		scale = intern->num->n_scale;
+		scale = intern->scale + BC_MATH_NUMBER_MAX_EX_SCALE;
 	} else {
 		scale = arg_scale;
 	}
@@ -1425,6 +1445,13 @@ PHP_METHOD(BcMath_Number, sqrt)
 		RETURN_THROWS();
 	}
 
+	size_t ret_scale = ret->n_scale;
+	bc_rm_trailing_zeros(ret);
+	if (scale_is_null) {
+		size_t diff = ret_scale - ret->n_scale;
+		scale -= diff > BC_MATH_NUMBER_MAX_EX_SCALE ? BC_MATH_NUMBER_MAX_EX_SCALE : diff;
+	}
+
 	bcmath_number_obj_t *new_intern = bcmath_number_new_obj(ret, scale);
 	RETURN_OBJ(&new_intern->std);
 }
@@ -1522,6 +1549,8 @@ PHP_METHOD(BcMath_Number, round)
 	bc_num ret = NULL;
 	bc_round(intern->num, precision, rounding_mode, &ret);
 
+	bc_rm_trailing_zeros(ret);
+
 	bcmath_number_obj_t *new_intern = bcmath_number_new_obj(ret, ret->n_scale);
 	RETURN_OBJ(&new_intern->std);
 }

ext/bcmath/libbcmath/src/bcmath.h

@@ -124,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/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--;
+	}
+}