delta/php-git.git - git.php.net: repository/php-src.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Happy New Year	Xinchen Hui	2013-01-01	1	-1/+1
\|
*	Leftover: Invoke re2c with --no-generation-date to prevent unintentional / ↵	Sebastian Bergmann	2012-12-06	1	-1/+1
\| \| \| \|	unnecessary changes in generated files.
*	Merge branch 'PHP-5.4' into PHP-5.5	Dmitry Stogov	2012-11-14	1	-345/+347
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PHP-5.4: Fixed compiler reenterability Fixed compiler reenterability Conflicts: Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h
\| *	Fixed compiler reenterability	Dmitry Stogov	2012-11-14	1	-341/+343
\| \|
\| *	- Regenerated files	Felipe Pena	2012-04-30	1	-343/+344
\| \|
\| *	- Regenerated files	Felipe Pena	2012-04-30	1	-342/+348
\| \|
* \|	Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport	Nikita Popov	2012-08-20	1	-379/+385
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merging master to fix Windows build Conflicts: Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h Zend/zend_vm_def.h
\| * \	Merge branch 'pull-request/31'	Stanislav Malyshev	2012-08-19	1	-377/+383
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* pull-request/31: Fix lexing of nested heredoc strings in token_get_all()
\| \| * \|	Fix lexing of nested heredoc strings in token_get_all()	Nikita Popov	2012-03-31	1	-375/+381
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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()).
* \| \|	Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport	Nikita Popov	2012-08-13	1	-632/+665
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is just an intial merge. It does not yet make generators and finally work together. Conflicts: Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h Zend/zend_vm_def.h Zend/zend_vm_execute.h Zend/zend_vm_execute.skl Zend/zend_vm_opcodes.h
\| * \|	Implemented 'finally' keywords for php	Xinchen Hui	2012-08-13	1	-632/+665
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RFC: https://wiki.php.net/rfc/finally FR: https://bugs.php.net/bug.php?id=32100 and I have got some improvment ideas(performance), will implemented later. thanks
* \| \|	Add sceleton for yield* expression	Nikita Popov	2012-06-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	This does not yet actually implement any delegation.
* \| \|	Add T_YIELD "yield" keyword	Nikita Popov	2012-05-15	1	-2554/+2590
\|/ /
* \|	- Regenerated files	Felipe Pena	2012-04-30	1	-343/+344
\| \|
* \|	- Regenerated files	Felipe Pena	2012-04-30	1	-342/+348
\| \|
* \|	Fix bug #61681: Malformed grammar	Nikita Popov	2012-04-09	1	-208/+232
\|/ \| \| \| \| \|	Generate T_STRING_VARNAME only if it actually is one. This is only the case for "${varname}" and "${varname[offset]}" so we can just add a check for } or [ after the LABEL.
*	Merge branch '5.3' into 5.4	Gustavo André dos Santos Lopes	2012-03-28	1	-7415/+7782
\|\ \| \| \| \| \| \|	Zend/zend_language_scanner.c and Zend/zend_language_scanner_defs.h had to be changed manually.
\| *	Revert "- fix bug #61504, fix build errors on windows and possibly other"	Gustavo André dos Santos Lopes	2012-03-28	1	-7415/+7415
\|/ \| \| \|	This reverts commit 74ee335e3aea8c48380334098b8d20eb54d6c6be.
*	- fix bug #61504, fix build errors on windows and possibly other	Pierre Joye	2012-03-28	1	-7415/+7415
\|
*	Fix #61095 (Lexing 0x0*+<NUM> incorrectly)	Etienne Kneuss	2012-02-20	1	-180/+184
\|
*	regen for r321655	Nuno Lopes	2012-01-01	1	-333/+335
\|
*	- Year++	Felipe Pena	2012-01-01	1	-1/+1
\|
*	Fixed Bug #53629 (memory leak inside highlight_string()).	Ilia Alshanetsky	2011-01-03	1	-333/+343
\|
*	- Year++	Felipe Pena	2011-01-01	1	-1/+1
\|
*	- Fixed bug #48930 (__COMPILER_HALT_OFFSET__ incorrect in PHP >= 5.3)	Felipe Pena	2010-06-30	1	-336/+348
\|
*	- Reverted fix for bug #48930 (due binary compatibility breakage)	Felipe Pena	2010-06-29	1	-335/+334
\|
*	- Fixed bug #48930 (__COMPILER_HALT_OFFSET__ incorrect in PHP >= 5.3)	Felipe Pena	2010-06-27	1	-334/+335
\|
*	- those are in 5.3.2 now, merge to 5.3.2 section is coming	Pierre Joye	2010-02-11	1	-1/+1
\|
*	sed -i "s#1998-2009#1998-2010#g" */.c */.h */.php	Sebastian Bergmann	2010-01-05	1	-1/+1
\|
*	- Fixed bug #50145 (crash while running bug35634.phpt)	Felipe Pena	2009-11-17	1	-5/+5
\|
*	- Fix skips	Jani Taskinen	2009-09-10	1	-1/+1
\|
*	Regenerate	Matt Wilmas	2009-05-05	1	-5332/+3830
\|
*	Fixed bug #47516 (nowdoc can not be embed in heredoc but can be embed in ↵	Dmitry Stogov	2009-03-26	1	-137/+141
\| \| \| \|	double quote)
*	Fixed bug #47038 (Memory leak in include)	Dmitry Stogov	2009-03-25	1	-399/+391
\|
*	MFH: Fix scanner handling of NULL values in heredoc, nowdoc, strings, ↵	Brian Shire	2009-03-16	1	-3709/+3644
\| \| \| \|	comments, and non-parsed content.
*	MFH: Add proper EOF handling for language scanner. Fixes bug #46817.	Brian Shire	2009-03-11	1	-3916/+4174
\|
*	Unmangle	Rasmus Lerdorf	2009-02-14	1	-16/+0
\|
*	2.4.1 is safe	Rasmus Lerdorf	2009-02-14	1	-0/+16
\|
*	MFH: Corrected fix for bug #46844 to only trigger on the 1st line of CLI	Ilia Alshanetsky	2009-01-09	1	-386/+365
\| \| \| \| \|	opened files.
*	- MFH: Year++	Felipe Pena	2009-01-02	1	-1/+1
\|
*	Fixed bug #46844 (php scripts or included files with first line starting	Ilia Alshanetsky	2009-01-01	1	-3/+3
\| \| \| \| \|	with # have the 1st line missed from the output).
*	- Next step in namespaces, using / as namespace separator.	Marcus Boerger	2008-11-04	1	-2605/+2615
\|
*	- MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro	Felipe Pena	2008-10-24	1	-1/+1
\|
*	- MFH: Removed some TSRMLS_FETCH()s	Felipe Pena	2008-08-15	1	-4/+4
\|
*	Fixed bug #45779 (regression with shebang lines processing)	Dmitry Stogov	2008-08-12	1	-363/+365
\|
*	- MFH: Fixed BC break: The magic constants must be case-insensitive.	Felipe Pena	2008-07-30	1	-144/+209
\|
*	- Touch.	Moriyoshi Koizumi	2008-07-28	1	-378/+379
\|
*	- Touch	Moriyoshi Koizumi	2008-07-28	1	-19/+19
\|
*	- touch	Moriyoshi Koizumi	2008-07-28	1	-383/+390
\|
*	. Added support for using static HEREDOCs to initialize static variables and ↵	Dmitry Stogov	2008-07-26	1	-3817/+3250
\| \| \| \| \| \| \| \|	class members or constants. (Matt) . Improved syntax highlighting and consistency for variables in double-quoted strings and literal text in HEREDOCs and backticks. (Matt) . Optimized interpolated strings to use one less opcode. (Matt)