com php-src: Merge branch 'const_scalar_exprs' of g ithub.com:bwoebi/php-src into const_scalar_exprs: Zend/Makefile.am Zend/Zend.dsp Zend/zend.h
Zend/ zend_compile.c Zend/zend_vm_execute.h configure .in win32/build/config.w32

Commit: af600c240d2efe33291e8dd71ce228b9fbc849c1 Author: Dmitry Stogov <dmitry@zend.com> Wed, 6 Nov 2013 15:41:33 +0400 Parents: d87388ba0f6cf29eb495f9af96ab6aa353ebcc4f 18e2b1a9a930d5ae15544c5a2beed6b20d58cdee Branches: PHP-5.6 Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=af600c240d2efe33291e8dd71ce228b9fbc849c1 Log: Merge branch 'const_scalar_exprs' of github.com:bwoebi/php-src into const_scalar_exprs * 'const_scalar_exprs' of github.com:bwoebi/php-src: Removed operations on constant arrays. They make no sense as constants are not allowed to be arrays. And as just properties are allowed to; no problem, we still don't need operations on any constant array. Added a few more operators Whitespace fix converted several switches to ifs and made more opcache friendly Fatal error about self referencing constants fixed Fixed mem leaks, added tests and ternary operator Working commit for constant scalar expressions (with constants). Tests will follow. Conflicts: Zend/Makefile.am configure.in win32/build/config.w32 Changed paths: MM Zend/Makefile.am MM Zend/Zend.dsp MM Zend/zend.h MM Zend/zend_compile.c MM Zend/zend_vm_execute.h MM configure.in MM win32/build/config.w32 Diff: diff --cc Zend/Makefile.am index 924a00d,d031608..d9ce4c6 --- a/Zend/Makefile.am +++ b/Zend/Makefile.am @@@ -18,7 -18,8 +18,7 @@@ libZend_la_SOURCES= zend_default_classes.c \ zend_iterators.c zend_interfaces.c zend_exceptions.c \ zend_strtod.c zend_closures.c zend_float..c zend_string.c zend_signal.c \ - zend_generators.c zend_virtual_cwd.c - zend_generators.c \ - zend_ast.c ++ zend_generators.c zend_virtual_cwd.c zend_ast.c libZend_la_LDFLAGS = libZend_la_LIBADD = @ZEND_EXTRA_LIBS@ diff --cc configure.in index 805aa48,97fd68e..29358b1 --- a/configure.in +++ b/configure.in @@@ -1475,8 -1475,9 +1475,8 @@@ PHP_ADD_SOURCES(Zend, zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \ zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \ zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \ - zend_closures.c zend_float.c zend_string.c zend_signal.c \ - zend_generators.c \ - zend_ast.c) + zend_closures.c zend_float.c zend_string.c zend_signal.c zend_generators.c \ - zend_virtual_cwd.c) ++ zend_virtual_cwd.c zend_ast.c) if test -r "$abs_srcdir/Zend/zend_objects.c"; then PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c zend_default_classes.c) diff --cc win32/build/config.w32 index af92eb0,d9bbc7e..6e19c48 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@@ -364,7 -364,9 +364,7 @@@ ADD_SOURCES("Zend", "zend_language_pars zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \ zend_object_handlers.c zend_objects_API.c \ zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c zend_closures.c \ - zend_float.c zend_string.c zend_generators.c zend_virtual_cwd.c"); - zend_float.c zend_string.c \ - zend_generators.c \ - zend_ast.c"); ++ zend_float.c zend_string.c zend_generators.c zend_virtual_cwd.c zend_ast.c"); if (VCVERS == 1200) { AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1);