summaryrefslogtreecommitdiff
path: root/Zend/zend_language_scanner.c
Commit message (Collapse)AuthorAgeFilesLines
* bump year which is missed in rev 49493a2Xinchen Hui2016-01-021-1/+1
|
* bump yearXinchen Hui2015-01-151-1/+1
|
* Merge branch 'PHP-5.5' into PHP-5.6Pierre Joye2014-03-101-7857/+7857
|\ | | | | | | | | | | | | | | | | | | | | * PHP-5.5: update NEWS fix #66872, invalid argument crashes gmp_testbit fix #66872, invalid argument crashes gmp_testbit add vc12 (2013) Conflicts: ext/gmp/gmp.c
| * Bump yearXinchen Hui2014-01-031-1/+1
| |
* | add T_POW (**) operatordatibbaw2014-02-061-2016/+2038
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Bump yearXinchen Hui2014-01-031-1/+1
| |
* | Merge branch 'PHP-5.5' into PHP-5.6krakjoe2013-12-221-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * PHP-5.5: stop warnings from unused opcode map - BFN - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com Included new .c file in build too Fixed little typo in zend_vm_gen.php Moved to new file, killing a lot of warnings
| * Merge branch 'PHP-5.4' into PHP-5.5krakjoe2013-12-221-1/+1
| |\ | | | | | | | | | | | | | | | * PHP-5.4: stop warnings from unused opcode map - BFN
* | | initial move on renaming files and fixing includesAnatol Belski2013-10-171-1/+1
| | |
* | | Implement variadic function syntaxNikita Popov2013-09-261-2169/+2187
| | | | | | | | | | | | As per RFC: https://wiki.php.net/rfc/variadics
* | | Provide more macros for handling of interned stringsNikita Popov2013-09-131-353/+346
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * str_erealloc behaves like erealloc for normal strings, but will use emalloc+memcpy for interned strings. * str_estrndup behaves like estrndup for normal strings, but will not copy interned strings. * str_strndup behaves like zend_strndup for normal strings, but will not copy interned strings. * str_efree_rel behaves like efree_rel for normal strings, but will not free interned strings. * str_hash will return INTERNED_HASH for interned strings and compute it using zend_hash_func for normal strings.
* | | Make use of Z_*VAL and ZVAL_* in language scannerNikita Popov2013-09-131-509/+439
|/ /
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-06-161-344/+348
|\ \ | |/ | | | | | | | | | | | | | | | | | | * PHP-5.4: Fix bug #64936 - clean doc comment state at the beginning and end of the scan ws fix Conflicts: Zend/zend_language_scanner.c Zend/zend_language_scanner.l Zend/zend_language_scanner_defs.h
| * Fix bug #64936 - clean doc comment state at the beginning and end of the scanStanislav Malyshev2013-06-161-341/+344
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2013-05-201-2/+2
|\ \ | |/ | | | | | | | | | | | | * PHP-5.4: fix bug #64660 - yyparse can return 2, not only 1 Conflicts: Zend/zend_language_scanner.c
| * fix bug #64660 - yyparse can return 2, not only 1Stanislav Malyshev2013-05-201-3/+3
| |
* | Merge branch 'PHP-5.4' into PHP-5.5Dmitry Stogov2013-03-281-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | * PHP-5.4: Fixed bug #64529 (Ran out of opcode space) Conflicts: NEWS Zend/zend_execute_API.c Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h
| * Fixed bug #64529 (Ran out of opcode space)Dmitry Stogov2013-03-281-3/+3
| |
| * Happy New YearXinchen Hui2013-01-011-1/+1
| |
* | Happy New YearXinchen Hui2013-01-011-1/+1
| |
* | 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-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 reenterabilityDmitry Stogov2012-11-141-341/+343
| |
| * - Regenerated filesFelipe Pena2012-04-301-343/+344
| |
| * - Regenerated filesFelipe Pena2012-04-301-342/+348
| |
* | Merge remote-tracking branch 'php-src/master' into addGeneratorsSupportNikita Popov2012-08-201-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 Malyshev2012-08-191-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 Popov2012-03-311-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 addGeneratorsSupportNikita Popov2012-08-131-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 phpXinchen Hui2012-08-131-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* expressionNikita Popov2012-06-191-1/+1
| | | | | | | | | | | | This does not yet actually implement any delegation.
* | | Add T_YIELD "yield" keywordNikita Popov2012-05-151-2554/+2590
|/ /
* | - Regenerated filesFelipe Pena2012-04-301-343/+344
| |
* | - Regenerated filesFelipe Pena2012-04-301-342/+348
| |
* | Fix bug #61681: Malformed grammarNikita Popov2012-04-091-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.4Gustavo André dos Santos Lopes2012-03-281-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 Lopes2012-03-281-7415/+7415
|/ | | | This reverts commit 74ee335e3aea8c48380334098b8d20eb54d6c6be.
* - fix bug #61504, fix build errors on windows and possibly otherPierre Joye2012-03-281-7415/+7415
|
* Fix #61095 (Lexing 0x0*+<NUM> incorrectly)Etienne Kneuss2012-02-201-180/+184
|
* regen for r321655Nuno Lopes2012-01-011-333/+335
|
* - Year++Felipe Pena2012-01-011-1/+1
|
* Fixed Bug #53629 (memory leak inside highlight_string()).Ilia Alshanetsky2011-01-031-333/+343
|
* - Year++Felipe Pena2011-01-011-1/+1
|
* - Fixed bug #48930 (__COMPILER_HALT_OFFSET__ incorrect in PHP >= 5.3)Felipe Pena2010-06-301-336/+348
|
* - Reverted fix for bug #48930 (due binary compatibility breakage)Felipe Pena2010-06-291-335/+334
|
* - Fixed bug #48930 (__COMPILER_HALT_OFFSET__ incorrect in PHP >= 5.3)Felipe Pena2010-06-271-334/+335
|
* - those are in 5.3.2 now, merge to 5.3.2 section is comingPierre Joye2010-02-111-1/+1
|
* sed -i "s#1998-2009#1998-2010#g" **/*.c **/*.h **/*.phpSebastian Bergmann2010-01-051-1/+1
|
* - Fixed bug #50145 (crash while running bug35634.phpt)Felipe Pena2009-11-171-5/+5
|
* - Fix skipsJani Taskinen2009-09-101-1/+1
|