Browse Source

Revert "Fix genarginfo to respect by-ref passing"

This reverts commit db6990a91b.
pull/1369/head
Dmitry Stogov 11 years ago
parent
commit
9a68fe51d7
  1. 4
      Zend/zend_builtin_functions.c
  2. 16
      scripts/dev/genarginfo.php

4
Zend/zend_builtin_functions.c

@ -738,8 +738,8 @@ ZEND_FUNCTION(strncasecmp)
}
/* }}} */
/* {{{ proto mixed each(array &arr)
Return the currently pointed key..value pair in the passed array, and advance the pointer to the next element, or false if there is no element at this place */
/* {{{ proto array each(array arr)
Return the currently pointed key..value pair in the passed array, and advance the pointer to the next element */
ZEND_FUNCTION(each)
{
zval *array, *entry, tmp;

16
scripts/dev/genarginfo.php

@ -38,21 +38,13 @@ if($m) {
echo "ZEND_BEGIN_ARG_INFO_EX(arginfo_{$name}, 0, 0, {$required})\n";
}
foreach($args as $arg) {
list($type, $name) = explode(' ', trim($arg), 2);
list($name) = explode('|', trim($name), 2); // No |'s in the names - choose the first
$name = trim($name);
if ($ref = ($name[0] == "&")) {
$name = trim(substr($name, 1));
}
list($name, $default) = explode("=", $name, 2);
$name = trim($name);
$allow_null = (int) (trim($default) == "null");
$ref = (int) $ref;
list($type,$name) = explode(' ', $arg, 2);
list($name,) = explode('|', $name, 2); // No |'s in the names - choose the first
$type=trim($type);
if(!empty($types[$type])) {
echo "\tZEND_ARG_TYPE_INFO($ref, {$name}, {$types[$type]}, $allow_null)\n";
echo "\tZEND_ARG_TYPE_INFO(0, {$name}, {$types[$type]}, 0)\n";
} else {
echo "\tZEND_ARG_INFO($ref, {$name})\n";
echo "\tZEND_ARG_INFO(0, {$name})\n";
}
}
echo "ZEND_END_ARG_INFO()\n\n";

Loading…
Cancel
Save