Make stubs namespaced

This is now support in gen_stub.

Author: nikic

ast.c

@@ -1253,7 +1253,7 @@ PHP_FUNCTION(get_supported_versions) {
 	}
 }
 
-PHP_METHOD(ast_Node, __construct) {
+PHP_METHOD(Node, __construct) {
 	int num_args = ZEND_NUM_ARGS();
 	if (num_args == 0) {
 		/* If arguments aren't passed, leave them as their default values. */
@@ -1302,21 +1302,6 @@ PHP_METHOD(ast_Node, __construct) {
 	}
 }
 
-const zend_function_entry ast_functions[] = {
-	ZEND_NS_FE("ast", parse_file, arginfo_parse_file)
-	ZEND_NS_FE("ast", parse_code, arginfo_parse_code)
-	ZEND_NS_FE("ast", get_kind_name, arginfo_get_kind_name)
-	ZEND_NS_FE("ast", kind_uses_flags, arginfo_kind_uses_flags)
-	ZEND_NS_FE("ast", get_metadata, arginfo_get_metadata)
-	ZEND_NS_FE("ast", get_supported_versions, arginfo_get_supported_versions)
-	PHP_FE_END
-};
-
-const zend_function_entry ast_node_functions[] = {
-	PHP_ME(ast_Node, __construct, arginfo_class_Node___construct, ZEND_ACC_PUBLIC)
-	PHP_FE_END
-};
-
 PHP_MINFO_FUNCTION(ast) {
 	zend_string *info = ast_version_info();
 
@@ -1463,7 +1448,7 @@ PHP_MINIT_FUNCTION(ast) {
 
 	ast_register_flag_constant("PARENTHESIZED_CONDITIONAL", ZEND_PARENTHESIZED_CONDITIONAL);
 
-	INIT_CLASS_ENTRY(tmp_ce, "ast\\Node", ast_node_functions);
+	INIT_CLASS_ENTRY(tmp_ce, "ast\\Node", class_Node_methods);
 	ast_node_ce = zend_register_internal_class(&tmp_ce);
 	ast_declare_property(ast_node_ce, AST_STR(str_kind), &zv_null);
 	ast_declare_property(ast_node_ce, AST_STR(str_flags), &zv_null);
@@ -1491,7 +1476,7 @@ PHP_MSHUTDOWN_FUNCTION(ast) {
 zend_module_entry ast_module_entry = {
 	STANDARD_MODULE_HEADER,
 	"ast",
-	ast_functions,
+	ext_functions,
 	PHP_MINIT(ast),
 	PHP_MSHUTDOWN(ast),
 	PHP_RINIT(ast),

ast.stub.php

@@ -1,16 +1,15 @@
 <?php
 
+/** @generate-function-entries */
+
 /**
  * USE ast_stub.php INSTEAD IF YOU ARE LOOKING FOR DOCUMENTATION OR STUBS FOR YOUR IDE.
  *
  * This is a stub file meant only for use with https://github.com/php/php-src/blob/master/build/gen_stub.php
  * to generate Reflection information (ReflectionParameter, ReflectionFunction, ReflectionMethod, etc.)
  */
 
-// XXX: build/gen_stub.php does not support namespace nodes at the time of writing.
-// The namespace is thus deliberately omitted so that ast_arginfo.h can be successfully built.
-// namespace ast;
-
+namespace ast;
 
 /**
  * Parses code file and returns AST root node.

ast_arginfo.h

@@ -1,29 +1,29 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 6c168364b94be45e237e47fd5709046457c6cb6b */
+ * Stub hash: 41024915fb5255fdbd22c2864f1d3793de262593 */
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_parse_code, 0, 2, ast\\Node, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_ast_parse_code, 0, 2, ast\\Node, 0)
 	ZEND_ARG_TYPE_INFO(0, code, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, version, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, filename, IS_STRING, 0, "\'string code\'")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_parse_file, 0, 2, ast\\Node, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_ast_parse_file, 0, 2, ast\\Node, 0)
 	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, version, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_get_kind_name, 0, 1, IS_STRING, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ast_get_kind_name, 0, 1, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, kind, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_kind_uses_flags, 0, 1, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ast_kind_uses_flags, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, kind, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_get_metadata, 0, 0, IS_ARRAY, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ast_get_metadata, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_get_supported_versions, 0, 0, IS_ARRAY, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ast_get_supported_versions, 0, 0, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, exclude_deprecated, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()
 
@@ -33,3 +33,29 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Node___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, children, IS_ARRAY, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, lineno, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
+
+
+ZEND_FUNCTION(parse_code);
+ZEND_FUNCTION(parse_file);
+ZEND_FUNCTION(get_kind_name);
+ZEND_FUNCTION(kind_uses_flags);
+ZEND_FUNCTION(get_metadata);
+ZEND_FUNCTION(get_supported_versions);
+ZEND_METHOD(Node, __construct);
+
+
+static const zend_function_entry ext_functions[] = {
+	ZEND_NS_FE("ast", parse_code, arginfo_ast_parse_code)
+	ZEND_NS_FE("ast", parse_file, arginfo_ast_parse_file)
+	ZEND_NS_FE("ast", get_kind_name, arginfo_ast_get_kind_name)
+	ZEND_NS_FE("ast", kind_uses_flags, arginfo_ast_kind_uses_flags)
+	ZEND_NS_FE("ast", get_metadata, arginfo_ast_get_metadata)
+	ZEND_NS_FE("ast", get_supported_versions, arginfo_ast_get_supported_versions)
+	ZEND_FE_END
+};
+
+
+static const zend_function_entry class_Node_methods[] = {
+	ZEND_ME(Node, __construct, arginfo_class_Node___construct, ZEND_ACC_PUBLIC)
+	ZEND_FE_END
+};