Refactor bc_raise() to get rid of Zend dependencies

This seperates the concerns of throwing exceptions back into the PHP_FUNCTION instead of being the responsability of the library

Author: Girgias

ext/bcmath/bcmath.c

@@ -501,7 +501,7 @@ PHP_FUNCTION(bcpow)
 	zend_string *left, *right;
 	zend_long scale_param;
 	bool scale_param_is_null = 1;
-	bc_num first, second, result;
+	bc_num first, bc_exponent, result;
 	int scale = BCG(bc_precision);
 
 	ZEND_PARSE_PARAMETERS_START(2, 3)
@@ -521,26 +521,37 @@ PHP_FUNCTION(bcpow)
 	}
 
 	bc_init_num(&first);
-	bc_init_num(&second);
+	bc_init_num(&bc_exponent);
 	bc_init_num(&result);
 
 	if (php_str2num(&first, ZSTR_VAL(left)) == FAILURE) {
 		zend_argument_value_error(1, "is not well-formed");
 		goto cleanup;
 	}
 
-	if (php_str2num(&second, ZSTR_VAL(right)) == FAILURE) {
+	if (php_str2num(&bc_exponent, ZSTR_VAL(right)) == FAILURE) {
 		zend_argument_value_error(2, "is not well-formed");
 		goto cleanup;
 	}
 
-	bc_raise (first, second, &result, scale);
+	/* Check the exponent for scale digits and convert to a long. */
+	if (bc_exponent->n_scale != 0) {
+		zend_argument_value_error(2, "cannot have a fractional part");
+		goto cleanup;
+	}
+	long exponent = bc_num2long(bc_exponent);
+	if (exponent == 0 && (bc_exponent->n_len > 1 || bc_exponent->n_value[0] != 0)) {
+		zend_argument_value_error(2, "is too large");
+		goto cleanup;
+	}
+
+	bc_raise(first, exponent, &result, scale);
 
 	RETVAL_STR(bc_num2str_ex(result, scale));
 
 	cleanup: {
 		bc_free_num(&first);
-		bc_free_num(&second);
+		bc_free_num(&bc_exponent);
 		bc_free_num(&result);
 	};
 }

ext/bcmath/libbcmath/src/bcmath.h

@@ -135,7 +135,9 @@ typedef enum {
 
 raise_mod_status bc_raisemod(bc_num base, bc_num expo, bc_num mod, bc_num *result, size_t scale);
 
-void bc_raise(bc_num num1, bc_num num2, bc_num *resul, size_t scale);
+void bc_raise(bc_num base, long exponent, bc_num *resul, size_t scale);
+
+void bc_raise_bc_exponent(bc_num base, bc_num exponent, bc_num *resul, size_t scale);
 
 bool bc_sqrt(bc_num *num, size_t scale);
 

ext/bcmath/libbcmath/src/raise.c

@@ -30,37 +30,23 @@
 *************************************************************************/
 
 #include "bcmath.h"
+#include <assert.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include "zend_exceptions.h" /* zend_argument_value_error() */
 
 
 /* Raise NUM1 to the NUM2 power.  The result is placed in RESULT.
    Maximum exponent is LONG_MAX.  If a NUM2 is not an integer,
    only the integer part is used.  */
 
-void bc_raise(bc_num num1, bc_num num2, bc_num *result, size_t scale)
+void bc_raise(bc_num num1, long exponent, bc_num *result, size_t scale)
 {
 	bc_num temp, power;
-	long exponent;
 	size_t rscale;
 	size_t pwrscale;
 	size_t calcscale;
 	bool is_neg;
 
-	/* Check the exponent for scale digits and convert to a long. */
-	if (num2->n_scale != 0) {
-		/* 2nd argument from PHP_FUNCTION(bcpow) */
-		zend_argument_value_error(2, "cannot have a fractional part");
-		return;
-	}
-	exponent = bc_num2long (num2);
-	if (exponent == 0 && (num2->n_len > 1 || num2->n_value[0] != 0)) {
-		/* 2nd argument from PHP_FUNCTION(bcpow) */
-		zend_argument_value_error(2, "is too large");
-		return;
-	}
-
 	/* Special case if exponent is a zero. */
 	if (exponent == 0) {
 		bc_free_num (result);
@@ -114,3 +100,20 @@ void bc_raise(bc_num num1, bc_num num2, bc_num *result, size_t scale)
 	}
 	bc_free_num (&power);
 }
+
+/* This is used internally by BCMath */
+void bc_raise_bc_exponent(bc_num base, bc_num expo, bc_num *result, size_t scale)
+{
+	/* Exponent must not have fractional part */
+	assert(expo->n_scale == 0);
+
+	long exponent = bc_num2long(expo);
+	/* Exponent must be properly convertable to long */
+	if (exponent == 0 && (expo->n_len > 1 || expo->n_value[0] != 0)) {
+		assert(false && "Exponent is not well formed in internal call");
+		//assert(exponent != 0 || (expo->n_len == 0 && expo->n_value[0] == 0));
+	}
+	//assert(exponent != 0 || (expo->n_len == 0 && expo->n_value[0] == 0));
+	bc_raise(base, exponent, result, scale);
+}
+

ext/bcmath/libbcmath/src/sqrt.c

@@ -81,7 +81,7 @@ bool bc_sqrt(bc_num *num, size_t scale)
 		bc_int2num (&guess1,(*num)->n_len);
 		bc_multiply (guess1, point5, &guess1, 0);
 		guess1->n_scale = 0;
-		bc_raise (guess, guess1, &guess, 0);
+		bc_raise_bc_exponent(guess, guess1, &guess, 0);
 		bc_free_num (&guess1);
 		cscale = 3;
 	}