summaryrefslogtreecommitdiff
path: root/ext/tokenizer
Commit message (Collapse)AuthorAgeFilesLines
* Make sure TOKEN_PARSE mode is thread safeNikita Popov2016-07-231-8/+10
| | | | | | Introduce an on_event_context passed to the on_event hook. Use this context to pass along the token array. Previously this was stored in a non-tls global :/
* Merge branch 'PHP-5.6' into PHP-7.0Lior Kaplan2016-01-014-4/+4
|\ | | | | | | | | * PHP-5.6: Happy new year (Update copyright to 2016)
| * Happy new year (Update copyright to 2016)Lior Kaplan2016-01-014-4/+4
| |
| * bump yearXinchen Hui2015-01-153-3/+3
| |
* | Fix #70831: Compile fails on system with 160 CPUsDaniel Axtens2015-12-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | This fixes the following build issue on 160-CPU POWER8 machines ext/tokenizer/tokenizer_data.c:28:34: fatal error: zend_language_parser.h: No such file or directory #include <zend_language_parser.h> It is fixed by introducing an explicit dependency on the header file. Signed-off-by: Daniel Axtens <dja@axtens.net>
* | adds missing tokens to list of semi-reserved words and regenerates test suiteMárcio Almada2015-09-041-12/+19
| |
* | Don't return T_ERROR from token_get_all()Nikita Popov2015-07-094-12/+10
| | | | | | | | | | | | This turned out to be rather inconvenient after all. Instead just return the same output we did on PHP 5. If people want to have an error, use TOKEN_PARSE.
* | Fix bug #69430Nikita Popov2015-07-094-23/+54
| | | | | | | | | | Don't throw from token_get_all() unless TOKEN_PARSE is used. Errors are reported as T_ERROR tokens.
* | Update token_get_all() arginfoNikita Popov2015-07-091-1/+2
| |
* | Remove these old references to the DSP files we don't use anymoreKalle Sommer Nielsen2015-06-221-1/+0
| |
* | Merge branch 'master' into throwable-interfaceAaron Piotrowski2015-06-146-26/+295
|\ \ | | | | | | | | | | | | | | | | | | # Conflicts: # Zend/zend_language_scanner.c # Zend/zend_language_scanner.l # ext/simplexml/tests/SimpleXMLElement_xpath.phpt
| * | Avoid zval duplication in ZVAL_ZVAL() macro (it was necessary only in few ↵Dmitry Stogov2015-06-121-2/+3
| | | | | | | | | | | | | | | | | | places). Switch from ZVAL_ZVAL() to simpler macros where possible (it makes sense to review remaining places)
| * | Fix tokenizer test due to recent changesBob Weinand2015-05-261-1/+1
| | |
| * | add missing SKIPIF section on testMárcio Almada2015-04-301-0/+2
| | |
| * | ext tokenizer port + cleanup unused lexer statesMárcio Almada2015-04-305-21/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we basically added a mechanism to store the token stream during parsing and exposed the entire parser stack on the tokenizer extension through an opt in flag: token_get_all($src, TOKEN_PARSE). this change allows easy future language enhancements regarding context aware parsing & scanning without further maintance on the tokenizer extension while solves known inconsistencies "parseless" tokenizer extension has when it handles `__halt_compiler()` presence.
| * | fix indentation + remove c++ commentsMárcio Almada2015-04-301-5/+5
| | |
* | | Updated tests to reflect exception class changes.Aaron Piotrowski2015-05-161-1/+1
|/ /
* | Regenerate tokenizer dataNikita Popov2015-04-141-0/+2
| |
* | Throw ParseException from lexerNikita Popov2015-04-023-1/+33
| | | | | | | | | | | | | | Primarily to avoid getting fatal errors from token_get_all(). Implemented using a magic E_ERROR token, which the lexer emits to force a parser failure.
* | cleanup mod version macros and mod defs, round xAnatol Belski2015-03-232-5/+4
| |
* | Regenerate ext/tokenizer dataNikita Popov2015-03-132-3/+5
| |
* | Márcio Almada remove dead tokens: T_CHARACTER, T_BAD_CHARACTER.Márcio Almada2015-02-081-4/+0
| |
* | bump yearXinchen Hui2015-01-153-3/+3
| |
* | trailing whitespace removalStanislav Malyshev2015-01-101-1/+1
| |
* | Use "float" and "integer" in typehint and zpp errorsAndrea Faulds2014-12-211-2/+2
| |
* | 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
| | | |
View Lorry Controller Status