Skip to content

Renaming a variable #74

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

Merged
merged 1 commit into from
Jul 4, 2019
Merged

Renaming a variable #74

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 17 additions & 2 deletions parser/parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,28 @@ static int is_empty(const char *program)

static void parser_add_str(zval *arr, const char *key, const char *val) {
zval tmp;
zend_string *tmp_str = zend_string_init(val, strlen(val), 0);
zend_string *tmp_str;
if (!strcmp(val, "return_value")) {
tmp_str = zend_string_init("_zephir_return_value", strlen("_zephir_return_value"), 0);
} else if (!strcmp(val, "this_ptr")) {
tmp_str = zend_string_init("_zephir_this_ptr", strlen("_zephir_this_ptr"), 0);
} else {
tmp_str = zend_string_init(val, strlen(val), 0);
}
ZVAL_STR(&tmp, tmp_str);
zend_hash_str_add(Z_ARRVAL_P(arr), key, strlen(key), &tmp);
}

static void parser_add_str_free(zval *arr, const char *key, char *val) {
zval tmp;
zend_string *tmp_str = zend_string_init(val, strlen(val), 0);
zend_string *tmp_str;
if (!strcmp(val, "return_value")) {
tmp_str = zend_string_init("_zephir_return_value", strlen("_zephir_return_value"), 0);
} else if (!strcmp(val, "this_ptr")) {
tmp_str = zend_string_init("_zephir_this_ptr", strlen("_zephir_this_ptr"), 0);
} else {
tmp_str = zend_string_init(val, strlen(val), 0);
}
ZVAL_STR(&tmp, tmp_str);
zend_hash_str_add(Z_ARRVAL_P(arr), key, strlen(key), &tmp);
efree(val);
Expand Down Expand Up @@ -1032,6 +1046,7 @@ static void xx_ret_declare_variable(zval *ret, xx_parser_token *T, zval *expr, x
array_init(ret);

parser_add_str_free(ret, "variable", T->token);

efree(T);

if (expr) {
Expand Down