Updated parser & leer to be usable with re2c

Fixes some weird temporary compilation errors too

1 files changed, 6 insertions, 1 deletions

diff --git a/phpdbg.h b/phpdbg.h
index be009e40d0..12350d5425 100644
--- a/phpdbg.h
+++ b/phpdbg.h
@@ -69,11 +69,14 @@
 #   include <readline/history.h>
 #endif
 
+#include "phpdbg_lexer.h"
 #include "phpdbg_cmd.h"
 #include "phpdbg_utils.h"
 #include "phpdbg_btree.h"
 #include "phpdbg_watch.h"
 
+int phpdbg_do_parse(phpdbg_param_t *stack, char *input TSRMLS_DC);
+
 #ifdef ZTS
 # define PHPDBG_G(v) TSRMG(phpdbg_globals_id, zend_phpdbg_globals *, v)
 #else
@@ -176,10 +179,12 @@ ZEND_BEGIN_MODULE_GLOBALS(phpdbg)
 	phpdbg_frame_t frame;                        /* frame */
 	zend_uint last_line;                         /* last executed line */
 
+	phpdbg_lexer_data lexer;                     /* lexer data */
+	phpdbg_param_t *parser_stack;                /* param stack during lexer / parser phase */
+
 #ifndef _WIN32
 	struct sigaction old_sigsegv_signal;         /* segv signal handler */
 #endif
-	
 	phpdbg_btree watchpoint_tree;                /* tree with watchpoints */
 	phpdbg_btree watch_HashTables;               /* tree with original dtors of watchpoints */
 	HashTable watchpoints;                       /* watchpoints */