Changeset 2f70efc4a754…
Parent 2b7189079f30…
by
Changes to 2 files · Browse files at 2f70efc4a754 Showing diff from parent 2b7189079f30 Diff from another changeset...
|
@@ -218,83 +218,3 @@ }
#endif
-
-
-// Replace parameters (%something)
-std::string ReplaceParams(const std::string& str,
- const std::map<std::string, std::string> params)
-{
- std::stringstream result;
- unsigned int i = 0;
- char c;
- int state = 0;
- unsigned int var_start = 0;
- bool hasMore;
- while (i < str.length())
- {
- c = str[i];
- hasMore = (i < str.length() - 1);
- switch(state)
- {
- // Normal processing
- case 0:
- {
- if (c == '%' && hasMore)
- {
- var_start = i + 1;
- state = 1;
- }
- else
- {
- result << c;
- }
- break;
- }
-
- // Found '%'
- case 1:
- {
- if ((c == '_' || isalnum(c)) && hasMore)
- {
- // do nothing
- }
- else
- {
- // replace variable
- if (var_start < i)
- {
- std::string var = str.substr(var_start, i - var_start);
- std::map<std::string, std::string>::const_iterator it =
- params.find(var);
- if (it != params.end())
- {
- result << it->second;
- }
- else
- {
- result << '%' << var;
- }
- }
- else
- {
- result << '%';
- }
- result << c;
- if (c != '%')
- {
- state = 0;
- }
- }
- break;
- }
-
- // should never get here
- default:
- ASSERT(false);
- }
- i++;
- }
-
- return result.str();
-}
-
|
@@ -106,10 +106,6 @@ wxString ExpandEnvStrings(const wxString& str);
#endif
-// Replace parameters (%something)
-std::string ReplaceParams(const std::string& str,
- const std::map<std::string, std::string> params);
-
// comparison function object
class less_nocase
{
|
Loading...