work on lexer to be more permissive (accept moar strings)

work on parameter parsing and command resolution
work on error reporting for failed arguments
update most commands
move quiet to set quiet
move set break on/off to set breaks on/off
keep set break for set break <id> <on/off>
update help accordingly

1 files changed, 66 insertions, 74 deletions

diff --git a/phpdbg_set.c b/phpdbg_set.c
index 7ce67d934d..739acd3c71 100644
--- a/phpdbg_set.c
+++ b/phpdbg_set.c
@@ -23,67 +23,50 @@
 #include "phpdbg_set.h"
 #include "phpdbg_utils.h"
 #include "phpdbg_bp.h"
+#include "phpdbg_prompt.h"
 
 ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
 
+#define PHPDBG_SET_COMMAND_D(f, h, a, m, l, s) \
+	PHPDBG_COMMAND_D_EXP(f, h, a, m, l, s, &phpdbg_prompt_commands[18])
+
 const phpdbg_command_t phpdbg_set_commands[] = {
-	PHPDBG_COMMAND_D_EX(prompt,       "usage: set prompt <string>",          'p', set_prompt,       NULL, "s"),
+	PHPDBG_SET_COMMAND_D(prompt,       "usage: set prompt [<string>]",            'p', set_prompt,       NULL, "|s"),
 #ifndef _WIN32
-	PHPDBG_COMMAND_D_EX(color,        "usage: set color  <element> <color>", 'c', set_color,        NULL, "ss"),
-	PHPDBG_COMMAND_D_EX(colors,       "usage: set colors <on|off>",			 'C', set_colors,       NULL, "b"),
+	PHPDBG_SET_COMMAND_D(color,        "usage: set color  <element> <color>",     'c', set_color,        NULL, "ss"),
+	PHPDBG_SET_COMMAND_D(colors,       "usage: set colors [<on|off>]",			 'C', set_colors,       NULL, "|b"),
 #endif
-	PHPDBG_COMMAND_D_EX(oplog,        "usage: set oplog  <output>",          'O', set_oplog,        NULL, "s"),
-	PHPDBG_COMMAND_D_EX(break,        "usage: set break [id] <on|off>",      'b', set_break,        NULL, "lb"),
+	PHPDBG_SET_COMMAND_D(oplog,        "usage: set oplog  [<output>]",            'O', set_oplog,        NULL, "|s"),
+	PHPDBG_SET_COMMAND_D(break,        "usage: set break id [<on|off>]",          'b', set_break,        NULL, "l|b"),
+	PHPDBG_SET_COMMAND_D(breaks,       "usage: set breaks [<on|off>]",            'B', set_breaks,       NULL, "|b"),
+	PHPDBG_SET_COMMAND_D(quiet,        "usage: set quiet [<on|off>]",             'q', set_quiet,        NULL, "|b"),
 	PHPDBG_END_COMMAND
 };
 
 PHPDBG_SET(prompt) /* {{{ */
 {
-	switch (param->type) {
-		case EMPTY_PARAM:
-			phpdbg_writeln("%s", phpdbg_get_prompt(TSRMLS_C));
-			break;
-
-		case STR_PARAM:
-			phpdbg_set_prompt(param->str TSRMLS_CC);
-			break;
-
-		phpdbg_default_switch_case();
-	}
-
+	if (!param || param->type == EMPTY_PARAM) {
+		phpdbg_writeln("%s", phpdbg_get_prompt(TSRMLS_C));
+	} else phpdbg_set_prompt(param->str TSRMLS_CC);
+	
 	return SUCCESS;
 } /* }}} */
 
 PHPDBG_SET(break) /* {{{ */
 {
-	if (!param || param->type == EMPTY_PARAM) {
-		phpdbg_writeln("%s",
-			PHPDBG_G(flags) & PHPDBG_IS_BP_ENABLED ? "on" : "off");
-	} else switch (param->type) {
-		case STR_PARAM:
-			if (strncasecmp(param->str, PHPDBG_STRL("on")) == 0) {
-				phpdbg_enable_breakpoints(TSRMLS_C);
-			} else if (strncasecmp(param->str, PHPDBG_STRL("off")) == 0) {
-				phpdbg_disable_breakpoints(TSRMLS_C);
-			}
-			break;
-			
+	switch (param->type) {
 		case NUMERIC_PARAM: {
 			if (param->next) {
-					/*
-					if (phpdbg_argv_is(2, "on")) {
-						phpdbg_enable_breakpoint(param->num TSRMLS_CC);
-					} else if (phpdbg_argv_is(2, "off")) {
-						phpdbg_disable_breakpoint(param->num TSRMLS_CC);
-					}
-					*/
+				if (param->next->num) {
+					phpdbg_enable_breakpoint(param->num TSRMLS_CC);
+				} else phpdbg_disable_breakpoint(param->num TSRMLS_CC);
 			} else {
 				phpdbg_breakbase_t *brake = phpdbg_find_breakbase(param->num TSRMLS_CC);
 				if (brake) {
 					phpdbg_writeln(
 						"%s", brake->disabled ? "off" : "on");
 				} else {
-					phpdbg_error("Failed to find breakpoint #%lx", param->num);
+					phpdbg_error("Failed to find breakpoint #%ld", param->num);
 				}
 			}
 		} break;
@@ -96,6 +79,26 @@ PHPDBG_SET(break) /* {{{ */
 	return SUCCESS;
 } /* }}} */
 
+PHPDBG_SET(breaks) /* {{{ */
+{
+	if (!param || param->type == EMPTY_PARAM) {
+		phpdbg_writeln("%s",
+			PHPDBG_G(flags) & PHPDBG_IS_BP_ENABLED ? "on" : "off");
+	} else switch (param->type) {	
+		case NUMERIC_PARAM: {
+			if (param->num) {
+				phpdbg_enable_breakpoints(TSRMLS_C);
+			} else phpdbg_disable_breakpoints(TSRMLS_C);
+		} break;
+
+		default:
+			phpdbg_error(
+				"set break used incorrectly: set break [id] <on|off>");
+	}
+
+	return SUCCESS;
+} /* }}} */
+
 #ifndef _WIN32
 PHPDBG_SET(color) /* {{{ */
 {
@@ -141,58 +144,31 @@ usage:
 
 PHPDBG_SET(colors) /* {{{ */
 {
-	switch (param->type) {
-		case EMPTY_PARAM: {
-			phpdbg_writeln(
-				"%s", PHPDBG_G(flags) & PHPDBG_IS_COLOURED ? "on" : "off");
-			goto done;
-		}
-		
-		case STR_PARAM: {
-			if (strncasecmp(param->str, PHPDBG_STRL("on")) == 0) {
+	if (!param || param->type == EMPTY_PARAM) {
+		phpdbg_writeln("%s", PHPDBG_G(flags) & PHPDBG_IS_COLOURED ? "on" : "off");
+	} else switch (param->type) {
+		case NUMERIC_PARAM: {
+			if (param->num) {
 				PHPDBG_G(flags) |= PHPDBG_IS_COLOURED;
-				goto done;
-			} else if (strncasecmp(param->str, PHPDBG_STRL("off")) == 0) {
+			} else {
 				PHPDBG_G(flags) &= ~PHPDBG_IS_COLOURED;
-				goto done;
 			}
-		}
+		} break;
 		
 		default:
 			phpdbg_error(
 				"set colors used incorrectly: set colors <on|off>");
 	}
 
-done:
 	return SUCCESS;
 } /* }}} */
 #endif
 
 PHPDBG_SET(oplog) /* {{{ */
 {
-	switch (param->type) {
-		case EMPTY_PARAM:
-			phpdbg_notice(
-				"Oplog %s", PHPDBG_G(oplog) ? "enabled" : "disabled");
-		break;
-
-		case NUMERIC_PARAM: switch (param->num) {
-			case 1:
-				phpdbg_error(
-					"An output file must be provided to enable oplog");
-			break;
-
-			case 0: {
-				if (PHPDBG_G(oplog)) {
-					phpdbg_notice("Disabling oplog");
-					fclose(
-						PHPDBG_G(oplog));
-				} else {
-					phpdbg_error("Oplog is not enabled!");
-				}
-			} break;
-		} break;
-
+	if (!param || param->type == EMPTY_PARAM) {
+		phpdbg_notice("Oplog %s", PHPDBG_G(oplog) ? "enabled" : "disabled");
+	} else switch (param->type) {
 		case STR_PARAM: {
 			/* open oplog */
 			FILE *old = PHPDBG_G(oplog);
@@ -216,3 +192,19 @@ PHPDBG_SET(oplog) /* {{{ */
 	return SUCCESS;
 } /* }}} */
 
+PHPDBG_SET(quiet) /* {{{ */
+{
+	if (!param || param->type == EMPTY_PARAM) {
+		phpdbg_writeln("Quietness %s",
+			PHPDBG_G(flags) & PHPDBG_IS_QUIET ? "on" : "off");
+	} else switch (param->type) {	
+		case NUMERIC_PARAM: {
+			if (param->num) {
+				PHPDBG_G(flags) |= PHPDBG_IS_QUIET;
+			} else PHPDBG_G(flags) &= ~PHPDBG_IS_QUIET;
+		} break;
+	}
+
+	return SUCCESS;
+} /* }}} */
+