delta/php-git.git/ext/tokenizer, branch php-7.0.8 git.php.net: repository/php-src.git Merge branch 'PHP-5.6' into PHP-7.0 2016-01-01T17:48:25+00:00 Lior Kaplan kaplanlior@gmail.com 2016-01-01T17:47:16+00:00 ed35de784f4ea53927e906ba4af335778de4d16a * PHP-5.6: Happy new year (Update copyright to 2016) 
* PHP-5.6:
  Happy new year (Update copyright to 2016)
Happy new year (Update copyright to 2016) 2016-01-01T17:21:47+00:00 Lior Kaplan kaplanlior@gmail.com 2016-01-01T17:19:27+00:00 49493a2dcfb2cd1758b69b13d9006ead3be0e066 






Fix #70831: Compile fails on system with 160 CPUs
2015-12-06T11:37:08+00:00

Daniel Axtens
dja@axtens.net

2015-11-01T23:17:10+00:00

2ea924fffcb1ed63af6d68560a4930881f4e8ab1

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>





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 suite
2015-09-04T13:02:50+00:00

Márcio Almada
marcio3w@gmail.com

2015-09-04T03:45:49+00:00

c08b3922dd26ae3854eda918a036209375bdb7f1












Don't return T_ERROR from token_get_all()
2015-07-09T21:02:21+00:00

Nikita Popov
nikic@php.net

2015-07-09T20:59:31+00:00

a49ce7bb91bec02d6f26b3118404371df23242fe

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.





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
2015-07-09T17:11:48+00:00

Nikita Popov
nikic@php.net

2015-07-09T17:10:06+00:00

d91aad5966f01259f0e1a431a754d917807761b5

Don't throw from token_get_all() unless TOKEN_PARSE is used. Errors
are reported as T_ERROR tokens.





Don't throw from token_get_all() unless TOKEN_PARSE is used. Errors
are reported as T_ERROR tokens.







Update token_get_all() arginfo
2015-07-09T16:19:12+00:00

Nikita Popov
nikic@php.net

2015-07-09T16:19:12+00:00

8abc3022b070a378dc31f9727ddece78557ca7a8












Remove these old references to the DSP files we don't use anymore
2015-06-22T11:29:42+00:00

Kalle Sommer Nielsen
kalle@php.net

2015-06-22T11:29:42+00:00

db22946b25181ddbb23067418ac7092a0c26d9b3












Merge branch 'master' into throwable-interface
2015-06-14T23:53:11+00:00

Aaron Piotrowski
aaron@trowski.com

2015-06-14T23:53:11+00:00

110e0a5a2cda3bfa7778bb871502ff2b50e59f76

# Conflicts:
#	Zend/zend_language_scanner.c
#	Zend/zend_language_scanner.l
#	ext/simplexml/tests/SimpleXMLElement_xpath.phpt





# 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 places).
2015-06-12T09:33:23+00:00

Dmitry Stogov
dmitry@zend.com

2015-06-12T09:33:23+00:00

8e10e8f921101e0787c8228d257107a204de3e36

Switch from ZVAL_ZVAL() to simpler macros where possible (it makes sense to review remaining places)





Switch from ZVAL_ZVAL() to simpler macros where possible (it makes sense to review remaining places)