dsp Wed, 25 Nov 2009 18:15:25 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=291320
Log:
Really use 62 as the upper boundary as requested and not 32.
Changed paths:
U php/php-src/branches/PHP_5_2/ext/gmp/gmp.c
U php/php-src/branches/PHP_5_2/ext/gmp/tests/bug50283.phpt
U php/php-src/branches/PHP_5_3/ext/gmp/gmp.c
U php/php-src/branches/PHP_5_3/ext/gmp/tests/bug50283.phpt
U php/php-src/trunk/ext/gmp/gmp.c
U php/php-src/trunk/ext/gmp/tests/bug50283.phpt
Modified: php/php-src/branches/PHP_5_2/ext/gmp/gmp.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/gmp/gmp.c 2009-11-25 16:53:25 UTC (rev 291319)
+++ php/php-src/branches/PHP_5_2/ext/gmp/gmp.c 2009-11-25 18:15:25 UTC (rev 291320)
@@ -817,7 +817,7 @@
break;
}
- if ((base < 2 && base > -2) || base > 36 || base < -36) {
+ if ((base < 2 && base > -2) || base > 62 || base < -36) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad base for conversion: %d", base);
RETURN_FALSE;
}
Modified: php/php-src/branches/PHP_5_2/ext/gmp/tests/bug50283.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/gmp/tests/bug50283.phpt 2009-11-25 16:53:25 UTC (rev 291319)
+++ php/php-src/branches/PHP_5_2/ext/gmp/tests/bug50283.phpt 2009-11-25 18:15:25 UTC (rev 291320)
@@ -5,25 +5,29 @@
--FILE--
<?php
$a = gmp_init("0x41682179fbf5");
-printf("Decimal: %s, 36-based: %s\n", gmp_strval($a), gmp_strval($a,-36));
+printf("Decimal: %s, -36-based: %s\n", gmp_strval($a), gmp_strval($a,-36));
printf("Decimal: %s, 36-based: %s\n", gmp_strval($a), gmp_strval($a,36));
-printf("Decimal: %s, 36-based: %s\n", gmp_strval($a), gmp_strval($a,-1));
-printf("Decimal: %s, 36-based: %s\n", gmp_strval($a), gmp_strval($a,1));
-printf("Decimal: %s, 36-based: %s\n", gmp_strval($a), gmp_strval($a,-37));
-printf("Decimal: %s, 36-based: %s\n", gmp_strval($a), gmp_strval($a,37));
+printf("Decimal: %s, -1-based: %s\n", gmp_strval($a), gmp_strval($a,-1));
+printf("Decimal: %s, 1-based: %s\n", gmp_strval($a), gmp_strval($a,1));
+printf("Decimal: %s, -37-based: %s\n", gmp_strval($a), gmp_strval($a,-37));
+printf("Decimal: %s, 37-based: %s\n", gmp_strval($a), gmp_strval($a,37));
+printf("Decimal: %s, 62-based: %s\n", gmp_strval($a), gmp_strval($a,62));
+printf("Decimal: %s, 63-based: %s\n", gmp_strval($a), gmp_strval($a,63));
?>
--EXPECTF--
-Decimal: 71915494046709, 36-based: PHPISCOOL
+Decimal: 71915494046709, -36-based: PHPISCOOL
Decimal: 71915494046709, 36-based: phpiscool
Warning: gmp_strval(): Bad base for conversion: -1 in %s on line 5
-Decimal: 71915494046709, 36-based:
+Decimal: 71915494046709, -1-based:
Warning: gmp_strval(): Bad base for conversion: 1 in %s on line 6
-Decimal: 71915494046709, 36-based:
+Decimal: 71915494046709, 1-based:
Warning: gmp_strval(): Bad base for conversion: -37 in %s on line 7
-Decimal: 71915494046709, 36-based:
+Decimal: 71915494046709, -37-based:
+Decimal: 71915494046709, 37-based: KHKATELJF
+Decimal: 71915494046709, 62-based: KQ6yq741
-Warning: gmp_strval(): Bad base for conversion: 37 in %s on line 8
-Decimal: 71915494046709, 36-based:
+Warning: gmp_strval(): Bad base for conversion: 63 in %s on line 10
+Decimal: 71915494046709, 63-based:
Modified: php/php-src/branches/PHP_5_3/ext/gmp/gmp.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/gmp/gmp.c 2009-11-25 16:53:25 UTC (rev 291319)
+++ php/php-src/branches/PHP_5_3/ext/gmp/gmp.c 2009-11-25 18:15:25 UTC (rev 291320)
@@ -796,7 +796,7 @@
return;
}
- if ((base < 2 && base > -2) || base > 36 || base < -36) {
+ if ((base < 2 && base > -2) || base > 62 || base < -36) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad base for conversion: %ld", base);
RETURN_FALSE;
}
Modified: php/php-src/branches/PHP_5_3/ext/gmp/tests/bug50283.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/gmp/tests/bug50283.phpt 2009-11-25 16:53:25 UTC (rev 291319)
+++ php/php-src/branches/PHP_5_3/ext/gmp/tests/bug50283.phpt 2009-11-25 18:15:25 UTC (rev 291320)
@@ -5,25 +5,29 @@
--FILE--
<?php
$a = gmp_init("0x41682179fbf5");
-printf("Decimal: %s, 36-based: %s\n", gmp_strval($a), gmp_strval($a,-36));
+printf("Decimal: %s, -36-based: %s\n", gmp_strval($a), gmp_strval($a,-36));
printf("Decimal: %s, 36-based: %s\n", gmp_strval($a), gmp_strval($a,36));
-printf("Decimal: %s, 36-based: %s\n", gmp_strval($a), gmp_strval($a,-1));
-printf("Decimal: %s, 36-based: %s\n", gmp_strval($a), gmp_strval($a,1));
-printf("Decimal: %s, 36-based: %s\n", gmp_strval($a), gmp_strval($a,-37));
-printf("Decimal: %s, 36-based: %s\n", gmp_strval($a), gmp_strval($a,37));
+printf("Decimal: %s, -1-based: %s\n", gmp_strval($a), gmp_strval($a,-1));
+printf("Decimal: %s, 1-based: %s\n", gmp_strval($a), gmp_strval($a,1));
+printf("Decimal: %s, -37-based: %s\n", gmp_strval($a), gmp_strval($a,-37));
+printf("Decimal: %s, 37-based: %s\n", gmp_strval($a), gmp_strval($a,37));
+printf("Decimal: %s, 62-based: %s\n", gmp_strval($a), gmp_strval($a,62));
+printf("Decimal: %s, 63-based: %s\n", gmp_strval($a), gmp_strval($a,63));
?>
--EXPECTF--
-Decimal: 71915494046709, 36-based: PHPISCOOL
+Decimal: 71915494046709, -36-based: PHPISCOOL
Decimal: 71915494046709, 36-based: phpiscool
Warning: gmp_strval(): Bad base for conversion: -1 in %s on line 5
-Decimal: 71915494046709, 36-based:
+Decimal: 71915494046709, -1-based:
Warning: gmp_strval(): Bad base for conversion: 1 in %s on line 6
-Decimal: 71915494046709, 36-based:
+Decimal: 71915494046709, 1-based:
Warning: gmp_strval(): Bad base for conversion: -37 in %s on line 7
-Decimal: 71915494046709, 36-based:
+Decimal: 71915494046709, -37-based:
+Decimal: 71915494046709, 37-based: KHKATELJF
+Decimal: 71915494046709, 62-based: KQ6yq741
-Warning: gmp_strval(): Bad base for conversion: 37 in %s on line 8
-Decimal: 71915494046709, 36-based:
+Warning: gmp_strval(): Bad base for conversion: 63 in %s on line 10
+Decimal: 71915494046709, 63-based:
Modified: php/php-src/trunk/ext/gmp/gmp.c
===================================================================
--- php/php-src/trunk/ext/gmp/gmp.c 2009-11-25 16:53:25 UTC (rev 291319)
+++ php/php-src/trunk/ext/gmp/gmp.c 2009-11-25 18:15:25 UTC (rev 291320)
@@ -804,7 +804,7 @@
return;
}
- if ((base < 2 && base > -2) || base > 36 || base < -36) {
+ if ((base < 2 && base > -2) || base > 62 || base < -36) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Bad base for conversion: %ld", base);
RETURN_FALSE;
}
Modified: php/php-src/trunk/ext/gmp/tests/bug50283.phpt
===================================================================
--- php/php-src/trunk/ext/gmp/tests/bug50283.phpt 2009-11-25 16:53:25 UTC (rev 291319)
+++ php/php-src/trunk/ext/gmp/tests/bug50283.phpt 2009-11-25 18:15:25 UTC (rev 291320)
@@ -5,25 +5,29 @@
--FILE--
<?php
$a = gmp_init("0x41682179fbf5");
-printf("Decimal: %s, 36-based: %s\n", gmp_strval($a), gmp_strval($a,-36));
+printf("Decimal: %s, -36-based: %s\n", gmp_strval($a), gmp_strval($a,-36));
printf("Decimal: %s, 36-based: %s\n", gmp_strval($a), gmp_strval($a,36));
-printf("Decimal: %s, 36-based: %s\n", gmp_strval($a), gmp_strval($a,-1));
-printf("Decimal: %s, 36-based: %s\n", gmp_strval($a), gmp_strval($a,1));
-printf("Decimal: %s, 36-based: %s\n", gmp_strval($a), gmp_strval($a,-37));
-printf("Decimal: %s, 36-based: %s\n", gmp_strval($a), gmp_strval($a,37));
+printf("Decimal: %s, -1-based: %s\n", gmp_strval($a), gmp_strval($a,-1));
+printf("Decimal: %s, 1-based: %s\n", gmp_strval($a), gmp_strval($a,1));
+printf("Decimal: %s, -37-based: %s\n", gmp_strval($a), gmp_strval($a,-37));
+printf("Decimal: %s, 37-based: %s\n", gmp_strval($a), gmp_strval($a,37));
+printf("Decimal: %s, 62-based: %s\n", gmp_strval($a), gmp_strval($a,62));
+printf("Decimal: %s, 63-based: %s\n", gmp_strval($a), gmp_strval($a,63));
?>
--EXPECTF--
-Decimal: 71915494046709, 36-based: PHPISCOOL
+Decimal: 71915494046709, -36-based: PHPISCOOL
Decimal: 71915494046709, 36-based: phpiscool
Warning: gmp_strval(): Bad base for conversion: -1 in %s on line 5
-Decimal: 71915494046709, 36-based:
+Decimal: 71915494046709, -1-based:
Warning: gmp_strval(): Bad base for conversion: 1 in %s on line 6
-Decimal: 71915494046709, 36-based:
+Decimal: 71915494046709, 1-based:
Warning: gmp_strval(): Bad base for conversion: -37 in %s on line 7
-Decimal: 71915494046709, 36-based:
+Decimal: 71915494046709, -37-based:
+Decimal: 71915494046709, 37-based: KHKATELJF
+Decimal: 71915494046709, 62-based: KQ6yq741
-Warning: gmp_strval(): Bad base for conversion: 37 in %s on line 8
-Decimal: 71915494046709, 36-based:
+Warning: gmp_strval(): Bad base for conversion: 63 in %s on line 10
+Decimal: 71915494046709, 63-based:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
