From b64aadc5b045d85f86e5341992a236f45af59086 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 24 Jun 2009 15:09:50 -0400 Subject: [PATCH] ENH: Remove unused cmSystemTools::RemoveEscapes The RemoveEscapes method is no longer used anywhere. All uses of it have been replaced by a real lexer. We can remove the method. --- Source/cmSystemTools.cxx | 42 ---------------------------------------- Source/cmSystemTools.h | 8 +------- 2 files changed, 1 insertion(+), 49 deletions(-) diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index d90728836..de5e31b1c 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -235,48 +235,6 @@ std::string cmSystemTools::EscapeSpaces(const char* str) } } - -std::string cmSystemTools::RemoveEscapes(const char* s) -{ - std::string result = ""; - for(const char* ch = s; *ch; ++ch) - { - if(*ch == '\\' && *(ch+1) != ';') - { - ++ch; - switch (*ch) - { - case '\\': result.insert(result.end(), '\\'); break; - case '"': result.insert(result.end(), '"'); break; - case ' ': result.insert(result.end(), ' '); break; - case 't': result.insert(result.end(), '\t'); break; - case 'n': result.insert(result.end(), '\n'); break; - case 'r': result.insert(result.end(), '\r'); break; - case '#': result.insert(result.end(), '#'); break; - case '(': result.insert(result.end(), '('); break; - case ')': result.insert(result.end(), ')'); break; - case '0': result.insert(result.end(), '\0'); break; - case '\0': - { - cmSystemTools::Error("Trailing backslash in argument:\n", s); - return result; - } - default: - { - std::string chStr(1, *ch); - cmSystemTools::Error("Invalid escape sequence \\", chStr.c_str(), - "\nin argument ", s); - } - } - } - else - { - result.insert(result.end(), *ch); - } - } - return result; -} - void cmSystemTools::Error(const char* m1, const char* m2, const char* m3, const char* m4) { diff --git a/Source/cmSystemTools.h b/Source/cmSystemTools.h index 097475971..486dceecd 100644 --- a/Source/cmSystemTools.h +++ b/Source/cmSystemTools.h @@ -59,13 +59,7 @@ public: ///! Escape quotes in a string. static std::string EscapeQuotes(const char* str); - - /** - * Given a string, replace any escape sequences with the corresponding - * characters. - */ - static std::string RemoveEscapes(const char*); - + typedef void (*ErrorCallback)(const char*, const char*, bool&, void*); /** * Set the function used by GUI's to display error messages