Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:79291
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.218.42 as permitted sender)
MIME-Version: 1.0
Sender: morrison.levi@gmail.com
In-Reply-To: <CA+9eiLs+3CXmHcu0wsP76reFseWw=oFTKD_Svn20zCh=kzdMZg@mail.gmail.com>
References: <CA+9eiLs+3CXmHcu0wsP76reFseWw=oFTKD_Svn20zCh=kzdMZg@mail.gmail.com>
Date: Fri, 28 Nov 2014 13:19:16 -0700
Message-ID: <CAFMT4Np+-oSRYkZcajHcw0eqzXrs1gvGkhNB-nRxk39wO1S1dA@mail.gmail.com>
To: Dmitry Stogov <dmitry@zend.com>
Cc: Nikita Popov <nikita.ppv@gmail.com>, Xinchen Hui <xinchen.h@zend.com>, Anatol Belski <ab@php.net>, 
	PHP Internals <internals@lists.php.net>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [PHP-DEV] Use zend_string* for op_array->arg_info[].name and class_name
From: levim@php.net (Levi Morrison)

> Please review the patch https://gist.github.com/dstogov/47a39aff37f0a6441ea0

Instead of duplicating logic in two places I'd rather grab the
relevant data first, then do the logic once:

zend_string *class_name;
if (fe->type == ZEND_INTERNAL_FUNCTION) {
    class_name = zend_string_init(
            ((zend_internal_arg_info*)fe_arg_info)->class_name,
            strlen(((zend_internal_arg_info*)fe_arg_info)->class_name), 0
    );
} else {
    class_name = zend_string_dup(fe_arg_info->class_name);
}

if (!zend_string_equals_literal_ci(class_name, "parent") &&
proto->common.scope) {
    fe_class_name = zend_string_copy(proto->common.scope->name);
} else if (!zend_string_equals_literal_ci(class_name, "self") &&
fe->common.scope) {
    fe_class_name = zend_string_copy(fe->common.scope->name);
} else {
    fe_class_name = class_name;
}
zend_string_release(class_name);