mirror of
https://github.com/sogou/workflow.git
synced 2026-02-08 01:33:17 +08:00
Modify variable names and simplify code.
This commit is contained in:
@@ -17,6 +17,8 @@
|
||||
*/
|
||||
|
||||
#include <ctype.h>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <algorithm>
|
||||
#include "StringUtil.h"
|
||||
|
||||
@@ -85,10 +87,10 @@ void StringUtil::url_decode(std::string& str)
|
||||
std::string StringUtil::url_encode(const std::string& str)
|
||||
{
|
||||
const char *cur = str.c_str();
|
||||
const char *ed = cur + str.size();
|
||||
const char *end = cur + str.size();
|
||||
std::string res;
|
||||
|
||||
while (cur < ed)
|
||||
while (cur < end)
|
||||
{
|
||||
if (*cur == ' ')
|
||||
res += '+';
|
||||
@@ -113,10 +115,10 @@ std::string StringUtil::url_encode(const std::string& str)
|
||||
std::string StringUtil::url_encode_component(const std::string& str)
|
||||
{
|
||||
const char *cur = str.c_str();
|
||||
const char *ed = cur + str.size();
|
||||
const char *end = cur + str.size();
|
||||
std::string res;
|
||||
|
||||
while (cur < ed)
|
||||
while (cur < end)
|
||||
{
|
||||
if (*cur == ' ')
|
||||
res += '+';
|
||||
@@ -139,19 +141,19 @@ std::string StringUtil::url_encode_component(const std::string& str)
|
||||
|
||||
std::vector<std::string> StringUtil::split(const std::string& str, char sep)
|
||||
{
|
||||
std::string::const_iterator start = str.begin();
|
||||
std::string::const_iterator cur = str.begin();
|
||||
std::string::const_iterator end = str.end();
|
||||
std::string::const_iterator next = find(start, end, sep);
|
||||
std::string::const_iterator next = find(cur, end, sep);
|
||||
std::vector<std::string> res;
|
||||
|
||||
while (next != end)
|
||||
{
|
||||
res.emplace_back(start, next);
|
||||
start = next + 1;
|
||||
next = std::find(start, end, sep);
|
||||
res.emplace_back(cur, next);
|
||||
cur = next + 1;
|
||||
next = std::find(cur, end, sep);
|
||||
}
|
||||
|
||||
res.emplace_back(start, next);
|
||||
res.emplace_back(cur, next);
|
||||
return res;
|
||||
}
|
||||
|
||||
@@ -159,21 +161,21 @@ std::vector<std::string> StringUtil::split_filter_empty(const std::string& str,
|
||||
char sep)
|
||||
{
|
||||
std::vector<std::string> res;
|
||||
std::string::const_iterator start = str.begin();
|
||||
std::string::const_iterator cur = str.begin();
|
||||
std::string::const_iterator end = str.end();
|
||||
std::string::const_iterator next = find(start, end, sep);
|
||||
std::string::const_iterator next = find(cur, end, sep);
|
||||
|
||||
while (next != end)
|
||||
{
|
||||
if (start < next)
|
||||
res.emplace_back(start, next);
|
||||
if (cur < next)
|
||||
res.emplace_back(cur, next);
|
||||
|
||||
start = next + 1;
|
||||
next = find(start, end, sep);
|
||||
cur = next + 1;
|
||||
next = find(cur, end, sep);
|
||||
}
|
||||
|
||||
if (start < next)
|
||||
res.emplace_back(start, next);
|
||||
if (cur < next)
|
||||
res.emplace_back(cur, next);
|
||||
|
||||
return res;
|
||||
}
|
||||
@@ -184,27 +186,27 @@ std::string StringUtil::strip(const std::string& str)
|
||||
|
||||
if (!str.empty())
|
||||
{
|
||||
const char *st = str.c_str();
|
||||
const char *ed = st + str.size() - 1;
|
||||
const char *cur = str.c_str();
|
||||
const char *end = cur + str.size();
|
||||
|
||||
while (st <= ed)
|
||||
while (cur < end)
|
||||
{
|
||||
if (!isspace(*st))
|
||||
if (!isspace(*cur))
|
||||
break;
|
||||
|
||||
st++;
|
||||
cur++;
|
||||
}
|
||||
|
||||
while (ed >= st)
|
||||
while (end > cur)
|
||||
{
|
||||
if (!isspace(*ed))
|
||||
if (!isspace(*(end - 1)))
|
||||
break;
|
||||
|
||||
ed--;
|
||||
end--;
|
||||
}
|
||||
|
||||
if (ed >= st)
|
||||
res.assign(st, ed - st + 1);
|
||||
if (end > cur)
|
||||
res.assign(cur, end - cur);
|
||||
}
|
||||
|
||||
return res;
|
||||
|
||||
Reference in New Issue
Block a user