From f4cfaf36e23ca47da3e352e1c60909104c059647 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Mon, 10 Feb 2014 10:04:30 +0400 Subject: Use better data structures (incomplete) --- ext/intl/breakiterator/breakiterator_class.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/intl/breakiterator/breakiterator_class.cpp') diff --git a/ext/intl/breakiterator/breakiterator_class.cpp b/ext/intl/breakiterator/breakiterator_class.cpp index 7ca7e94c95..b6b47348f0 100644 --- a/ext/intl/breakiterator/breakiterator_class.cpp +++ b/ext/intl/breakiterator/breakiterator_class.cpp @@ -386,12 +386,12 @@ U_CFUNC void breakiterator_register_BreakIterator_class(TSRMLS_D) INIT_CLASS_ENTRY(ce, "IntlRuleBasedBreakIterator", RuleBasedBreakIterator_class_functions); RuleBasedBreakIterator_ce_ptr = zend_register_internal_class_ex(&ce, - BreakIterator_ce_ptr, NULL TSRMLS_CC); + BreakIterator_ce_ptr TSRMLS_CC); /* Create and register 'CodePointBreakIterator' class. */ INIT_CLASS_ENTRY(ce, "IntlCodePointBreakIterator", CodePointBreakIterator_class_functions); CodePointBreakIterator_ce_ptr = zend_register_internal_class_ex(&ce, - BreakIterator_ce_ptr, NULL TSRMLS_CC); + BreakIterator_ce_ptr TSRMLS_CC); } /* }}} */ -- cgit v1.2.1 From 050d7e38ad4163e7fa65e26724d3516ce7b33601 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 15 Apr 2014 15:40:40 +0400 Subject: Cleanup (1-st round) --- ext/intl/breakiterator/breakiterator_class.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/intl/breakiterator/breakiterator_class.cpp') diff --git a/ext/intl/breakiterator/breakiterator_class.cpp b/ext/intl/breakiterator/breakiterator_class.cpp index b6b47348f0..181d0e03b9 100644 --- a/ext/intl/breakiterator/breakiterator_class.cpp +++ b/ext/intl/breakiterator/breakiterator_class.cpp @@ -165,7 +165,7 @@ static HashTable *BreakIterator_get_debug_info(zval *object, int *is_temp TSRMLS } add_assoc_string_ex(&zv, "type", sizeof("type"), - const_cast(typeid(*biter).name()), 1); + const_cast(typeid(*biter).name())); return Z_ARRVAL(zv); } -- cgit v1.2.1 From 4fbaddb4f8b041769bea7efdd12313641387bd14 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Sat, 28 Jun 2014 00:02:50 +0800 Subject: Refactoring ext/intl (incompleted) --- ext/intl/breakiterator/breakiterator_class.cpp | 81 ++++++++++---------------- 1 file changed, 31 insertions(+), 50 deletions(-) (limited to 'ext/intl/breakiterator/breakiterator_class.cpp') diff --git a/ext/intl/breakiterator/breakiterator_class.cpp b/ext/intl/breakiterator/breakiterator_class.cpp index 181d0e03b9..e756f366ef 100644 --- a/ext/intl/breakiterator/breakiterator_class.cpp +++ b/ext/intl/breakiterator/breakiterator_class.cpp @@ -81,8 +81,8 @@ static int BreakIterator_compare_objects(zval *object1, BreakIterator_object *bio1, *bio2; - bio1 = (BreakIterator_object*)zend_object_store_get_object(object1 TSRMLS_CC); - bio2 = (BreakIterator_object*)zend_object_store_get_object(object2 TSRMLS_CC); + bio1 = Z_INTL_BREAKITERATOR_P(object1); + bio2 = Z_INTL_BREAKITERATOR_P(object2); if (bio1->biter == NULL || bio2->biter == NULL) { return bio1->biter == bio2->biter ? 0 : 1; @@ -93,41 +93,36 @@ static int BreakIterator_compare_objects(zval *object1, /* }}} */ /* {{{ clone handler for BreakIterator */ -static zend_object_value BreakIterator_clone_obj(zval *object TSRMLS_DC) +static zend_object *BreakIterator_clone_obj(zval *object TSRMLS_DC) { BreakIterator_object *bio_orig, *bio_new; - zend_object_value ret_val; + zend_object *ret_val; - bio_orig = (BreakIterator_object*)zend_object_store_get_object(object TSRMLS_CC); + bio_orig = Z_INTL_BREAKITERATOR_P(object); intl_errors_reset(INTL_DATA_ERROR_P(bio_orig) TSRMLS_CC); ret_val = BreakIterator_ce_ptr->create_object(Z_OBJCE_P(object) TSRMLS_CC); - bio_new = (BreakIterator_object*)zend_object_store_get_object_by_handle( - ret_val.handle TSRMLS_CC); + bio_new = php_intl_breakiterator_fetch_object(ret_val); - zend_objects_clone_members(&bio_new->zo, ret_val, - &bio_orig->zo, Z_OBJ_HANDLE_P(object) TSRMLS_CC); + zend_objects_clone_members(&bio_new->zo, &bio_orig->zo TSRMLS_CC); if (bio_orig->biter != NULL) { BreakIterator *new_biter; new_biter = bio_orig->biter->clone(); if (!new_biter) { - char *err_msg; + zend_string *err_msg; intl_errors_set_code(BREAKITER_ERROR_P(bio_orig), U_MEMORY_ALLOCATION_ERROR TSRMLS_CC); intl_errors_set_custom_msg(BREAKITER_ERROR_P(bio_orig), "Could not clone BreakIterator", 0 TSRMLS_CC); err_msg = intl_error_get_message(BREAKITER_ERROR_P(bio_orig) TSRMLS_CC); - zend_throw_exception(NULL, err_msg, 0 TSRMLS_CC); - efree(err_msg); + zend_throw_exception(NULL, err_msg->val, 0 TSRMLS_CC); + STR_FREE(err_msg); } else { bio_new->biter = new_biter; - bio_new->text = bio_orig->text; - if (bio_new->text) { - zval_add_ref(&bio_new->text); - } + ZVAL_COPY(&bio_new->text, &bio_orig->text); } } else { zend_throw_exception(NULL, "Cannot clone unconstructed BreakIterator", 0 TSRMLS_CC); @@ -148,23 +143,23 @@ static HashTable *BreakIterator_get_debug_info(zval *object, int *is_temp TSRMLS array_init_size(&zv, 8); - bio = (BreakIterator_object*)zend_object_store_get_object(object TSRMLS_CC); + bio = Z_INTL_BREAKITERATOR_P(object); biter = bio->biter; if (biter == NULL) { - add_assoc_bool_ex(&zv, "valid", sizeof("valid"), 0); + add_assoc_bool_ex(&zv, "valid", sizeof("valid") - 1, 0); return Z_ARRVAL(zv); } - add_assoc_bool_ex(&zv, "valid", sizeof("valid"), 1); + add_assoc_bool_ex(&zv, "valid", sizeof("valid") - 1, 1); - if (bio->text == NULL) { - add_assoc_null_ex(&zv, "text", sizeof("text")); + if (Z_ISUNDEF(bio->text)) { + add_assoc_null_ex(&zv, "text", sizeof("text") - 1); } else { - zval_add_ref(&bio->text); - add_assoc_zval_ex(&zv, "text", sizeof("text"), bio->text); + Z_TRY_ADDREF(bio->text); + add_assoc_zval_ex(&zv, "text", sizeof("text") - 1, &bio->text); } - add_assoc_string_ex(&zv, "type", sizeof("type"), + add_assoc_string_ex(&zv, "type", sizeof("type") - 1, const_cast(typeid(*biter).name())); return Z_ARRVAL(zv); @@ -178,26 +173,23 @@ static void breakiterator_object_init(BreakIterator_object *bio TSRMLS_DC) { intl_error_init(BREAKITER_ERROR_P(bio) TSRMLS_CC); bio->biter = NULL; - bio->text = NULL; + ZVAL_UNDEF(&bio->text); } /* }}} */ /* {{{ BreakIterator_objects_dtor */ -static void BreakIterator_objects_dtor(void *object, - zend_object_handle handle TSRMLS_DC) +static void BreakIterator_objects_dtor(zend_object *object TSRMLS_DC) { - zend_objects_destroy_object((zend_object*)object, handle TSRMLS_CC); + zend_objects_destroy_object(object TSRMLS_CC); } /* }}} */ /* {{{ BreakIterator_objects_free */ static void BreakIterator_objects_free(zend_object *object TSRMLS_DC) { - BreakIterator_object* bio = (BreakIterator_object*) object; + BreakIterator_object* bio = php_intl_breakiterator_fetch_object(object); - if (bio->text) { - zval_ptr_dtor(&bio->text); - } + zval_ptr_dtor(&bio->text); if (bio->biter) { delete bio->biter; bio->biter = NULL; @@ -205,37 +197,23 @@ static void BreakIterator_objects_free(zend_object *object TSRMLS_DC) intl_error_reset(BREAKITER_ERROR_P(bio) TSRMLS_CC); zend_object_std_dtor(&bio->zo TSRMLS_CC); - - efree(bio); } /* }}} */ /* {{{ BreakIterator_object_create */ -static zend_object_value BreakIterator_object_create(zend_class_entry *ce TSRMLS_DC) +static zend_object *BreakIterator_object_create(zend_class_entry *ce TSRMLS_DC) { - zend_object_value retval; BreakIterator_object* intern; - intern = (BreakIterator_object*)ecalloc(1, sizeof(BreakIterator_object)); + intern = (BreakIterator_object*)ecalloc(1, sizeof(BreakIterator_object) + sizeof(zval) * (ce->default_properties_count - 1)); zend_object_std_init(&intern->zo, ce TSRMLS_CC); -#if PHP_VERSION_ID < 50399 - zend_hash_copy(intern->zo.properties, &(ce->default_properties), - (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval*)); -#else object_properties_init((zend_object*) intern, ce); -#endif breakiterator_object_init(intern TSRMLS_CC); - retval.handle = zend_objects_store_put( - intern, - BreakIterator_objects_dtor, - (zend_objects_free_object_storage_t) BreakIterator_objects_free, - NULL TSRMLS_CC); - - retval.handlers = &BreakIterator_handlers; + intern->zo.handlers = &BreakIterator_handlers; - return retval; + return &intern->zo; } /* }}} */ @@ -343,9 +321,12 @@ U_CFUNC void breakiterator_register_BreakIterator_class(TSRMLS_D) memcpy(&BreakIterator_handlers, zend_get_std_object_handlers(), sizeof BreakIterator_handlers); + BreakIterator_handlers.offset = XtOffsetOf(BreakIterator_object, zo); BreakIterator_handlers.compare_objects = BreakIterator_compare_objects; BreakIterator_handlers.clone_obj = BreakIterator_clone_obj; BreakIterator_handlers.get_debug_info = BreakIterator_get_debug_info; + BreakIterator_handlers.dtor_obj = BreakIterator_objects_dtor; + BreakIterator_handlers.free_obj = BreakIterator_objects_free; zend_class_implements(BreakIterator_ce_ptr TSRMLS_CC, 1, zend_ce_traversable); -- cgit v1.2.1 From b6e9c76d67a8cfb397598ac354d9aeb9609ba1d2 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Sat, 28 Jun 2014 12:20:35 +0800 Subject: Refactoring ext/intl (only compilerable now, far to finish :<) --- ext/intl/breakiterator/breakiterator_class.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/intl/breakiterator/breakiterator_class.cpp') diff --git a/ext/intl/breakiterator/breakiterator_class.cpp b/ext/intl/breakiterator/breakiterator_class.cpp index e756f366ef..73d4b7550f 100644 --- a/ext/intl/breakiterator/breakiterator_class.cpp +++ b/ext/intl/breakiterator/breakiterator_class.cpp @@ -135,7 +135,7 @@ static zend_object *BreakIterator_clone_obj(zval *object TSRMLS_DC) /* {{{ get_debug_info handler for BreakIterator */ static HashTable *BreakIterator_get_debug_info(zval *object, int *is_temp TSRMLS_DC) { - zval zv = zval_used_for_init; + zval zv; BreakIterator_object *bio; const BreakIterator *biter; -- cgit v1.2.1 From 1d793348067e5769144c0f7efd86428a4137baec Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Sat, 28 Jun 2014 23:30:46 +0800 Subject: Fixed get_debug_info --- ext/intl/breakiterator/breakiterator_class.cpp | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'ext/intl/breakiterator/breakiterator_class.cpp') diff --git a/ext/intl/breakiterator/breakiterator_class.cpp b/ext/intl/breakiterator/breakiterator_class.cpp index 73d4b7550f..ecaf503565 100644 --- a/ext/intl/breakiterator/breakiterator_class.cpp +++ b/ext/intl/breakiterator/breakiterator_class.cpp @@ -135,34 +135,39 @@ static zend_object *BreakIterator_clone_obj(zval *object TSRMLS_DC) /* {{{ get_debug_info handler for BreakIterator */ static HashTable *BreakIterator_get_debug_info(zval *object, int *is_temp TSRMLS_DC) { - zval zv; + zval val; + HashTable *debug_info; BreakIterator_object *bio; const BreakIterator *biter; *is_temp = 1; - array_init_size(&zv, 8); + ALLOC_HASHTABLE(debug_info); + zend_hash_init(debug_info, 8, NULL, ZVAL_PTR_DTOR, 0); bio = Z_INTL_BREAKITERATOR_P(object); biter = bio->biter; if (biter == NULL) { - add_assoc_bool_ex(&zv, "valid", sizeof("valid") - 1, 0); - return Z_ARRVAL(zv); + ZVAL_FALSE(&val); + zend_hash_str_update(debug_info, "valid", sizeof("valid") - 1, &val); + return debug_info; } - add_assoc_bool_ex(&zv, "valid", sizeof("valid") - 1, 1); + ZVAL_TRUE(&val); + zend_hash_str_update(debug_info, "valid", sizeof("valid") - 1, &val); if (Z_ISUNDEF(bio->text)) { - add_assoc_null_ex(&zv, "text", sizeof("text") - 1); + ZVAL_NULL(&val); + zend_hash_str_update(debug_info, "text", sizeof("text") - 1, &val); } else { Z_TRY_ADDREF(bio->text); - add_assoc_zval_ex(&zv, "text", sizeof("text") - 1, &bio->text); + zend_hash_str_update(debug_info, "text", sizeof("text") - 1, &bio->text); } - add_assoc_string_ex(&zv, "type", sizeof("type") - 1, - const_cast(typeid(*biter).name())); + ZVAL_STRING(&val, const_cast(typeid(*biter).name())); + zend_hash_str_update(debug_info, "type", sizeof("type") - 1, &bio->text); - return Z_ARRVAL(zv); + return debug_info; } /* }}} */ -- cgit v1.2.1 From 9fb8c16b6cd5f8c47ab6b83b821f0bf79448bcac Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Sun, 29 Jun 2014 15:24:00 +0800 Subject: Fixed temporarily un-expected object re-init --- ext/intl/breakiterator/breakiterator_class.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ext/intl/breakiterator/breakiterator_class.cpp') diff --git a/ext/intl/breakiterator/breakiterator_class.cpp b/ext/intl/breakiterator/breakiterator_class.cpp index ecaf503565..7aa1eae0bc 100644 --- a/ext/intl/breakiterator/breakiterator_class.cpp +++ b/ext/intl/breakiterator/breakiterator_class.cpp @@ -47,7 +47,7 @@ zend_object_handlers BreakIterator_handlers; /* }}} */ U_CFUNC void breakiterator_object_create(zval *object, - BreakIterator *biter TSRMLS_DC) + BreakIterator *biter, int brand_new TSRMLS_DC) { UClassID classId = biter->getDynamicClassID(); zend_class_entry *ce; @@ -60,7 +60,9 @@ U_CFUNC void breakiterator_object_create(zval *object, ce = BreakIterator_ce_ptr; } - object_init_ex(object, ce); + if (brand_new) { + object_init_ex(object, ce); + } breakiterator_object_construct(object, biter TSRMLS_CC); } -- cgit v1.2.1 From 63d3f0b844b3a5f1c94be3c97bca29235dc2b3fc Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Tue, 19 Aug 2014 08:07:31 +0200 Subject: basic macro replacements, all at once --- ext/intl/breakiterator/breakiterator_class.cpp | 50 +++++++++++++------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'ext/intl/breakiterator/breakiterator_class.cpp') diff --git a/ext/intl/breakiterator/breakiterator_class.cpp b/ext/intl/breakiterator/breakiterator_class.cpp index 7aa1eae0bc..7c06af792c 100644 --- a/ext/intl/breakiterator/breakiterator_class.cpp +++ b/ext/intl/breakiterator/breakiterator_class.cpp @@ -338,36 +338,36 @@ U_CFUNC void breakiterator_register_BreakIterator_class(TSRMLS_D) zend_class_implements(BreakIterator_ce_ptr TSRMLS_CC, 1, zend_ce_traversable); - zend_declare_class_constant_long(BreakIterator_ce_ptr, + zend_declare_class_constant_int(BreakIterator_ce_ptr, "DONE", sizeof("DONE") - 1, BreakIterator::DONE TSRMLS_CC ); /* Declare constants that are defined in the C header */ -#define BREAKITER_DECL_LONG_CONST(name) \ - zend_declare_class_constant_long(BreakIterator_ce_ptr, #name, \ +#define BREAKITER_DECL_INT_CONST(name) \ + zend_declare_class_constant_int(BreakIterator_ce_ptr, #name, \ sizeof(#name) - 1, UBRK_ ## name TSRMLS_CC) - BREAKITER_DECL_LONG_CONST(WORD_NONE); - BREAKITER_DECL_LONG_CONST(WORD_NONE_LIMIT); - BREAKITER_DECL_LONG_CONST(WORD_NUMBER); - BREAKITER_DECL_LONG_CONST(WORD_NUMBER_LIMIT); - BREAKITER_DECL_LONG_CONST(WORD_LETTER); - BREAKITER_DECL_LONG_CONST(WORD_LETTER_LIMIT); - BREAKITER_DECL_LONG_CONST(WORD_KANA); - BREAKITER_DECL_LONG_CONST(WORD_KANA_LIMIT); - BREAKITER_DECL_LONG_CONST(WORD_IDEO); - BREAKITER_DECL_LONG_CONST(WORD_IDEO_LIMIT); - - BREAKITER_DECL_LONG_CONST(LINE_SOFT); - BREAKITER_DECL_LONG_CONST(LINE_SOFT_LIMIT); - BREAKITER_DECL_LONG_CONST(LINE_HARD); - BREAKITER_DECL_LONG_CONST(LINE_HARD_LIMIT); - - BREAKITER_DECL_LONG_CONST(SENTENCE_TERM); - BREAKITER_DECL_LONG_CONST(SENTENCE_TERM_LIMIT); - BREAKITER_DECL_LONG_CONST(SENTENCE_SEP); - BREAKITER_DECL_LONG_CONST(SENTENCE_SEP_LIMIT); - -#undef BREAKITER_DECL_LONG_CONST + BREAKITER_DECL_INT_CONST(WORD_NONE); + BREAKITER_DECL_INT_CONST(WORD_NONE_LIMIT); + BREAKITER_DECL_INT_CONST(WORD_NUMBER); + BREAKITER_DECL_INT_CONST(WORD_NUMBER_LIMIT); + BREAKITER_DECL_INT_CONST(WORD_LETTER); + BREAKITER_DECL_INT_CONST(WORD_LETTER_LIMIT); + BREAKITER_DECL_INT_CONST(WORD_KANA); + BREAKITER_DECL_INT_CONST(WORD_KANA_LIMIT); + BREAKITER_DECL_INT_CONST(WORD_IDEO); + BREAKITER_DECL_INT_CONST(WORD_IDEO_LIMIT); + + BREAKITER_DECL_INT_CONST(LINE_SOFT); + BREAKITER_DECL_INT_CONST(LINE_SOFT_LIMIT); + BREAKITER_DECL_INT_CONST(LINE_HARD); + BREAKITER_DECL_INT_CONST(LINE_HARD_LIMIT); + + BREAKITER_DECL_INT_CONST(SENTENCE_TERM); + BREAKITER_DECL_INT_CONST(SENTENCE_TERM_LIMIT); + BREAKITER_DECL_INT_CONST(SENTENCE_SEP); + BREAKITER_DECL_INT_CONST(SENTENCE_SEP_LIMIT); + +#undef BREAKITER_DECL_INT_CONST /* Create and register 'RuleBasedBreakIterator' class. */ -- cgit v1.2.1 From c3e3c98ec666812daaaca896cf5ef758a8a6df14 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 25 Aug 2014 19:24:55 +0200 Subject: master renames phase 1 --- ext/intl/breakiterator/breakiterator_class.cpp | 52 +++++++++++++------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'ext/intl/breakiterator/breakiterator_class.cpp') diff --git a/ext/intl/breakiterator/breakiterator_class.cpp b/ext/intl/breakiterator/breakiterator_class.cpp index 7c06af792c..ea3a305dd9 100644 --- a/ext/intl/breakiterator/breakiterator_class.cpp +++ b/ext/intl/breakiterator/breakiterator_class.cpp @@ -121,7 +121,7 @@ static zend_object *BreakIterator_clone_obj(zval *object TSRMLS_DC) "Could not clone BreakIterator", 0 TSRMLS_CC); err_msg = intl_error_get_message(BREAKITER_ERROR_P(bio_orig) TSRMLS_CC); zend_throw_exception(NULL, err_msg->val, 0 TSRMLS_CC); - STR_FREE(err_msg); + zend_string_free(err_msg); } else { bio_new->biter = new_biter; ZVAL_COPY(&bio_new->text, &bio_orig->text); @@ -338,36 +338,36 @@ U_CFUNC void breakiterator_register_BreakIterator_class(TSRMLS_D) zend_class_implements(BreakIterator_ce_ptr TSRMLS_CC, 1, zend_ce_traversable); - zend_declare_class_constant_int(BreakIterator_ce_ptr, + zend_declare_class_constant_long(BreakIterator_ce_ptr, "DONE", sizeof("DONE") - 1, BreakIterator::DONE TSRMLS_CC ); /* Declare constants that are defined in the C header */ -#define BREAKITER_DECL_INT_CONST(name) \ - zend_declare_class_constant_int(BreakIterator_ce_ptr, #name, \ +#define BREAKITER_DECL_LONG_CONST(name) \ + zend_declare_class_constant_long(BreakIterator_ce_ptr, #name, \ sizeof(#name) - 1, UBRK_ ## name TSRMLS_CC) - BREAKITER_DECL_INT_CONST(WORD_NONE); - BREAKITER_DECL_INT_CONST(WORD_NONE_LIMIT); - BREAKITER_DECL_INT_CONST(WORD_NUMBER); - BREAKITER_DECL_INT_CONST(WORD_NUMBER_LIMIT); - BREAKITER_DECL_INT_CONST(WORD_LETTER); - BREAKITER_DECL_INT_CONST(WORD_LETTER_LIMIT); - BREAKITER_DECL_INT_CONST(WORD_KANA); - BREAKITER_DECL_INT_CONST(WORD_KANA_LIMIT); - BREAKITER_DECL_INT_CONST(WORD_IDEO); - BREAKITER_DECL_INT_CONST(WORD_IDEO_LIMIT); - - BREAKITER_DECL_INT_CONST(LINE_SOFT); - BREAKITER_DECL_INT_CONST(LINE_SOFT_LIMIT); - BREAKITER_DECL_INT_CONST(LINE_HARD); - BREAKITER_DECL_INT_CONST(LINE_HARD_LIMIT); - - BREAKITER_DECL_INT_CONST(SENTENCE_TERM); - BREAKITER_DECL_INT_CONST(SENTENCE_TERM_LIMIT); - BREAKITER_DECL_INT_CONST(SENTENCE_SEP); - BREAKITER_DECL_INT_CONST(SENTENCE_SEP_LIMIT); - -#undef BREAKITER_DECL_INT_CONST + BREAKITER_DECL_LONG_CONST(WORD_NONE); + BREAKITER_DECL_LONG_CONST(WORD_NONE_LIMIT); + BREAKITER_DECL_LONG_CONST(WORD_NUMBER); + BREAKITER_DECL_LONG_CONST(WORD_NUMBER_LIMIT); + BREAKITER_DECL_LONG_CONST(WORD_LETTER); + BREAKITER_DECL_LONG_CONST(WORD_LETTER_LIMIT); + BREAKITER_DECL_LONG_CONST(WORD_KANA); + BREAKITER_DECL_LONG_CONST(WORD_KANA_LIMIT); + BREAKITER_DECL_LONG_CONST(WORD_IDEO); + BREAKITER_DECL_LONG_CONST(WORD_IDEO_LIMIT); + + BREAKITER_DECL_LONG_CONST(LINE_SOFT); + BREAKITER_DECL_LONG_CONST(LINE_SOFT_LIMIT); + BREAKITER_DECL_LONG_CONST(LINE_HARD); + BREAKITER_DECL_LONG_CONST(LINE_HARD_LIMIT); + + BREAKITER_DECL_LONG_CONST(SENTENCE_TERM); + BREAKITER_DECL_LONG_CONST(SENTENCE_TERM_LIMIT); + BREAKITER_DECL_LONG_CONST(SENTENCE_SEP); + BREAKITER_DECL_LONG_CONST(SENTENCE_SEP_LIMIT); + +#undef BREAKITER_DECL_LONG_CONST /* Create and register 'RuleBasedBreakIterator' class. */ -- cgit v1.2.1 From d0cb715373c3fbe9dc095378ec5ed8c71f799f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= Date: Fri, 19 Sep 2014 18:33:14 +0200 Subject: s/PHP 5/PHP 7/ --- ext/intl/breakiterator/breakiterator_class.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/intl/breakiterator/breakiterator_class.cpp') diff --git a/ext/intl/breakiterator/breakiterator_class.cpp b/ext/intl/breakiterator/breakiterator_class.cpp index ea3a305dd9..715a866111 100644 --- a/ext/intl/breakiterator/breakiterator_class.cpp +++ b/ext/intl/breakiterator/breakiterator_class.cpp @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | -- cgit v1.2.1