Move code from zend_default_classes.c to zend_attributes.c

Author: beberlei

Zend/zend_attributes.c

@@ -0,0 +1,41 @@
+#include "zend.h"
+#include "zend_API.h"
+#include "zend_attributes.h"
+
+void zend_attribute_validate_phpattribute(zval *attribute)
+{
+}
+
+void zend_attribute_validate_phpcompilerattribute(zval *attribute)
+{
+	zend_error(E_COMPILE_ERROR, "The PhpCompilerAttribute can only be used by internal classes, use PhpAttribute instead");
+}
+
+void zend_register_attribute_ce(void)
+{
+	zend_hash_init(&zend_attributes_internal_validators, 8, NULL, NULL, 1);
+
+	zend_class_entry ce;
+	zend_attributes_internal_validator cb;
+
+	INIT_CLASS_ENTRY(ce, "PhpAttribute", NULL);
+	zend_ce_php_attribute = zend_register_internal_class(&ce);
+	zend_ce_php_attribute->ce_flags |= ZEND_ACC_FINAL;
+
+	cb = zend_attribute_validate_phpattribute;
+	zend_compiler_attribute_register(zend_ce_php_attribute, &cb);
+
+	INIT_CLASS_ENTRY(ce, "PhpCompilerAttribute", NULL);
+	zend_ce_php_compiler_attribute = zend_register_internal_class(&ce);
+	zend_ce_php_compiler_attribute->ce_flags |= ZEND_ACC_FINAL;
+
+	cb = zend_attribute_validate_phpcompilerattribute;
+	zend_compiler_attribute_register(zend_ce_php_compiler_attribute, &cb);
+}
+
+void zend_compiler_attribute_register(zend_class_entry *ce, zend_attributes_internal_validator *validator)
+{
+	zend_string *attribute_name = zend_string_tolower_ex(ce->name, 1);
+
+	zend_hash_update_mem(&zend_attributes_internal_validators, attribute_name, validator, sizeof(zend_attributes_internal_validator));
+}

Zend/zend_attributes.h

@@ -7,10 +7,6 @@ zend_class_entry *zend_ce_php_compiler_attribute;
 typedef void (*zend_attributes_internal_validator)(zval *attribute);
 HashTable zend_attributes_internal_validators;
 
-static void zend_compiler_attribute_register(zend_class_entry *ce, zend_attributes_internal_validator *validator)
-{
-	zend_string *attribute_name = zend_string_tolower_ex(ce->name, 1);
-
-	zend_hash_update_mem(&zend_attributes_internal_validators, attribute_name, validator, sizeof(zend_attributes_internal_validator));
-}
+void zend_compiler_attribute_register(zend_class_entry *ce, zend_attributes_internal_validator *validator);
+void zend_register_attribute_ce(void);
 #endif

Zend/zend_default_classes.c

@@ -27,37 +27,6 @@
 #include "zend_generators.h"
 #include "zend_weakrefs.h"
 
-void zend_attribute_validate_phpattribute(zval *attribute)
-{
-}
-
-void zend_attribute_validate_phpcompilerattribute(zval *attribute)
-{
-	zend_error(E_COMPILE_ERROR, "The PhpCompilerAttribute can only be used by internal classes, use PhpAttribute instead");
-}
-
-static void zend_register_attribute_ce(void)
-{
-	zend_hash_init(&zend_attributes_internal_validators, 8, NULL, NULL, 1);
-
-	zend_class_entry ce;
-	zend_attributes_internal_validator cb;
-
-	INIT_CLASS_ENTRY(ce, "PhpAttribute", NULL);
-	zend_ce_php_attribute = zend_register_internal_class(&ce);
-	zend_ce_php_attribute->ce_flags |= ZEND_ACC_FINAL;
-
-	cb = zend_attribute_validate_phpattribute;
-	zend_compiler_attribute_register(zend_ce_php_attribute, &cb);
-
-	INIT_CLASS_ENTRY(ce, "PhpCompilerAttribute", NULL);
-	zend_ce_php_compiler_attribute = zend_register_internal_class(&ce);
-	zend_ce_php_compiler_attribute->ce_flags |= ZEND_ACC_FINAL;
-
-	cb = zend_attribute_validate_phpcompilerattribute;
-	zend_compiler_attribute_register(zend_ce_php_compiler_attribute, &cb);
-}
-
 ZEND_API void zend_register_default_classes(void)
 {
 	zend_register_interfaces();

configure.ac

@@ -1459,7 +1459,7 @@ PHP_ADD_SOURCES(Zend, \
     zend_execute_API.c zend_highlight.c zend_llist.c \
     zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
     zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
-    zend_list.c zend_builtin_functions.c \
+    zend_list.c zend_builtin_functions.c zend_attributes.c \
     zend_ini.c zend_sort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \
     zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \
     zend_closures.c zend_weakrefs.c zend_float.c zend_string.c zend_signal.c zend_generators.c \

win32/build/config.w32

@@ -230,7 +230,7 @@ ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.c \
 	zend_execute_API.c zend_highlight.c \
 	zend_llist.c zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c \
 	zend_stack.c zend_variables.c zend.c zend_API.c zend_extensions.c \
-	zend_hash.c zend_list.c zend_builtin_functions.c \
+	zend_hash.c zend_list.c zend_builtin_functions.c zend_attributes.c \
 	zend_ini.c zend_sort.c zend_multibyte.c zend_ts_hash.c \
 	zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \
 	zend_object_handlers.c zend_objects_API.c \