Skip to content

undefine user constants at runtime #433

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

undefine user constants at runtime #433

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3697d8e
undefine user constants at runtime
krakjoe Sep 6, 2013
618154e
optional case sensitivity
krakjoe Sep 6, 2013
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
41 changes: 41 additions & 0 deletions Zend/zend_builtin_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ static ZEND_FUNCTION(strncasecmp);
static ZEND_FUNCTION(each);
static ZEND_FUNCTION(error_reporting);
static ZEND_FUNCTION(define);
static ZEND_FUNCTION(undefine);
static ZEND_FUNCTION(defined);
static ZEND_FUNCTION(get_class);
static ZEND_FUNCTION(get_called_class);
Expand Down Expand Up @@ -132,6 +133,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_define, 0, 0, 3)
ZEND_ARG_INFO(0, case_insensitive)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_undefine, 0, 0, 1)
ZEND_ARG_INFO(0, constant_name)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO_EX(arginfo_defined, 0, 0, 1)
ZEND_ARG_INFO(0, constant_name)
ZEND_END_ARG_INFO()
Expand Down Expand Up @@ -253,6 +258,7 @@ static const zend_function_entry builtin_functions[] = { /* {{{ */
ZEND_FE(each, arginfo_each)
ZEND_FE(error_reporting, arginfo_error_reporting)
ZEND_FE(define, arginfo_define)
ZEND_FE(undefine, arginfo_undefine)
ZEND_FE(defined, arginfo_defined)
ZEND_FE(get_class, arginfo_get_class)
ZEND_FE(get_called_class, arginfo_zend__void)
Expand Down Expand Up @@ -720,6 +726,41 @@ ZEND_FUNCTION(define)
}
/* }}} */

/* {{{ proto bool undefine(string constant_name)
Undefine a constant */
ZEND_FUNCTION(undefine)
{
char *name;
zend_uint name_len;

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &name, &name_len) == FAILURE) {
return;
}

{
zend_constant *defined = NULL;

if (zend_hash_find(EG(zend_constants), name, name_len+1, (void**)&defined) == FAILURE) {
char *lname = zend_str_tolower_dup(name, name_len);

if (zend_hash_find(
EG(zend_constants), lname, name_len+1, (void**)&defined) == SUCCESS) {
if (defined->cs & CONST_CS)
defined = NULL;
}

efree(lname);
}

if (defined != NULL) {
if ((defined->module_number == PHP_USER_CONSTANT)) {
RETURN_BOOL((zend_hash_del(EG(zend_constants), name, name_len+1)==SUCCESS));
}
}

RETURN_FALSE;
}
}

/* {{{ proto bool defined(string constant_name)
Check whether a constant exists */
Expand Down