OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

Foundation Classes - AsciiString RemoveAll do not trunk the string #136

Browse Source 
Updated RemoveAll to trunk the string and
  reuse single method for case sensitive and not sensitive
This commit is contained in:
dpasukhi 2024-10-31 21:19:54 +00:00
parent f180697d9c
commit 3ddb860a44
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/TCollection/TCollection_AsciiString.cxx
View File

@ -924,20 +924,23 @@ Standard_OStream& operator << (Standard_OStream& astream,
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void TCollection_AsciiString::RemoveAll(const Standard_Character what, void TCollection_AsciiString::RemoveAll(const Standard_Character what,
const Standard_Boolean CaseSensitive) const Standard_Boolean CaseSensitive)
{ {
if (mylength == 0) return; if (mylength == 0)
int c = 0; {
if (CaseSensitive) { return;
for (int i=0; i < mylength; i++)
if (mystring[i] != what) mystring[c++] = mystring[i];
} }
else { const Standard_Character aTargetChar = CaseSensitive ? what : ::UpperCase(what);
Standard_Character upperwhat = ::UpperCase(what); int aNewLength = 0;
for (int i=0; i < mylength; i++) { for (int i = 0; i < mylength; ++i)
if (::UpperCase(mystring[i]) != upperwhat) mystring[c++] = mystring[i]; {
const Standard_Character aCurrentChar = CaseSensitive ? mystring[i] : ::UpperCase(mystring[i]);
if (aCurrentChar != aTargetChar)
{
mystring[aNewLength++] = mystring[i];
} }
} }
mylength = c; mylength = aNewLength;
mystring[mylength] = '\0';
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -945,11 +948,7 @@ void TCollection_AsciiString::RemoveAll(const Standard_Character what,
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void TCollection_AsciiString::RemoveAll(const Standard_Character what) void TCollection_AsciiString::RemoveAll(const Standard_Character what)
{ {
if (mylength == 0) return; RemoveAll(what, Standard_True);
int c = 0;
for (int i=0; i < mylength; i++)
if (mystring[i] != what) mystring[c++] = mystring[i];
mylength = c;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------