diff options
| author | Nikita Popov <nikic@php.net> | 2014-07-16 23:23:25 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-07-16 23:23:25 +0200 |
| commit | 64a71321852abd8bbe845cc0ac610c9edb75feb1 (patch) | |
| tree | f770e717ca2a04beb89f7dcce735b35c74c6a291 /Zend/zend_language_scanner.l | |
| parent | a75921dcb1cb6d55a530e39c7d0c758b4ed9d2a3 (diff) | |
| download | php-git-64a71321852abd8bbe845cc0ac610c9edb75feb1.tar.gz | |
Port __METHOD__
Diffstat (limited to 'Zend/zend_language_scanner.l')
| -rw-r--r-- | Zend/zend_language_scanner.l | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index 1ac86f45e1..17d58c240d 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -1624,34 +1624,6 @@ NEWLINE ("\r"|"\n"|"\r\n") } <ST_IN_SCRIPTING>"__METHOD__" { - if (CG(active_class_entry)) { - int len = 0; - - if (CG(active_class_entry)->name) { - len += CG(active_class_entry)->name->len; - } - if (CG(active_op_array) && CG(active_op_array)->function_name) { - len += sizeof("::")-1; - len += CG(active_op_array)->function_name->len; - } - ZVAL_NEW_STR(zendlval, STR_ALLOC(len, 0)); - len = 0; - if (CG(active_class_entry)->name) { - memcpy(Z_STRVAL_P(zendlval), CG(active_class_entry)->name->val, CG(active_class_entry)->name->len); - len += CG(active_class_entry)->name->len; - } - if (CG(active_op_array) && CG(active_op_array)->function_name) { - memcpy(Z_STRVAL_P(zendlval) + len, "::", sizeof("::")-1); - len += sizeof("::")-1; - memcpy(Z_STRVAL_P(zendlval) + len, CG(active_op_array)->function_name->val, CG(active_op_array)->function_name->len); - len += CG(active_op_array)->function_name->len; - } - Z_STRVAL_P(zendlval)[len] = 0; - } else if (CG(active_op_array) && CG(active_op_array)->function_name) { - ZVAL_STR(zendlval, STR_COPY(CG(active_op_array)->function_name)); - } else { - ZVAL_EMPTY_STRING(zendlval); - } return T_METHOD_C; } |