Added IntlCodePointBreakIterator.

Objects of this class can be instantiated with

IntlBreakIterator::createCodePointInstance()

The method does not take a locale, as it would not make sense in this
context.

This class has one additional method:

long IntlCodePointIterator::getLastCodePoint()

which returns either -1 or the last code point we moved over, if any
(and discounting any movement before the last call to
IntlBreakIterator::first() or IntlBreakIterator::last()).

Author: cataphract

ext/intl/breakiterator/breakiterator_class.cpp

@@ -20,6 +20,7 @@
 
 #include <unicode/brkiter.h>
 #include <unicode/rbbi.h>
+#include "codepointiterator_internal.h"
 
 #include "breakiterator_iterators.h"
 
@@ -30,14 +31,18 @@ extern "C" {
 #include "breakiterator_class.h"
 #include "breakiterator_methods.h"
 #include "rulebasedbreakiterator_methods.h"
+#include "codepointiterator_methods.h"
 #include <zend_exceptions.h>
 #include <zend_interfaces.h>
 #include <assert.h>
 }
 
+using PHP::CodePointBreakIterator;
+
 /* {{{ Global variables */
 zend_class_entry *BreakIterator_ce_ptr;
 zend_class_entry *RuleBasedBreakIterator_ce_ptr;
+zend_class_entry *CodePointBreakIterator_ce_ptr;
 zend_object_handlers BreakIterator_handlers;
 /* }}} */
 
@@ -49,6 +54,8 @@ U_CFUNC	void breakiterator_object_create(zval *object,
 
 	if (classId == RuleBasedBreakIterator::getStaticClassID()) {
 		ce = RuleBasedBreakIterator_ce_ptr;
+	} else if (classId == CodePointBreakIterator::getStaticClassID()) {
+		ce = CodePointBreakIterator_ce_ptr;
 	} else {
 		ce = BreakIterator_ce_ptr;
 	}
@@ -274,6 +281,7 @@ static const zend_function_entry BreakIterator_class_functions[] = {
 	PHP_ME_MAPPING(createCharacterInstance,	breakiter_create_character_instance,	ainfo_biter_locale,					ZEND_ACC_STATIC | ZEND_ACC_PUBLIC)
 	PHP_ME_MAPPING(createSentenceInstance,	breakiter_create_sentence_instance,		ainfo_biter_locale,					ZEND_ACC_STATIC | ZEND_ACC_PUBLIC)
 	PHP_ME_MAPPING(createTitleInstance,		breakiter_create_title_instance,		ainfo_biter_locale,					ZEND_ACC_STATIC | ZEND_ACC_PUBLIC)
+	PHP_ME_MAPPING(createCodePointInstance,	breakiter_create_code_point_instance,	ainfo_biter_void,					ZEND_ACC_STATIC | ZEND_ACC_PUBLIC)
 	PHP_ME_MAPPING(getText,					breakiter_get_text,						ainfo_biter_void,					ZEND_ACC_PUBLIC)
 	PHP_ME_MAPPING(setText,					breakiter_set_text,						ainfo_biter_setText,				ZEND_ACC_PUBLIC)
 	PHP_ME_MAPPING(first,					breakiter_first,						ainfo_biter_void,					ZEND_ACC_PUBLIC)
@@ -305,6 +313,14 @@ static const zend_function_entry RuleBasedBreakIterator_class_functions[] = {
 };
 /* }}} */
 
+/* {{{ CodePointBreakIterator_class_functions
+ */
+static const zend_function_entry CodePointBreakIterator_class_functions[] = {
+	PHP_ME_MAPPING(getLastCodePoint,		cpbi_get_last_code_point,				ainfo_biter_void,					ZEND_ACC_PUBLIC)
+	PHP_FE_END
+};
+/* }}} */
+
 
 /* {{{ breakiterator_register_BreakIterator_class
  * Initialize 'BreakIterator' class
@@ -364,6 +380,12 @@ 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, NULL 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);
 }
 /* }}} */

ext/intl/breakiterator/breakiterator_methods.cpp

@@ -19,6 +19,7 @@
 #endif
 
 #include <unicode/brkiter.h>
+#include "codepointiterator_internal.h"
 
 #include "breakiterator_iterators.h"
 
@@ -29,6 +30,8 @@ extern "C" {
 #include <zend_exceptions.h>
 }
 
+using PHP::CodePointBreakIterator;
+
 U_CFUNC PHP_METHOD(BreakIterator, __construct)
 {
 	zend_throw_exception( NULL,
@@ -107,6 +110,21 @@ U_CFUNC PHP_FUNCTION(breakiter_create_title_instance)
 			INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 
+U_CFUNC PHP_FUNCTION(breakiter_create_code_point_instance)
+{
+	UErrorCode status = UErrorCode();
+	intl_error_reset(NULL TSRMLS_CC);
+
+	if (zend_parse_parameters_none() == FAILURE) {
+		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
+			"breakiter_create_code_point_instance: bad arguments", 0 TSRMLS_CC);
+		RETURN_NULL();
+	}
+
+	CodePointBreakIterator *cpbi = new CodePointBreakIterator();
+	breakiterator_object_create(return_value, cpbi TSRMLS_CC);
+}
+
 U_CFUNC PHP_FUNCTION(breakiter_get_text)
 {
 	BREAKITER_METHOD_INIT_VARS;

ext/intl/breakiterator/breakiterator_methods.h

@@ -31,6 +31,8 @@ PHP_FUNCTION(breakiter_create_sentence_instance);
 
 PHP_FUNCTION(breakiter_create_title_instance);
 
+PHP_FUNCTION(breakiter_create_code_point_instance);
+
 PHP_FUNCTION(breakiter_get_text);
 
 PHP_FUNCTION(breakiter_set_text);