cvs: php4(php_4_0_4) /ext/ctype ctype.c php_ctype.h /ext/ctype/tests 001.phpt 002.phpt

sas Tue Dec 19 23:42:53 2000 EDT Branch: php_4_0_4 Modified files: /php4/ext/ctype ctype.c php_ctype.h /php4/ext/ctype/tests 001.phpt 002.phpt Log: merge in function name changes Index: php4/ext/ctype/ctype.c diff -u php4/ext/ctype/ctype.c:1.1 php4/ext/ctype/ctype.c:1.1.2.1 --- php4/ext/ctype/ctype.c:1.1 Tue Nov 21 17:00:44 2000 +++ php4/ext/ctype/ctype.c Tue Dec 19 23:42:52 2000 @@ -41,17 +41,17 @@ */ 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[] */ }; @@ -177,7 +177,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 +195,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 +213,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 +231,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 +249,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 +267,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 +285,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 +303,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 +321,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 +339,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 +357,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.1.2.1 --- php4/ext/ctype/php_ctype.h:1.1 Tue Nov 21 17:00:44 2000 +++ php4/ext/ctype/php_ctype.h Tue Dec 19 23:42:52 2000 @@ -41,17 +41,17 @@ 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.1.2.1 --- php4/ext/ctype/tests/001.phpt:1.1 Tue Nov 21 17:00:44 2000 +++ php4/ext/ctype/tests/001.phpt Tue Dec 19 23:42:52 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.1.2.1 --- php4/ext/ctype/tests/002.phpt:1.1 Tue Nov 21 17:00:44 2000 +++ php4/ext/ctype/tests/002.phpt Tue Dec 19 23:42:52 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