Permalink
Browse files

- Revert ZEND_BEGIN_ARG_INFO change

  • Loading branch information...
felipensp committed Nov 2, 2008
1 parent d90dfe7 commit 7a37fa2d6bd740c70dab947718ba7ea2d0b99c47
Showing with 2,570 additions and 72 deletions.
  1. +1 −1 Zend/zend_API.h
  2. +49 −0 Zend/zend_builtin_functions.c
  3. +2 −0 Zend/zend_exceptions.c
  4. +4 −0 Zend/zend_interfaces.c
  5. +10 −0 ext/bcmath/bcmath.c
  6. +7 −0 ext/bz2/bz2.c
  7. +18 −0 ext/calendar/calendar.c
  8. +32 −0 ext/com_dotnet/com_extension.c
  9. +11 −0 ext/ctype/ctype.c
  10. +18 −0 ext/curl/interface.c
  11. +65 −0 ext/date/php_date.c
  12. +15 −0 ext/dba/dba.c
  13. +2 −0 ext/dom/attr.c
  14. +1 −0 ext/dom/cdatasection.c
  15. +5 −0 ext/dom/characterdata.c
  16. +1 −0 ext/dom/comment.c
  17. +33 −0 ext/dom/document.c
  18. +2 −0 ext/dom/documentfragment.c
  19. +3 −0 ext/dom/domconfiguration.c
  20. +1 −0 ext/dom/domerrorhandler.c
  21. +4 −0 ext/dom/domimplementation.c
  22. +1 −0 ext/dom/domimplementationlist.c
  23. +2 −0 ext/dom/domimplementationsource.c
  24. +1 −0 ext/dom/domstringlist.c
  25. +19 −0 ext/dom/element.c
  26. +1 −0 ext/dom/entityreference.c
  27. +7 −0 ext/dom/namednodemap.c
  28. +2 −0 ext/dom/namelist.c
  29. +21 −0 ext/dom/node.c
  30. +1 −0 ext/dom/nodelist.c
  31. +1 −0 ext/dom/php_dom.c
  32. +1 −0 ext/dom/processinginstruction.c
  33. +2 −0 ext/dom/string_extend.c
  34. +4 −0 ext/dom/text.c
  35. +5 −0 ext/dom/xpath.c
  36. +7 −0 ext/ereg/ereg.c
  37. +4 −0 ext/exif/exif.c
  38. +9 −0 ext/fileinfo/fileinfo.c
  39. +7 −0 ext/filter/filter.c
  40. +33 −0 ext/ftp/php_ftp.c
  41. +98 −0 ext/gd/gd.c
  42. +9 −0 ext/gettext/gettext.c
  43. +40 −0 ext/gmp/gmp.c
  44. +20 −0 ext/hash/hash.c
  45. +11 −0 ext/iconv/iconv.c
  46. +63 −0 ext/imap/php_imap.c
  47. +49 −0 ext/interbase/interbase.c
  48. +4 −0 ext/intl/collator/collator_class.c
  49. +8 −0 ext/intl/dateformat/dateformat_class.c
  50. +11 −0 ext/intl/formatter/formatter_class.c
  51. +5 −0 ext/intl/locale/locale_class.c
  52. +6 −0 ext/intl/msgformat/msgformat_class.c
  53. +1 −0 ext/intl/normalizer/normalizer_class.c
  54. +43 −0 ext/intl/php_intl.c
  55. +2 −0 ext/json/json.c
  56. +38 −0 ext/ldap/ldap.c
  57. +5 −0 ext/libxml/libxml.c
  58. +54 −0 ext/mbstring/mbstring.c
  59. +36 −0 ext/mcrypt/mcrypt.c
  60. +28 −0 ext/msql/php_msql.c
  61. +19 −0 ext/mssql/php_mssql.c
  62. +3 −0 ext/mysqli/mysqli_fe.c
  63. +95 −0 ext/oci8/oci8.c
  64. +12 −0 ext/odbc/birdstep.c
  65. +43 −0 ext/odbc/php_odbc.c
  66. +42 −0 ext/openssl/openssl.c
  67. +17 −0 ext/pcntl/pcntl.c
  68. +8 −0 ext/pcre/php_pcre.c
  69. +0 −6 ext/pcre/tests/007.phpt
  70. +0 −6 ext/pcre/tests/backtrack_limit.phpt
  71. +0 −6 ext/pcre/tests/bug27103.phpt
  72. +0 −6 ext/pcre/tests/invalid_utf8.phpt
  73. +0 −6 ext/pcre/tests/invalid_utf8_offset.phpt
  74. +0 −3 ext/pcre/tests/locales.phpt
  75. +0 −6 ext/pcre/tests/pcre_anchored.phpt
  76. +0 −6 ext/pcre/tests/preg_replace2.phpt
  77. +0 −6 ext/pcre/tests/recursion_limit.phpt
  78. +17 −0 ext/pcre/tests/skip.ini
  79. +9 −0 ext/pcre/tests/skip_001.inc
  80. +5 −0 ext/pcre/tests/skip_002.inc
  81. +5 −0 ext/pcre/tests/skip_003.inc
  82. +1 −0 ext/pdo/pdo.c
  83. +12 −0 ext/pdo/pdo_stmt.c
  84. +82 −0 ext/pgsql/pgsql.c
  85. +31 −0 ext/phar/phar_object.c
  86. +35 −0 ext/posix/posix.c
  87. +19 −0 ext/pspell/pspell.c
  88. +13 −0 ext/readline/readline.c
  89. +2 −0 ext/recode/recode.c
  90. +38 −0 ext/reflection/php_reflection.c
  91. +14 −0 ext/session/session.c
  92. +6 −0 ext/shmop/shmop.c
  93. +3 −0 ext/simplexml/simplexml.c
  94. +23 −0 ext/snmp/snmp.c
  95. +28 −0 ext/soap/soap.c
  96. +25 −0 ext/sockets/sockets.c
  97. +13 −0 ext/spl/php_spl.c
  98. +10 −0 ext/spl/spl_array.c
  99. +21 −0 ext/spl/spl_directory.c
  100. +4 −0 ext/spl/spl_dllist.c
  101. +4 −0 ext/spl/spl_fixedarray.c
  102. +4 −0 ext/spl/spl_heap.c
  103. +23 −0 ext/spl/spl_iterators.c
  104. +13 −1 ext/spl/spl_observer.c
  105. +66 −0 ext/sqlite/sqlite.c
  106. +28 −0 ext/sqlite3/sqlite3.c
  107. +488 −0 ext/standard/basic_functions.c
  108. +3 −0 ext/standard/user_filters.c
  109. +23 −0 ext/sybase_ct/php_sybase_ct.c
  110. +7 −0 ext/sysvmsg/sysvmsg.c
  111. +4 −0 ext/sysvsem/sysvsem.c
  112. +6 −0 ext/sysvshm/sysvshm.c
  113. +25 −0 ext/tidy/tidy.c
  114. +2 −0 ext/tokenizer/tokenizer.c
  115. +6 −0 ext/wddx/wddx.c
  116. +24 −0 ext/xml/xml.c
  117. +25 −0 ext/xmlreader/php_xmlreader.c
  118. +13 −0 ext/xmlrpc/xmlrpc-epi-php.c
  119. +57 −0 ext/xmlwriter/php_xmlwriter.c
  120. +10 −0 ext/xsl/xsltprocessor.c
  121. +10 −0 ext/zip/php_zip.c
  122. +10 −0 ext/zlib/zlib.c
  123. +70 −19 run-tests.php
  124. +1 −0 sapi/aolserver/aolserver.c
  125. +10 −0 sapi/apache/php_apache.c
  126. +9 −0 sapi/apache2filter/php_functions.c
  127. +9 −0 sapi/apache2handler/php_functions.c
  128. +10 −0 sapi/apache_hooks/php_apache.c
  129. +9 −0 sapi/milter/php_milter.c
  130. +3 −0 sapi/nsapi/nsapi.c
