mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-25 21:20:10 +01:00
Jon Meow
2344a52e24
TODOs in the test for known issues. I may switch the approach to getting the variable type (on examination, this isn't working quite as well as I'd thought) but for now I think it's okay. I had an earlier approach though that may work better overall -- I'd been thinking this would work better, but as you can see in the null check for type information, I think I missed a key point. Anyways, what'd really been vexing me was `int i, j` which I think I handle passably well now. There's obviously room for improvement, but given I've been going at this for a couple days now, I thought it best to checkpoint where I was. This also includes some related framework changes to fix bumps I was running into. Overall the tool should operate a bit more smoothly with these changes. There are still issues with overlapping replacements, but I think it's primarily with range-based for loops which I just need to take some time to fix.
62 lines
2.3 KiB
C++
62 lines
2.3 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#include "migrate_cpp/cpp_refactoring/var_decl.h"
|
|
|
|
#include "clang/ASTMatchers/ASTMatchers.h"
|
|
#include "clang/Lex/Lexer.h"
|
|
|
|
namespace cam = ::clang::ast_matchers;
|
|
|
|
namespace Carbon {
|
|
|
|
VarDecl::VarDecl(std::map<std::string, Replacements>& in_replacements,
|
|
cam::MatchFinder* finder)
|
|
: Matcher(in_replacements) {
|
|
finder->addMatcher(cam::varDecl().bind(Label), this);
|
|
}
|
|
|
|
void VarDecl::run(const cam::MatchFinder::MatchResult& result) {
|
|
const auto* decl = result.Nodes.getNodeAs<clang::VarDecl>(Label);
|
|
if (!decl) {
|
|
llvm::report_fatal_error(std::string("getNodeAs failed for ") + Label);
|
|
}
|
|
|
|
auto& sm = *(result.SourceManager);
|
|
auto lang_opts = result.Context->getLangOpts();
|
|
|
|
std::string after;
|
|
// Start the replacement with "var" unless it's a parameter.
|
|
if (result.Nodes.getNodeAs<clang::ParmVarDecl>(Label) == nullptr) {
|
|
after = "var ";
|
|
}
|
|
// Finish the "type: name" replacement.
|
|
after += decl->getNameAsString() + ": " +
|
|
clang::QualType::getAsString(decl->getType().split(), lang_opts);
|
|
|
|
if (decl->getTypeSourceInfo() == nullptr) {
|
|
// TODO: Need to understand what's happening in this case. Not sure if we
|
|
// need to address it.
|
|
return;
|
|
}
|
|
|
|
// This decides the range to replace. Normally the entire decl is replaced,
|
|
// but for code like `int i, j` we need to detect the comma between the
|
|
// declared names. That case currently results in `var i: int, var j: int`.
|
|
auto type_loc = decl->getTypeSourceInfo()->getTypeLoc();
|
|
auto after_type_loc =
|
|
clang::Lexer::getLocForEndOfToken(type_loc.getEndLoc(), 0, sm, lang_opts);
|
|
// If there's a comma, this range will be non-empty.
|
|
auto comma_source_text = clang::Lexer::getSourceText(
|
|
clang::CharSourceRange::getCharRange(after_type_loc, decl->getLocation()),
|
|
sm, lang_opts);
|
|
bool has_comma = !comma_source_text.trim().empty();
|
|
clang::CharSourceRange replace_range = clang::CharSourceRange::getTokenRange(
|
|
has_comma ? decl->getLocation() : decl->getBeginLoc(), decl->getEndLoc());
|
|
|
|
AddReplacement(sm, replace_range, after);
|
|
}
|
|
|
|
} // namespace Carbon
|