carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-04 22:02:52 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Fix fn placement around keywords (#613)

Browse Source 
Co-authored-by: Geoff Romer <gromer@google.com>
This commit is contained in:
Jon Meow
2021-07-01 09:43:14 -07:00
committed by GitHub
co-authored by Geoff Romer
parent 1071ec52b7
commit e7a1093eb9
7 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
migrate_cpp/cpp_refactoring/fn_inserter.cpp
+24 -4
View File
@@ -5,6 +5,7 @@
#include "migrate_cpp/cpp_refactoring/fn_inserter.h"
#include "clang/ASTMatchers/ASTMatchers.h"
#include "clang/Lex/Lexer.h"
namespace cam = ::clang::ast_matchers;
@@ -27,10 +28,29 @@ void FnInserter::run(const cam::MatchFinder::MatchResult& result) {
if (!decl) {
llvm::report_fatal_error(std::string("getNodeAs failed for ") + Label);
}
auto begin = decl->getBeginLoc();
// Replace the first token in the range, `auto`.
auto range = clang::CharSourceRange::getTokenRange(begin, begin);
AddReplacement(*(result.SourceManager), range, "fn");
auto& sm = *(result.SourceManager);
auto lang_opts = result.Context->getLangOpts();
// For names like "Class::Method", replace up to "Class" not "Method".
clang::NestedNameSpecifierLoc qual_loc = decl->getQualifierLoc();
clang::SourceLocation name_begin_loc =
qual_loc.hasQualifier() ? qual_loc.getBeginLoc() : decl->getLocation();
auto range =
clang::CharSourceRange::getCharRange(decl->getBeginLoc(), name_begin_loc);
// In order to handle keywords like "virtual" in "virtual auto Foo() -> ...",
// scan the replaced text and only drop auto/void entries.
llvm::SmallVector<llvm::StringRef> split;
clang::Lexer::getSourceText(range, sm, lang_opts)
.split(split, ' ', /*MaxSplit=*/-1, /*KeepEmpty=*/false);
std::string new_text = "fn ";
for (llvm::StringRef t : split) {
if (t != "auto" && t != "void") {
new_text += t.str() + " ";
}
}
AddReplacement(*(result.SourceManager), range, new_text);
}
} // namespace Carbon