com php-src: Replicate old linenos for class binding: Zend/tests/bug43323.phpt Zend/zend_compile.c
| From: | Nikita Popov | Date: | Sat, 26 Jul 2014 16:36:57 +0000 |
| Subject: | com php-src: Replicate old linenos for class binding: Zend/tests/bug43323.phpt Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80928@lists.php.net to get a copy of this message | ||
Commit: 17234d7895367d722b65fd3d1911eca039769c03
Author: Nikita Popov <nikic@php.net> Sat, 26 Jul 2014 18:36:57 +0200
Parents: 1bdc433259e7b27f739dc7846df37f84054acf50
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=17234d7895367d722b65fd3d1911eca039769c03
Log:
Replicate old linenos for class binding
Changed paths:
M Zend/tests/bug43323.phpt
M Zend/zend_compile.c
Diff:
diff --git a/Zend/tests/bug43323.phpt b/Zend/tests/bug43323.phpt
index f2d279d..d366a6d 100644
--- a/Zend/tests/bug43323.phpt
+++ b/Zend/tests/bug43323.phpt
@@ -9,4 +9,4 @@ abstract class bar {
class foo extends bar {
}
--EXPECTF--
-Fatal error: Class foo contains 1 abstract method and must therefore be declared abstract or
implement the remaining methods (bar::bar) in %sbug43323.php on line 6
+Fatal error: Class foo contains 1 abstract method and must therefore be declared abstract or
implement the remaining methods (bar::bar) in %sbug43323.php on line 7
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 57781cb..31a3590 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -7454,6 +7454,7 @@ void zend_compile_top_stmt(zend_ast *ast TSRMLS_DC) {
zend_verify_namespace(TSRMLS_C);
}
if (ast->kind == ZEND_AST_FUNC_DECL || ast->kind == ZEND_AST_CLASS) {
+ CG(zend_lineno) = ((zend_ast_decl *) ast)->end_lineno;
zend_do_early_binding(TSRMLS_C);
}
}