anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add operator += for ASCII C strings and single ASCII chars

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15274 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2006-10-08 09:44:26 +00:00
parent 055b0390dc
commit ead66c0679
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/support/docstring.C
View File

@ -40,6 +40,19 @@ docstring const from_ascii(std::string const & ascii)
}
std::string const to_ascii(docstring const & ucs4)
{
int const len = ucs4.length();
std::string ascii;
ascii.resize(len);
for (int i = 0; i < len; ++i) {
BOOST_ASSERT(ucs4[i] < 0x80);
ascii[i] = static_cast<char>(ucs4[i]);
}
return ascii;
}
docstring const from_utf8(std::string const & utf8)
{
std::vector<lyx::char_type> const ucs4 =
@ -109,6 +122,24 @@ lyx::docstring operator+(char l, lyx::docstring const & r)
}
lyx::docstring operator+=(lyx::docstring & l, char const * r)
{
for (char const * c = r; *c; ++c) {
BOOST_ASSERT(static_cast<unsigned char>(*c) < 0x80);
l.push_back(*c);
}
return l;
}
lyx::docstring operator+=(lyx::docstring & l, char r)
{
BOOST_ASSERT(static_cast<unsigned char>(r) < 0x80);
l.push_back(r);
return l;
}
#if (!defined(HAVE_WCHAR_T) || SIZEOF_WCHAR_T != 4) && defined(__GNUC__)
// gcc does not have proper locale facets for lyx::char_type if

9
src/support/docstring.h
View File

@ -28,6 +28,9 @@ docstring const from_ascii(char const *);
/// Creates a docstring from a std::string of ASCII characters
docstring const from_ascii(std::string const &);
/// Creates a std::string of ASCII characters from a docstring
std::string const to_ascii(docstring const &);
/// Creates a docstring from a UTF8 string. This should go eventually.
docstring const from_utf8(std::string const &);
@ -60,6 +63,12 @@ lyx::docstring operator+(lyx::docstring const & l, char r);
/// Concatenate a single ASCII character and a docstring
lyx::docstring operator+(char l, lyx::docstring const & r);
/// Append a C string of ASCII characters to a docstring
lyx::docstring operator+=(lyx::docstring &, char const *);
/// Append a single ASCII character to a docstring
lyx::docstring operator+=(lyx::docstring & l, char r);
#if SIZEOF_WCHAR_T != 4 && defined(__GNUC__) && defined(__GNUC_MINOR__) && __GNUC__ == 3 && __GNUC_MINOR__ < 4
// Missing char_traits methods in gcc 3.3 and older. Taken from gcc 4.2svn.