Add namespace constants for PHP 5

shono0027 · Dec 4, 2015 · cab4d21 · cab4d21
1 parent 70dbb43
commit cab4d21
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/mecab/mecab5.c b/mecab/mecab5.c
@@ -665,17 +665,23 @@ static PHP_MINIT_FUNCTION(mecab)
 {
 	REGISTER_INI_ENTRIES();
 
+	REGISTER_NS_STRING_CONSTANT("MeCab", "VERSION", (char *)mecab_version(), CONST_PERSISTENT | CONST_CS);
+	PHP_MECAB_REGISTER_NS_CONSTANT(NOR_NODE);
+	PHP_MECAB_REGISTER_NS_CONSTANT(UNK_NODE);
+	PHP_MECAB_REGISTER_NS_CONSTANT(BOS_NODE);
+	PHP_MECAB_REGISTER_NS_CONSTANT(EOS_NODE);
+	PHP_MECAB_REGISTER_NS_CONSTANT(SYS_DIC);
+	PHP_MECAB_REGISTER_NS_CONSTANT(USR_DIC);
+	PHP_MECAB_REGISTER_NS_CONSTANT(UNK_DIC);
+
 	REGISTER_STRING_CONSTANT("MECAB_VERSION", (char *)mecab_version(), CONST_PERSISTENT | CONST_CS);
-#define PHP_MECAB_REGISTER_CONSTANT(name) \
-	REGISTER_LONG_CONSTANT(#name, name, CONST_PERSISTENT | CONST_CS)
 	PHP_MECAB_REGISTER_CONSTANT(MECAB_NOR_NODE);
 	PHP_MECAB_REGISTER_CONSTANT(MECAB_UNK_NODE);
 	PHP_MECAB_REGISTER_CONSTANT(MECAB_BOS_NODE);
 	PHP_MECAB_REGISTER_CONSTANT(MECAB_EOS_NODE);
 	PHP_MECAB_REGISTER_CONSTANT(MECAB_SYS_DIC);
 	PHP_MECAB_REGISTER_CONSTANT(MECAB_USR_DIC);
 	PHP_MECAB_REGISTER_CONSTANT(MECAB_UNK_DIC);
-#undef PHP_MECAB_REGISTER_CONSTANT
 
 	le_mecab = zend_register_list_destructors_ex(
 			php_mecab_free_resource, NULL, "mecab", module_number);

diff --git a/mecab/mecab7.c b/mecab/mecab7.c
@@ -512,16 +512,13 @@ static PHP_MINIT_FUNCTION(mecab)
 	REGISTER_INI_ENTRIES();
 
 	REGISTER_NS_STRING_CONSTANT("MeCab", "VERSION", (char *)mecab_version(), CONST_PERSISTENT | CONST_CS);
-#define PHP_MECAB_REGISTER_CONSTANT(name) \
-	REGISTER_NS_LONG_CONSTANT("MeCab", #name, MECAB_##name, CONST_PERSISTENT | CONST_CS)
-	PHP_MECAB_REGISTER_CONSTANT(NOR_NODE);
-	PHP_MECAB_REGISTER_CONSTANT(UNK_NODE);
-	PHP_MECAB_REGISTER_CONSTANT(BOS_NODE);
-	PHP_MECAB_REGISTER_CONSTANT(EOS_NODE);
-	PHP_MECAB_REGISTER_CONSTANT(SYS_DIC);
-	PHP_MECAB_REGISTER_CONSTANT(USR_DIC);
-	PHP_MECAB_REGISTER_CONSTANT(UNK_DIC);
-#undef PHP_MECAB_REGISTER_CONSTANT
+	PHP_MECAB_REGISTER_NS_CONSTANT(NOR_NODE);
+	PHP_MECAB_REGISTER_NS_CONSTANT(UNK_NODE);
+	PHP_MECAB_REGISTER_NS_CONSTANT(BOS_NODE);
+	PHP_MECAB_REGISTER_NS_CONSTANT(EOS_NODE);
+	PHP_MECAB_REGISTER_NS_CONSTANT(SYS_DIC);
+	PHP_MECAB_REGISTER_NS_CONSTANT(USR_DIC);
+	PHP_MECAB_REGISTER_NS_CONSTANT(UNK_DIC);
 
 #define PHP_MECAB_GET_CE(ce, lcname) \
 	(ce = php_mecab_get_class_entry(lcname, sizeof(lcname) - 1 TSRMLS_CC))

diff --git a/mecab/php_mecab_compat5.h b/mecab/php_mecab_compat5.h
@@ -125,6 +125,12 @@
 #define PHP_MECAB_NODE_RETURN_PROPERTY(type, ...) PHP_MECAB_RETURN_PROPERTY(node, type, __VA_ARGS__)
 #define PHP_MECAB_PATH_RETURN_PROPERTY(type, ...) PHP_MECAB_RETURN_PROPERTY(path, type, __VA_ARGS__)
 
+#define PHP_MECAB_REGISTER_CONSTANT(name) \
+	REGISTER_LONG_CONSTANT(#name, name, CONST_PERSISTENT | CONST_CS)
+
+#define PHP_MECAB_REGISTER_NS_CONSTANT(name) \
+	REGISTER_NS_LONG_CONSTANT("MeCab", #name, MECAB_##name, CONST_PERSISTENT | CONST_CS)
+
 #if PHP_API_VERSION < 20100412
 static inline void
 object_properties_init(zend_object *object, zend_class_entry *class_type)

diff --git a/mecab/php_mecab_compat7.h b/mecab/php_mecab_compat7.h
@@ -74,4 +74,7 @@
 #define PHP_MECAB_NODE_RETURN_PROPERTY(type, ...) PHP_MECAB_RETURN_PROPERTY(node, type, __VA_ARGS__)
 #define PHP_MECAB_PATH_RETURN_PROPERTY(type, ...) PHP_MECAB_RETURN_PROPERTY(path, type, __VA_ARGS__)
 
+#define PHP_MECAB_REGISTER_NS_CONSTANT(name) \
+	REGISTER_NS_LONG_CONSTANT("MeCab", #name, MECAB_##name, CONST_PERSISTENT | CONST_CS)
+
 #endif /* PHP_MECAB_COMPAT_H */