Skip to content

C
core
Kaydet (Commit) 8007417c authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Revert "Revert "Generalize OUStringLiteral1"" 

This reverts commit 5cba714b, now including a
workaround for <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53658> "internal
compiler error -- segmentation fault."

Change-Id: I31f6d9ddcb0b884134703df2b9dc1800ba0a84be
üst 707ef317
Hide whitespace changes
Inline Side-by-side
Showing with 427 additions and 199 deletions
include/rtl/strbuf.hxx
Dosyayı görüntüle @ 8007417c
...@@ -170,10 +170,14 @@ public: ...@@ -170,10 +170,14 @@ public:
template< typename T > template< typename T >
OStringBuffer( T& literal, typename libreoffice_internal::ConstCharArrayDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy()) OStringBuffer( T& literal, typename libreoffice_internal::ConstCharArrayDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy())
: pData(NULL) : pData(NULL)
, nCapacity( libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 + 16 ) , nCapacity( libreoffice_internal::ConstCharArrayDetector<T>::length + 16 )
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
rtl_string_newFromLiteral( &pData, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, 16 ); libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
rtl_string_newFromLiteral(
&pData,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal),
libreoffice_internal::ConstCharArrayDetector<T>::length, 16);
#ifdef RTL_STRING_UNITTEST #ifdef RTL_STRING_UNITTEST
rtl_string_unittest_const_literal = true; rtl_string_unittest_const_literal = true;
#endif #endif
...@@ -453,8 +457,12 @@ public: ...@@ -453,8 +457,12 @@ public:
typename libreoffice_internal::ConstCharArrayDetector< T, OStringBuffer& >::Type append( T& literal ) typename libreoffice_internal::ConstCharArrayDetector< T, OStringBuffer& >::Type append( T& literal )
{ {
RTL_STRING_CONST_FUNCTION RTL_STRING_CONST_FUNCTION
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
rtl_stringbuffer_insert( &pData, &nCapacity, getLength(), literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ); libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
rtl_stringbuffer_insert(
&pData, &nCapacity, getLength(),
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal),
libreoffice_internal::ConstCharArrayDetector<T>::length);
return *this; return *this;
} }
...@@ -708,8 +716,12 @@ public: ...@@ -708,8 +716,12 @@ public:
typename libreoffice_internal::ConstCharArrayDetector< T, OStringBuffer& >::Type insert( sal_Int32 offset, T& literal ) typename libreoffice_internal::ConstCharArrayDetector< T, OStringBuffer& >::Type insert( sal_Int32 offset, T& literal )
{ {
RTL_STRING_CONST_FUNCTION RTL_STRING_CONST_FUNCTION
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
rtl_stringbuffer_insert( &pData, &nCapacity, offset, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ); libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
rtl_stringbuffer_insert(
&pData, &nCapacity, offset,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal),
libreoffice_internal::ConstCharArrayDetector<T>::length);
return *this; return *this;
} }
......
include/rtl/string.hxx
Dosyayı görüntüle @ 8007417c
...@@ -181,12 +181,18 @@ public: ...@@ -181,12 +181,18 @@ public:
template< typename T > template< typename T >
OString( T& literal, typename libreoffice_internal::ConstCharArrayDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy() ) OString( T& literal, typename libreoffice_internal::ConstCharArrayDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy() )
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
pData = 0; pData = 0;
if( libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 == 0 ) // empty string if (libreoffice_internal::ConstCharArrayDetector<T>::length == 0) {
rtl_string_new( &pData ); rtl_string_new(&pData);
else } else {
rtl_string_newFromLiteral( &pData, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, 0 ); rtl_string_newFromLiteral(
&pData,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(
literal),
libreoffice_internal::ConstCharArrayDetector<T>::length, 0);
}
#ifdef RTL_STRING_UNITTEST #ifdef RTL_STRING_UNITTEST
rtl_string_unittest_const_literal = true; rtl_string_unittest_const_literal = true;
#endif #endif
...@@ -278,11 +284,17 @@ public: ...@@ -278,11 +284,17 @@ public:
typename libreoffice_internal::ConstCharArrayDetector< T, OString& >::Type operator=( T& literal ) typename libreoffice_internal::ConstCharArrayDetector< T, OString& >::Type operator=( T& literal )
{ {
RTL_STRING_CONST_FUNCTION RTL_STRING_CONST_FUNCTION
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
if( libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 == 0 ) // empty string libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
rtl_string_new( &pData ); if (libreoffice_internal::ConstCharArrayDetector<T>::length == 0) {
else rtl_string_new(&pData);
rtl_string_newFromLiteral( &pData, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, 0 ); } else {
rtl_string_newFromLiteral(
&pData,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(
literal),
libreoffice_internal::ConstCharArrayDetector<T>::length, 0);
}
return *this; return *this;
} }
...@@ -543,11 +555,17 @@ public: ...@@ -543,11 +555,17 @@ public:
typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type equalsIgnoreAsciiCase( T& literal ) const typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type equalsIgnoreAsciiCase( T& literal ) const
{ {
RTL_STRING_CONST_FUNCTION RTL_STRING_CONST_FUNCTION
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
if ( pData->length != libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ) libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
return false; return
return rtl_str_compareIgnoreAsciiCase_WithLength( pData->buffer, pData->length, (pData->length
literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0; == libreoffice_internal::ConstCharArrayDetector<T>::length)
&& (rtl_str_compareIgnoreAsciiCase_WithLength(
pData->buffer, pData->length,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(
literal),
libreoffice_internal::ConstCharArrayDetector<T>::length)
== 0);
} }
/** /**
...@@ -608,10 +626,16 @@ public: ...@@ -608,10 +626,16 @@ public:
typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type match( T& literal, sal_Int32 fromIndex = 0 ) const typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type match( T& literal, sal_Int32 fromIndex = 0 ) const
{ {
RTL_STRING_CONST_FUNCTION RTL_STRING_CONST_FUNCTION
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
return rtl_str_shortenedCompare_WithLength( libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
pData->buffer + fromIndex, pData->length - fromIndex, return
literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1) == 0; rtl_str_shortenedCompare_WithLength(
pData->buffer + fromIndex, pData->length - fromIndex,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(
literal),
libreoffice_internal::ConstCharArrayDetector<T>::length,
libreoffice_internal::ConstCharArrayDetector<T>::length)
== 0;
} }
/** /**
...@@ -681,9 +705,16 @@ public: ...@@ -681,9 +705,16 @@ public:
typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type matchIgnoreAsciiCase( T& literal, sal_Int32 fromIndex = 0 ) const typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type matchIgnoreAsciiCase( T& literal, sal_Int32 fromIndex = 0 ) const
{ {
RTL_STRING_CONST_FUNCTION RTL_STRING_CONST_FUNCTION
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
return rtl_str_shortenedCompareIgnoreAsciiCase_WithLength( pData->buffer+fromIndex, pData->length-fromIndex, libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0; return
rtl_str_shortenedCompareIgnoreAsciiCase_WithLength(
pData->buffer+fromIndex, pData->length-fromIndex,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(
literal),
libreoffice_internal::ConstCharArrayDetector<T>::length,
libreoffice_internal::ConstCharArrayDetector<T>::length)
== 0;
} }
/** /**
...@@ -720,7 +751,8 @@ public: ...@@ -720,7 +751,8 @@ public:
RTL_STRING_CONST_FUNCTION RTL_STRING_CONST_FUNCTION
bool b = match(literal, 0); bool b = match(literal, 0);
if (b && rest != 0) { if (b && rest != 0) {
*rest = copy(libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1); *rest = copy(
libreoffice_internal::ConstCharArrayDetector<T>::length);
} }
return b; return b;
} }
...@@ -758,14 +790,21 @@ public: ...@@ -758,14 +790,21 @@ public:
T & literal, OString * rest = 0) const T & literal, OString * rest = 0) const
{ {
RTL_STRING_CONST_FUNCTION RTL_STRING_CONST_FUNCTION
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
bool b = libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 <= getLength() libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
&& match(literal, getLength() - ( libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 )); bool b
= (libreoffice_internal::ConstCharArrayDetector<T>::length
<= sal_uInt32(getLength()))
&& match(
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(
literal),
(getLength()
- libreoffice_internal::ConstCharArrayDetector<T>::length));
if (b && rest != 0) { if (b && rest != 0) {
*rest = copy( *rest = copy(
0, 0,
(getLength() (getLength()
- (libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1))); - libreoffice_internal::ConstCharArrayDetector<T>::length));
} }
return b; return b;
} }
...@@ -834,10 +873,17 @@ public: ...@@ -834,10 +873,17 @@ public:
friend typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator==( const OString& rStr, T& literal ) friend typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator==( const OString& rStr, T& literal )
{ {
RTL_STRING_CONST_FUNCTION RTL_STRING_CONST_FUNCTION
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
return rStr.getLength() == libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
&& rtl_str_compare_WithLength( rStr.pData->buffer, rStr.pData->length, literal, return
libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0; (rStr.getLength()
== libreoffice_internal::ConstCharArrayDetector<T>::length)
&& (rtl_str_compare_WithLength(
rStr.pData->buffer, rStr.pData->length,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(
literal),
libreoffice_internal::ConstCharArrayDetector<T>::length)
== 0);
} }
/** /**
...@@ -849,10 +895,17 @@ public: ...@@ -849,10 +895,17 @@ public:
friend typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator==( T& literal, const OString& rStr ) friend typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator==( T& literal, const OString& rStr )
{ {
RTL_STRING_CONST_FUNCTION RTL_STRING_CONST_FUNCTION
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
return rStr.getLength() == libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
&& rtl_str_compare_WithLength( rStr.pData->buffer, rStr.pData->length, literal, return
libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0; (rStr.getLength()
== libreoffice_internal::ConstCharArrayDetector<T>::length)
&& (rtl_str_compare_WithLength(
rStr.pData->buffer, rStr.pData->length,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(
literal),
libreoffice_internal::ConstCharArrayDetector<T>::length)
== 0);
} }
template< typename T > template< typename T >
...@@ -994,9 +1047,12 @@ public: ...@@ -994,9 +1047,12 @@ public:
typename libreoffice_internal::ConstCharArrayDetector< T, sal_Int32 >::Type indexOf( T& literal, sal_Int32 fromIndex = 0 ) const typename libreoffice_internal::ConstCharArrayDetector< T, sal_Int32 >::Type indexOf( T& literal, sal_Int32 fromIndex = 0 ) const
{ {
RTL_STRING_CONST_FUNCTION RTL_STRING_CONST_FUNCTION
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
sal_Int32 n = rtl_str_indexOfStr_WithLength( sal_Int32 n = rtl_str_indexOfStr_WithLength(
pData->buffer + fromIndex, pData->length - fromIndex, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1); pData->buffer + fromIndex, pData->length - fromIndex,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal),
libreoffice_internal::ConstCharArrayDetector<T>::length);
return n < 0 ? n : n + fromIndex; return n < 0 ? n : n + fromIndex;
} }
......
include/rtl/stringconcat.hxx
Dosyayı görüntüle @ 8007417c
...@@ -141,6 +141,19 @@ struct ToStringHelper< const char[ N ] > ...@@ -141,6 +141,19 @@ struct ToStringHelper< const char[ N ] >
static const bool allowOUStringConcat = true; static const bool allowOUStringConcat = true;
}; };
#if defined LIBO_INTERNAL_ONLY
template<char C> struct ToStringHelper<OUStringLiteral1_<C>> {
static int length(OUStringLiteral1_<C>) { return 1; }
static char * addData(char * buffer, OUStringLiteral1_<C> literal)
{ return addDataHelper(buffer, &literal.c, 1); }
static sal_Unicode * addData(
sal_Unicode * buffer, OUStringLiteral1_<C> literal)
{ return addDataLiteral(buffer, &literal.c, 1); }
static bool const allowOStringConcat = false;
static bool const allowOUStringConcat = true;
};
#endif
/** /**
@internal @internal
......
include/rtl/stringutils.hxx
Dosyayı görüntüle @ 8007417c
...@@ -11,6 +11,10 @@ ...@@ -11,6 +11,10 @@
#define INCLUDED_RTL_STRINGUTILS_HXX #define INCLUDED_RTL_STRINGUTILS_HXX
#include <sal/config.h> #include <sal/config.h>
#include <cstddef>
#include <cstring>
#include <sal/types.h> #include <sal/types.h>
// The unittest uses slightly different code to help check that the proper // The unittest uses slightly different code to help check that the proper
...@@ -29,6 +33,60 @@ namespace rtl ...@@ -29,6 +33,60 @@ namespace rtl
#undef rtl #undef rtl
#endif #endif
#if defined LIBO_INTERNAL_ONLY
/// @cond INTERNAL
/** A simple wrapper around an ASCII character literal.
Can be useful to pass a char constant with ASCII value into a
OUString-related function that is optimized for ASCII string literal
arguments. That is, instead of
char const WILDCARD = '%';
...
if (s[i] == WILDCARD) ...
...
if (s.endsWith(OUString(WILDCARD))) ...
use
char const WILDCARD = '%';
...
if (s[i] == WILDCARD) ...
...
if (s.endsWith(OUStringLiteral1<WILDCARD>())) ...
to avoid creating a temporary OUString instance, and instead pick the
endsWith overload actually designed to take an argument of type
char const[N].
Instances of OUStringLiteral1 need to be const, as those literal-optimized
functions take the literal argument by non-const lvalue reference, for
technical reasons. Except with MSVC, at least up to Visual Studio 2013:
For one, it fails to take that const-ness into account when trying to match
"OUStringLiteral1_<C> const" against T in a "T & literal" parameter of a
function template. But for another, as a language extension, it allows to
bind non-const temporary OUStringLiteral1_ instances to non-const lvalue
references, but also with a warning that thus needs to be disabled.
@since LibreOffice 5.0
*/
template<char C> struct SAL_WARN_UNUSED OUStringLiteral1_ {
static_assert(
static_cast<unsigned char>(C) < 0x80,
"non-ASCII character in OUStringLiteral1");
char const c = C;
};
#if defined _MSC_VER && _MSC_VER <= 1800 // Visual Studio 2013
template<char C> using OUStringLiteral1 = OUStringLiteral1_<C>;
#pragma warning(disable: 4239)
#else
template<char C> using OUStringLiteral1 = OUStringLiteral1_<C> const;
#endif
/// @endcond
#endif
namespace libreoffice_internal namespace libreoffice_internal
{ {
/* /*
...@@ -102,13 +160,34 @@ struct ConstCharArrayDetector ...@@ -102,13 +160,34 @@ struct ConstCharArrayDetector
{ {
static const bool ok = false; static const bool ok = false;
}; };
template< int N, typename T > template< std::size_t N, typename T >
struct ConstCharArrayDetector< const char[ N ], T > struct ConstCharArrayDetector< const char[ N ], T >
{ {
typedef T Type; typedef T Type;
static const int size = N; static const std::size_t length = N - 1;
static const bool ok = true; static const bool ok = true;
static bool isValid(char const (& literal)[N])
{ return std::strlen(literal) == length; }
static char const * toPointer(char const (& literal)[N]) { return literal; }
}; };
#if defined LIBO_INTERNAL_ONLY
template<char C, typename T> struct ConstCharArrayDetector<
#if defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ <= 8 \
&& !defined __clang__
OUStringLiteral1_<C> const,
#else
OUStringLiteral1<C>,
#endif
T>
{
typedef T Type;
static const std::size_t length = 1;
static const bool ok = true;
static bool isValid(OUStringLiteral1_<C>) { return true; }
static char const * toPointer(OUStringLiteral1_<C> const & literal)
{ return &literal.c; }
};
#endif
// this one is used to rule out only const char[N] // this one is used to rule out only const char[N]
template< typename T > template< typename T >
...@@ -137,6 +216,10 @@ template< int N > ...@@ -137,6 +216,10 @@ template< int N >
struct ExceptCharArrayDetector< const char[ N ] > struct ExceptCharArrayDetector< const char[ N ] >
{ {
}; };
#if defined LIBO_INTERNAL_ONLY && defined _MSC_VER && _MSC_VER <= 1800
// Visual Studio 2013
template<char C> struct ExceptCharArrayDetector<OUStringLiteral1<C>> {};
#endif
template< typename T1, typename T2 = void > template< typename T1, typename T2 = void >
struct SalUnicodePtrDetector struct SalUnicodePtrDetector
......
include/rtl/ustrbuf.hxx
Dosyayı görüntüle @ 8007417c
...@@ -132,10 +132,14 @@ public: ...@@ -132,10 +132,14 @@ public:
template< typename T > template< typename T >
OUStringBuffer( T& literal, typename libreoffice_internal::ConstCharArrayDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy() ) OUStringBuffer( T& literal, typename libreoffice_internal::ConstCharArrayDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy() )
: pData(NULL) : pData(NULL)
, nCapacity( libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 + 16 ) , nCapacity( libreoffice_internal::ConstCharArrayDetector<T>::length + 16 )
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
rtl_uString_newFromLiteral( &pData, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, 16 ); libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
rtl_uString_newFromLiteral(
&pData,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal),
libreoffice_internal::ConstCharArrayDetector<T>::length, 16);
#ifdef RTL_STRING_UNITTEST #ifdef RTL_STRING_UNITTEST
rtl_string_unittest_const_literal = true; rtl_string_unittest_const_literal = true;
#endif #endif
...@@ -470,9 +474,12 @@ public: ...@@ -470,9 +474,12 @@ public:
template< typename T > template< typename T >
typename libreoffice_internal::ConstCharArrayDetector< T, OUStringBuffer& >::Type append( T& literal ) typename libreoffice_internal::ConstCharArrayDetector< T, OUStringBuffer& >::Type append( T& literal )
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
rtl_uStringbuffer_insert_ascii( &pData, &nCapacity, getLength(), literal, libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ); rtl_uStringbuffer_insert_ascii(
&pData, &nCapacity, getLength(),
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal),
libreoffice_internal::ConstCharArrayDetector<T>::length);
return *this; return *this;
} }
...@@ -813,9 +820,12 @@ public: ...@@ -813,9 +820,12 @@ public:
template< typename T > template< typename T >
typename libreoffice_internal::ConstCharArrayDetector< T, OUStringBuffer& >::Type insert( sal_Int32 offset, T& literal ) typename libreoffice_internal::ConstCharArrayDetector< T, OUStringBuffer& >::Type insert( sal_Int32 offset, T& literal )
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
rtl_uStringbuffer_insert_ascii( &pData, &nCapacity, offset, literal, libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ); rtl_uStringbuffer_insert_ascii(
&pData, &nCapacity, offset,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal),
libreoffice_internal::ConstCharArrayDetector<T>::length);
return *this; return *this;
} }
...@@ -1199,11 +1209,13 @@ public: ...@@ -1199,11 +1209,13 @@ public:
template< typename T > template< typename T >
typename libreoffice_internal::ConstCharArrayDetector< T, sal_Int32 >::Type indexOf( T& literal, sal_Int32 fromIndex = 0 ) const typename libreoffice_internal::ConstCharArrayDetector< T, sal_Int32 >::Type indexOf( T& literal, sal_Int32 fromIndex = 0 ) const
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
sal_Int32 ret = rtl_ustr_indexOfAscii_WithLength( libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
pData->buffer + fromIndex, pData->length - fromIndex, literal, sal_Int32 n = rtl_ustr_indexOfAscii_WithLength(
libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1); pData->buffer + fromIndex, pData->length - fromIndex,
return ret < 0 ? ret : ret + fromIndex; libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal),
libreoffice_internal::ConstCharArrayDetector<T>::length);
return n < 0 ? n : n + fromIndex;
} }
/** /**
...@@ -1263,9 +1275,12 @@ public: ...@@ -1263,9 +1275,12 @@ public:
template< typename T > template< typename T >
typename libreoffice_internal::ConstCharArrayDetector< T, sal_Int32 >::Type lastIndexOf( T& literal ) const typename libreoffice_internal::ConstCharArrayDetector< T, sal_Int32 >::Type lastIndexOf( T& literal ) const
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
return rtl_ustr_lastIndexOfAscii_WithLength( return rtl_ustr_lastIndexOfAscii_WithLength(
pData->buffer, pData->length, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1); pData->buffer, pData->length,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal),
libreoffice_internal::ConstCharArrayDetector<T>::length);
} }
/** /**
......
include/rtl/ustring.hxx
Dosyayı görüntüle @ 8007417c
...@@ -73,17 +73,6 @@ struct SAL_WARN_UNUSED OUStringLiteral ...@@ -73,17 +73,6 @@ struct SAL_WARN_UNUSED OUStringLiteral
const char* data; const char* data;
}; };
/** A simple wrapper around an ASCII character literal, for use in certain
OUString functions designed for efficient processing of string literals.
@since LibreOffice 5.0
*/
template<char C> struct SAL_WARN_UNUSED OUStringLiteral1 {
static_assert(
static_cast<unsigned char>(C) < 0x80,
"non-ASCII character in OUStringLiteral1");
};
/// @endcond /// @endcond
#endif #endif
...@@ -226,12 +215,18 @@ public: ...@@ -226,12 +215,18 @@ public:
template< typename T > template< typename T >
OUString( T& literal, typename libreoffice_internal::ConstCharArrayDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy() ) OUString( T& literal, typename libreoffice_internal::ConstCharArrayDetector< T, libreoffice_internal::Dummy >::Type = libreoffice_internal::Dummy() )
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
pData = 0; pData = 0;
if( libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 == 0 ) // empty string if (libreoffice_internal::ConstCharArrayDetector<T>::length == 0) {
rtl_uString_new( &pData ); rtl_uString_new(&pData);
else } else {
rtl_uString_newFromLiteral( &pData, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, 0 ); rtl_uString_newFromLiteral(
&pData,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(
literal),
libreoffice_internal::ConstCharArrayDetector<T>::length, 0);
}
#ifdef RTL_STRING_UNITTEST #ifdef RTL_STRING_UNITTEST
rtl_string_unittest_const_literal = true; rtl_string_unittest_const_literal = true;
#endif #endif
...@@ -404,27 +399,19 @@ public: ...@@ -404,27 +399,19 @@ public:
template< typename T > template< typename T >
typename libreoffice_internal::ConstCharArrayDetector< T, OUString& >::Type operator=( T& literal ) typename libreoffice_internal::ConstCharArrayDetector< T, OUString& >::Type operator=( T& literal )
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
if( libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 == 0 ) // empty string libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
rtl_uString_new( &pData ); if (libreoffice_internal::ConstCharArrayDetector<T>::length == 0) {
else rtl_uString_new(&pData);
rtl_uString_newFromLiteral( &pData, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, 0 ); } else {
return *this; rtl_uString_newFromLiteral(
} &pData,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(
#if defined LIBO_INTERNAL_ONLY // "RTL_FAST_STRING" literal),
/// @cond INTERNAL libreoffice_internal::ConstCharArrayDetector<T>::length, 0);
/** Assign a new string from a single ASCII character literal. }
@since LibreOffice 5.0
*/
template<char C> OUString & operator =(OUStringLiteral1<C>) {
sal_Unicode const c = C;
rtl_uString_newFromStr_WithLength(&pData, &c, 1);
return *this; return *this;
} }
/// @endcond
#endif
/** /**
Append a string to this string. Append a string to this string.
...@@ -578,9 +565,12 @@ public: ...@@ -578,9 +565,12 @@ public:
template< typename T > template< typename T >
typename libreoffice_internal::ConstCharArrayDetector< T, sal_Int32 >::Type reverseCompareTo( T& literal ) const typename libreoffice_internal::ConstCharArrayDetector< T, sal_Int32 >::Type reverseCompareTo( T& literal ) const
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
return rtl_ustr_asciil_reverseCompare_WithLength( pData->buffer, pData->length, libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ); return rtl_ustr_asciil_reverseCompare_WithLength(
pData->buffer, pData->length,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal),
libreoffice_internal::ConstCharArrayDetector<T>::length);
} }
/** /**
...@@ -658,11 +648,16 @@ public: ...@@ -658,11 +648,16 @@ public:
template< typename T > template< typename T >
typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type equalsIgnoreAsciiCase( T& literal ) const typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type equalsIgnoreAsciiCase( T& literal ) const
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
if ( pData->length != libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ) libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
return false; return
(pData->length
return rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength( pData->buffer, pData->length, literal ) == 0; == libreoffice_internal::ConstCharArrayDetector<T>::length)
&& (rtl_ustr_ascii_compareIgnoreAsciiCase_WithLength(
pData->buffer, pData->length,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(
literal))
== 0);
} }
/** /**
...@@ -694,9 +689,15 @@ public: ...@@ -694,9 +689,15 @@ public:
template< typename T > template< typename T >
typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type match( T& literal, sal_Int32 fromIndex = 0 ) const typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type match( T& literal, sal_Int32 fromIndex = 0 ) const
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
return rtl_ustr_ascii_shortenedCompare_WithLength( pData->buffer+fromIndex, pData->length-fromIndex, libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0; return
rtl_ustr_ascii_shortenedCompare_WithLength(
pData->buffer+fromIndex, pData->length-fromIndex,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(
literal),
libreoffice_internal::ConstCharArrayDetector<T>::length)
== 0;
} }
/** /**
...@@ -732,9 +733,15 @@ public: ...@@ -732,9 +733,15 @@ public:
template< typename T > template< typename T >
typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type matchIgnoreAsciiCase( T& literal, sal_Int32 fromIndex = 0 ) const typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type matchIgnoreAsciiCase( T& literal, sal_Int32 fromIndex = 0 ) const
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
return rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( pData->buffer+fromIndex, pData->length-fromIndex, libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ) == 0; return
rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength(
pData->buffer+fromIndex, pData->length-fromIndex,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(
literal),
libreoffice_internal::ConstCharArrayDetector<T>::length)
== 0;
} }
/** /**
...@@ -1039,12 +1046,19 @@ public: ...@@ -1039,12 +1046,19 @@ public:
typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type startsWith( typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type startsWith(
T & literal, OUString * rest = 0) const T & literal, OUString * rest = 0) const
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
bool b = libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 <= pData->length libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
&& rtl_ustr_asciil_reverseEquals_WithLength( pData->buffer, literal, bool b
libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1); = (libreoffice_internal::ConstCharArrayDetector<T>::length
<= sal_uInt32(pData->length))
&& rtl_ustr_asciil_reverseEquals_WithLength(
pData->buffer,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(
literal),
libreoffice_internal::ConstCharArrayDetector<T>::length);
if (b && rest != 0) { if (b && rest != 0) {
*rest = copy(libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1); *rest = copy(
libreoffice_internal::ConstCharArrayDetector<T>::length);
} }
return b; return b;
} }
...@@ -1088,14 +1102,19 @@ public: ...@@ -1088,14 +1102,19 @@ public:
typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type
startsWithIgnoreAsciiCase(T & literal, OUString * rest = 0) const startsWithIgnoreAsciiCase(T & literal, OUString * rest = 0) const
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
bool b = (rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths( libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
pData->buffer, bool b
libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, literal, = (rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths(
libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1) pData->buffer,
== 0); libreoffice_internal::ConstCharArrayDetector<T>::length,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(
literal),
libreoffice_internal::ConstCharArrayDetector<T>::length)
== 0);
if (b && rest != 0) { if (b && rest != 0) {
*rest = copy(libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1); *rest = copy(
libreoffice_internal::ConstCharArrayDetector<T>::length);
} }
return b; return b;
} }
...@@ -1132,16 +1151,22 @@ public: ...@@ -1132,16 +1151,22 @@ public:
typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type
endsWith(T & literal, OUString * rest = 0) const endsWith(T & literal, OUString * rest = 0) const
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
bool b = libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 <= pData->length libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
bool b
= (libreoffice_internal::ConstCharArrayDetector<T>::length
<= sal_uInt32(pData->length))
&& rtl_ustr_asciil_reverseEquals_WithLength( && rtl_ustr_asciil_reverseEquals_WithLength(
pData->buffer + pData->length - ( libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ), literal, (pData->buffer + pData->length
libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1); - libreoffice_internal::ConstCharArrayDetector<T>::length),
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(
literal),
libreoffice_internal::ConstCharArrayDetector<T>::length);
if (b && rest != 0) { if (b && rest != 0) {
*rest = copy( *rest = copy(
0, 0,
(getLength() (getLength()
- (libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1))); - libreoffice_internal::ConstCharArrayDetector<T>::length));
} }
return b; return b;
} }
...@@ -1205,18 +1230,24 @@ public: ...@@ -1205,18 +1230,24 @@ public:
typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type
endsWithIgnoreAsciiCase(T & literal, OUString * rest = 0) const endsWithIgnoreAsciiCase(T & literal, OUString * rest = 0) const
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
bool b = libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 <= pData->length libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
bool b
= (libreoffice_internal::ConstCharArrayDetector<T>::length
<= sal_uInt32(pData->length))
&& (rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths( && (rtl_ustr_ascii_compareIgnoreAsciiCase_WithLengths(
pData->buffer + pData->length - ( libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ), (pData->buffer + pData->length
libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, literal, - libreoffice_internal::ConstCharArrayDetector<T>::length),
libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1) libreoffice_internal::ConstCharArrayDetector<T>::length,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(
literal),
libreoffice_internal::ConstCharArrayDetector<T>::length)
== 0); == 0);
if (b && rest != 0) { if (b && rest != 0) {
*rest = copy( *rest = copy(
0, 0,
(getLength() (getLength()
- (libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1))); - libreoffice_internal::ConstCharArrayDetector<T>::length));
} }
return b; return b;
} }
...@@ -1274,8 +1305,11 @@ public: ...@@ -1274,8 +1305,11 @@ public:
template< typename T > template< typename T >
friend inline typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator==( const OUString& string, T& literal ) friend inline typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator==( const OUString& string, T& literal )
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
return string.equalsAsciiL( literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ); libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
return string.equalsAsciiL(
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal),
libreoffice_internal::ConstCharArrayDetector<T>::length);
} }
/** /**
* Compare string to an ASCII string literal. * Compare string to an ASCII string literal.
...@@ -1287,8 +1321,11 @@ public: ...@@ -1287,8 +1321,11 @@ public:
template< typename T > template< typename T >
friend inline typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator==( T& literal, const OUString& string ) friend inline typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator==( T& literal, const OUString& string )
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
return string.equalsAsciiL( literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ); libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
return string.equalsAsciiL(
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal),
libreoffice_internal::ConstCharArrayDetector<T>::length);
} }
/** /**
* Compare string to an ASCII string literal. * Compare string to an ASCII string literal.
...@@ -1300,8 +1337,11 @@ public: ...@@ -1300,8 +1337,11 @@ public:
template< typename T > template< typename T >
friend inline typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator!=( const OUString& string, T& literal ) friend inline typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator!=( const OUString& string, T& literal )
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
return !string.equalsAsciiL( literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ); libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
return !string.equalsAsciiL(
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal),
libreoffice_internal::ConstCharArrayDetector<T>::length);
} }
/** /**
* Compare string to an ASCII string literal. * Compare string to an ASCII string literal.
...@@ -1313,8 +1353,11 @@ public: ...@@ -1313,8 +1353,11 @@ public:
template< typename T > template< typename T >
friend inline typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator!=( T& literal, const OUString& string ) friend inline typename libreoffice_internal::ConstCharArrayDetector< T, bool >::Type operator!=( T& literal, const OUString& string )
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
return !string.equalsAsciiL( literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1 ); libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
return !string.equalsAsciiL(
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal),
libreoffice_internal::ConstCharArrayDetector<T>::length);
} }
#if defined LIBO_INTERNAL_ONLY #if defined LIBO_INTERNAL_ONLY
...@@ -1492,11 +1535,13 @@ public: ...@@ -1492,11 +1535,13 @@ public:
template< typename T > template< typename T >
typename libreoffice_internal::ConstCharArrayDetector< T, sal_Int32 >::Type indexOf( T& literal, sal_Int32 fromIndex = 0 ) const typename libreoffice_internal::ConstCharArrayDetector< T, sal_Int32 >::Type indexOf( T& literal, sal_Int32 fromIndex = 0 ) const
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
sal_Int32 ret = rtl_ustr_indexOfAscii_WithLength( libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
pData->buffer + fromIndex, pData->length - fromIndex, literal, sal_Int32 n = rtl_ustr_indexOfAscii_WithLength(
libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1); pData->buffer + fromIndex, pData->length - fromIndex,
return ret < 0 ? ret : ret + fromIndex; libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal),
libreoffice_internal::ConstCharArrayDetector<T>::length);
return n < 0 ? n : n + fromIndex;
} }
/** /**
...@@ -1590,9 +1635,12 @@ public: ...@@ -1590,9 +1635,12 @@ public:
template< typename T > template< typename T >
typename libreoffice_internal::ConstCharArrayDetector< T, sal_Int32 >::Type lastIndexOf( T& literal ) const typename libreoffice_internal::ConstCharArrayDetector< T, sal_Int32 >::Type lastIndexOf( T& literal ) const
{ {
assert( strlen( literal ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); assert(
libreoffice_internal::ConstCharArrayDetector<T>::isValid(literal));
return rtl_ustr_lastIndexOfAscii_WithLength( return rtl_ustr_lastIndexOfAscii_WithLength(
pData->buffer, pData->length, literal, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1); pData->buffer, pData->length,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(literal),
libreoffice_internal::ConstCharArrayDetector<T>::length);
} }
/** /**
...@@ -1768,11 +1816,14 @@ public: ...@@ -1768,11 +1816,14 @@ public:
SAL_WARN_UNUSED_RESULT typename libreoffice_internal::ConstCharArrayDetector< T, OUString >::Type replaceFirst( T& from, OUString const & to, SAL_WARN_UNUSED_RESULT typename libreoffice_internal::ConstCharArrayDetector< T, OUString >::Type replaceFirst( T& from, OUString const & to,
sal_Int32 * index = 0) const sal_Int32 * index = 0) const
{ {
assert(libreoffice_internal::ConstCharArrayDetector<T>::isValid(from));
rtl_uString * s = 0; rtl_uString * s = 0;
sal_Int32 i = 0; sal_Int32 i = 0;
assert( strlen( from ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
rtl_uString_newReplaceFirstAsciiL( rtl_uString_newReplaceFirstAsciiL(
&s, pData, from, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, to.pData, index == 0 ? &i : index); &s, pData,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(from),
libreoffice_internal::ConstCharArrayDetector<T>::length, to.pData,
index == 0 ? &i : index);
return OUString(s, SAL_NO_ACQUIRE); return OUString(s, SAL_NO_ACQUIRE);
} }
...@@ -1798,11 +1849,14 @@ public: ...@@ -1798,11 +1849,14 @@ public:
SAL_WARN_UNUSED_RESULT typename libreoffice_internal::ConstCharArrayDetector< T, OUString >::Type replaceFirst( OUString const & from, T& to, SAL_WARN_UNUSED_RESULT typename libreoffice_internal::ConstCharArrayDetector< T, OUString >::Type replaceFirst( OUString const & from, T& to,
sal_Int32 * index = 0) const sal_Int32 * index = 0) const
{ {
assert(libreoffice_internal::ConstCharArrayDetector<T>::isValid(to));
rtl_uString * s = 0; rtl_uString * s = 0;
sal_Int32 i = 0; sal_Int32 i = 0;
assert( strlen( to ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 );
rtl_uString_newReplaceFirstToAsciiL( rtl_uString_newReplaceFirstToAsciiL(
&s, pData, from.pData, to, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, index == 0 ? &i : index); &s, pData, from.pData,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(to),
libreoffice_internal::ConstCharArrayDetector<T>::length,
index == 0 ? &i : index);
return OUString(s, SAL_NO_ACQUIRE); return OUString(s, SAL_NO_ACQUIRE);
} }
...@@ -1828,13 +1882,17 @@ public: ...@@ -1828,13 +1882,17 @@ public:
SAL_WARN_UNUSED_RESULT typename libreoffice_internal::ConstCharArrayDetector< T1, typename libreoffice_internal::ConstCharArrayDetector< T2, OUString >::Type >::Type SAL_WARN_UNUSED_RESULT typename libreoffice_internal::ConstCharArrayDetector< T1, typename libreoffice_internal::ConstCharArrayDetector< T2, OUString >::Type >::Type
replaceFirst( T1& from, T2& to, sal_Int32 * index = 0) const replaceFirst( T1& from, T2& to, sal_Int32 * index = 0) const
{ {
assert(libreoffice_internal::ConstCharArrayDetector<T1>::isValid(from));
assert(libreoffice_internal::ConstCharArrayDetector<T2>::isValid(to));
rtl_uString * s = 0; rtl_uString * s = 0;
sal_Int32 i = 0; sal_Int32 i = 0;
assert( strlen( from ) == libreoffice_internal::ConstCharArrayDetector< T1 >::size - 1 );
assert( strlen( to ) == libreoffice_internal::ConstCharArrayDetector< T2 >::size - 1 );
rtl_uString_newReplaceFirstAsciiLAsciiL( rtl_uString_newReplaceFirstAsciiLAsciiL(
&s, pData, from, libreoffice_internal::ConstCharArrayDetector< T1, void >::size - 1, to, &s, pData,
libreoffice_internal::ConstCharArrayDetector< T2, void >::size - 1, index == 0 ? &i : index); libreoffice_internal::ConstCharArrayDetector<T1>::toPointer(from),
libreoffice_internal::ConstCharArrayDetector<T1>::length,
libreoffice_internal::ConstCharArrayDetector<T2>::toPointer(to),
libreoffice_internal::ConstCharArrayDetector<T2>::length,
index == 0 ? &i : index);
return OUString(s, SAL_NO_ACQUIRE); return OUString(s, SAL_NO_ACQUIRE);
} }
...@@ -1877,9 +1935,12 @@ public: ...@@ -1877,9 +1935,12 @@ public:
template< typename T > template< typename T >
SAL_WARN_UNUSED_RESULT typename libreoffice_internal::ConstCharArrayDetector< T, OUString >::Type replaceAll( T& from, OUString const & to) const SAL_WARN_UNUSED_RESULT typename libreoffice_internal::ConstCharArrayDetector< T, OUString >::Type replaceAll( T& from, OUString const & to) const
{ {
assert(libreoffice_internal::ConstCharArrayDetector<T>::isValid(from));
rtl_uString * s = 0; rtl_uString * s = 0;
assert( strlen( from ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); rtl_uString_newReplaceAllAsciiL(
rtl_uString_newReplaceAllAsciiL(&s, pData, from, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1, to.pData); &s, pData,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(from),
libreoffice_internal::ConstCharArrayDetector<T>::length, to.pData);
return OUString(s, SAL_NO_ACQUIRE); return OUString(s, SAL_NO_ACQUIRE);
} }
...@@ -1899,9 +1960,12 @@ public: ...@@ -1899,9 +1960,12 @@ public:
template< typename T > template< typename T >
SAL_WARN_UNUSED_RESULT typename libreoffice_internal::ConstCharArrayDetector< T, OUString >::Type replaceAll( OUString const & from, T& to) const SAL_WARN_UNUSED_RESULT typename libreoffice_internal::ConstCharArrayDetector< T, OUString >::Type replaceAll( OUString const & from, T& to) const
{ {
assert(libreoffice_internal::ConstCharArrayDetector<T>::isValid(to));
rtl_uString * s = 0; rtl_uString * s = 0;
assert( strlen( to ) == libreoffice_internal::ConstCharArrayDetector< T >::size - 1 ); rtl_uString_newReplaceAllToAsciiL(
rtl_uString_newReplaceAllToAsciiL(&s, pData, from.pData, to, libreoffice_internal::ConstCharArrayDetector< T, void >::size - 1); &s, pData, from.pData,
libreoffice_internal::ConstCharArrayDetector<T>::toPointer(to),
libreoffice_internal::ConstCharArrayDetector<T>::length);
return OUString(s, SAL_NO_ACQUIRE); return OUString(s, SAL_NO_ACQUIRE);
} }
...@@ -1922,12 +1986,15 @@ public: ...@@ -1922,12 +1986,15 @@ public:
SAL_WARN_UNUSED_RESULT typename libreoffice_internal::ConstCharArrayDetector< T1, typename libreoffice_internal::ConstCharArrayDetector< T2, OUString >::Type >::Type SAL_WARN_UNUSED_RESULT typename libreoffice_internal::ConstCharArrayDetector< T1, typename libreoffice_internal::ConstCharArrayDetector< T2, OUString >::Type >::Type
replaceAll( T1& from, T2& to ) const replaceAll( T1& from, T2& to ) const
{ {
assert(libreoffice_internal::ConstCharArrayDetector<T1>::isValid(from));
assert(libreoffice_internal::ConstCharArrayDetector<T2>::isValid(to));
rtl_uString * s = 0; rtl_uString * s = 0;
assert( strlen( from ) == libreoffice_internal::ConstCharArrayDetector< T1 >::size - 1 );
assert( strlen( to ) == libreoffice_internal::ConstCharArrayDetector< T2 >::size - 1 );
rtl_uString_newReplaceAllAsciiLAsciiL( rtl_uString_newReplaceAllAsciiLAsciiL(
&s, pData, from, libreoffice_internal::ConstCharArrayDetector< T1, void >::size - 1, &s, pData,
to, libreoffice_internal::ConstCharArrayDetector< T2, void >::size - 1); libreoffice_internal::ConstCharArrayDetector<T1>::toPointer(from),
libreoffice_internal::ConstCharArrayDetector<T1>::length,
libreoffice_internal::ConstCharArrayDetector<T2>::toPointer(to),
libreoffice_internal::ConstCharArrayDetector<T2>::length);
return OUString(s, SAL_NO_ACQUIRE); return OUString(s, SAL_NO_ACQUIRE);
} }
...@@ -2564,26 +2631,6 @@ public: ...@@ -2564,26 +2631,6 @@ public:
#if defined LIBO_INTERNAL_ONLY // "RTL_FAST_STRING" #if defined LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
/// @cond INTERNAL /// @cond INTERNAL
/** Compare a string and an ASCII character literal for equality.
@since LibreOffice 5.0
*/
template<char C> bool operator ==(OUString const & string, OUStringLiteral1<C>)
{
char const c = C;
return string.equalsAsciiL(&c, 1);
}
/** Compare a string and an ASCII character literal for inequality.
@since LibreOffice 5.0
*/
template<char C> bool operator !=(
OUString const & string, OUStringLiteral1<C> literal)
{
return !(string == literal);
}
/** /**
@internal @internal
*/ */
...@@ -2608,18 +2655,6 @@ struct ToStringHelper< OUStringLiteral > ...@@ -2608,18 +2655,6 @@ struct ToStringHelper< OUStringLiteral >
static const bool allowOUStringConcat = true; static const bool allowOUStringConcat = true;
}; };
/**
@internal
*/
template<char C> struct ToStringHelper<OUStringLiteral1<C>>
{
static int length(OUStringLiteral1<C>) { return 1; }
static sal_Unicode * addData(sal_Unicode * buffer, OUStringLiteral1<C>)
{ *buffer++ = C; return buffer; }
static const bool allowOStringConcat = false;
static const bool allowOUStringConcat = true;
};
/** /**
@internal @internal
*/ */
......
sal/qa/rtl/strings/test_oustring_stringliterals.cxx
Dosyayı görüntüle @ 8007417c
...@@ -192,6 +192,20 @@ void test::oustring::StringLiterals::checkOUStringLiteral() ...@@ -192,6 +192,20 @@ void test::oustring::StringLiterals::checkOUStringLiteral()
void test::oustring::StringLiterals::checkOUStringLiteral1() void test::oustring::StringLiterals::checkOUStringLiteral1()
{ {
auto l1 = rtlunittest::OUStringLiteral1<'A'>();
CPPUNIT_ASSERT_EQUAL('A', l1.c);
char const c2 = 'A';
auto l2 = rtlunittest::OUStringLiteral1<c2>();
CPPUNIT_ASSERT_EQUAL('A', l2.c);
// char c3 = 'A'; auto l3 = rtlunittest::OUStringLiteral1<c3>();
auto l4 = rtlunittest::OUStringLiteral1<sal_Unicode('A')>();
CPPUNIT_ASSERT_EQUAL('A', l4.c);
// auto l5 = rtlunittest::OUStringLiteral1<sal_Unicode(0x100)>();
rtl::OUString s1; rtl::OUString s1;
s1 = rtlunittest::OUStringLiteral1<'A'>(); s1 = rtlunittest::OUStringLiteral1<'A'>();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), s1.getLength()); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), s1.getLength());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment