Skip to content

Generate method entries for ext/intl #5370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Generate method entries for ext/intl #5370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9916eeb
Generate method entries for ext/intl
kocsismate Apr 12, 2020
0c5313b
Address review comment
kocsismate Apr 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ext/intl/breakiterator/breakiterator.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

/** @generate-function-entries */

class IntlBreakIterator implements Traversable
{
/** @return IntlBreakIterator|null */
Expand Down
78 changes: 78 additions & 0 deletions ext/intl/breakiterator/breakiterator_arginfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,81 @@ ZEND_END_ARG_INFO()
#define arginfo_class_IntlPartsIterator_getBreakIterator arginfo_class_IntlBreakIterator_createCodePointInstance

#define arginfo_class_IntlCodePointBreakIterator_getLastCodePoint arginfo_class_IntlBreakIterator_createCodePointInstance


ZEND_METHOD(IntlBreakIterator, createCharacterInstance);
ZEND_METHOD(IntlBreakIterator, createCodePointInstance);
ZEND_METHOD(IntlBreakIterator, createLineInstance);
ZEND_METHOD(IntlBreakIterator, createSentenceInstance);
ZEND_METHOD(IntlBreakIterator, createTitleInstance);
ZEND_METHOD(IntlBreakIterator, createWordInstance);
ZEND_METHOD(IntlBreakIterator, __construct);
ZEND_METHOD(IntlBreakIterator, current);
ZEND_METHOD(IntlBreakIterator, first);
ZEND_METHOD(IntlBreakIterator, following);
ZEND_METHOD(IntlBreakIterator, getErrorCode);
ZEND_METHOD(IntlBreakIterator, getErrorMessage);
ZEND_METHOD(IntlBreakIterator, getLocale);
ZEND_METHOD(IntlBreakIterator, getPartsIterator);
ZEND_METHOD(IntlBreakIterator, getText);
ZEND_METHOD(IntlBreakIterator, isBoundary);
ZEND_METHOD(IntlBreakIterator, last);
ZEND_METHOD(IntlBreakIterator, next);
ZEND_METHOD(IntlBreakIterator, preceding);
ZEND_METHOD(IntlBreakIterator, previous);
ZEND_METHOD(IntlBreakIterator, setText);
ZEND_METHOD(IntlRuleBasedBreakIterator, __construct);
ZEND_METHOD(IntlRuleBasedBreakIterator, getBinaryRules);
ZEND_METHOD(IntlRuleBasedBreakIterator, getRules);
ZEND_METHOD(IntlRuleBasedBreakIterator, getRuleStatus);
ZEND_METHOD(IntlRuleBasedBreakIterator, getRuleStatusVec);
ZEND_METHOD(IntlPartsIterator, getBreakIterator);
ZEND_METHOD(IntlCodePointBreakIterator, getLastCodePoint);


static const zend_function_entry class_IntlBreakIterator_methods[] = {
ZEND_ME(IntlBreakIterator, createCharacterInstance, arginfo_class_IntlBreakIterator_createCharacterInstance, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
ZEND_ME(IntlBreakIterator, createCodePointInstance, arginfo_class_IntlBreakIterator_createCodePointInstance, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
ZEND_ME(IntlBreakIterator, createLineInstance, arginfo_class_IntlBreakIterator_createLineInstance, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
ZEND_ME(IntlBreakIterator, createSentenceInstance, arginfo_class_IntlBreakIterator_createSentenceInstance, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
ZEND_ME(IntlBreakIterator, createTitleInstance, arginfo_class_IntlBreakIterator_createTitleInstance, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
ZEND_ME(IntlBreakIterator, createWordInstance, arginfo_class_IntlBreakIterator_createWordInstance, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
ZEND_ME(IntlBreakIterator, __construct, arginfo_class_IntlBreakIterator___construct, ZEND_ACC_PRIVATE)
ZEND_ME(IntlBreakIterator, current, arginfo_class_IntlBreakIterator_current, ZEND_ACC_PUBLIC)
ZEND_ME(IntlBreakIterator, first, arginfo_class_IntlBreakIterator_first, ZEND_ACC_PUBLIC)
ZEND_ME(IntlBreakIterator, following, arginfo_class_IntlBreakIterator_following, ZEND_ACC_PUBLIC)
ZEND_ME(IntlBreakIterator, getErrorCode, arginfo_class_IntlBreakIterator_getErrorCode, ZEND_ACC_PUBLIC)
ZEND_ME(IntlBreakIterator, getErrorMessage, arginfo_class_IntlBreakIterator_getErrorMessage, ZEND_ACC_PUBLIC)
ZEND_ME(IntlBreakIterator, getLocale, arginfo_class_IntlBreakIterator_getLocale, ZEND_ACC_PUBLIC)
ZEND_ME(IntlBreakIterator, getPartsIterator, arginfo_class_IntlBreakIterator_getPartsIterator, ZEND_ACC_PUBLIC)
ZEND_ME(IntlBreakIterator, getText, arginfo_class_IntlBreakIterator_getText, ZEND_ACC_PUBLIC)
ZEND_ME(IntlBreakIterator, isBoundary, arginfo_class_IntlBreakIterator_isBoundary, ZEND_ACC_PUBLIC)
ZEND_ME(IntlBreakIterator, last, arginfo_class_IntlBreakIterator_last, ZEND_ACC_PUBLIC)
ZEND_ME(IntlBreakIterator, next, arginfo_class_IntlBreakIterator_next, ZEND_ACC_PUBLIC)
ZEND_ME(IntlBreakIterator, preceding, arginfo_class_IntlBreakIterator_preceding, ZEND_ACC_PUBLIC)
ZEND_ME(IntlBreakIterator, previous, arginfo_class_IntlBreakIterator_previous, ZEND_ACC_PUBLIC)
ZEND_ME(IntlBreakIterator, setText, arginfo_class_IntlBreakIterator_setText, ZEND_ACC_PUBLIC)
ZEND_FE_END
};


static const zend_function_entry class_IntlRuleBasedBreakIterator_methods[] = {
ZEND_ME(IntlRuleBasedBreakIterator, __construct, arginfo_class_IntlRuleBasedBreakIterator___construct, ZEND_ACC_PUBLIC)
ZEND_ME(IntlRuleBasedBreakIterator, getBinaryRules, arginfo_class_IntlRuleBasedBreakIterator_getBinaryRules, ZEND_ACC_PUBLIC)
ZEND_ME(IntlRuleBasedBreakIterator, getRules, arginfo_class_IntlRuleBasedBreakIterator_getRules, ZEND_ACC_PUBLIC)
ZEND_ME(IntlRuleBasedBreakIterator, getRuleStatus, arginfo_class_IntlRuleBasedBreakIterator_getRuleStatus, ZEND_ACC_PUBLIC)
ZEND_ME(IntlRuleBasedBreakIterator, getRuleStatusVec, arginfo_class_IntlRuleBasedBreakIterator_getRuleStatusVec, ZEND_ACC_PUBLIC)
ZEND_FE_END
};


static const zend_function_entry class_IntlPartsIterator_methods[] = {
ZEND_ME(IntlPartsIterator, getBreakIterator, arginfo_class_IntlPartsIterator_getBreakIterator, ZEND_ACC_PUBLIC)
ZEND_FE_END
};


static const zend_function_entry class_IntlCodePointBreakIterator_methods[] = {
ZEND_ME(IntlCodePointBreakIterator, getLastCodePoint, arginfo_class_IntlCodePointBreakIterator_getLastCodePoint, ZEND_ACC_PUBLIC)
ZEND_FE_END
};
60 changes: 3 additions & 57 deletions ext/intl/breakiterator/breakiterator_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ extern "C" {
#define USE_BREAKITERATOR_POINTER 1
#include "breakiterator_class.h"
#include "breakiterator_arginfo.h"
#include "breakiterator_methods.h"
#include "rulebasedbreakiterator_methods.h"
#include "codepointiterator_methods.h"
#include <zend_exceptions.h>
#include <zend_interfaces.h>
#include <assert.h>
Expand Down Expand Up @@ -218,57 +215,6 @@ static zend_object *BreakIterator_object_create(zend_class_entry *ce)
}
/* }}} */

/* {{{ BreakIterator_class_functions
* Every 'IntlBreakIterator' class method has an entry in this table
*/
static const zend_function_entry BreakIterator_class_functions[] = {
PHP_ME(BreakIterator, __construct, arginfo_class_IntlBreakIterator___construct, ZEND_ACC_PRIVATE)
PHP_ME(BreakIterator, createWordInstance, arginfo_class_IntlBreakIterator_createWordInstance, ZEND_ACC_STATIC | ZEND_ACC_PUBLIC)
PHP_ME(BreakIterator, createLineInstance, arginfo_class_IntlBreakIterator_createLineInstance, ZEND_ACC_STATIC | ZEND_ACC_PUBLIC)
PHP_ME(BreakIterator, createCharacterInstance, arginfo_class_IntlBreakIterator_createCharacterInstance, ZEND_ACC_STATIC | ZEND_ACC_PUBLIC)
PHP_ME(BreakIterator, createSentenceInstance, arginfo_class_IntlBreakIterator_createSentenceInstance, ZEND_ACC_STATIC | ZEND_ACC_PUBLIC)
PHP_ME(BreakIterator, createTitleInstance, arginfo_class_IntlBreakIterator_createTitleInstance, ZEND_ACC_STATIC | ZEND_ACC_PUBLIC)
PHP_ME(BreakIterator, createCodePointInstance, arginfo_class_IntlBreakIterator_createCodePointInstance, ZEND_ACC_STATIC | ZEND_ACC_PUBLIC)
PHP_ME(BreakIterator, getText, arginfo_class_IntlBreakIterator_getText, ZEND_ACC_PUBLIC)
PHP_ME(BreakIterator, setText, arginfo_class_IntlBreakIterator_setText, ZEND_ACC_PUBLIC)
PHP_ME(BreakIterator, first, arginfo_class_IntlBreakIterator_first, ZEND_ACC_PUBLIC)
PHP_ME(BreakIterator, last, arginfo_class_IntlBreakIterator_last, ZEND_ACC_PUBLIC)
PHP_ME(BreakIterator, previous, arginfo_class_IntlBreakIterator_previous, ZEND_ACC_PUBLIC)
PHP_ME(BreakIterator, next, arginfo_class_IntlBreakIterator_next, ZEND_ACC_PUBLIC)
PHP_ME(BreakIterator, current, arginfo_class_IntlBreakIterator_current, ZEND_ACC_PUBLIC)
PHP_ME(BreakIterator, following, arginfo_class_IntlBreakIterator_following, ZEND_ACC_PUBLIC)
PHP_ME(BreakIterator, preceding, arginfo_class_IntlBreakIterator_preceding, ZEND_ACC_PUBLIC)
PHP_ME(BreakIterator, isBoundary, arginfo_class_IntlBreakIterator_isBoundary, ZEND_ACC_PUBLIC)
PHP_ME(BreakIterator, getLocale, arginfo_class_IntlBreakIterator_getLocale, ZEND_ACC_PUBLIC)
PHP_ME(BreakIterator, getPartsIterator, arginfo_class_IntlBreakIterator_getPartsIterator, ZEND_ACC_PUBLIC)

PHP_ME(BreakIterator, getErrorCode, arginfo_class_IntlBreakIterator_getErrorCode, ZEND_ACC_PUBLIC)
PHP_ME(BreakIterator, getErrorMessage, arginfo_class_IntlBreakIterator_getErrorMessage, ZEND_ACC_PUBLIC)
PHP_FE_END
};
/* }}} */

/* {{{ RuleBasedBreakIterator_class_functions
*/
static const zend_function_entry RuleBasedBreakIterator_class_functions[] = {
PHP_ME(IntlRuleBasedBreakIterator, __construct, arginfo_class_IntlRuleBasedBreakIterator___construct, ZEND_ACC_PUBLIC)
PHP_ME(IntlRuleBasedBreakIterator, getRules, arginfo_class_IntlRuleBasedBreakIterator_getRules, ZEND_ACC_PUBLIC)
PHP_ME(IntlRuleBasedBreakIterator, getRuleStatus, arginfo_class_IntlRuleBasedBreakIterator_getRuleStatus, ZEND_ACC_PUBLIC)
PHP_ME(IntlRuleBasedBreakIterator, getRuleStatusVec, arginfo_class_IntlRuleBasedBreakIterator_getRuleStatusVec, ZEND_ACC_PUBLIC)
PHP_ME(IntlRuleBasedBreakIterator, getBinaryRules, arginfo_class_IntlRuleBasedBreakIterator_getBinaryRules, ZEND_ACC_PUBLIC)
PHP_FE_END
};
/* }}} */

/* {{{ CodePointBreakIterator_class_functions
*/
static const zend_function_entry CodePointBreakIterator_class_functions[] = {
PHP_ME(IntlCodePointBreakIterator, getLastCodePoint, arginfo_class_IntlCodePointBreakIterator_getLastCodePoint, ZEND_ACC_PUBLIC)
PHP_FE_END
};
/* }}} */


/* {{{ breakiterator_register_BreakIterator_class
* Initialize 'BreakIterator' class
*/
Expand All @@ -277,7 +223,7 @@ U_CFUNC void breakiterator_register_BreakIterator_class(void)
zend_class_entry ce;

/* Create and register 'BreakIterator' class. */
INIT_CLASS_ENTRY(ce, "IntlBreakIterator", BreakIterator_class_functions);
INIT_CLASS_ENTRY(ce, "IntlBreakIterator", class_IntlBreakIterator_methods);
ce.create_object = BreakIterator_object_create;
ce.get_iterator = _breakiterator_get_iterator;
BreakIterator_ce_ptr = zend_register_internal_class(&ce);
Expand Down Expand Up @@ -327,13 +273,13 @@ U_CFUNC void breakiterator_register_BreakIterator_class(void)

/* Create and register 'RuleBasedBreakIterator' class. */
INIT_CLASS_ENTRY(ce, "IntlRuleBasedBreakIterator",
RuleBasedBreakIterator_class_functions);
class_IntlRuleBasedBreakIterator_methods);
RuleBasedBreakIterator_ce_ptr = zend_register_internal_class_ex(&ce,
BreakIterator_ce_ptr);

/* Create and register 'CodePointBreakIterator' class. */
INIT_CLASS_ENTRY(ce, "IntlCodePointBreakIterator",
CodePointBreakIterator_class_functions);
class_IntlCodePointBreakIterator_methods);
CodePointBreakIterator_ce_ptr = zend_register_internal_class_ex(&ce,
BreakIterator_ce_ptr);
}
Expand Down
7 changes: 1 addition & 6 deletions ext/intl/breakiterator/breakiterator_iterators.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,17 +286,12 @@ U_CFUNC PHP_METHOD(IntlPartsIterator, getBreakIterator)
ZVAL_COPY_DEREF(return_value, biter_zval);
}

static const zend_function_entry IntlPartsIterator_class_functions[] = {
PHP_ME(IntlPartsIterator, getBreakIterator, arginfo_class_IntlPartsIterator_getBreakIterator, ZEND_ACC_PUBLIC)
PHP_FE_END
};

U_CFUNC void breakiterator_register_IntlPartsIterator_class(void)
{
zend_class_entry ce;

/* Create and register 'BreakIterator' class. */
INIT_CLASS_ENTRY(ce, "IntlPartsIterator", IntlPartsIterator_class_functions);
INIT_CLASS_ENTRY(ce, "IntlPartsIterator", class_IntlPartsIterator_methods);
IntlPartsIterator_ce_ptr = zend_register_internal_class_ex(&ce,
IntlIterator_ce_ptr);
IntlPartsIterator_ce_ptr->create_object = IntlPartsIterator_object_create;
Expand Down
42 changes: 21 additions & 21 deletions ext/intl/breakiterator/breakiterator_methods.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ using PHP::CodePointBreakIterator;
using icu::BreakIterator;
using icu::Locale;

U_CFUNC PHP_METHOD(BreakIterator, __construct)
U_CFUNC PHP_METHOD(IntlBreakIterator, __construct)
{
zend_throw_exception( NULL,
"An object of this type cannot be created with the new operator",
Expand Down Expand Up @@ -73,42 +73,42 @@ static void _breakiter_factory(const char *func_name,
breakiterator_object_create(return_value, biter, 1);
}

U_CFUNC PHP_METHOD(BreakIterator, createWordInstance)
U_CFUNC PHP_METHOD(IntlBreakIterator, createWordInstance)
{
_breakiter_factory("breakiter_create_word_instance",
&BreakIterator::createWordInstance,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}

U_CFUNC PHP_METHOD(BreakIterator, createLineInstance)
U_CFUNC PHP_METHOD(IntlBreakIterator, createLineInstance)
{
_breakiter_factory("breakiter_create_line_instance",
&BreakIterator::createLineInstance,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}

U_CFUNC PHP_METHOD(BreakIterator, createCharacterInstance)
U_CFUNC PHP_METHOD(IntlBreakIterator, createCharacterInstance)
{
_breakiter_factory("breakiter_create_character_instance",
&BreakIterator::createCharacterInstance,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}

U_CFUNC PHP_METHOD(BreakIterator, createSentenceInstance)
U_CFUNC PHP_METHOD(IntlBreakIterator, createSentenceInstance)
{
_breakiter_factory("breakiter_create_sentence_instance",
&BreakIterator::createSentenceInstance,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}

U_CFUNC PHP_METHOD(BreakIterator, createTitleInstance)
U_CFUNC PHP_METHOD(IntlBreakIterator, createTitleInstance)
{
_breakiter_factory("breakiter_create_title_instance",
&BreakIterator::createTitleInstance,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}

U_CFUNC PHP_METHOD(BreakIterator, createCodePointInstance)
U_CFUNC PHP_METHOD(IntlBreakIterator, createCodePointInstance)
{
intl_error_reset(NULL);

Expand All @@ -120,7 +120,7 @@ U_CFUNC PHP_METHOD(BreakIterator, createCodePointInstance)
breakiterator_object_create(return_value, cpbi, 1);
}

U_CFUNC PHP_METHOD(BreakIterator, getText)
U_CFUNC PHP_METHOD(IntlBreakIterator, getText)
{
BREAKITER_METHOD_INIT_VARS;
object = ZEND_THIS;
Expand All @@ -138,7 +138,7 @@ U_CFUNC PHP_METHOD(BreakIterator, getText)
}
}

U_CFUNC PHP_METHOD(BreakIterator, setText)
U_CFUNC PHP_METHOD(IntlBreakIterator, setText)
{
UText *ut = NULL;
zend_string *text;
Expand Down Expand Up @@ -217,28 +217,28 @@ static void _breakiter_int32_ret_int32(
RETURN_LONG((zend_long)res);
}

U_CFUNC PHP_METHOD(BreakIterator, first)
U_CFUNC PHP_METHOD(IntlBreakIterator, first)
{
_breakiter_no_args_ret_int32("breakiter_first",
&BreakIterator::first,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}

U_CFUNC PHP_METHOD(BreakIterator, last)
U_CFUNC PHP_METHOD(IntlBreakIterator, last)
{
_breakiter_no_args_ret_int32("breakiter_last",
&BreakIterator::last,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}

U_CFUNC PHP_METHOD(BreakIterator, previous)
U_CFUNC PHP_METHOD(IntlBreakIterator, previous)
{
_breakiter_no_args_ret_int32("breakiter_previous",
&BreakIterator::previous,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}

U_CFUNC PHP_METHOD(BreakIterator, next)
U_CFUNC PHP_METHOD(IntlBreakIterator, next)
{
bool no_arg_version = false;

Expand Down Expand Up @@ -267,7 +267,7 @@ U_CFUNC PHP_METHOD(BreakIterator, next)
}
}

U_CFUNC PHP_METHOD(BreakIterator, current)
U_CFUNC PHP_METHOD(IntlBreakIterator, current)
{
BREAKITER_METHOD_INIT_VARS;
object = ZEND_THIS;
Expand All @@ -283,21 +283,21 @@ U_CFUNC PHP_METHOD(BreakIterator, current)
RETURN_LONG((zend_long)res);
}

U_CFUNC PHP_METHOD(BreakIterator, following)
U_CFUNC PHP_METHOD(IntlBreakIterator, following)
{
_breakiter_int32_ret_int32("breakiter_following",
&BreakIterator::following,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}

U_CFUNC PHP_METHOD(BreakIterator, preceding)
U_CFUNC PHP_METHOD(IntlBreakIterator, preceding)
{
_breakiter_int32_ret_int32("breakiter_preceding",
&BreakIterator::preceding,
INTERNAL_FUNCTION_PARAM_PASSTHRU);
}

U_CFUNC PHP_METHOD(BreakIterator, isBoundary)
U_CFUNC PHP_METHOD(IntlBreakIterator, isBoundary)
{
zend_long offset;
BREAKITER_METHOD_INIT_VARS;
Expand All @@ -322,7 +322,7 @@ U_CFUNC PHP_METHOD(BreakIterator, isBoundary)
RETURN_BOOL((zend_long)res);
}

U_CFUNC PHP_METHOD(BreakIterator, getLocale)
U_CFUNC PHP_METHOD(IntlBreakIterator, getLocale)
{
zend_long locale_type;
BREAKITER_METHOD_INIT_VARS;
Expand All @@ -348,7 +348,7 @@ U_CFUNC PHP_METHOD(BreakIterator, getLocale)
RETURN_STRING(locale.getName());
}

U_CFUNC PHP_METHOD(BreakIterator, getPartsIterator)
U_CFUNC PHP_METHOD(IntlBreakIterator, getPartsIterator)
{
zend_long key_type = 0;
BREAKITER_METHOD_INIT_VARS;
Expand All @@ -372,7 +372,7 @@ U_CFUNC PHP_METHOD(BreakIterator, getPartsIterator)
object, return_value, (parts_iter_key_type)key_type);
}

U_CFUNC PHP_METHOD(BreakIterator, getErrorCode)
U_CFUNC PHP_METHOD(IntlBreakIterator, getErrorCode)
{
BREAKITER_METHOD_INIT_VARS;
object = ZEND_THIS;
Expand All @@ -386,7 +386,7 @@ U_CFUNC PHP_METHOD(BreakIterator, getErrorCode)
RETURN_LONG((zend_long)BREAKITER_ERROR_CODE(bio));
}

U_CFUNC PHP_METHOD(BreakIterator, getErrorMessage)
U_CFUNC PHP_METHOD(IntlBreakIterator, getErrorMessage)
{
zend_string* message = NULL;
BREAKITER_METHOD_INIT_VARS;
Expand Down
Loading