com php-src: Throw \self etc error: Zend/zend_compile.c Z end/zend_language_parser.y
| From: | Nikita Popov | Date: | Sat, 19 Jul 2014 21:44:33 +0000 |
| Subject: | com php-src: Throw \self etc error: Zend/zend_compile.c Z end/zend_language_parser.y | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80975@lists.php.net to get a copy of this message | ||
Commit: 028c7d20fbe090d8c19b708c16e43b5fcc49fd58
Author: Nikita Popov <nikic@php.net> Sat, 19 Jul 2014 23:44:33 +0200
Parents: c8d99a1333069edbf0fb2c84b8c3167ca5cb384d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=028c7d20fbe090d8c19b708c16e43b5fcc49fd58
Log:
Throw \self etc error
Could only enable this now that everything uses the new format
Changed paths:
M Zend/zend_compile.c
M Zend/zend_language_parser.y
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index ccbccff..94b3dee 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -4437,9 +4437,9 @@ static zend_bool zend_is_const_default_class_ref(zend_ast *name_ast) {
}
/* Fully qualified names are always default refs */
- /*if (!name_ast->attr) {
+ if (!name_ast->attr) {
return 1;
- }*/
+ }
name = zend_ast_get_zval(name_ast);
fetch_type = zend_get_class_fetch_type(Z_STRVAL_P(name), Z_STRLEN_P(name));
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index fad4643..ae3edf3 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -936,7 +936,7 @@ function_call:
class_name:
T_STATIC
{ zval zv; ZVAL_STRINGL(&zv, "static", sizeof("static")-1);
- $$.u.ast = zend_ast_create_zval(&zv); }
+ $$.u.ast = zend_ast_create_zval_ex(&zv, 1); }
| name { $$.u.ast = $1.u.ast; }
;