...that have been made unused by 7ef3d937415185ef66e32dd3043783eddcd03db5 "loplugin:ostr: Rewrite some uses of O[U]String to use ""_ostr/u""_ustr literals". (And which means we can remove the relevant code from that plugin again.) (This also found a handful of remaining uses that had been hard for the plugin to discover, along the lines of > std::map<OUString, int> m = {{u"foo", 0}}; being represented by a > DeclStmt 0xdaca578 <line:103:5, col:50> > `-VarDecl 0xdac9150 <col:5, col:49> col:29 s11 'std::map<OUString, int>':'std::map<rtl::OUString, int>' cinit destroyed > `-ExprWithCleanups 0xdaca548 <col:35, col:49> 'std::map<OUString, int>':'std::map<rtl::OUString, int>' > `-CXXConstructExpr 0xdaca508 <col:35, col:49> 'std::map<OUString, int>':'std::map<rtl::OUString, int>' 'void (initializer_list<value_type>, const std::less<rtl::OUString> &, const allocator_type &)' list std::initializer_list > |-CXXStdInitializerListExpr 0xdaca480 <col:35, col:49> 'initializer_list<value_type>':'std::initializer_list<std::pair<const rtl::OUString, int>>' > | `-MaterializeTemporaryExpr 0xdaca468 <col:35, col:49> 'const std::pair<const rtl::OUString, int>[1]' xvalue > | `-CXXBindTemporaryExpr 0xdaca448 <col:35, col:49> 'const std::pair<const rtl::OUString, int>[1]' (CXXTemporary 0xdaca448) > | `-InitListExpr 0xdac9df0 <col:35, col:49> 'const std::pair<const rtl::OUString, int>[1]' > | `-CXXConstructExpr 0xdaca408 <col:36, col:48> 'const std::pair<const rtl::OUString, int>' 'void (const char16_t (&)[4], int &&) noexcept(_S_nothrow_constructible<const char16_t (&)[4], int>())' list > | |-StringLiteral 0xdac91b8 <col:38> 'const char16_t[4]' lvalue u"foo" > | `-MaterializeTemporaryExpr 0xdaca3f0 <col:46> 'int' xvalue > | `-IntegerLiteral 0xdac91d8 <col:46> 'int' 0 > |-CXXDefaultArgExpr 0xdaca498 <<invalid sloc>> 'const std::less<rtl::OUString>':'const std::less<rtl::OUString>' lvalue > `-CXXDefaultArgExpr 0xdaca4b8 <<invalid sloc>> 'const allocator_type':'const std::allocator<std::pair<const rtl::OUString, int>>' lvalue Clang AST.) Change-Id: I496fe9d4d5e1a033cb7b27b4e04b303f8ddbed4a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157756 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
135 lines
5.6 KiB
C++
135 lines
5.6 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*/
|
|
|
|
#include <sal/config.h>
|
|
|
|
#include <iterator>
|
|
#include <vector>
|
|
|
|
#include <rtl/ustring.hxx>
|
|
|
|
// expected-error-re@+1 {{change type of variable 'literal1' from constant character array ('const char{{ ?}}[4]') to OStringLiteral [loplugin:stringliteralvar]}}
|
|
char const literal1[] = "foo";
|
|
OString f1()
|
|
{
|
|
// expected-note-re@+1 {{first passed into a '{{(rtl::)?}}OString' constructor here [loplugin:stringliteralvar]}}
|
|
return literal1;
|
|
}
|
|
|
|
void f(OUString const&);
|
|
void f2()
|
|
{
|
|
// expected-error-re@+1 {{change type of variable 'literal' from constant character array ('const char{{ ?}}[4]') to OUStringLiteral, and make it static [loplugin:stringliteralvar]}}
|
|
char const literal[] = "foo";
|
|
// expected-note-re@+1 {{first passed into a '{{(rtl::)?}}OUString' constructor here [loplugin:stringliteralvar]}}
|
|
f(literal);
|
|
}
|
|
|
|
struct S3
|
|
{
|
|
// expected-error-re@+1 {{change type of variable 'literal' from constant character array ('const char16_t{{ ?}}[4]') to OUStringLiteral [loplugin:stringliteralvar]}}
|
|
static constexpr char16_t literal[] = u"foo";
|
|
};
|
|
void f3()
|
|
{
|
|
// expected-note-re@+1 {{first passed into a '{{(rtl::)?}}OUString' constructor here [loplugin:stringliteralvar]}}
|
|
f(OUString(S3::literal, 3));
|
|
}
|
|
|
|
std::vector<OUString> f4()
|
|
{
|
|
// expected-error-re@+1 {{change type of variable 'literal' from constant character array ('const char16_t{{ ?}}[4]') to OUStringLiteral [loplugin:stringliteralvar]}}
|
|
static constexpr char16_t literal[] = u"foo";
|
|
// expected-note-re@+1 {{first passed into a '{{(rtl::)?}}OUString' constructor here [loplugin:stringliteralvar]}}
|
|
return { OUString(literal, 3) };
|
|
}
|
|
|
|
void f5()
|
|
{
|
|
// expected-error-re@+1 {{variable 'literal' of type 'const {{(rtl::)?}}OUStringLiteral<4>'{{( \(aka 'const rtl::OUStringLiteral<4>'\))?}} with automatic storage duration most likely needs to be static [loplugin:stringliteralvar]}}
|
|
OUStringLiteral const literal = u"foo";
|
|
// expected-note-re@+1 {{first converted to '{{(rtl::)?}}OUString' here [loplugin:stringliteralvar]}}
|
|
f(literal);
|
|
}
|
|
|
|
void f6()
|
|
{
|
|
// expected-error-re@+1 {{variable 'literal' of type 'const {{(rtl::)?}}OUStringLiteral<4>'{{( \(aka 'const rtl::OUStringLiteral<4>'\))?}} with automatic storage duration most likely needs to be static [loplugin:stringliteralvar]}}
|
|
constexpr OUStringLiteral literal = u"foo";
|
|
// expected-note-re@+1 {{first converted to '{{(rtl::)?}}OUString' here [loplugin:stringliteralvar]}}
|
|
f(literal);
|
|
}
|
|
|
|
void f7()
|
|
{
|
|
static constexpr OUStringLiteral const literal = u"foo";
|
|
f(literal);
|
|
}
|
|
|
|
void f8()
|
|
{
|
|
static constexpr OUStringLiteral const literal = u"foo";
|
|
// expected-error-re@+1 {{variable 'literal' of type 'const {{(rtl::)?}}OUStringLiteral<4>'{{( \(aka 'const rtl::OUStringLiteral<4>'\))?}} suspiciously used in a sizeof expression [loplugin:stringliteralvar]}}
|
|
(void)sizeof literal;
|
|
}
|
|
|
|
void f9()
|
|
{
|
|
// expected-error-re@+1 {{change type of variable 'literal' from constant character array ('const sal_Unicode{{ ?}}[3]'{{( \(aka 'const char16_t\[3\]'\))?}}) to OUStringLiteral [loplugin:stringliteralvar]}}
|
|
static sal_Unicode const literal[] = { 'f', 'o', 'o' };
|
|
// expected-note-re@+1 {{first passed into a '{{(rtl::)?}}OUString' constructor here [loplugin:stringliteralvar]}}
|
|
f(OUString(literal, std::size(literal)));
|
|
}
|
|
|
|
void f10()
|
|
{
|
|
// expected-error-re@+1 {{change type of variable 'literal' from constant character array ('const sal_Unicode{{ ?}}[3]'{{( \(aka 'const char16_t\[3\]'\))?}}) to OUStringLiteral [loplugin:stringliteralvar]}}
|
|
static sal_Unicode const literal[] = { 'f', 'o', 'o' };
|
|
// expected-note-re@+1 {{first passed into a '{{(rtl::)?}}OUString' constructor here [loplugin:stringliteralvar]}}
|
|
f(OUString(literal, 3));
|
|
}
|
|
|
|
void f11(int nStreamType)
|
|
{
|
|
// expected-error-re@+1 {{change type of variable 'sDocumentType' from constant character array ('const char{{ ?}}[4]') to OUStringLiteral, and make it static [loplugin:stringliteralvar]}}
|
|
const char sDocumentType[] = "foo";
|
|
OUString sStreamType;
|
|
switch (nStreamType)
|
|
{
|
|
case 1:
|
|
// expected-note@+1 {{first assigned here [loplugin:stringliteralvar]}}
|
|
sStreamType = sDocumentType;
|
|
break;
|
|
}
|
|
(void)sStreamType;
|
|
}
|
|
|
|
extern sal_Unicode const extarr[1];
|
|
|
|
sal_Unicode init();
|
|
|
|
void f12()
|
|
{
|
|
// Suppress warnings if the array contains a malformed sequence of UTF-16 code units...:
|
|
static sal_Unicode const arr1[] = { 0xD800 };
|
|
f(OUString(arr1, 1));
|
|
// ...Or potentially contains a malformed sequence of UTF-16 code units...:
|
|
f(OUString(extarr, 1));
|
|
sal_Unicode const arr2[] = { init() };
|
|
f(OUString(arr2, 1));
|
|
// ...But generate a warning if the array contains a well-formed sequence of UTF-16 code units
|
|
// containing surrogates:
|
|
// expected-error-re@+1 {{change type of variable 'arr3' from constant character array ('const sal_Unicode{{ ?}}[2]'{{( \(aka 'const char16_t\[2\]'\))?}}) to OUStringLiteral [loplugin:stringliteralvar]}}
|
|
static sal_Unicode const arr3[] = { 0xD800, 0xDC00 };
|
|
// expected-note-re@+1 {{first passed into a '{{(rtl::)?}}OUString' constructor here [loplugin:stringliteralvar]}}
|
|
f(OUString(arr3, 2));
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
|