com php-src: Revert "Fix genarginfo to respect by-ref passing": Zend/zend_builtin_functions.c scripts/dev/genarginfo. php

From: Date: Mon, 22 Jun 2015 08:44:13 +0000
Subject: com php-src: Revert "Fix genarginfo to respect by-ref passing": Zend/zend_builtin_functions.c scripts/dev/genarginfo. php
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-87432@lists.php.net to get a copy of this message
Commit: 9a68fe51d735f230fdd6dc1672a39edfa25f20b2 Author: Dmitry Stogov <dmitry@zend.com> Mon, 22 Jun 2015 11:44:13 +0300 Parents: 13d5893c2aad219cde5d9c5a83000669bc7e6d06 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9a68fe51d735f230fdd6dc1672a39edfa25f20b2 Log: Revert "Fix genarginfo to respect by-ref passing" This reverts commit db6990a91b2ca931074b29886c7f7819b14bb021. Changed paths: M Zend/zend_builtin_functions.c M scripts/dev/genarginfo.php Diff: diff --git a/Zend/zend_builtin_functions..c b/Zend/zend_builtin_functions.c index 08e78fd..98970e2 100644 --- a/Zend/zend_builtin_functions.c +++ b/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; diff --git a/scripts/dev/genarginfo..php b/scripts/dev/genarginfo.php index 94c10f8..de69f5b 100644 --- a/scripts/dev/genarginfo.php +++ b/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";

« previous php.cvs (#87432) next »