View
@@ -101,7 +101,7 @@ typedef struct _zend_fcall_info_cache {
#define ZEND_ARG_OBJ_INFO(pass_by_ref, name, classname, allow_null) { #name, sizeof(#name)-1, #classname, sizeof(#classname)-1, 0, allow_null, pass_by_ref, 0, 0 },
#define ZEND_ARG_ARRAY_INFO(pass_by_ref, name, allow_null) { #name, sizeof(#name)-1, NULL, 0, 1, allow_null, pass_by_ref, 0, 0 },
#define ZEND_BEGIN_ARG_INFO_EX(name, pass_rest_by_reference, return_reference, required_num_args) \
- const static zend_arg_info name[] = { \
+ const zend_arg_info name[] = { \
{ NULL, 0, NULL, 0, 0, 0, pass_rest_by_reference, return_reference, required_num_args },
#define ZEND_BEGIN_ARG_INFO(name, pass_rest_by_reference) \
ZEND_BEGIN_ARG_INFO_EX(name, pass_rest_by_reference, ZEND_RETURN_VALUE, -1)
@@ -92,201 +92,250 @@ static ZEND_FUNCTION(gc_enable);
static ZEND_FUNCTION(gc_disable);
/* {{{ arginfo */
+static
ZEND_BEGIN_ARG_INFO(arginfo_zend_version, 0)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO(arginfo_gc_collect_cycles, 0)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO(arginfo_gc_enabled, 0)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO(arginfo_gc_enable, 0)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO(arginfo_gc_disable, 0)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO(arginfo_func_num_args, 0)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_func_get_arg, 0, 0, 1)
ZEND_ARG_INFO(0, arg_num)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO(arginfo_func_get_args, 0)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_strlen, 0, 0, 1)
ZEND_ARG_INFO(0, str)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_strcmp, 0, 0, 2)
ZEND_ARG_INFO(0, str1)
ZEND_ARG_INFO(0, str2)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_strncmp, 0, 0, 3)
ZEND_ARG_INFO(0, str1)
ZEND_ARG_INFO(0, str2)
ZEND_ARG_INFO(0, len)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_strcasecmp, 0, 0, 2)
ZEND_ARG_INFO(0, str1)
ZEND_ARG_INFO(0, str2)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_strncasecmp, 0, 0, 3)
ZEND_ARG_INFO(0, str1)
ZEND_ARG_INFO(0, str2)
ZEND_ARG_INFO(0, len)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_each, 0, 0, 1)
ZEND_ARG_INFO(1, arr)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_error_reporting, 0, 0, 1)
ZEND_ARG_INFO(0, new_error_level)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_define, 0, 0, 3)
ZEND_ARG_INFO(0, constant_name)
ZEND_ARG_INFO(0, value)
ZEND_ARG_INFO(0, case_insensitive)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_defined, 0, 0, 1)
ZEND_ARG_INFO(0, constant_name)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_class, 0, 0, 0)
ZEND_ARG_INFO(0, object)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO(arginfo_get_called_class, 0)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_parent_class, 0, 0, 0)
ZEND_ARG_INFO(0, object)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_is_subclass_of, 0, 0, 2)
ZEND_ARG_INFO(0, object)
ZEND_ARG_INFO(0, class_name)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_is_a, 0, 0, 2)
ZEND_ARG_INFO(0, object)
ZEND_ARG_INFO(0, class_name)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_class_vars, 0, 0, 1)
ZEND_ARG_INFO(0, class_name)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_object_vars, 0, 0, 1)
ZEND_ARG_INFO(0, obj)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_class_methods, 0, 0, 1)
ZEND_ARG_INFO(0, class)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_method_exists, 0, 0, 2)
ZEND_ARG_INFO(0, object)
ZEND_ARG_INFO(0, method)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_property_exists, 0, 0, 2)
ZEND_ARG_INFO(0, object_or_class)
ZEND_ARG_INFO(0, property_name)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_exists, 0, 0, 1)
ZEND_ARG_INFO(0, classname)
ZEND_ARG_INFO(0, autoload)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_interface_exists, 0, 0, 1)
ZEND_ARG_INFO(0, classname)
ZEND_ARG_INFO(0, autoload)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_function_exists, 0, 0, 1)
ZEND_ARG_INFO(0, function_name)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_class_alias, 0, 0, 2)
ZEND_ARG_INFO(0, user_class_name)
ZEND_ARG_INFO(0, alias_name)
ZEND_ARG_INFO(0, autoload)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO(arginfo_get_included_files, 0)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_trigger_error, 0, 0, 1)
ZEND_ARG_INFO(0, messsage)
ZEND_ARG_INFO(0, error_type)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_set_error_handler, 0, 0, 1)
ZEND_ARG_INFO(0, error_handler)
ZEND_ARG_INFO(0, error_types)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO(arginfo_restore_error_handler, 0)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_set_exception_handler, 0, 0, 1)
ZEND_ARG_INFO(0, exception_handler)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO(arginfo_restore_exception_handler, 0)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO(arginfo_get_declared_classes, 0)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO(arginfo_get_declared_interfaces, 0)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO(arginfo_get_defined_functions, 0)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO(arginfo_get_defined_vars, 0)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_create_function, 0, 0, 2)
ZEND_ARG_INFO(0, args)
ZEND_ARG_INFO(0, code)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_resource_type, 0, 0, 1)
ZEND_ARG_INFO(0, res)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_loaded_extensions, 0, 0, 0)
ZEND_ARG_INFO(0, zend_extensions)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_defined_constants, 0, 0, 0)
ZEND_ARG_INFO(0, categorize)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO(arginfo_debug_print_backtrace, 0)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_debug_backtrace, 0, 0, 0)
ZEND_ARG_INFO(0, provide_object)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_extension_loaded, 0, 0, 1)
ZEND_ARG_INFO(0, extension_name)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_get_extension_funcs, 0, 0, 1)
ZEND_ARG_INFO(0, extension_name)
ZEND_END_ARG_INFO()
View
@@ -605,6 +605,7 @@ ZEND_METHOD(exception, __toString)
* And never try to change the state of exceptions and never implement anything
* that gives the user anything to accomplish this.
*/
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_exception___construct, 0, 0, 0)
ZEND_ARG_INFO(0, message)
ZEND_ARG_INFO(0, code)
@@ -625,6 +626,7 @@ const static zend_function_entry default_exception_functions[] = {
{NULL, NULL, NULL}
};
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_error_exception___construct, 0, 0, 0)
ZEND_ARG_INFO(0, message)
ZEND_ARG_INFO(0, code)
View
@@ -498,14 +498,17 @@ const zend_function_entry zend_funcs_iterator[] = {
const zend_function_entry *zend_funcs_traversable = NULL;
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_arrayaccess_offset, 0, 0, 1)
ZEND_ARG_INFO(0, offset)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_arrayaccess_offset_get, 0, 0, 1) /* actually this should be return by ref but atm cannot be */
ZEND_ARG_INFO(0, offset)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_arrayaccess_offset_value, 0, 0, 2)
ZEND_ARG_INFO(0, offset)
ZEND_ARG_INFO(0, value)
@@ -519,6 +522,7 @@ const zend_function_entry zend_funcs_arrayaccess[] = {
{NULL, NULL, NULL}
};
+static
ZEND_BEGIN_ARG_INFO(arginfo_serializable_serialize, 0)
ZEND_ARG_INFO(0, serialized)
ZEND_END_ARG_INFO()
View
@@ -36,59 +36,69 @@ static PHP_GINIT_FUNCTION(bcmath);
static PHP_GSHUTDOWN_FUNCTION(bcmath);
/* {{{ arginfo */
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcadd, 0, 0, 2)
ZEND_ARG_INFO(0, left_operand)
ZEND_ARG_INFO(0, right_operand)
ZEND_ARG_INFO(0, scale)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcsub, 0, 0, 2)
ZEND_ARG_INFO(0, left_operand)
ZEND_ARG_INFO(0, right_operand)
ZEND_ARG_INFO(0, scale)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcmul, 0, 0, 2)
ZEND_ARG_INFO(0, left_operand)
ZEND_ARG_INFO(0, right_operand)
ZEND_ARG_INFO(0, scale)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcdiv, 0, 0, 2)
ZEND_ARG_INFO(0, left_operand)
ZEND_ARG_INFO(0, right_operand)
ZEND_ARG_INFO(0, scale)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO(arginfo_bcmod, 0)
ZEND_ARG_INFO(0, left_operand)
ZEND_ARG_INFO(0, right_operand)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcpowmod, 0, 0, 3)
ZEND_ARG_INFO(0, x)
ZEND_ARG_INFO(0, y)
ZEND_ARG_INFO(0, mod)
ZEND_ARG_INFO(0, scale)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcpow, 0, 0, 2)
ZEND_ARG_INFO(0, x)
ZEND_ARG_INFO(0, y)
ZEND_ARG_INFO(0, scale)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_bcsqrt, 0, 0, 1)
ZEND_ARG_INFO(0, operand)
ZEND_ARG_INFO(0, scale)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO_EX(arginfo_bccomp, 0, 0, 2)
ZEND_ARG_INFO(0, left_operand)
ZEND_ARG_INFO(0, right_operand)
ZEND_ARG_INFO(0, scale)
ZEND_END_ARG_INFO()
+static
ZEND_BEGIN_ARG_INFO(arginfo_bcscale, 0)
ZEND_ARG_INFO(0, scale)
ZEND_END_ARG_INFO()
Oops, something went wrong.

0 comments on commit 7a37fa2

Please sign in to comment.