com php-src: Test a few more error conditions in the compiler: Zend/tests/class_name_as_scalar_error_007.php t Zend/tests/duplicate_label_error.phpt
Zend/tests/ma gic_const_in_global_scope.phpt Zend/tests/special _name_error1.phpt Zend/tests/special_name_error 2.phpt
Zend/tests/special_name_error3.phpt Zend /zend_compile.c
| From: | Nikita Popov | Date: | Mon, 22 Sep 2014 22:57:00 +0000 |
| Subject: | com php-src: Test a few more error conditions in the compiler: Zend/tests/class_name_as_scalar_error_007.php t Zend/tests/duplicate_label_error.phpt Zend/tests/ma gic_const_in_global_scope.phpt Zend/tests/special _name_error1.phpt Zend/tests/special_name_error 2.phpt Zend/tests/special_name_error3.phpt Zend /zend_compile.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81869@lists.php.net to get a copy of this message | ||
Commit: 75533c9b2343824c73a53a9800d282e6bec446da
Author: Nikita Popov <nikic@php.net> Tue, 23 Sep 2014 00:57:00 +0200
Parents: 51119054ffbb30d67c0afa77d5830f190b1fdc14
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=75533c9b2343824c73a53a9800d282e6bec446da
Log:
Test a few more error conditions in the compiler
Changed paths:
A Zend/tests/class_name_as_scalar_error_007..phpt
A Zend/tests/duplicate_label_error.phpt
A Zend/tests/magic_const_in_global_scope.phpt
A Zend/tests/special_name_error1.phpt
A Zend/tests/special_name_error2.phpt
A Zend/tests/special_name_error3..phpt
M Zend/zend_compile.c
Diff:
diff --git a/Zend/tests/class_name_as_scalar_error_007.phpt
b/Zend/tests/class_name_as_scalar_error_007.phpt
new file mode 100644
index 0000000..2bfa5f3
--- /dev/null
+++ b/Zend/tests/class_name_as_scalar_error_007.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Cannot access self::class when no class scope is active
+--FILE--
+<?php
+
+var_dump(self::class);
+
+?>
+--EXPECTF--
+Fatal error: Cannot access self::class when no class scope is active in %s on line %d
diff --git a/Zend/tests/duplicate_label_error.phpt b/Zend/tests/duplicate_label_error.phpt
new file mode 100644
index 0000000..c89d7a6
--- /dev/null
+++ b/Zend/tests/duplicate_label_error.phpt
@@ -0,0 +1,12 @@
+--TEST--
+Duplicate labels are not allowed
+--FILE--
+<?php
+
+foo:
+foo:
+goto foo;
+
+?>
+--EXPECTF--
+Fatal error: Label 'foo' already defined in %s on line %d
diff --git a/Zend/tests/magic_const_in_global_scope.phpt
b/Zend/tests/magic_const_in_global_scope.phpt
new file mode 100644
index 0000000..31f7eae
--- /dev/null
+++ b/Zend/tests/magic_const_in_global_scope.phpt
@@ -0,0 +1,26 @@
+--TEST--
+Test use of magic constants in the global scope
+--FILE--
+<?php
+
+var_dump(
+ __LINE__,
+ __FILE__,
+ __DIR__,
+ __FUNCTION__,
+ __METHOD__,
+ __CLASS__,
+ __TRAIT__,
+ __NAMESPACE__
+);
+
+?>
+--EXPECTF--
+int(4)
+string(%d) "%s"
+string(%d) "%s"
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
+string(0) ""
diff --git a/Zend/tests/special_name_error1.phpt b/Zend/tests/special_name_error1.phpt
new file mode 100644
index 0000000..63bf5a6
--- /dev/null
+++ b/Zend/tests/special_name_error1.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Cannot use special class name as namespace
+--FILE--
+<?php
+
+namespace self;
+
+?>
+--EXPECTF--
+Fatal error: Cannot use 'self' as namespace name in %s on line %d
diff --git a/Zend/tests/special_name_error2.phpt b/Zend/tests/special_name_error2.phpt
new file mode 100644
index 0000000..08122b3
--- /dev/null
+++ b/Zend/tests/special_name_error2.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Cannot use special class name as alias
+--FILE--
+<?php
+
+use Foo\Bar as self;
+
+?>
+--EXPECTF--
+Fatal error: Cannot use Foo\Bar as self because 'self' is a special class name in %s on
line %d
diff --git a/Zend/tests/special_name_error3.phpt b/Zend/tests/special_name_error3.phpt
new file mode 100644
index 0000000..74e69f1
--- /dev/null
+++ b/Zend/tests/special_name_error3.phpt
@@ -0,0 +1,10 @@
+--TEST--
+Cannot use special class name as trait name
+--FILE--
+<?php
+
+trait self {}
+
+?>
+--EXPECTF--
+Fatal error: Cannot use 'self' as class name as it is reserved in %s on line %d
diff --git a/Zend/zend_compile.c b/Zend/zend_compile..c
index ca4aa69..262dc8c 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3256,11 +3256,9 @@ void zend_compile_goto(zend_ast *ast TSRMLS_DC) /* {{{ */
void zend_compile_label(zend_ast *ast TSRMLS_DC) /* {{{ */
{
- zval *label = zend_ast_get_zval(ast->child[0]);
+ zend_string *label = zend_ast_get_str(ast->child[0]);
zend_label dest;
- ZEND_ASSERT(Z_TYPE_P(label) == IS_STRING);
-
if (!CG(context).labels) {
ALLOC_HASHTABLE(CG(context).labels);
zend_hash_init(CG(context).labels, 8, NULL, ptr_dtor, 0);
@@ -3269,8 +3267,8 @@ void zend_compile_label(zend_ast *ast TSRMLS_DC) /* {{{ */
dest.brk_cont = CG(context).current_brk_cont;
dest.opline_num = get_next_op_number(CG(active_op_array));
- if (!zend_hash_add_mem(CG(context).labels, Z_STR_P(label), &dest, sizeof(zend_label))) {
- zend_error_noreturn(E_COMPILE_ERROR, "Label '%s' already defined",
Z_STRVAL_P(label));
+ if (!zend_hash_add_mem(CG(context).labels, label, &dest, sizeof(zend_label))) {
+ zend_error_noreturn(E_COMPILE_ERROR, "Label '%s' already defined",
label->val);
}
}
/* }}} */