cvs: ZendEngine2(PHP_5_3) / zend_compile.c
[email protected] ("Stanislav Malyshev")
| Newsgroups | php.zend-engine.cvs |
|---|---|
| Message-ID | <cvsstas1227661027@cvsserver> |
stas Wed Nov 26 00:57:07 2008 UTC
Modified files: (Branch: PHP_5_3)
/ZendEngine2 zend_compile.c
Log:
cleanup from ::->\ change
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_compile.c?r1=1.647.2.27.2.41.2.94&r2=1.647.2.27.2.41.2.95&diff_format=u
Index: ZendEngine2/zend_compile.c
diff -u ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.94 ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.95
--- ZendEngine2/zend_compile.c:1.647.2.27.2.41.2.94 Tue Nov 25 09:56:32 2008
+++ ZendEngine2/zend_compile.c Wed Nov 26 00:57:05 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.94 2008/11/25 09:56:32 dmitry Exp $ */
+/* $Id: zend_compile.c,v 1.647.2.27.2.41.2.95 2008/11/26 00:57:05 stas Exp $ */
#include <zend_language_parser.h>
#include "zend.h"
@@ -1992,10 +1992,11 @@
zend_op *opline;
ulong fetch_type = 0;
+#if 0
if (class_name->op_type == IS_CONST &&
Z_TYPE(class_name->u.constant) == IS_STRING &&
Z_STRLEN(class_name->u.constant) == 0) {
- /* namespace::func() not in namespace */
+ /* namespace\func() not in namespace */
zval_dtor(&class_name->u.constant);
if (CG(current_namespace)) {
znode tmp;
@@ -2008,6 +2009,7 @@
}
return zend_do_begin_function_call(method_name, 0 TSRMLS_CC);
}
+#endif
if (method_name->op_type == IS_CONST) {
char *lcname = zend_str_tolower_dup(Z_STRVAL(method_name->u.constant), Z_STRLEN(method_name->u.constant));
@@ -2035,7 +2037,7 @@
if (class_node.op_type == IS_CONST &&
method_name->op_type == IS_CONST) {
- /* Prebuild ns::func name to speedup run-time check.
+ /* Prebuild ns\func name to speedup run-time check.
The additional names are stored in additional OP_DATA opcode. */
char *nsname, *fname;
unsigned int nsname_len, len;