summaryrefslogtreecommitdiff
path: root/Zend/zend_language_scanner_defs.h
Commit message (Collapse)AuthorAgeFilesLines
* Leftover: Invoke re2c with --no-generation-date to prevent unintentional / ↵Sebastian Bergmann2012-12-061-1/+1
| | | | unnecessary changes in generated files.
* Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2012-11-141-1/+1
|\ | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed compiler reenterability Fixed compiler reenterability Conflicts: Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h
| * Fixed compiler reenterabilityDmitry Stogov2012-11-141-1/+1
| |
| * - Regenerated filesFelipe Pena2012-04-301-1/+1
| |
| * - Regenerated filesFelipe Pena2012-04-301-1/+1
| |
* | Merge remote-tracking branch 'php-src/master' into addGeneratorsSupportNikita Popov2012-08-201-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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 Malyshev2012-08-191-1/+1
| |\ \ | | | | | | | | | | | | | | | | * 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-311-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 addGeneratorsSupportNikita Popov2012-08-131-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 phpXinchen Hui2012-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | 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* expressionNikita Popov2012-06-191-1/+1
| | | | | | | | | | | | This does not yet actually implement any delegation.
* | | Add T_YIELD "yield" keywordNikita Popov2012-05-151-1/+1
|/ /
* | - Regenerated filesFelipe Pena2012-04-301-1/+1
| |
* | - Regenerated filesFelipe Pena2012-04-301-1/+1
| |
* | Fix bug #61681: Malformed grammarNikita Popov2012-04-091-1/+1
|/ | | | | | 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.4Gustavo André dos Santos Lopes2012-03-281-15/+15
|\ | | | | | | 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 Lopes2012-03-281-15/+15
|/ | | | This reverts commit 74ee335e3aea8c48380334098b8d20eb54d6c6be.
* - fix bug #61504, fix build errors on windows and possibly otherPierre Joye2012-03-281-15/+15
|
* Fix #61095 (Lexing 0x0*+<NUM> incorrectly)Etienne Kneuss2012-02-201-1/+1
|
* Fixed Bug #53629 (memory leak inside highlight_string()).Ilia Alshanetsky2011-01-031-1/+1
|
* - Reverted fix for bug #48930 (due binary compatibility breakage)Felipe Pena2010-06-291-1/+1
|
* - those are in 5.3.2 now, merge to 5.3.2 section is comingPierre Joye2010-02-111-1/+1
|
* - Fix skipsJani Taskinen2009-09-101-1/+1
|
* RegenerateMatt Wilmas2009-05-051-4/+1
|
* Fixed bug #47516 (nowdoc can not be embed in heredoc but can be embed in ↵Dmitry Stogov2009-03-261-1/+1
| | | | double quote)
* Fixed bug #47038 (Memory leak in include)Dmitry Stogov2009-03-251-1/+1
|
* MFH: Fix scanner handling of NULL values in heredoc, nowdoc, strings, ↵Brian Shire2009-03-161-1/+1
| | | | comments, and non-parsed content.
* MFH: Add proper EOF handling for language scanner. Fixes bug #46817.Brian Shire2009-03-111-1/+1
|
* UnmangleRasmus Lerdorf2009-02-141-8/+0
|
* 2.4.1 is safeRasmus Lerdorf2009-02-141-0/+8
|
* MFH: Corrected fix for bug #46844 to only trigger on the 1st line of CLIIlia Alshanetsky2009-01-091-1/+1
| | | | | opened files.
* - Next step in namespaces, using / as namespace separator.Marcus Boerger2008-11-041-1/+1
|
* - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macroFelipe Pena2008-10-241-1/+1
|
* Fixed bug #45779 (regression with shebang lines processing)Dmitry Stogov2008-08-121-1/+1
|
* - Touch.Moriyoshi Koizumi2008-07-281-1/+1
|
* - TouchMoriyoshi Koizumi2008-07-281-1/+1
|
* - touchMoriyoshi Koizumi2008-07-281-1/+1
|
* . Added support for using static HEREDOCs to initialize static variables and ↵Dmitry Stogov2008-07-261-4/+1
| | | | | | | | 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)
* - Revived zend multibyteMoriyoshi Koizumi2008-07-241-1/+1
|
* regenerateNuno Lopes2008-07-081-1/+1
|
* regenerateNuno Lopes2008-07-061-1/+1
|
* regenerateNuno Lopes2008-07-061-1/+1
|
* implemented again zend-multibyte for PHP 5.3Rui Hirokawa2008-06-291-1/+1
|
* fix heredoc+nowdocNuno Lopes2008-04-101-1/+1
| | | | | #patch by Matt Wilmas
* fix the yyless() definition to match flex one and revert part of last patch ↵Nuno Lopes2008-04-091-1/+1
| | | | (so that it remains similar with flex's scan)
* - Allow HEREDOC syntax with double quotesFelipe Pena2008-04-051-1/+1
| | | | | (http://wiki.php.net/rfc/heredoc-with-double-quotes)
* add sanity checks for ZEND_MMAP_AHEAD and reduce the value from 32 to 16 ↵Nuno Lopes2008-04-041-1/+1
| | | | (lowest safe value)
* MFH: Implemented "jump label" operator (limited "goto")Felipe Pena2008-03-281-1/+1
| | | | | [DOC]
* - Another re2c version bump and scanner regenerationMarcus Boerger2008-03-221-1/+1
| | | | | # It appears no one has used re2c in the way we do
* fix gcov buildNuno Lopes2008-03-191-2/+2
|
View Lorry Controller Status