cvs: php4 /ext/ctype ctype.c php_ctype.h /ext/ctype/tests 001.phpt 002.phpt
| From: | Hartmut Holzgraefe | Date: | Tue, 19 Dec 2000 11:50:31 +0000 |
| Subject: | cvs: php4 /ext/ctype ctype.c php_ctype.h /ext/ctype/tests 001.phpt 002.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-3211@lists.php.net to get a copy of this message | ||
hholzgra Tue Dec 19 03:50:31 2000 EDT
Modified files:
/php4/ext/ctype ctype.c php_ctype.h
/php4/ext/ctype/tests 001.phpt 002.phpt
Log:
@ ctype functions now follow the extension naming conventions (Hartmut)
# removed unneccesary code generated by ext_skel
Index: php4/ext/ctype/ctype.c diff -u php4/ext/ctype/ctype.c:1.1 php4/ext/ctype/ctype.c:1.2 --- php4/ext/ctype/ctype.c:1.1 Tue Nov 21 17:00:44 2000 +++ php4/ext/ctype/ctype.c Tue Dec 19 03:50:30 2000 @@ -40,28 +40,27 @@ /* Every user visible function must have an entry in ctype_functions[]. */ function_entry ctype_functions[] = { - PHP_FE(confirm_ctype_compiled, NULL) /* For testing, remove later. */ - PHP_FE(isalnum, NULL) - PHP_FE(isalpha, NULL) - PHP_FE(iscntrl, NULL) - PHP_FE(isdigit, NULL) - PHP_FE(islower, NULL) - PHP_FE(isgraph, NULL) - PHP_FE(isprint, NULL) - PHP_FE(ispunct, NULL) - PHP_FE(isspace, NULL) - PHP_FE(isupper, NULL) - PHP_FE(isxdigit, NULL) + PHP_FE(ctype_alnum, NULL) + PHP_FE(ctype_alpha, NULL) + PHP_FE(ctype_cntrl, NULL) + PHP_FE(ctype_digit, NULL) + PHP_FE(ctype_lower, NULL) + PHP_FE(ctype_graph, NULL) + PHP_FE(ctype_print, NULL) + PHP_FE(ctype_punct, NULL) + PHP_FE(ctype_space, NULL) + PHP_FE(ctype_upper, NULL) + PHP_FE(ctype_xdigit, NULL) {NULL, NULL, NULL} /* Must be the last line in ctype_functions[] */ }; zend_module_entry ctype_module_entry = { "ctype", ctype_functions, - PHP_MINIT(ctype), - PHP_MSHUTDOWN(ctype), - PHP_RINIT(ctype), /* Replace with NULL if there's nothing to do at request start */ - PHP_RSHUTDOWN(ctype), /* Replace with NULL if there's nothing to do at request end */ + NULL, + NULL, + NULL, + NULL, PHP_MINFO(ctype), STANDARD_MODULE_PROPERTIES }; @@ -70,45 +69,11 @@ ZEND_GET_MODULE(ctype) #endif -/* Remove comments and fill if you need to have entries in php.ini -PHP_INI_BEGIN() -PHP_INI_END() -*/ - #ifndef PHP_EXPERIMENTAL #define PHP_EXPERIMENTAL(x,y) #endif -PHP_MINIT_FUNCTION(ctype) -{ -/* Remove comments if you have entries in php.ini - REGISTER_INI_ENTRIES(); -*/ - - return SUCCESS; -} - -PHP_MSHUTDOWN_FUNCTION(ctype) -{ -/* Remove comments if you have entries in php.ini - UNREGISTER_INI_ENTRIES(); -*/ - return SUCCESS; -} - -/* Remove if there's nothing to do at request start */ -PHP_RINIT_FUNCTION(ctype) -{ - return SUCCESS; -} - -/* Remove if there's nothing to do at request end */ -PHP_RSHUTDOWN_FUNCTION(ctype) -{ - return SUCCESS; -} - PHP_MINFO_FUNCTION(ctype) { ELS_FETCH(); @@ -117,40 +82,8 @@ php_info_print_table_start(); php_info_print_table_row(2, "ctype functions", "enabled (experimental)"); php_info_print_table_end(); - - /* Remove comments if you have entries in php.ini - DISPLAY_INI_ENTRIES(); - */ } -/* Remove the following function when you have succesfully modified config.m4 - so that your module can be compiled into PHP, it exists only for testing - purposes. */ - -/* Every user-visible function in PHP should document itself in the source */ -/* {{{ proto string confirm_ctype_compiled(string arg) - Return a string to confirm that the module is compiled in */ -PHP_FUNCTION(confirm_ctype_compiled) -{ - zval **arg; - int len; - char string[256]; - - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_string_ex(arg); - - len = sprintf(string, "Congratulations, you have successfully modified ext/ctype/config.m4, module %s is compiled into PHP", Z_STRVAL_PP(arg)); - RETURN_STRINGL(string, len, 1); -} -/* }}} */ -/* The previous line is meant for emacs, so it can correctly fold and unfold - functions in source code. See the corresponding marks just before function - definition, where the functions purpose is also documented. Please follow - this convention for the convenience of others editing your code. -*/ static int ctype(int (*iswhat)(int),zval **c) { @@ -177,7 +110,7 @@ /* {{{ proto bool isalnum(mixed c) Check for alphanumeric character(s) */ -PHP_FUNCTION(isalnum) +PHP_FUNCTION(ctype_alnum) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; @@ -195,7 +128,7 @@ /* {{{ proto bool isalpha(mixed c) Check for alphabetic character(s) */ -PHP_FUNCTION(isalpha) +PHP_FUNCTION(ctype_alpha) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; @@ -213,7 +146,7 @@ /* {{{ proto bool iscntrl(mixed c) Check for control character(s) */ -PHP_FUNCTION(iscntrl) +PHP_FUNCTION(ctype_cntrl) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; @@ -231,7 +164,7 @@ /* {{{ proto bool isdigit(mixed c) Check for numeric character(s) */ -PHP_FUNCTION(isdigit) +PHP_FUNCTION(ctype_digit) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; @@ -249,7 +182,7 @@ /* {{{ proto bool islower(mixed c) Check for lowercase character(s) */ -PHP_FUNCTION(islower) +PHP_FUNCTION(ctype_lower) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; @@ -267,7 +200,7 @@ /* {{{ proto bool isgraph(mixed c) Check for any printable character(s) except space */ -PHP_FUNCTION(isgraph) +PHP_FUNCTION(ctype_graph) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; @@ -285,7 +218,7 @@ /* {{{ proto bool isprint(mixed c) Check for printable character(s) */ -PHP_FUNCTION(isprint) +PHP_FUNCTION(ctype_print) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; @@ -303,7 +236,7 @@ /* {{{ proto bool ispunct(mixed c) Check for any printable character which is not a space or an alphanumeric character */ -PHP_FUNCTION(ispunct) +PHP_FUNCTION(ctype_punct) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; @@ -321,7 +254,7 @@ /* {{{ proto bool isspace(mixed c) Check for whitespace character(s)*/ -PHP_FUNCTION(isspace) +PHP_FUNCTION(ctype_space) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; @@ -339,7 +272,7 @@ /* {{{ proto bool isupper(mixed c) Check for uppercase character(s) */ -PHP_FUNCTION(isupper) +PHP_FUNCTION(ctype_upper) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; @@ -357,7 +290,7 @@ /* {{{ proto bool isxdigit(mixed c) Check for character(s) representing a hexadecimal digit */ -PHP_FUNCTION(isxdigit) +PHP_FUNCTION(ctype_xdigit) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; Index: php4/ext/ctype/php_ctype.h diff -u php4/ext/ctype/php_ctype.h:1.1 php4/ext/ctype/php_ctype.h:1.2 --- php4/ext/ctype/php_ctype.h:1.1 Tue Nov 21 17:00:44 2000 +++ php4/ext/ctype/php_ctype.h Tue Dec 19 03:50:30 2000 @@ -40,18 +40,17 @@ PHP_RSHUTDOWN_FUNCTION(ctype); PHP_MINFO_FUNCTION(ctype); -PHP_FUNCTION(confirm_ctype_compiled); /* For testing, remove later. */ -PHP_FUNCTION(isalnum); -PHP_FUNCTION(isalpha); -PHP_FUNCTION(iscntrl); -PHP_FUNCTION(isdigit); -PHP_FUNCTION(islower); -PHP_FUNCTION(isgraph); -PHP_FUNCTION(isprint); -PHP_FUNCTION(ispunct); -PHP_FUNCTION(isspace); -PHP_FUNCTION(isupper); -PHP_FUNCTION(isxdigit); +PHP_FUNCTION(ctype_alnum); +PHP_FUNCTION(ctype_alpha); +PHP_FUNCTION(ctype_cntrl); +PHP_FUNCTION(ctype_digit); +PHP_FUNCTION(ctype_lower); +PHP_FUNCTION(ctype_graph); +PHP_FUNCTION(ctype_print); +PHP_FUNCTION(ctype_punct); +PHP_FUNCTION(ctype_space); +PHP_FUNCTION(ctype_upper); +PHP_FUNCTION(ctype_xdigit); /* Declare any global variables you may need between the BEGIN Index: php4/ext/ctype/tests/001.phpt diff -u php4/ext/ctype/tests/001.phpt:1.1 php4/ext/ctype/tests/001.phpt:1.2 --- php4/ext/ctype/tests/001.phpt:1.1 Tue Nov 21 17:00:44 2000 +++ php4/ext/ctype/tests/001.phpt Tue Dec 19 03:50:30 2000 @@ -15,27 +15,27 @@ } echo "$function $n\n"; } -ctype_test_001("islower"); -ctype_test_001("isupper"); -ctype_test_001("isalpha"); -ctype_test_001("isdigit"); -ctype_test_001("isalnum"); -ctype_test_001("iscntrl"); -ctype_test_001("isgraph"); -ctype_test_001("isprint"); -ctype_test_001("ispunct"); -ctype_test_001("isspace"); -ctype_test_001("isxdigit"); +ctype_test_001("ctype_lower"); +ctype_test_001("ctype_upper"); +ctype_test_001("ctype_alpha"); +ctype_test_001("ctype_digit"); +ctype_test_001("ctype_alnum"); +ctype_test_001("ctype_cntrl"); +ctype_test_001("ctype_graph"); +ctype_test_001("ctype_print"); +ctype_test_001("ctype_punct"); +ctype_test_001("ctype_space"); +ctype_test_001("ctype_xdigit"); ?> --EXPECT-- -islower 26 -isupper 26 -isalpha 52 -isdigit 10 -isalnum 62 -iscntrl 33 -isgraph 94 -isprint 95 -ispunct 32 -isspace 6 -isxdigit 22 +ctype_lower 26 +ctype_upper 26 +ctype_alpha 52 +ctype_digit 10 +ctype_alnum 62 +ctype_cntrl 33 +ctype_graph 94 +ctype_print 95 +ctype_punct 32 +ctype_space 6 +ctype_xdigit 22 Index: php4/ext/ctype/tests/002.phpt diff -u php4/ext/ctype/tests/002.phpt:1.1 php4/ext/ctype/tests/002.phpt:1.2 --- php4/ext/ctype/tests/002.phpt:1.1 Tue Nov 21 17:00:44 2000 +++ php4/ext/ctype/tests/002.phpt Tue Dec 19 03:50:30 2000 @@ -17,27 +17,27 @@ } echo "$function $n $m\n"; } -ctype_test_002("islower"); -ctype_test_002("isupper"); -ctype_test_002("isalpha"); -ctype_test_002("isdigit"); -ctype_test_002("isalnum"); -ctype_test_002("iscntrl"); -ctype_test_002("isgraph"); -ctype_test_002("isprint"); -ctype_test_002("ispunct"); -ctype_test_002("isspace"); -ctype_test_002("isxdigit"); +ctype_test_002("ctype_lower"); +ctype_test_002("ctype_upper"); +ctype_test_002("ctype_alpha"); +ctype_test_002("ctype_digit"); +ctype_test_002("ctype_alnum"); +ctype_test_002("ctype_cntrl"); +ctype_test_002("ctype_graph"); +ctype_test_002("ctype_print"); +ctype_test_002("ctype_punct"); +ctype_test_002("ctype_space"); +ctype_test_002("ctype_xdigit"); ?> --EXPECT-- -islower 26 0 -isupper 26 0 -isalpha 52 0 -isdigit 10 0 -isalnum 62 0 -iscntrl 33 0 -isgraph 94 94 -isprint 95 95 -ispunct 32 0 -isspace 6 0 -isxdigit 22 0 +ctype_lower 26 0 +ctype_upper 26 0 +ctype_alpha 52 0 +ctype_digit 10 0 +ctype_alnum 62 0 +ctype_cntrl 33 0 +ctype_graph 94 94 +ctype_print 95 95 +ctype_punct 32 0 +ctype_space 6 0 +ctype_xdigit 22 0
Index: php4/ext/ctype/ctype.c diff -u php4/ext/ctype/ctype.c:1.1 php4/ext/ctype/ctype.c:1.2 --- php4/ext/ctype/ctype.c:1.1 Tue Nov 21 17:00:44 2000 +++ php4/ext/ctype/ctype.c Tue Dec 19 03:50:30 2000 @@ -40,28 +40,27 @@ /* Every user visible function must have an entry in ctype_functions[]. */ function_entry ctype_functions[] = { - PHP_FE(confirm_ctype_compiled, NULL) /* For testing, remove later. */ - PHP_FE(isalnum, NULL) - PHP_FE(isalpha, NULL) - PHP_FE(iscntrl, NULL) - PHP_FE(isdigit, NULL) - PHP_FE(islower, NULL) - PHP_FE(isgraph, NULL) - PHP_FE(isprint, NULL) - PHP_FE(ispunct, NULL) - PHP_FE(isspace, NULL) - PHP_FE(isupper, NULL) - PHP_FE(isxdigit, NULL) + PHP_FE(ctype_alnum, NULL) + PHP_FE(ctype_alpha, NULL) + PHP_FE(ctype_cntrl, NULL) + PHP_FE(ctype_digit, NULL) + PHP_FE(ctype_lower, NULL) + PHP_FE(ctype_graph, NULL) + PHP_FE(ctype_print, NULL) + PHP_FE(ctype_punct, NULL) + PHP_FE(ctype_space, NULL) + PHP_FE(ctype_upper, NULL) + PHP_FE(ctype_xdigit, NULL) {NULL, NULL, NULL} /* Must be the last line in ctype_functions[] */ }; zend_module_entry ctype_module_entry = { "ctype", ctype_functions, - PHP_MINIT(ctype), - PHP_MSHUTDOWN(ctype), - PHP_RINIT(ctype), /* Replace with NULL if there's nothing to do at request start */ - PHP_RSHUTDOWN(ctype), /* Replace with NULL if there's nothing to do at request end */ + NULL, + NULL, + NULL, + NULL, PHP_MINFO(ctype), STANDARD_MODULE_PROPERTIES }; @@ -70,45 +69,11 @@ ZEND_GET_MODULE(ctype) #endif -/* Remove comments and fill if you need to have entries in php.ini -PHP_INI_BEGIN() -PHP_INI_END() -*/ - #ifndef PHP_EXPERIMENTAL #define PHP_EXPERIMENTAL(x,y) #endif -PHP_MINIT_FUNCTION(ctype) -{ -/* Remove comments if you have entries in php.ini - REGISTER_INI_ENTRIES(); -*/ - - return SUCCESS; -} - -PHP_MSHUTDOWN_FUNCTION(ctype) -{ -/* Remove comments if you have entries in php.ini - UNREGISTER_INI_ENTRIES(); -*/ - return SUCCESS; -} - -/* Remove if there's nothing to do at request start */ -PHP_RINIT_FUNCTION(ctype) -{ - return SUCCESS; -} - -/* Remove if there's nothing to do at request end */ -PHP_RSHUTDOWN_FUNCTION(ctype) -{ - return SUCCESS; -} - PHP_MINFO_FUNCTION(ctype) { ELS_FETCH(); @@ -117,40 +82,8 @@ php_info_print_table_start(); php_info_print_table_row(2, "ctype functions", "enabled (experimental)"); php_info_print_table_end(); - - /* Remove comments if you have entries in php.ini - DISPLAY_INI_ENTRIES(); - */ } -/* Remove the following function when you have succesfully modified config.m4 - so that your module can be compiled into PHP, it exists only for testing - purposes. */ - -/* Every user-visible function in PHP should document itself in the source */ -/* {{{ proto string confirm_ctype_compiled(string arg) - Return a string to confirm that the module is compiled in */ -PHP_FUNCTION(confirm_ctype_compiled) -{ - zval **arg; - int len; - char string[256]; - - if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE) { - WRONG_PARAM_COUNT; - } - - convert_to_string_ex(arg); - - len = sprintf(string, "Congratulations, you have successfully modified ext/ctype/config.m4, module %s is compiled into PHP", Z_STRVAL_PP(arg)); - RETURN_STRINGL(string, len, 1); -} -/* }}} */ -/* The previous line is meant for emacs, so it can correctly fold and unfold - functions in source code. See the corresponding marks just before function - definition, where the functions purpose is also documented. Please follow - this convention for the convenience of others editing your code. -*/ static int ctype(int (*iswhat)(int),zval **c) { @@ -177,7 +110,7 @@ /* {{{ proto bool isalnum(mixed c) Check for alphanumeric character(s) */ -PHP_FUNCTION(isalnum) +PHP_FUNCTION(ctype_alnum) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; @@ -195,7 +128,7 @@ /* {{{ proto bool isalpha(mixed c) Check for alphabetic character(s) */ -PHP_FUNCTION(isalpha) +PHP_FUNCTION(ctype_alpha) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; @@ -213,7 +146,7 @@ /* {{{ proto bool iscntrl(mixed c) Check for control character(s) */ -PHP_FUNCTION(iscntrl) +PHP_FUNCTION(ctype_cntrl) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; @@ -231,7 +164,7 @@ /* {{{ proto bool isdigit(mixed c) Check for numeric character(s) */ -PHP_FUNCTION(isdigit) +PHP_FUNCTION(ctype_digit) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; @@ -249,7 +182,7 @@ /* {{{ proto bool islower(mixed c) Check for lowercase character(s) */ -PHP_FUNCTION(islower) +PHP_FUNCTION(ctype_lower) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; @@ -267,7 +200,7 @@ /* {{{ proto bool isgraph(mixed c) Check for any printable character(s) except space */ -PHP_FUNCTION(isgraph) +PHP_FUNCTION(ctype_graph) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; @@ -285,7 +218,7 @@ /* {{{ proto bool isprint(mixed c) Check for printable character(s) */ -PHP_FUNCTION(isprint) +PHP_FUNCTION(ctype_print) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; @@ -303,7 +236,7 @@ /* {{{ proto bool ispunct(mixed c) Check for any printable character which is not a space or an alphanumeric character */ -PHP_FUNCTION(ispunct) +PHP_FUNCTION(ctype_punct) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; @@ -321,7 +254,7 @@ /* {{{ proto bool isspace(mixed c) Check for whitespace character(s)*/ -PHP_FUNCTION(isspace) +PHP_FUNCTION(ctype_space) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; @@ -339,7 +272,7 @@ /* {{{ proto bool isupper(mixed c) Check for uppercase character(s) */ -PHP_FUNCTION(isupper) +PHP_FUNCTION(ctype_upper) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; @@ -357,7 +290,7 @@ /* {{{ proto bool isxdigit(mixed c) Check for character(s) representing a hexadecimal digit */ -PHP_FUNCTION(isxdigit) +PHP_FUNCTION(ctype_xdigit) { PHP_EXPERIMENTAL("4.0.4dev",NULL) zval **c; Index: php4/ext/ctype/php_ctype.h diff -u php4/ext/ctype/php_ctype.h:1.1 php4/ext/ctype/php_ctype.h:1.2 --- php4/ext/ctype/php_ctype.h:1.1 Tue Nov 21 17:00:44 2000 +++ php4/ext/ctype/php_ctype.h Tue Dec 19 03:50:30 2000 @@ -40,18 +40,17 @@ PHP_RSHUTDOWN_FUNCTION(ctype); PHP_MINFO_FUNCTION(ctype); -PHP_FUNCTION(confirm_ctype_compiled); /* For testing, remove later. */ -PHP_FUNCTION(isalnum); -PHP_FUNCTION(isalpha); -PHP_FUNCTION(iscntrl); -PHP_FUNCTION(isdigit); -PHP_FUNCTION(islower); -PHP_FUNCTION(isgraph); -PHP_FUNCTION(isprint); -PHP_FUNCTION(ispunct); -PHP_FUNCTION(isspace); -PHP_FUNCTION(isupper); -PHP_FUNCTION(isxdigit); +PHP_FUNCTION(ctype_alnum); +PHP_FUNCTION(ctype_alpha); +PHP_FUNCTION(ctype_cntrl); +PHP_FUNCTION(ctype_digit); +PHP_FUNCTION(ctype_lower); +PHP_FUNCTION(ctype_graph); +PHP_FUNCTION(ctype_print); +PHP_FUNCTION(ctype_punct); +PHP_FUNCTION(ctype_space); +PHP_FUNCTION(ctype_upper); +PHP_FUNCTION(ctype_xdigit); /* Declare any global variables you may need between the BEGIN Index: php4/ext/ctype/tests/001.phpt diff -u php4/ext/ctype/tests/001.phpt:1.1 php4/ext/ctype/tests/001.phpt:1.2 --- php4/ext/ctype/tests/001.phpt:1.1 Tue Nov 21 17:00:44 2000 +++ php4/ext/ctype/tests/001.phpt Tue Dec 19 03:50:30 2000 @@ -15,27 +15,27 @@ } echo "$function $n\n"; } -ctype_test_001("islower"); -ctype_test_001("isupper"); -ctype_test_001("isalpha"); -ctype_test_001("isdigit"); -ctype_test_001("isalnum"); -ctype_test_001("iscntrl"); -ctype_test_001("isgraph"); -ctype_test_001("isprint"); -ctype_test_001("ispunct"); -ctype_test_001("isspace"); -ctype_test_001("isxdigit"); +ctype_test_001("ctype_lower"); +ctype_test_001("ctype_upper"); +ctype_test_001("ctype_alpha"); +ctype_test_001("ctype_digit"); +ctype_test_001("ctype_alnum"); +ctype_test_001("ctype_cntrl"); +ctype_test_001("ctype_graph"); +ctype_test_001("ctype_print"); +ctype_test_001("ctype_punct"); +ctype_test_001("ctype_space"); +ctype_test_001("ctype_xdigit"); ?> --EXPECT-- -islower 26 -isupper 26 -isalpha 52 -isdigit 10 -isalnum 62 -iscntrl 33 -isgraph 94 -isprint 95 -ispunct 32 -isspace 6 -isxdigit 22 +ctype_lower 26 +ctype_upper 26 +ctype_alpha 52 +ctype_digit 10 +ctype_alnum 62 +ctype_cntrl 33 +ctype_graph 94 +ctype_print 95 +ctype_punct 32 +ctype_space 6 +ctype_xdigit 22 Index: php4/ext/ctype/tests/002.phpt diff -u php4/ext/ctype/tests/002.phpt:1.1 php4/ext/ctype/tests/002.phpt:1.2 --- php4/ext/ctype/tests/002.phpt:1.1 Tue Nov 21 17:00:44 2000 +++ php4/ext/ctype/tests/002.phpt Tue Dec 19 03:50:30 2000 @@ -17,27 +17,27 @@ } echo "$function $n $m\n"; } -ctype_test_002("islower"); -ctype_test_002("isupper"); -ctype_test_002("isalpha"); -ctype_test_002("isdigit"); -ctype_test_002("isalnum"); -ctype_test_002("iscntrl"); -ctype_test_002("isgraph"); -ctype_test_002("isprint"); -ctype_test_002("ispunct"); -ctype_test_002("isspace"); -ctype_test_002("isxdigit"); +ctype_test_002("ctype_lower"); +ctype_test_002("ctype_upper"); +ctype_test_002("ctype_alpha"); +ctype_test_002("ctype_digit"); +ctype_test_002("ctype_alnum"); +ctype_test_002("ctype_cntrl"); +ctype_test_002("ctype_graph"); +ctype_test_002("ctype_print"); +ctype_test_002("ctype_punct"); +ctype_test_002("ctype_space"); +ctype_test_002("ctype_xdigit"); ?> --EXPECT-- -islower 26 0 -isupper 26 0 -isalpha 52 0 -isdigit 10 0 -isalnum 62 0 -iscntrl 33 0 -isgraph 94 94 -isprint 95 95 -ispunct 32 0 -isspace 6 0 -isxdigit 22 0 +ctype_lower 26 0 +ctype_upper 26 0 +ctype_alpha 52 0 +ctype_digit 10 0 +ctype_alnum 62 0 +ctype_cntrl 33 0 +ctype_graph 94 94 +ctype_print 95 95 +ctype_punct 32 0 +ctype_space 6 0 +ctype_xdigit 22 0