Added try-catch to run_bcmath_tests_function.inc

Author: SakiTakamachi

ext/bcmath/tests/bcpow.phpt

@@ -6,35 +6,7 @@ bcmath
 bcmath.scale=0
 --FILE--
 <?php
-// slightly modified run_bcmath_tests_function.inc for bcpow testing
-const STRING_PADDING = 30;
-function run_bcmath_tests(
-    $firstTerms,
-    $secondTerms,
-    $symbol,
-    $bcmath_function
-) {
-    $scales = [0, 10];
-    foreach ($scales as $scale) {
-        foreach ($firstTerms as $firstTerm) {
-            echo "Number \"$firstTerm\" (scale $scale)\n";
-            foreach ($secondTerms as $secondTerm) {
-                if (in_array($firstTerm, ['0', '-0'], true) && $secondTerm[0] === '-') {
-                    $ret = 'skip negative power of zero';
-                } else {
-                    $ret = $bcmath_function($firstTerm, $secondTerm, $scale);
-                }
-                echo $firstTerm,
-                    " $symbol ",
-                    str_pad($secondTerm, STRING_PADDING),
-                    " = ",
-                    $ret,
-                    "\n";
-            }
-            echo "\n";
-        }
-    }
-}
+require(__DIR__ . "/run_bcmath_tests_function.inc");
 
 $exponents = ["15", "-15", "1", "-9", "0", "-0"];
 $baseNumbers = array_merge($exponents, [
@@ -88,19 +60,19 @@ Number "-9" (scale 0)
 
 Number "0" (scale 0)
 0 ** 15                             = 0
-0 ** -15                            = skip negative power of zero
+0 ** -15                            = Negative power of zero
 0 ** 1                              = 0
-0 ** -9                             = skip negative power of zero
+0 ** -9                             = Negative power of zero
 0 ** 0                              = 1
-0 ** -0                             = skip negative power of zero
+0 ** -0                             = 1
 
 Number "-0" (scale 0)
 -0 ** 15                             = 0
--0 ** -15                            = skip negative power of zero
+-0 ** -15                            = Negative power of zero
 -0 ** 1                              = 0
--0 ** -9                             = skip negative power of zero
+-0 ** -9                             = Negative power of zero
 -0 ** 0                              = 1
--0 ** -0                             = skip negative power of zero
+-0 ** -0                             = 1
 
 Number "14.14" (scale 0)
 14.14 ** 15                             = 180609729388653367
@@ -216,19 +188,19 @@ Number "-9" (scale 10)
 
 Number "0" (scale 10)
 0 ** 15                             = 0.0000000000
-0 ** -15                            = skip negative power of zero
+0 ** -15                            = Negative power of zero
 0 ** 1                              = 0.0000000000
-0 ** -9                             = skip negative power of zero
+0 ** -9                             = Negative power of zero
 0 ** 0                              = 1.0000000000
-0 ** -0                             = skip negative power of zero
+0 ** -0                             = 1.0000000000
 
 Number "-0" (scale 10)
 -0 ** 15                             = 0.0000000000
--0 ** -15                            = skip negative power of zero
+-0 ** -15                            = Negative power of zero
 -0 ** 1                              = 0.0000000000
--0 ** -9                             = skip negative power of zero
+-0 ** -9                             = Negative power of zero
 -0 ** 0                              = 1.0000000000
--0 ** -0                             = skip negative power of zero
+-0 ** -0                             = 1.0000000000
 
 Number "14.14" (scale 10)
 14.14 ** 15                             = 180609729388653367.2586094856

ext/bcmath/tests/run_bcmath_tests_function.inc

@@ -13,11 +13,16 @@ function run_bcmath_tests(
         foreach ($firstTerms as $firstTerm) {
             echo "Number \"$firstTerm\" (scale $scale)\n";
             foreach ($secondTerms as $secondTerm) {
+                try {
+                    $ret = $bcmath_function($firstTerm, $secondTerm, $scale);
+                } catch (Throwable $e) {
+                    $ret = $e->getMessage();
+                }
                 echo $firstTerm,
                     " $symbol ",
                     str_pad($secondTerm, STRING_PADDING),
                     " = ",
-                    $bcmath_function($firstTerm, $secondTerm, $scale),
+                    $ret,
                     "\n";
             }
             echo "\n";