Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'PHP-7.1' | Nikita Popov | 2017-03-23 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2017-03-23 | 1 | -3959/+4147 |
| |\ | |||||
| | * | Fix sequencing UB | Nikita Popov | 2017-03-23 | 1 | -421/+444 |
| | | | |||||
| | * | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-04 | 1 | -1/+1 |
| | | | |||||
| | * | Fix line number of implicit return in pseudo-main scope | Nikita Popov | 2016-10-12 | 1 | -3956/+4124 |
| | | | |||||
| * | | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-04 | 1 | -1/+1 |
| | | | |||||
* | | | Fixed bug #74300 | xKhorasan | 2017-03-23 | 1 | -421/+444 |
| | | | |||||
* | | | Simplify increment_lineno handling | Nikita Popov | 2017-03-22 | 1 | -130/+133 |
| | | | |||||
* | | | Resolve conflict | Sammy Kaye Powers | 2017-01-03 | 1 | -3929/+4094 |
|\ \ \ | |||||
| * | | | updating cvs revisions of strlcat/cpy | David Carlier | 2016-10-20 | 1 | -3929/+4094 |
| |/ / | |||||
* | | | Update copyright headers to 2017 | Sammy Kaye Powers | 2017-01-02 | 1 | -1/+1 |
|/ / | |||||
* | | Implement #72918: negative offset inside a quoted string leads to parse error | Christoph M. Becker | 2016-10-14 | 1 | -4094/+3929 |
| | | | | | | | | | | We allow negative numeric offsets for the simple syntax inside double-quoted and heredoc strings. | ||||
* | | Merge branch 'PHP-7.0' into PHP-7.1 | Nikita Popov | 2016-10-14 | 1 | -3964/+4131 |
| | | | | | | | | (cherry picked from commit 26964ccea0f52ed4d6beda3bcfd1508f6d3dad43) | ||||
* | | Make sure TOKEN_PARSE mode is thread safe | Nikita Popov | 2016-07-23 | 1 | -350/+356 |
| | | | | | | | | | | | | 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 :/ | ||||
* | | Fixed compilation warnings | Dmitry Stogov | 2016-06-21 | 1 | -3/+3 |
| | | |||||
* | | Check in generated lexer | Sara Golemon | 2016-05-14 | 1 | -348/+354 |
| | | | | | | | | | | This should have been included with my previous diff implementing octal overflow warning. Ooops. | ||||
* | | Eliminated checks for (func->op_array.fn_flags & ZEND_ACC_GENERATOR) in fast ↵ | Dmitry Stogov | 2016-05-13 | 1 | -2739/+2746 |
| | | | | | | | | | | | | | | path of DO_FCALL* handlers. This slightly improves calls to regular function and method calls in cost of a bit slower generator initialization. Separate call frame for generators, allocated on heap, now created by ZEND_GENERATOR_CREATE instruction. | ||||
* | | Revert "Refactor zval cleanup into single function" | Dmitry Stogov | 2016-05-06 | 1 | -186/+176 |
| | | | | | | | | This reverts commit bac6fdb0c52c924e726c5a78de8858bf27b6586b. | ||||
* | | Refactor zval cleanup into single function | Bob Weinand | 2016-05-05 | 1 | -176/+186 |
| | | | | | | | | Also use zval_ptr_dtor_nogc() everywhere in Zend in favor of zval_dtor() | ||||
* | | Fix bug #71897 | Andrea Faulds | 2016-05-04 | 1 | -2583/+2577 |
| | | |||||
* | | Merge branch 'PHP-7.0' | Nikita Popov | 2016-03-06 | 1 | -216/+217 |
|\ \ | |/ | | | | | | | Conflicts: Zend/zend_language_scanner.c | ||||
| * | Fixed bug #71724 | Nikita Popov | 2016-03-06 | 1 | -216/+217 |
| | | |||||
* | | Merge branch 'PHP-7.0' | Xinchen Hui | 2016-01-02 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | bump year which is missed in rev 49493a2 | Xinchen Hui | 2016-01-02 | 1 | -1/+1 |
| | | |||||
* | | Separate common part of compile_file() and compile_string() into zend_compile() | Dmitry Stogov | 2015-11-12 | 1 | -417/+393 |
|/ | |||||
* | Don't return T_ERROR from token_get_all() | Nikita Popov | 2015-07-09 | 1 | -199/+191 |
| | | | | | | 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 #69430 | Nikita Popov | 2015-07-09 | 1 | -348/+353 |
| | | | | | Don't throw from token_get_all() unless TOKEN_PARSE is used. Errors are reported as T_ERROR tokens. | ||||
* | Switch code on thrown TypeError and ParseError to 0, update related tests | Aaron Piotrowski | 2015-07-07 | 1 | -5/+5 |
| | |||||
* | Replace references to PHP_WIN32 and TSRM_WIN32 with ZEND_WIN32 in Zend/, ↵ | Kalle Sommer Nielsen | 2015-07-04 | 1 | -2/+2 |
| | | | | this also fixes 1 instance of where fflush(stderr) was misplaced (zend_extensions.c) | ||||
* | Switch position of ce in exception ce variable names | Aaron Piotrowski | 2015-07-03 | 1 | -5/+5 |
| | |||||
* | Cleanup exception ce API | Aaron Piotrowski | 2015-07-03 | 1 | -5/+5 |
| | | | | | Removed recently added functions to get Error ce's and marked the old functions fetching default_exception_ce and error_exception_ce as deprecated. | ||||
* | Merge branch 'master' into throwable-interface | Aaron Piotrowski | 2015-06-14 | 1 | -537/+560 |
|\ | | | | | | | | | | | | | # Conflicts: # Zend/zend_language_scanner.c # Zend/zend_language_scanner.l # ext/simplexml/tests/SimpleXMLElement_xpath.phpt | ||||
| * | Rebuild scanner, add NEWS/UPGRADING | Bob Weinand | 2015-05-25 | 1 | -537/+560 |
| | | |||||
* | | Remodel exceptions based on Throwable interface | Aaron Piotrowski | 2015-05-16 | 1 | -5/+5 |
|/ | | | | | | | | | | | Added Throwable interface that exceptions must implement in order to be thrown. BaseException was removed, EngineException renamed to Error, and TypeException and ParseException renamed to TypeError and ParseError. Exception and Error no longer extend a common base class, rather they both implement the Throwable interface. | ||||
* | Add line_start/end info to main op_array | Bob Weinand | 2015-04-25 | 1 | -348/+352 |
| | |||||
* | Move more stuff to file_context | Nikita Popov | 2015-04-21 | 1 | -350/+348 |
| | | | | | | | | Introduce helper macro FC(x) for CG(file_context).x. end_compilation() now handled by file_context_end(). While at it, dropped zval wrapper for ticcks. | ||||
* | Fixed bug #69388 | Nikita Popov | 2015-04-20 | 1 | -354/+362 |
| | | | | | | | | | | | | Renamed compiler_context to oparray_context. Introduced per-file file_context. Moved import tables into the file_context. context_stack no longer exists, instead keeping backups of contexts on C stack. Same for file contexts. TODO: Move more things out of CG into file_context. There should be a number of other things that we should not try to reuse in nested compilations. | ||||
* | Merge branch 'coroutineDelegation' of https://github.com/bwoebi/php-src | Bob Weinand | 2015-04-14 | 1 | -974/+1033 |
|\ | |||||
| * | Added yield from operator | Bob Weinand | 2015-03-07 | 1 | -972/+1031 |
| | | |||||
* | | Throw ParseException from lexer | Nikita Popov | 2015-04-02 | 1 | -358/+376 |
| | | | | | | | | | | | | | | 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. | ||||
* | | Use zend_error_noreturn() for fatal errors | Dmitry Stogov | 2015-04-01 | 1 | -1/+1 |
| | | |||||
* | | Optimize zend_string_realloc() add more specialized versions ↵ | Dmitry Stogov | 2015-03-20 | 1 | -1/+1 |
| | | | | | | | | zend_string_extend() and zend_string_truncate() | ||||
* | | Support ParseException for require etc | Nikita Popov | 2015-03-17 | 1 | -379/+371 |
| | | |||||
* | | Use zend_string* instead of char* for opened_patch handling. Avoid ↵ | Dmitry Stogov | 2015-03-04 | 1 | -2718/+2712 |
| | | | | | | | | reallocations and improve string reuse. | ||||
* | | Blast off to space. | Andrea Faulds | 2015-01-29 | 1 | -2949/+2964 |
|/ | |||||
* | Fixed compiler reenterability | Dmitry Stogov | 2015-01-22 | 1 | -344/+350 |
| | |||||
* | Provide compiler hook for altering the AST pre-compilation. | Sara Golemon | 2015-01-19 | 1 | -344/+350 |
| | |||||
* | Fixed annoying incompatible pointer type warning | Xinchen Hui | 2015-01-18 | 1 | -2529/+2525 |
| | |||||
* | Error on invalid octal (fixes PHPSadness #31) | Andrea Faulds | 2015-01-17 | 1 | -456/+503 |
| | | | | Further error checks | ||||
* | bump year | Xinchen Hui | 2015-01-15 | 1 | -1/+1 |
| |