com php-src: fixup help, behaviour of step command when not executing: phpdbg_help.c phpdbg_prompt.c
| From: | Bob Weinand | Date: | Mon, 21 Apr 2014 21:00:21 +0000 |
| Subject: | com php-src: fixup help, behaviour of step command when not executing: phpdbg_help.c phpdbg_prompt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76971@lists.php.net to get a copy of this message | ||
Commit: c1e12316f1126ae3b3867a38d6930cf66cfb0675
Author: krakjoe <joe.watkins@live.co.uk> Mon, 21 Apr 2014 22:00:21 +0100
Parents: e9668d4ce8512838d92b05aa47da02c85a37c486
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c1e12316f1126ae3b3867a38d6930cf66cfb0675
Log:
fixup help, behaviour of step command when not executing
Changed paths:
M phpdbg_help.c
M phpdbg_prompt.c
Diff:
diff --git a/phpdbg_help.c b/phpdbg_help.c
index 32a78cb..f2d074d 100644
--- a/phpdbg_help.c
+++ b/phpdbg_help.c
@@ -711,11 +711,13 @@ phpdbg_help_text_t phpdbg_help_text[] = {
"populate these tables for a given execution context."
},
-//*********** what is the difference between n and s ???
{"continue",
-"The **continue** command causes control to be passed back to the vm, continuing execution.
The next "
-"opline will be executed if **step** is set **on**. Otherwise execution will continue to the
next "
-"breakpoint or script completion" CR CR
+"Continue with execution after hitting a break or watchpoint" CR CR
+
+"**Examples**" CR CR
+" $P continue" CR
+" $P c" CR
+" Continue executing until the next break or watchpoint" CR CR
"Note **continue** will trigger a \"not running\" error if not executing."
},
@@ -863,7 +865,7 @@ phpdbg_help_text_t phpdbg_help_text[] = {
},
{"step",
-"Execute opcodes until beginning on next line" CR CR
+"Execute opcodes until next line" CR CR
"**Examples**" CR CR
diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index 2e07c32..e2603a0 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -424,7 +424,9 @@ int phpdbg_compile(TSRMLS_D) /* {{{ */
PHPDBG_COMMAND(step) /* {{{ */
{
- PHPDBG_G(flags) |= PHPDBG_IS_STEPPING;
+ if (EG(in_execution)) {
+ PHPDBG_G(flags) |= PHPDBG_IS_STEPPING;
+ }
return PHPDBG_NEXT;
} /* }}} */