From: Antony Dovgal <tony2001@php.net>
Date: Thu, 26 Apr 2007 13:44:02 +0000 (+0000)
Subject: MFH: add test & GMP_VERSION constant
X-Git-Tag: php-5.2.2RC2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e7b4e5d1a5de612256b7324b5d8a22ca2cd34a3;p=php

MFH: add test & GMP_VERSION constant
do not allow zero operand in gmp_divexact()
---

diff --git a/NEWS b/NEWS
index 82ad920084..cf593caa1f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? Apr 2007, PHP 5.2.2RC2
+- Added GMP_VERSION constant. (Tony)
 - Fixed commandline handling fro CLI and CGI. (Marcus, Johannes)
 - Upgraded SQLite 3 to version 3.3.16 (Ilia)
 - Updated timezone database to version 2007.5. (Derick)
diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c
index b8e036ee62..6610a8c00a 100644
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@@ -389,6 +389,7 @@ ZEND_MODULE_STARTUP_D(gmp)
 	REGISTER_LONG_CONSTANT("GMP_ROUND_ZERO", GMP_ROUND_ZERO, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GMP_ROUND_PLUSINF", GMP_ROUND_PLUSINF, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("GMP_ROUND_MINUSINF", GMP_ROUND_MINUSINF, CONST_CS | CONST_PERSISTENT);
+	REGISTER_STRING_CONSTANT("GMP_VERSION", (char *)gmp_version, CONST_CS | CONST_PERSISTENT);
 
 	mp_set_memory_functions(gmp_emalloc, gmp_erealloc, gmp_efree);
 
@@ -415,6 +416,7 @@ ZEND_MODULE_INFO_D(gmp)
 {
 	php_info_print_table_start();
 	php_info_print_table_row(2, "gmp support", "enabled");
+	php_info_print_table_row(2, "GMP version", gmp_version);
 	php_info_print_table_end();
 }
 /* }}} */
@@ -996,7 +998,13 @@ ZEND_FUNCTION(gmp_mod)
    Divide a by b using exact division algorithm */
 ZEND_FUNCTION(gmp_divexact)
 {
-	gmp_binary_op(mpz_divexact);
+	zval **a_arg, **b_arg;
+
+	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &a_arg, &b_arg) == FAILURE){
+		WRONG_PARAM_COUNT;
+	}
+	
+	gmp_zval_binary_ui_op_ex(return_value, a_arg, b_arg, mpz_divexact, NULL, 0, 1 TSRMLS_CC);
 }
 /* }}} */
 
diff --git a/ext/gmp/tests/011.phpt b/ext/gmp/tests/011.phpt
new file mode 100644
index 0000000000..1f7097a0d8
--- /dev/null
+++ b/ext/gmp/tests/011.phpt
@@ -0,0 +1,41 @@
+--TEST--
+gmp_divexact() tests (OK to fail with GMP =< 4.2.1)
+--FILE--
+<?php
+
+$r = gmp_divexact("233", "23345555555555555555555555");
+var_dump(gmp_strval($r));
+
+$r = gmp_divexact("233", "0");
+var_dump(gmp_strval($r));
+
+$r = gmp_divexact("100", "10");
+var_dump(gmp_strval($r));
+
+$r = gmp_divexact("1024", "2");
+var_dump(gmp_strval($r));
+
+$n = gmp_init("10000000000000000000");
+$r = gmp_divexact($n, "2");
+var_dump(gmp_strval($r));
+
+$r = gmp_divexact($n, "50");
+var_dump(gmp_strval($r));
+
+$n1 = gmp_init("-100000000000000000000000000");
+$r = gmp_divexact($n1, $n);
+var_dump(gmp_strval($r));
+
+echo "Done\n";
+?>
+--EXPECTF--	
+string(1) "0"
+
+Warning: gmp_divexact(): Zero operand not allowed in %s on line %d
+string(1) "0"
+string(2) "10"
+string(3) "512"
+string(19) "5000000000000000000"
+string(18) "200000000000000000"
+string(9) "-10000000"
+Done