Skip to content

Commit d622b6e

Browse files
committed
xrCore/xr_trims: support xr_string for _GetItems()
1 parent 2b3140e commit d622b6e

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

src/xrCore/xr_trims.cpp

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,21 @@ LPSTR _GetItems(LPCSTR src, int idx_start, int idx_end, LPSTR dst, char separato
108108
return dst;
109109
}
110110

111+
pcstr _GetItems(pcstr src, int idx_start, int idx_end, xr_string& dst, char separator)
112+
{
113+
int level = 0;
114+
for (pcstr p = src; *p != 0; p++)
115+
{
116+
if ((level >= idx_start) && (level < idx_end))
117+
dst += *p;
118+
if (*p == separator)
119+
level++;
120+
if (level >= idx_end)
121+
break;
122+
}
123+
return dst.c_str();
124+
}
125+
111126
u32 _ParseItem(LPCSTR src, xr_token* token_list)
112127
{
113128
for (int i = 0; token_list[i].name; i++)
@@ -270,20 +285,7 @@ LPCSTR _CopyVal(LPCSTR src, AnsiString& dst, char separator)
270285
return dst.c_str();
271286
}
272287

273-
LPCSTR _GetItems(LPCSTR src, int idx_start, int idx_end, AnsiString& dst, char separator)
274-
{
275-
int level = 0;
276-
for (LPCSTR p = src; *p != 0; p++)
277-
{
278-
if ((level >= idx_start) && (level < idx_end))
279-
dst += *p;
280-
if (*p == separator)
281-
level++;
282-
if (level >= idx_end)
283-
break;
284-
}
285-
return dst.c_str();
286-
}
288+
287289

288290
LPCSTR _GetItem(LPCSTR src, int index, AnsiString& dst, char separator, LPCSTR def, bool trim)
289291
{

src/xrCore/xr_trims.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ using string64Vec = xr_vector<string64>;
1212
#ifdef __BORLANDC__
1313
XRCORE_API AnsiString& _Trim(AnsiString& str);
1414
XRCORE_API LPCSTR _GetItem(LPCSTR src, int, AnsiString& p, char separator = ',', LPCSTR = "", bool trim = true);
15-
XRCORE_API LPCSTR _GetItems(LPCSTR src, int idx_start, int idx_end, AnsiString& dst, char separator);
1615
XRCORE_API LPCSTR _CopyVal(LPCSTR src, AnsiString& dst, char separator = ',');
1716
XRCORE_API AnsiString _ListToSequence(const AStringVec& lst);
1817
XRCORE_API AnsiString _ListToSequence2(const AStringVec& lst);
@@ -32,6 +31,7 @@ inline LPSTR _GetItem(
3231
}
3332

3433
XRCORE_API LPSTR _GetItems(LPCSTR, int, int, LPSTR, char separator = ',');
34+
XRCORE_API pcstr _GetItems(pcstr, int, int, xr_string&, char);
3535
XRCORE_API LPCSTR _SetPos(LPCSTR src, u32 pos, char separator = ',');
3636
XRCORE_API LPCSTR _CopyVal(LPCSTR src, LPSTR dst, char separator = ',');
3737
XRCORE_API LPSTR _Trim(LPSTR str);

0 commit comments

Comments
 (0)