com php-src: Fix tokenizer test due to recent changes: Zend/zend_language_parser.y ext/tokenizer/tests/token _get_all_TOKEN_PARSE_001.phpt
| From: | Bob Weinand | Date: | Mon, 25 May 2015 22:17:27 +0000 |
| Subject: | com php-src: Fix tokenizer test due to recent changes: Zend/zend_language_parser.y ext/tokenizer/tests/token _get_all_TOKEN_PARSE_001.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86928@lists.php.net to get a copy of this message | ||
Commit: 31f3eeb0c56eeeaf2c8bff4722cb1b6a3d2e25fc
Author: Bob Weinand <bobwei9@hotmail.com> Tue, 26 May 2015 00:17:27 +0200
Parents: 8cd62071abc3defd8d5f9a2dc3a788d8692af3c0
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=31f3eeb0c56eeeaf2c8bff4722cb1b6a3d2e25fc
Log:
Fix tokenizer test due to recent changes
Changed paths:
M Zend/zend_language_parser.y
M ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt
Diff:
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index e9a77c3..9f61fab 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -270,8 +270,7 @@ reserved_non_modifiers:
| T_FOR | T_ENDFOR | T_FOREACH | T_ENDFOREACH | T_DECLARE | T_ENDDECLARE | T_AS | T_TRY | T_CATCH
| T_FINALLY
| 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_ARRAY | T_CALLABLE | T_EXTENDS | T_IMPLEMENTS | T_NAMESPACE | T_TRAIT | T_INTERFACE | T_CLASS
;
semi_reserved:
diff --git a/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt
b/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt
index ab33435..eb0e300 100644
--- a/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt
+++ b/ext/tokenizer/tests/token_get_all_TOKEN_PARSE_001.phpt
@@ -58,7 +58,7 @@ L6: T_STRING continue
;
L7: T_STRING X
L7: T_DOUBLE_COLON ::
-L7: T_CLASS class
+L7: T_STRING class
;
L9: T_CLASS class
L9: T_STRING X