diff options
| author | Nikita Popov <nikic@php.net> | 2016-04-07 05:51:49 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-04-07 05:52:32 +0200 |
| commit | 5ab950cb2ca362af3f718179f1da430922c1e0dd (patch) | |
| tree | ae45b63338cbf7049d79601c98d9c968b4f00f20 | |
| parent | 6467a4eb367fd1174fbed79f014772321f68e8bc (diff) | |
| download | php-git-5ab950cb2ca362af3f718179f1da430922c1e0dd.tar.gz | |
Remove __halt_compiler from semi-reserved tokens
token_get_all() is not capable of dealing with this one correctly.
| -rw-r--r-- | Zend/tests/grammar/semi_reserved_001.phpt | 3 | ||||
| -rw-r--r-- | Zend/tests/grammar/semi_reserved_002.phpt | 3 | ||||
| -rw-r--r-- | Zend/tests/grammar/semi_reserved_005.phpt | 3 | ||||
| -rw-r--r-- | Zend/zend_language_parser.y | 2 |
4 files changed, 1 insertions, 10 deletions
diff --git a/Zend/tests/grammar/semi_reserved_001.phpt b/Zend/tests/grammar/semi_reserved_001.phpt index 26b3638a47..48937de39e 100644 --- a/Zend/tests/grammar/semi_reserved_001.phpt +++ b/Zend/tests/grammar/semi_reserved_001.phpt @@ -80,7 +80,6 @@ class Obj function __FILE__(){ echo __METHOD__, PHP_EOL; } function __DIR__(){ echo __METHOD__, PHP_EOL; } function __NAMESPACE__(){ echo __METHOD__, PHP_EOL; } - function __halt_compiler(){ echo __METHOD__, PHP_EOL; } } $obj = new Obj; @@ -160,7 +159,6 @@ $obj->__LINE__(); $obj->__FILE__(); $obj->__DIR__(); $obj->__NAMESPACE__(); -$obj->__halt_compiler(); echo "\nDone\n"; @@ -240,6 +238,5 @@ Obj::__LINE__ Obj::__FILE__ Obj::__DIR__ Obj::__NAMESPACE__ -Obj::__halt_compiler Done diff --git a/Zend/tests/grammar/semi_reserved_002.phpt b/Zend/tests/grammar/semi_reserved_002.phpt index 483ac8ce80..a082f9ddbb 100644 --- a/Zend/tests/grammar/semi_reserved_002.phpt +++ b/Zend/tests/grammar/semi_reserved_002.phpt @@ -80,7 +80,6 @@ class Obj static function __FILE__(){ echo __METHOD__, PHP_EOL; } static function __DIR__(){ echo __METHOD__, PHP_EOL; } static function __NAMESPACE__(){ echo __METHOD__, PHP_EOL; } - static function __halt_compiler(){ echo __METHOD__, PHP_EOL; } } Obj::empty(); @@ -158,7 +157,6 @@ Obj::__LINE__(); Obj::__FILE__(); Obj::__DIR__(); Obj::__NAMESPACE__(); -Obj::__halt_compiler(); echo "\nDone\n"; @@ -238,6 +236,5 @@ Obj::__LINE__ Obj::__FILE__ Obj::__DIR__ Obj::__NAMESPACE__ -Obj::__halt_compiler Done diff --git a/Zend/tests/grammar/semi_reserved_005.phpt b/Zend/tests/grammar/semi_reserved_005.phpt index b2b8471bf0..45d20ad0d8 100644 --- a/Zend/tests/grammar/semi_reserved_005.phpt +++ b/Zend/tests/grammar/semi_reserved_005.phpt @@ -79,7 +79,6 @@ class Obj const __FILE__ = '__FILE__'; const __DIR__ = '__DIR__'; const __NAMESPACE__ = '__NAMESPACE__'; - const __HALT_COMPILER = '__halt_compiler'; } echo Obj::EMPTY, PHP_EOL; @@ -156,7 +155,6 @@ echo Obj::__LINE__, PHP_EOL; echo Obj::__FILE__, PHP_EOL; echo Obj::__DIR__, PHP_EOL; echo Obj::__NAMESPACE__, PHP_EOL; -echo Obj::__HALT_COMPILER, PHP_EOL; echo "\nDone\n"; @@ -235,6 +233,5 @@ __LINE__ __FILE__ __DIR__ __NAMESPACE__ -__halt_compiler Done diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 804ed37473..9f99453cd4 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -272,7 +272,7 @@ reserved_non_modifiers: | T_THROW | T_USE | T_INSTEADOF | T_GLOBAL | T_VAR | T_UNSET | T_ISSET | T_EMPTY | T_CONTINUE | T_GOTO | T_FUNCTION | T_CONST | T_RETURN | T_PRINT | T_YIELD | T_LIST | T_SWITCH | T_ENDSWITCH | T_CASE | T_DEFAULT | T_BREAK | T_ARRAY | T_CALLABLE | T_EXTENDS | T_IMPLEMENTS | T_NAMESPACE | T_TRAIT | T_INTERFACE | T_CLASS - | T_CLASS_C | T_TRAIT_C | T_FUNC_C | T_METHOD_C | T_LINE | T_FILE | T_DIR | T_NS_C | T_HALT_COMPILER + | T_CLASS_C | T_TRAIT_C | T_FUNC_C | T_METHOD_C | T_LINE | T_FILE | T_DIR | T_NS_C ; semi_reserved: |