Merge sapi/phpdbg into PHP-5.6

diff --cc sapi/phpdbg/.gitignore
index 297efcbc420ea23282dbcc04087b73ae693e27c8,0000000000000000000000000000000000000000..af445861acdbb1efc63ddcd53d2a309a535e454c
mode 100644,000000..100644
--- 1/sapi/phpdbg/.gitignore
--- /dev/null
+++ b/sapi/phpdbg/.gitignore
@@@ -1,5 -1,0 +1,7 @@@
- ./phpdbg
 +.libs/
++phpdbg
 +*.lo
 +*.o
 +build
++phpdbg_parser.c
++phpdbg_parser.h

diff --cc sapi/phpdbg/Makefile.frag
index 5be6d5b00f4f3af44945fc74d001d29a26ad6f4e,0000000000000000000000000000000000000000..45768de2effe542861128acda3975c5bd3b2cb70
mode 100644,000000..100644
--- 1/sapi/phpdbg/Makefile.frag
--- /dev/null
+++ b/sapi/phpdbg/Makefile.frag
@@@ -1,28 -1,0 +1,36 @@@
- 
 +phpdbg: $(BUILD_BINARY)
 +
 +phpdbg-shared: $(BUILD_SHARED)
 +
 +$(BUILD_SHARED): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
 +      $(BUILD_PHPDBG_SHARED)
 +
 +$(BUILD_BINARY): $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_PHPDBG_OBJS)
 +      $(BUILD_PHPDBG)
 +
++$(builddir)/sapi/phpdbg/phpdbg_lexer.lo: $(srcdir)/sapi/phpdbg/phpdbg_parser.h
++
++$(srcdir)/sapi/phpdbg/phpdbg_lexer.c: $(srcdir)/sapi/phpdbg/phpdbg_lexer.l
++      @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo sapi/phpdbg/phpdbg_lexer.c sapi/phpdbg/phpdbg_lexer.l)
++
++$(srcdir)/sapi/phpdbg/phpdbg_parser.h: $(srcdir)/sapi/phpdbg/phpdbg_parser.c
++$(srcdir)/sapi/phpdbg/phpdbg_parser.c: $(srcdir)/sapi/phpdbg/phpdbg_parser.y
++      @$(YACC) -p phpdbg_ -v -d $(srcdir)/sapi/phpdbg/phpdbg_parser.y -o $@
++
 +install-phpdbg: $(BUILD_BINARY)
 +      @echo "Installing phpdbg binary:         $(INSTALL_ROOT)$(bindir)/"
 +      @$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
 +      @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/log
 +      @$(mkinstalldirs) $(INSTALL_ROOT)$(localstatedir)/run
 +      @$(INSTALL) -m 0755 $(BUILD_BINARY) $(INSTALL_ROOT)$(bindir)/$(program_prefix)phpdbg$(program_suffix)$(EXEEXT)
 +
 +clean-phpdbg:
 +      @echo "Cleaning phpdbg object files ..."
 +      find sapi/phpdbg/ -name *.lo -o -name *.o | xargs rm -f
 +
 +test-phpdbg:
 +      @echo "Running phpdbg tests ..."
 +      @$(top_builddir)/sapi/cli/php sapi/phpdbg/tests/run-tests.php --phpdbg sapi/phpdbg/phpdbg
 +
 +.PHONY: clean-phpdbg test-phpdbg
 +

diff --cc sapi/phpdbg/config.m4
Simple merge

diff --cc sapi/phpdbg/config.w32
Simple merge

diff --cc sapi/phpdbg/phpdbg.c
Simple merge

diff --cc sapi/phpdbg/phpdbg.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_bp.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_bp.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_break.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_break.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_btree.c
index 0000000000000000000000000000000000000000,8fc2561e0477dae29ed051649f59d8fa28fb9781..8fc2561e0477dae29ed051649f59d8fa28fb9781
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_btree.c
+++ b/sapi/phpdbg/phpdbg_btree.c

diff --cc sapi/phpdbg/phpdbg_btree.h
index 0000000000000000000000000000000000000000,5fb217db35ee128ef178f8ccfd32b27a18f6d652..5fb217db35ee128ef178f8ccfd32b27a18f6d652
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_btree.h
+++ b/sapi/phpdbg/phpdbg_btree.h

diff --cc sapi/phpdbg/phpdbg_cmd.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_cmd.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_frame.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_help.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_help.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_info.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_info.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_lexer.c
index 0000000000000000000000000000000000000000,c289004b9817d26051cd1a79bd2dadf125d7f589..c289004b9817d26051cd1a79bd2dadf125d7f589
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_lexer.c
+++ b/sapi/phpdbg/phpdbg_lexer.c

diff --cc sapi/phpdbg/phpdbg_lexer.h
index 0000000000000000000000000000000000000000,1958cef9a263cf99c29d7486d1fa60812067af9c..1958cef9a263cf99c29d7486d1fa60812067af9c
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_lexer.h
+++ b/sapi/phpdbg/phpdbg_lexer.h

diff --cc sapi/phpdbg/phpdbg_lexer.l
index 0000000000000000000000000000000000000000,ad5edd9f8f97b2b1bb2ba424295e88db9479aae1..ad5edd9f8f97b2b1bb2ba424295e88db9479aae1
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_lexer.l
+++ b/sapi/phpdbg/phpdbg_lexer.l

diff --cc sapi/phpdbg/phpdbg_list.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_list.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_opcode.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_parser.y
index 0000000000000000000000000000000000000000,4a84504e2e569721993ee716c077f0f94f8e0adb..4a84504e2e569721993ee716c077f0f94f8e0adb
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_parser.y
+++ b/sapi/phpdbg/phpdbg_parser.y

diff --cc sapi/phpdbg/phpdbg_print.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_print.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_prompt.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_prompt.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_set.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_set.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_utils.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_utils.h
Simple merge

diff --cc sapi/phpdbg/phpdbg_watch.c
index 0000000000000000000000000000000000000000,a6bf6289bf57269054f341be9ce883ebd3b46db9..a6bf6289bf57269054f341be9ce883ebd3b46db9
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_watch.c
+++ b/sapi/phpdbg/phpdbg_watch.c

diff --cc sapi/phpdbg/phpdbg_watch.h
index 0000000000000000000000000000000000000000,d00bcff77e5f4b5589ddc2e087a130032458962d..d00bcff77e5f4b5589ddc2e087a130032458962d
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_watch.h
+++ b/sapi/phpdbg/phpdbg_watch.h

diff --cc sapi/phpdbg/phpdbg_win.c
index 0000000000000000000000000000000000000000,b0cbdf267a1a38c32b37ae7ea3725b574d859c9c..b0cbdf267a1a38c32b37ae7ea3725b574d859c9c
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_win.c
+++ b/sapi/phpdbg/phpdbg_win.c

diff --cc sapi/phpdbg/phpdbg_win.h
index 0000000000000000000000000000000000000000,68c305279073018a79d42db1dbec490b802b9421..68c305279073018a79d42db1dbec490b802b9421
mode 000000,100644..100644
--- /dev/null
--- 2/phpdbg_win.h
+++ b/sapi/phpdbg/phpdbg_win.h

diff --cc sapi/phpdbg/test.php
Simple merge