mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-25 06:50:12 +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.
44 lines
1.3 KiB
C++
44 lines
1.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/matcher.h"
|
|
|
|
namespace ct = ::clang::tooling;
|
|
|
|
namespace Carbon {
|
|
|
|
void Matcher::AddReplacement(const clang::SourceManager& sm,
|
|
clang::CharSourceRange range,
|
|
llvm::StringRef replacement_text) {
|
|
if (!range.isValid()) {
|
|
// Invalid range.
|
|
return;
|
|
}
|
|
if (sm.getDecomposedLoc(range.getBegin()).first !=
|
|
sm.getDecomposedLoc(range.getEnd()).first) {
|
|
// Range spans macro expansions.
|
|
return;
|
|
}
|
|
if (sm.getFileID(range.getBegin()) != sm.getFileID(range.getEnd())) {
|
|
// Range spans files.
|
|
return;
|
|
}
|
|
|
|
auto rep = ct::Replacement(sm, sm.getExpansionRange(range), replacement_text);
|
|
auto entry = replacements->find(std::string(rep.getFilePath()));
|
|
if (entry == replacements->end()) {
|
|
// The replacement was in a file which isn't being updated, such as a system
|
|
// header.
|
|
return;
|
|
}
|
|
|
|
auto err = entry->second.add(rep);
|
|
if (err) {
|
|
llvm::errs() << "Error with replacement `" << rep.toString()
|
|
<< "`: " << llvm::toString(std::move(err)) << "\n";
|
|
}
|
|
}
|
|
|
|
} // namespace Carbon
|