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

For-range in replacement logic (#631)

Browse Source 
This replaces GetAstMatcher with AddMatcher because cxxForRangeStmt is a StatementMatcher. addMatcher has multiple definitions (https://clang.llvm.org/doxygen/classclang_1_1ast__matchers_1_1MatchFinder.html) and so this approach allows using the right addMatcher without writing per-call overloads.

To handle the `var`, I'm considering something like moving VarDecl logic into a VarMatcherBase so that I can just use CXXForRangeStmt's getLoopVariable. The problem is a for-range statement has multiple VarDecls, and getLoopVariable may be the easiest way to identify the real one.
This commit is contained in:
Jon Meow
2021-07-12 16:20:44 -07:00
committed by GitHub
parent c4079bfdae
commit 6fa42a7f3c
18 changed files with 212 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
migrate_cpp/cpp_refactoring/matcher.h
+4 -3
View File
@@ -71,9 +71,10 @@ class MatcherFactory {
const clang::ast_matchers::MatchFinder::MatchResult* match_result,
Matcher::ReplacementMap* replacements) -> std::unique_ptr<Matcher> = 0;
// Returns the AST matcher which determines when the Matcher is instantiated
// and run.
virtual auto GetAstMatcher() -> clang::ast_matchers::DeclarationMatcher = 0;
// Adds the Matcher to the finder with the provided callback.
virtual void AddMatcher(
clang::ast_matchers::MatchFinder* finder,
clang::ast_matchers::MatchFinder::MatchCallback* callback) = 0;
};
// A convenience factory that implements CreateMatcher for Matchers that have a