From: krakjoe <joe.watkins@live.co.uk>
Date: Sun, 13 Apr 2014 10:42:47 +0000 (+0100)
Subject: fix compat with lexer stuff
X-Git-Tag: php-5.6.0beta2~1^2~37^2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=faa7e3264e4f1d91678baf4ef1287e655f81c61d;p=php

fix compat with lexer stuff
---

diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index 93bc638089..bc2e667e6b 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -66,7 +66,7 @@ const phpdbg_command_t phpdbg_prompt_commands[] = {
 	PHPDBG_COMMAND_D(export,  "export breaks to a .phpdbginit script",    '>', NULL, "s"),
 	PHPDBG_COMMAND_D(sh,   	  "shell a command",                           0, NULL, "i"),
 	PHPDBG_COMMAND_D(quit,    "exit phpdbg",                              'q', NULL, 0),
-	PHPDBG_COMMAND_D(watch,   "set watchpoint",                           'w', phpdbg_watch_commands, "ss"),
+	PHPDBG_COMMAND_D(watch,   "set watchpoint",                           'w', phpdbg_watch_commands, "|ss"),
 	PHPDBG_END_COMMAND
 }; /* }}} */
 
@@ -1002,15 +1002,13 @@ PHPDBG_COMMAND(list) /* {{{ */
 
 PHPDBG_COMMAND(watch) /* {{{ */
 {
-	switch (param->type) {
+	if (!param || param->type == EMPTY_PARAM) {
+		phpdbg_list_watchpoints(TSRMLS_C);
+	} else switch (param->type) {
 		case STR_PARAM:
 			phpdbg_create_var_watchpoint(param->str, param->len TSRMLS_CC);
 			break;
 
-		case EMPTY_PARAM:
-			phpdbg_list_watchpoints(TSRMLS_C);
-			break;
-
 		phpdbg_default_switch_case();
 	}