Throw \self etc error

Could only enable this now that everything uses the new format

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index ccbccffb9b08f284c0998feb80acc18f7cb7160a..94b3deef296fe599a7bd0640c7e99fce7397c714 100644 (file)
--- 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 fad46439633f4af7e81ce2f940af0bd57814a6b1..ae3edf3c08a73578c9e99eaf67dc537ad69fdd9f 100644 (file)
--- 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; }
 ;