Merge sapi/phpdbg into PHP-5.6

diff --cc sapi/phpdbg/.gitignore
index 5506a2652d09ffcc7738f4e54f598f6816c49493,0000000000000000000000000000000000000000..51165dab2f3279b516cc4ac91b19c345829a3692
mode 100644,000000..100644
--- 1/sapi/phpdbg/.gitignore
--- /dev/null
+++ b/sapi/phpdbg/.gitignore
@@@ -1,5 -1,0 +1,6 @@@
 +.libs/
 +phpdbg
 +*.lo
 +*.o
++*.output
 +build

diff --cc sapi/phpdbg/Makefile.frag
index 45768de2effe542861128acda3975c5bd3b2cb70,0000000000000000000000000000000000000000..d787b0fb1806975525c8d5edd84fcc73ed72a679
mode 100644,000000..100644
--- 1/sapi/phpdbg/Makefile.frag
--- /dev/null
+++ b/sapi/phpdbg/Makefile.frag
@@@ -1,36 -1,0 +1,39 @@@
- $(builddir)/sapi/phpdbg/phpdbg_lexer.lo: $(srcdir)/sapi/phpdbg/phpdbg_parser.h
 +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)
 +
- $(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)
++%.c: %.y
++%.c: %.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 $@
++$(builddir)/phpdbg_lexer.lo: $(srcdir)/phpdbg_parser.h
 +
++$(srcdir)/phpdbg_lexer.c: $(srcdir)/phpdbg_lexer.l
++      @(cd $(top_srcdir); $(RE2C) $(RE2C_FLAGS) --no-generation-date -cbdFo $(srcdir)/phpdbg_lexer.c $(srcdir)/phpdbg_lexer.l)
++
++$(srcdir)/phpdbg_parser.h: $(srcdir)/phpdbg_parser.c
++$(srcdir)/phpdbg_parser.c: $(srcdir)/phpdbg_parser.y
++      @$(YACC) -p phpdbg_ -v -d $(srcdir)/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/phpdbg.h
Simple merge

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

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

diff --cc sapi/phpdbg/phpdbg_lexer.l
Simple merge

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

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

diff --cc sapi/phpdbg/phpdbg_parser.y
Simple merge

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

diff --cc sapi/phpdbg/travis/ci.sh
Simple merge