From: Bob Weinand <bobwei9@hotmail.com>
Date: Mon, 21 Apr 2014 21:29:25 +0000 (+0200)
Subject: Merge sapi/phpdbg into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~351^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=708af5fd8e3b279aa2f6343e369e26a67d8bedc1;p=php

Merge sapi/phpdbg into PHP-5.6
---

708af5fd8e3b279aa2f6343e369e26a67d8bedc1
diff --cc sapi/phpdbg/.gitignore
index 297efcbc42,0000000000..af445861ac
mode 100644,000000..100644
--- a/sapi/phpdbg/.gitignore
+++ b/sapi/phpdbg/.gitignore
@@@ -1,5 -1,0 +1,7 @@@
 +.libs/
- ./phpdbg
++phpdbg
 +*.lo
 +*.o
 +build
++phpdbg_parser.c
++phpdbg_parser.h
diff --cc sapi/phpdbg/Makefile.frag
index 5be6d5b00f,0000000000..45768de2ef
mode 100644,000000..100644
--- a/sapi/phpdbg/Makefile.frag
+++ 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/phpdbg_btree.c
index 0000000000,8fc2561e04..8fc2561e04
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_btree.c
+++ b/sapi/phpdbg/phpdbg_btree.c
diff --cc sapi/phpdbg/phpdbg_btree.h
index 0000000000,5fb217db35..5fb217db35
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_btree.h
+++ b/sapi/phpdbg/phpdbg_btree.h
diff --cc sapi/phpdbg/phpdbg_lexer.c
index 0000000000,c289004b98..c289004b98
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_lexer.c
+++ b/sapi/phpdbg/phpdbg_lexer.c
diff --cc sapi/phpdbg/phpdbg_lexer.h
index 0000000000,1958cef9a2..1958cef9a2
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_lexer.h
+++ b/sapi/phpdbg/phpdbg_lexer.h
diff --cc sapi/phpdbg/phpdbg_lexer.l
index 0000000000,ad5edd9f8f..ad5edd9f8f
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_lexer.l
+++ b/sapi/phpdbg/phpdbg_lexer.l
diff --cc sapi/phpdbg/phpdbg_parser.y
index 0000000000,4a84504e2e..4a84504e2e
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_parser.y
+++ b/sapi/phpdbg/phpdbg_parser.y
diff --cc sapi/phpdbg/phpdbg_watch.c
index 0000000000,a6bf6289bf..a6bf6289bf
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_watch.c
+++ b/sapi/phpdbg/phpdbg_watch.c
diff --cc sapi/phpdbg/phpdbg_watch.h
index 0000000000,d00bcff77e..d00bcff77e
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_watch.h
+++ b/sapi/phpdbg/phpdbg_watch.h
diff --cc sapi/phpdbg/phpdbg_win.c
index 0000000000,b0cbdf267a..b0cbdf267a
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_win.c
+++ b/sapi/phpdbg/phpdbg_win.c
diff --cc sapi/phpdbg/phpdbg_win.h
index 0000000000,68c3052790..68c3052790
mode 000000,100644..100644
--- a/sapi/phpdbg/phpdbg_win.h
+++ b/sapi/phpdbg/phpdbg_win.h