tomasz.sowa
/
pikotools
1
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

add methods for trimming \r\n from the end of a string 

add:
void trim_last_new_lines(std::string & str, bool check_carriage_return_too = true);
void trim_last_new_lines(std::wstring & str, bool check_carriage_return_too = true);
This commit is contained in:
Tomasz Sowa 2022-07-30 02:43:29 +02:00
parent d13c10c604
commit aa97fe2811
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/convert/text.cpp
View File

@ -5,7 +5,7 @@
*/ */
/* /*
* Copyright (c) 2017-2021, Tomasz Sowa * Copyright (c) 2017-2022, Tomasz Sowa
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -532,6 +532,18 @@ void trim(std::wstring & str, wchar_t c)
} }
void trim_last_new_lines(std::string & str, bool check_carriage_return_too)
{
pt_private::trim_last_generic(str, '\n', check_carriage_return_too, '\r');
}
void trim_last_new_lines(std::wstring & str, bool check_carriage_return_too)
{
pt_private::trim_last_generic(str, '\n', check_carriage_return_too, '\r');
}
} }

2
src/convert/text.h
View File

@ -201,6 +201,8 @@ void trim_last(std::wstring & str, wchar_t c);
void trim(std::string & str, wchar_t c); void trim(std::string & str, wchar_t c);
void trim(std::wstring & str, wchar_t c); void trim(std::wstring & str, wchar_t c);
void trim_last_new_lines(std::string & str, bool check_carriage_return_too = true);
void trim_last_new_lines(std::wstring & str, bool check_carriage_return_too = true);

14
src/convert/text_private.h
View File

@ -5,7 +5,7 @@
*/ */
/* /*
* Copyright (c) 2021, Tomasz Sowa * Copyright (c) 2021-2022, Tomasz Sowa
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -367,24 +367,24 @@ size_t i;
template<typename StringType> template<typename StringType>
void trim_last_generic(StringType & s, wchar_t c) void trim_last_generic(StringType & s, wchar_t c, bool has_c2 = false, wchar_t c2 = 0)
{ {
size_t i; size_t i;
if( s.empty() ) if( s.empty() )
return; return;
// looking for the 'c' characters at the end // looking for the 'c' or 'c2' (if defined) characters at the end
for(i=s.size()-1 ; i>0 && s[i]==c ; --i); for(i=s.size()-1 ; i>0 && (s[i]==c || (has_c2 && s[i]==c2)) ; --i);
if( i==0 && s[i]==c ) if( i==0 && (s[i]==c || (has_c2 && s[i]==c2)) )
{ {
// the whole string has the 'c' characters // the whole string has the 'c' and 'c2' characters
s.clear(); s.clear();
return; return;
} }
// deleting 'c' characters at the end // deleting 'c' and 'c2' characters at the end
if( i != s.size() - 1 ) if( i != s.size() - 1 )
s.erase(i+1, StringType::npos); s.erase(i+1, StringType::npos);
} }