Author: ioeric Date: Wed Oct 5 10:52:39 2016 New Revision: 283333 URL: http://llvm.org/viewvc/llvm-project?rev=283333&view=rev Log: [change-namespace] Fixed a bug in getShortestQualifiedNameInNamespace.
Reviewers: hokein Subscribers: cfe-commits Differential Revision: https://reviews.llvm.org/D25065 Modified: clang-tools-extra/trunk/change-namespace/ChangeNamespace.cpp clang-tools-extra/trunk/unittests/change-namespace/ChangeNamespaceTests.cpp Modified: clang-tools-extra/trunk/change-namespace/ChangeNamespace.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/change-namespace/ChangeNamespace.cpp?rev=283333&r1=283332&r2=283333&view=diff ============================================================================== --- clang-tools-extra/trunk/change-namespace/ChangeNamespace.cpp (original) +++ clang-tools-extra/trunk/change-namespace/ChangeNamespace.cpp Wed Oct 5 10:52:39 2016 @@ -173,21 +173,24 @@ tooling::Replacement createInsertion(Sou // Returns the shortest qualified name for declaration `DeclName` in the // namespace `NsName`. For example, if `DeclName` is "a::b::X" and `NsName` // is "a::c::d", then "b::X" will be returned. +// \param DeclName A fully qualified name, "::a::b::X" or "a::b::X". +// \param NsName A fully qualified name, "::a::b" or "a::b". Global namespace +// will have empty name. std::string getShortestQualifiedNameInNamespace(llvm::StringRef DeclName, llvm::StringRef NsName) { - llvm::SmallVector<llvm::StringRef, 4> DeclNameSplitted; - DeclName.split(DeclNameSplitted, "::"); - if (DeclNameSplitted.size() == 1) - return DeclName; - const auto UnqualifiedName = DeclNameSplitted.back(); - while (true) { + DeclName = DeclName.ltrim(':'); + NsName = NsName.ltrim(':'); + // If `DeclName` is a global variable, we prepend "::" to it if it is not in + // the global namespace. + if (DeclName.find(':') == llvm::StringRef::npos) + return NsName.empty() ? DeclName.str() : ("::" + DeclName).str(); + + while (!DeclName.consume_front((NsName + "::").str())) { const auto Pos = NsName.find_last_of(':'); if (Pos == llvm::StringRef::npos) return DeclName; - const auto Prefix = NsName.substr(0, Pos - 1); - if (DeclName.startswith(Prefix)) - return (Prefix + "::" + UnqualifiedName).str(); - NsName = Prefix; + assert(Pos > 0); + NsName = NsName.substr(0, Pos - 1); } return DeclName; } Modified: clang-tools-extra/trunk/unittests/change-namespace/ChangeNamespaceTests.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/change-namespace/ChangeNamespaceTests.cpp?rev=283333&r1=283332&r2=283333&view=diff ============================================================================== --- clang-tools-extra/trunk/unittests/change-namespace/ChangeNamespaceTests.cpp (original) +++ clang-tools-extra/trunk/unittests/change-namespace/ChangeNamespaceTests.cpp Wed Oct 5 10:52:39 2016 @@ -113,6 +113,24 @@ TEST_F(ChangeNamespaceTest, SimpleMoveIn EXPECT_EQ(format(Expected), runChangeNamespaceOnCode(Code)); } +TEST_F(ChangeNamespaceTest, MoveIntoAnotherNestedNamespaceWithRef) { + NewNamespace = "na::nc"; + std::string Code = "namespace na {\n" + "class A {};\n" + "namespace nb {\n" + "class X { A a; };\n" + "} // namespace nb\n" + "} // namespace na\n"; + std::string Expected = "namespace na {\n" + "class A {};\n" + "\n" + "namespace nc {\n" + "class X { A a; };\n" + "} // namespace nc\n" + "} // namespace na\n"; + EXPECT_EQ(format(Expected), runChangeNamespaceOnCode(Code)); +} + TEST_F(ChangeNamespaceTest, SimpleMoveNestedNamespace) { NewNamespace = "na::x::y"; std::string Code = "namespace na {\n" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
