From 411892d848be30ef36a76aa55ec675fc809a5bf4 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Mon, 5 Dec 2011 20:31:22 +0200 Subject: COMMON: Handle boolean types in the debugger --- gui/debugger.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gui/debugger.cpp') diff --git a/gui/debugger.cpp b/gui/debugger.cpp index 3973583d38..d5fdbd82c6 100644 --- a/gui/debugger.cpp +++ b/gui/debugger.cpp @@ -247,6 +247,18 @@ bool Debugger::parseCommand(const char *inputOrig) { *(int32 *)_dvars[i].variable = atoi(param[1]); DebugPrintf("(int)%s = %d\n", param[0], *(int32 *)_dvars[i].variable); break; + case DVAR_BOOL: + { + Common::String value = Common::String(param[1]); + if (value.equalsIgnoreCase("true") || value.equalsIgnoreCase("false") || + value == "1" || value == "0") { + *(bool *)_dvars[i].variable = (value.equalsIgnoreCase("true") || value == "1"); + DebugPrintf("(bool)%s = %s\n", param[0], *(bool *)_dvars[i].variable ? "true" : "false"); + } else { + DebugPrintf("Invalid value for boolean variable. Valid values are \"true\", \"false\", \"1\", \"0\""); + } + } + break; // Integer Array case DVAR_INTARRAY: { const char *chr = strchr(param[0], '['); @@ -278,6 +290,9 @@ bool Debugger::parseCommand(const char *inputOrig) { case DVAR_INT: DebugPrintf("(int)%s = %d\n", param[0], *(const int32 *)_dvars[i].variable); break; + case DVAR_BOOL: + DebugPrintf("(bool)%s = %s\n", param[0], *(const bool *)_dvars[i].variable ? "true" : "false"); + break; // Integer array case DVAR_INTARRAY: { const char *chr = strchr(param[0], '['); -- cgit v1.2.3 From f0fc910d28f4e44f82f17c0bae14ae57aee5cf17 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Mon, 5 Dec 2011 21:24:36 +0200 Subject: COMMON: Fix styling --- gui/debugger.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'gui/debugger.cpp') diff --git a/gui/debugger.cpp b/gui/debugger.cpp index d5fdbd82c6..13a347a9fa 100644 --- a/gui/debugger.cpp +++ b/gui/debugger.cpp @@ -247,16 +247,15 @@ bool Debugger::parseCommand(const char *inputOrig) { *(int32 *)_dvars[i].variable = atoi(param[1]); DebugPrintf("(int)%s = %d\n", param[0], *(int32 *)_dvars[i].variable); break; - case DVAR_BOOL: - { - Common::String value = Common::String(param[1]); - if (value.equalsIgnoreCase("true") || value.equalsIgnoreCase("false") || - value == "1" || value == "0") { - *(bool *)_dvars[i].variable = (value.equalsIgnoreCase("true") || value == "1"); - DebugPrintf("(bool)%s = %s\n", param[0], *(bool *)_dvars[i].variable ? "true" : "false"); - } else { - DebugPrintf("Invalid value for boolean variable. Valid values are \"true\", \"false\", \"1\", \"0\""); - } + case DVAR_BOOL: { + Common::String value = Common::String(param[1]); + if (value.equalsIgnoreCase("true") || value.equalsIgnoreCase("false") || + value == "1" || value == "0") { + *(bool *)_dvars[i].variable = (value.equalsIgnoreCase("true") || value == "1"); + DebugPrintf("(bool)%s = %s\n", param[0], *(bool *)_dvars[i].variable ? "true" : "false"); + } else { + DebugPrintf("Invalid value for boolean variable. Valid values are \"true\", \"false\", \"1\", \"0\""); + } } break; // Integer Array -- cgit v1.2.3 From bc0d9bd3a7830f8c67ef417c8af2e85c88666eaf Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Mon, 5 Dec 2011 22:18:36 +0100 Subject: GUI: Simplify boolean parsing in our debugger. --- gui/debugger.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'gui/debugger.cpp') diff --git a/gui/debugger.cpp b/gui/debugger.cpp index 13a347a9fa..3878cc00e3 100644 --- a/gui/debugger.cpp +++ b/gui/debugger.cpp @@ -247,16 +247,11 @@ bool Debugger::parseCommand(const char *inputOrig) { *(int32 *)_dvars[i].variable = atoi(param[1]); DebugPrintf("(int)%s = %d\n", param[0], *(int32 *)_dvars[i].variable); break; - case DVAR_BOOL: { - Common::String value = Common::String(param[1]); - if (value.equalsIgnoreCase("true") || value.equalsIgnoreCase("false") || - value == "1" || value == "0") { - *(bool *)_dvars[i].variable = (value.equalsIgnoreCase("true") || value == "1"); + case DVAR_BOOL: + if (Common::parseBool(param[1], *(bool *)_dvars[i].variable)) DebugPrintf("(bool)%s = %s\n", param[0], *(bool *)_dvars[i].variable ? "true" : "false"); - } else { - DebugPrintf("Invalid value for boolean variable. Valid values are \"true\", \"false\", \"1\", \"0\""); - } - } + else + DebugPrintf("Invalid value for boolean variable. Valid values are \"true\", \"false\", \"1\", \"0\", \"yes\", \"no\""); break; // Integer Array case DVAR_INTARRAY: { -- cgit v1.2.3 From 2362a3f689a3a87b342339e274a2f29e5125ddf2 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Mon, 5 Dec 2011 23:00:06 +0100 Subject: GUI: Add new line to error string in debugger. --- gui/debugger.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gui/debugger.cpp') diff --git a/gui/debugger.cpp b/gui/debugger.cpp index 3878cc00e3..26e62dc1d9 100644 --- a/gui/debugger.cpp +++ b/gui/debugger.cpp @@ -251,7 +251,7 @@ bool Debugger::parseCommand(const char *inputOrig) { if (Common::parseBool(param[1], *(bool *)_dvars[i].variable)) DebugPrintf("(bool)%s = %s\n", param[0], *(bool *)_dvars[i].variable ? "true" : "false"); else - DebugPrintf("Invalid value for boolean variable. Valid values are \"true\", \"false\", \"1\", \"0\", \"yes\", \"no\""); + DebugPrintf("Invalid value for boolean variable. Valid values are \"true\", \"false\", \"1\", \"0\", \"yes\", \"no\"\n"); break; // Integer Array case DVAR_INTARRAY: { -- cgit v1.2.3