diff options
author | Bob Weinand <bobwei9@hotmail.com> | 2014-06-09 10:06:29 +0200 |
---|---|---|
committer | Bob Weinand <bobwei9@hotmail.com> | 2014-06-09 10:06:29 +0200 |
commit | 6adc30028cfd04a1c6bcb0866de2fb22dae49ef5 (patch) | |
tree | 0e46646d08d8b28a3e02de8b9eab1a9bf52b166a /sapi/phpdbg/phpdbg.h | |
parent | be133d4eebb3856d76e935d618b2cccb262145b4 (diff) | |
parent | 158b03fdef46458604d9ada7560f062bd36b8ef6 (diff) | |
download | php-git-6adc30028cfd04a1c6bcb0866de2fb22dae49ef5.tar.gz |
Merge sapi/phpdbg into PHP-5.6
Diffstat (limited to 'sapi/phpdbg/phpdbg.h')
-rw-r--r-- | sapi/phpdbg/phpdbg.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg.h b/sapi/phpdbg/phpdbg.h index be009e40d0..12350d5425 100644 --- a/sapi/phpdbg/phpdbg.h +++ b/sapi/phpdbg/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 */ |