summaryrefslogtreecommitdiff
path: root/ext/tokenizer
Commit message (Collapse)AuthorAgeFilesLines
* first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-9/+9
|
* Merge branch 'master' into zppFailOnOverflowAndrea Faulds2014-11-291-2/+2
|\
| * fix testAnatol Belski2014-11-201-1/+1
| |
| * typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-191-2/+2
| |
* | Skip buncha tests on 32-bitAndrea Faulds2014-11-291-1/+2
|/
* Regenerate tokenizer dataNikita Popov2014-10-052-34/+36
| | | | Also fix the tokenizer_data_gen.sh script after 64bit changes.
* removed *.dsw and *.dsp filesAnatol Belski2014-09-281-108/+0
|
* Merge branch 'master' into issue-67910Florian MARGAINE2014-09-204-5/+5
|\ | | | | | | | | | | Conflicts: README.PARAMETER_PARSING_API ext/gmp/tests/001.phpt
| * s/PHP 5/PHP 7/Johannes Schlüter2014-09-194-4/+4
| |
| * Avoid double IS_INTERNED() checkDmitry Stogov2014-09-191-1/+1
| |
* | Replaces php5 with php7, without whitespace changes.Florian MARGAINE2014-09-201-2/+2
|/
* Fix tokenizer test to not depend on specific token numbersNikita Popov2014-08-261-11/+13
|
* master renames phase 1Anatol Belski2014-08-252-140/+140
|
* fixes to tokenizerAnatol Belski2014-08-192-4/+4
|
* basic macro replacements, all at onceAnatol Belski2014-08-192-137/+137
|
* Merge branch 'master' into phpngDmitry Stogov2014-06-122-0/+19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (77 commits) NEWS entry for Fix potential segfault in dns_get_record() NEWS entry for "Fix potential segfault in dns_get_record()" NEWS entry for Fix potential segfault in dns_get_record( Fix potential segfault in dns_get_record() Revert "Add optional second arg to unserialize()" 5.5.15 now update NEWS Fix bug #66127 (Segmentation fault with ArrayObject unset) 5.4.31 next Add NEWS. This doesn't need UPGRADING (or an RFC), IMO. Fix broken test. Add a mime type map generation script and update the header. Move the mime type map out of php_cli_server.c for easier generation. Replace the CLI server's linear search for extensions with a hash table. fix test Remove unused included file NEWS NEWS NEWS Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec ... Conflicts: Zend/zend_closures.c Zend/zend_execute.c Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/spl/spl_array.c ext/standard/basic_functions.c ext/standard/dns.c ext/standard/var.c
| * use ./tokenizer_data_gen.sh to for adding T_POW & T_POW_EQUALFerenc Kovacs2014-06-081-4/+4
| |
| * Fix bug #67392: token_name() does not return name for T_POW and T_POW_EQUAL ↵Ferenc Kovacs2014-06-072-0/+19
| | | | | | | | token
* | Merge mainstream 'master' branch into refactoringDmitry Stogov2014-04-262-11/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During merge I had to revert: Nikita's patch for php_splice() (it probably needs to be applyed again) Bob Weinand's patches related to constant expression handling (we need to review them carefully) I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway) Conflicts: Zend/zend.h Zend/zend_API.c Zend/zend_ast.c Zend/zend_compile.c Zend/zend_compile.h Zend/zend_constants.c Zend/zend_exceptions.c Zend/zend_execute.c Zend/zend_execute.h Zend/zend_execute_API.c Zend/zend_hash.c Zend/zend_highlight.c Zend/zend_language_parser.y Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h Zend/zend_variables.c Zend/zend_vm_def.h Zend/zend_vm_execute.h ext/date/php_date.c ext/dom/documenttype.c ext/hash/hash.c ext/iconv/iconv.c ext/mbstring/tests/zend_multibyte-10.phpt ext/mbstring/tests/zend_multibyte-11.phpt ext/mbstring/tests/zend_multibyte-12.phpt ext/mysql/php_mysql.c ext/mysqli/mysqli.c ext/mysqlnd/mysqlnd_reverse_api.c ext/mysqlnd/php_mysqlnd.c ext/opcache/ZendAccelerator.c ext/opcache/zend_accelerator_util_funcs.c ext/opcache/zend_persist.c ext/opcache/zend_persist_calc.c ext/pcre/php_pcre.c ext/pdo/pdo_dbh.c ext/pdo/pdo_stmt.c ext/pdo_pgsql/pgsql_driver.c ext/pgsql/pgsql.c ext/reflection/php_reflection.c ext/session/session.c ext/spl/spl_array.c ext/spl/spl_observer.c ext/standard/array.c ext/standard/basic_functions.c ext/standard/html.c ext/standard/mail.c ext/standard/php_array.h ext/standard/proc_open.c ext/standard/streamsfuncs.c ext/standard/user_filters.c ext/standard/var_unserializer.c ext/standard/var_unserializer.re main/php_variables.c sapi/phpdbg/phpdbg.c sapi/phpdbg/phpdbg_bp.c sapi/phpdbg/phpdbg_frame.c sapi/phpdbg/phpdbg_help.c sapi/phpdbg/phpdbg_list.c sapi/phpdbg/phpdbg_print.c sapi/phpdbg/phpdbg_prompt.c
| * Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2014-02-141-1/+1
| |\
| | * Merge branch 'PHP-5.4' into PHP-5.5Lior Kaplan2014-02-141-1/+1
| | |\
| | | * a few typofixesVeres Lajos2014-02-141-1/+1
| | | |
| | | * Bump yearXinchen Hui2014-01-034-4/+4
| | | |
| | | * Happy New YearXinchen Hui2013-01-014-4/+4
| | | |
| | | * - Year++Felipe Pena2012-01-014-5/+5
| | | |
| | | * Fixed bug #54084 (token_get_all with regards to __halt_compiler is not ↵Stanislav Malyshev2011-11-083-20/+331
| | | | | | | | | | | | | | | | binary safe)
| | | * - Drop T_SCALAR_CASTFelipe Pena2011-08-161-2/+2
| | | |
| | | * Callable typehint following the rules of is_callable($arg, false);Hannes Magnusson2011-08-161-0/+4
| | | |
| | | * Added __TRAIT__ magic constant [TRAITS] [DOC]Stefan Marr2011-07-311-35/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | # __TRAIT__ behaves like __CLASS__ more or less but is constraint to traits. # Since traits are not types, there are not many valid use cases, and trying # to use __TRAIT__ to make traits more like classes is discouraged.
| | | * Added: SKIP when tokenizer extension is not availableStefan Marr2011-07-3121-0/+42
| | | |
| | | * - Make usage of new PHP_FE_END macroFelipe Pena2011-07-251-1/+1
| | | |
| | | * and clean the tokenizer tooStanislav Malyshev2011-06-031-4/+0
| | | |
| | | * forgot tokenizer...Stanislav Malyshev2011-05-151-16/+0
| | | |
| | * | Bump yearXinchen Hui2014-01-034-4/+4
| | | |
| * | | add T_POW (**) operatordatibbaw2014-02-061-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed recognition of the operator Added opcode, still doing multiply instead of pow() opcode now always returns int(42) The right answer, but always a float Yanked code from pow() implementation. Should not handle negative long as exponent ourselves Added test cases from pow() Moved precedence higher than '~' Added GMP operator overloading Added ZEND_ASSIGN_POW (**=) operator. Added pow() as a language construct. Adjusted test cases for changed precedence. Reduced pow() to shell function around ZEND_API pow_function() Reduced test case to only contain edge cases Added overloading test case Moved unary minus above T_POW Revert "Added pow() as a language construct." Bad bad bad idea. This reverts commit f60b98cf7a8371233d800a6faa286ddba4432d02. Reverted unary minus behaviour due to previous revert. Convert arrays to int(0) Exponent with array as a base becomes int(0) Rebase against master Fixed tokenizer test case
* | | | Cleanup (1-st round)Dmitry Stogov2014-04-151-3/+3
| | | |
* | | | Port tokenizer extensionNikita Popov2014-04-101-24/+20
|/ / /
* | | Bump yearXinchen Hui2014-01-034-4/+4
| | |
* | | Implement variadic function syntaxNikita Popov2013-09-261-2/+4
|/ / | | | | | | As per RFC: https://wiki.php.net/rfc/variadics
* | Happy New YearXinchen Hui2013-01-014-4/+4
| |
* | Fix test failed due to new Token T_YIELDXinchen Hui2012-09-021-10/+10
| |
* | Merge remote-tracking branch 'php-src/master' into addGeneratorsSupportNikita Popov2012-08-203-5/+125
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merging master to fix Windows build Conflicts: Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h Zend/zend_vm_def.h
| * | add finallyStanislav Malyshev2012-08-191-1/+3
| | |
| * | Merge branch 'pull-request/31'Stanislav Malyshev2012-08-192-4/+122
| |\ \ | | | | | | | | | | | | | | | | * pull-request/31: Fix lexing of nested heredoc strings in token_get_all()
| | * | Fix lexing of nested heredoc strings in token_get_all()Nikita Popov2012-03-312-4/+122
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes bug #60097. Before two global variables CG(heredoc) and CG(heredoc_len) were used to track the current heredoc label. In order to support nested heredoc strings the *previous* heredoc label was assigned as the token value of T_START_HEREDOC and the language_parser.y assigned that to CG(heredoc). This created a dependency of the lexer on the parser. Thus the token_get_all() function, which accesses the lexer directly without also running the parser, was not able to tokenize nested heredoc strings (and leaked memory). Same applies for the source-code highlighting functions. The new approach is to maintain a heredoc_label_stack in the lexer, which contains all active heredoc labels. As it is no longer required, T_START_HEREDOC and T_END_HEREDOC now don't carry a token value anymore. In order to make the work with zend_ptr_stack in this context more convenient I added a new function zend_ptr_stack_top(), which retrieves the top element of the stack (similar to zend_stack_top()).
* | | Add T_YIELD in tokenizer_data.cNikita Popov2012-07-228-20/+22
|/ / | | | | | | | | Also had to fix up some tokenizer tests that were affected by the token number changes.
* | - Year++Felipe Pena2012-01-014-5/+5
| |
* | Fixed bug #54084 (token_get_all with regards to __halt_compiler is not ↵Stanislav Malyshev2011-11-083-20/+331
| | | | | | | | binary safe)
* | - Drop T_SCALAR_CASTFelipe Pena2011-08-161-2/+2
| |
* | Callable typehint following the rules of is_callable($arg, false);Hannes Magnusson2011-08-161-0/+4
| |