rename next to continue, cleanup help

diff --git a/phpdbg_help.c b/phpdbg_help.c
index 331c28fdb28b9e258400e2a44d5482d36b01377e..4866f1e67e2f350675f0df7cb4789fa17527b249 100644 (file)
--- a/phpdbg_help.c
+++ b/phpdbg_help.c
@@ -318,30 +318,28 @@ phpdbg_help_text_t phpdbg_help_text[] = {
 "**Information**" CR
 "  **list**     list PHP source" CR
 "  **info**     displays information on the debug session" CR
-"  **help**     provide help on a topic" CR
-"  **print**    print argument " CR
-"  **frame**    select a stack frame and print a stack frame summary" CR CR
+"  **print**    show opcodes " CR
+"  **frame**    select a stack frame and print a stack frame summary" CR 
+"  **help**     provide help on a topic" CR CR
 
 "**Starting and Stopping Execution**" CR
 "  **exec**     set execution context" CR
 "  **run**      attempt execution" CR
-"  **step**     Enable or disable per opcode stepping mode" CR
-"  **next**     continue execution" CR
+"  **continue** continue execution" CR
 "  **until**    continue execution up to the given location" CR
 "  **finish**   continue up to end of the current execution frame" CR
 "  **leave**    continue up to end of the current execution frame and halt after the calling instruction" CR
 "  **break**    set a breakpoint at the specified target" CR
 "  **watch**    set a watchpoint on $variable" CR
-"  **ev**       evaluate some code" CR
 "  **clear**    clear one or all breakpoints" CR
 "  **clean**    clean the execution environment" CR CR
 
 "**Miscellaneous**" CR
-"  **quiet**    silence some output" CR
 "  **set**      set the phpdbg configuration" CR
 "  **source**   execute a phpdbginit script" CR
 "  **register** register a phpdbginit function as a command alias" CR
 "  **sh**       shell a command" CR
+"  **ev**       evaluate some code" CR
 "  **quit**     exit phpdbg" CR CR
 
 "Type **help <command>** or (**help alias**) to get detailed help on any of the above commands, "
@@ -714,12 +712,12 @@ phpdbg_help_text_t phpdbg_help_text[] = {
 },
 
 //*********** what is the difference between n and s ???
-{"next",
-"The **next** command causes control to be passed back to the vm, continuing execution.  The next "
-"opline will be executed if **step 1** is set.  Otherwise execution will continue to the next "
+{"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
 
-"Note **next** will trigger a \"not running\" error if not executing."
+"Note **continue** will trigger a \"not running\" error if not executing."
 },
 
 {"print",

diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index c3971ccef4b7df3ecbcfd72d7e05a2046490620a..1b1cb25215bbb122912a26dc1556ddbccdc0c16d 100644 (file)
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -44,7 +44,7 @@ int yyparse(phpdbg_param_t *stack, yyscan_t scanner);
 const phpdbg_command_t phpdbg_prompt_commands[] = {
        PHPDBG_COMMAND_D(exec,    "set execution context",                    'e', NULL, "s"),
        PHPDBG_COMMAND_D(step,    "step through execution",                   's', NULL, "b"),
-       PHPDBG_COMMAND_D(next,    "continue execution",                       'n', NULL, 0),
+       PHPDBG_COMMAND_D(continue,"continue execution",                       'c', NULL, 0),
        PHPDBG_COMMAND_D(run,     "attempt execution",                        'r', NULL, "|s"),
        PHPDBG_COMMAND_D(ev,      "evaluate some code",                        0, NULL, "i"),
        PHPDBG_COMMAND_D(until,   "continue past the current line",           'u', NULL, 0),
@@ -433,7 +433,7 @@ PHPDBG_COMMAND(step) /* {{{ */
        return SUCCESS;
 } /* }}} */
 
-PHPDBG_COMMAND(next) /* {{{ */
+PHPDBG_COMMAND(continue) /* {{{ */
 {
        return PHPDBG_NEXT;
 } /* }}} */

diff --git a/phpdbg_prompt.h b/phpdbg_prompt.h
index 51efffa0d3f282bf4b6f4d643b08c89efb49a6a5..ef648aabeb08ad011979fb7673571eb35d567dd7 100644 (file)
--- a/phpdbg_prompt.h
+++ b/phpdbg_prompt.h
@@ -30,9 +30,8 @@ void phpdbg_clean(zend_bool full TSRMLS_DC); /* }}} */
 
 /* {{{ phpdbg command handlers */
 PHPDBG_COMMAND(exec);
-PHPDBG_COMMAND(compile);
 PHPDBG_COMMAND(step);
-PHPDBG_COMMAND(next);
+PHPDBG_COMMAND(continue);
 PHPDBG_COMMAND(run);
 PHPDBG_COMMAND(ev);
 PHPDBG_COMMAND(until);