diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /Zend/zend_language_parser.y | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'Zend/zend_language_parser.y')
| -rw-r--r-- | Zend/zend_language_parser.y | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y index 4d66648055..da94e0e773 100644 --- a/Zend/zend_language_parser.y +++ b/Zend/zend_language_parser.y @@ -54,10 +54,6 @@ static YYSIZE_T zend_yytnamerr(char*, const char*); %expect 2 %code requires { -#ifdef ZTS -# define YYPARSE_PARAM tsrm_ls -# define YYLEX_PARAM tsrm_ls -#endif } %destructor { zend_ast_destroy($$); } <ast> @@ -287,8 +283,8 @@ top_statement: | class_declaration_statement { $$ = $1; } | T_HALT_COMPILER '(' ')' ';' { $$ = zend_ast_create(ZEND_AST_HALT_COMPILER, - zend_ast_create_zval_from_long(zend_get_scanned_file_offset(TSRMLS_C))); - zend_stop_lexing(TSRMLS_C); } + zend_ast_create_zval_from_long(zend_get_scanned_file_offset())); + zend_stop_lexing(); } | T_NAMESPACE namespace_name ';' { $$ = zend_ast_create(ZEND_AST_NAMESPACE, $2, NULL); RESET_DOC_COMMENT(); } @@ -372,7 +368,7 @@ statement: foreach_statement { $$ = zend_ast_create(ZEND_AST_FOREACH, $3, $7, $5, $9); } | T_DECLARE '(' const_list ')' - { zend_handle_encoding_declaration($3 TSRMLS_CC); } + { zend_handle_encoding_declaration($3); } declare_statement { $$ = zend_ast_create(ZEND_AST_DECLARE, $3, $6); } | ';' /* empty statement */ { $$ = NULL; } @@ -610,7 +606,7 @@ class_statement_list: class_statement: variable_modifiers property_list ';' - { $$ = zend_ast_append_doc_comment($2 TSRMLS_CC); $$->attr = $1; } + { $$ = zend_ast_append_doc_comment($2); $$->attr = $1; } | T_CONST class_const_list ';' { $$ = $2; RESET_DOC_COMMENT(); } | T_USE name_list trait_adaptations @@ -1175,8 +1171,7 @@ static YYSIZE_T zend_yytnamerr(char *yyres, const char *yystr) return yystrlen(yystr); } { - TSRMLS_FETCH(); - if (CG(parse_error) == 0) { + if (CG(parse_error) == 0) { char buffer[120]; const unsigned char *end, *str, *tok1 = NULL, *tok2 = NULL; unsigned int len = 0, toklen = 0, yystr_len; |