[PHP-DEV] [PATCH] Allow mixed $initial in array_reduce

[Christian Schneider]

I attached a patch and a phpt-file for a small patch to array_reduce  
to allow any type of $initial value. This patch is for HEAD but could  
easily be applied/ported to 5.3.

- Chris
Index: ext/standard/array.c
===================================================================
RCS file: /repository/php-src/ext/standard/array.c,v
retrieving revision 1.448
diff -u -r1.448 array.c
--- ext/standard/array.c        12 Mar 2008 19:21:30 -0000      1.448
+++ ext/standard/array.c        8 Apr 2008 01:11:41 -0000
@@ -4219,7 +4219,7 @@
 }
 /* }}} */
 
-/* {{{ proto mixed array_reduce(array input, mixed callback [, int initial]) U
+/* {{{ proto mixed array_reduce(array input, mixed callback [, mixed initial]) 
U
    Iteratively reduce the array to a single value via the callback. */
 PHP_FUNCTION(array_reduce)
 {
@@ -4230,18 +4230,19 @@
        zval *retval;
        zend_fcall_info fci;
        zend_fcall_info_cache fci_cache = empty_fcall_info_cache;
-       long initial;
+       zval *initial;
        HashPosition pos;
        HashTable *htbl;
 
-       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "af|l", &input, 
&fci, &fci_cache, &initial) == FAILURE) {
+       if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "af|z", &input, 
&fci, &fci_cache, &initial) == FAILURE) {
                return;
        }
 
        if (ZEND_NUM_ARGS() > 2) {
                ALLOC_ZVAL(result);
+               *result = *initial;
+               zval_copy_ctor(result);
                INIT_PZVAL(result);
-               ZVAL_LONG(result, initial);
        } else {
                MAKE_STD_ZVAL(result);
                ZVAL_NULL(result);
--TEST--
Test array_reduce() function
--INI--
precision=14
--FILE--
<?php
/* Prototype: array array_reduce(array $array, mixed $callback, mixed $initial);
   Description: Iteratively reduce the array to a single value via the callback
*/

$array = array('foo', 'foo', 'bar', 'qux', 'qux', 'quux');

echo "\n*** Testing array_reduce() to integer ***\n";
function reduce_int($w, $v) { return $w + strlen($v); }
$initial = 42;
var_dump(array_reduce($array, 'reduce_int', $initial), $initial);

echo "\n*** Testing array_reduce() to float ***\n";
function reduce_float($w, $v) { return $w + strlen($v) / 10; }
$initial = 4.2;
var_dump(array_reduce($array, 'reduce_float', $initial), $initial);

echo "\n*** Testing array_reduce() to string ***\n";
function reduce_string($w, $v) { return $w . $v; }
$initial = 'quux';
var_dump(array_reduce($array, 'reduce_string', $initial), $initial);

echo "\n*** Testing array_reduce() to array ***\n";
function reduce_array($w, $v) { $w[$v]++; return $w; }
$initial = array('foo' => 42, 'bar' => 17, 'qux' => -2, 'quux' => 0);
var_dump(array_reduce($array, 'reduce_array', $initial), $initial);

echo "\nDone";
?> 
--EXPECTF--
*** Testing array_reduce() to integer ***
int(61)
int(42)

*** Testing array_reduce() to float ***
float(6.1)
float(4.2)

*** Testing array_reduce() to string ***
string(23) "quuxfoofoobarquxquxquux"
string(4) "quux"

*** Testing array_reduce() to array ***
array(4) {
  ["foo"]=>
  int(44)
  ["bar"]=>
  int(18)
  ["qux"]=>
  int(0)
  ["quux"]=>
  int(1)
}
array(4) {
  ["foo"]=>
  int(42)
  ["bar"]=>
  int(17)
  ["qux"]=>
  int(-2)
  ["quux"]=>
  int(0)
}

Done

-- 
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php