Index: tools/gn/substitution_writer.cc |
diff --git a/tools/gn/substitution_writer.cc b/tools/gn/substitution_writer.cc |
index 0cab497570c32f4237aa29ff51b1028bfac29dc6..65a1d1fe2859f23388922df978ddb2cab1a71d48 100644 |
--- a/tools/gn/substitution_writer.cc |
+++ b/tools/gn/substitution_writer.cc |
@@ -151,8 +151,7 @@ void SubstitutionWriter::WriteWithNinjaVariables( |
bool needs_quotes = false; |
std::string result; |
- for (size_t i = 0; i < pattern.ranges().size(); i++) { |
- const SubstitutionPattern::Subrange range = pattern.ranges()[i]; |
+ for (const auto& range : pattern.ranges()) { |
if (range.type == SUBSTITUTION_LITERAL) { |
result.append(EscapeString(range.literal, no_quoting, &needs_quotes)); |
} else { |
@@ -172,8 +171,7 @@ void SubstitutionWriter::WriteWithNinjaVariables( |
void SubstitutionWriter::GetListAsSourceFiles( |
const SubstitutionList& list, |
std::vector<SourceFile>* output) { |
- for (size_t i = 0; i < list.list().size(); i++) { |
- const SubstitutionPattern& pattern = list.list()[i]; |
+ for (const auto& pattern : list.list()) { |
CHECK(pattern.ranges().size() == 1 && |
pattern.ranges()[0].type == SUBSTITUTION_LITERAL) |
<< "The substitution patterm \"" |
@@ -195,10 +193,8 @@ void SubstitutionWriter::GetListAsOutputFiles( |
std::vector<OutputFile>* output) { |
std::vector<SourceFile> output_as_sources; |
GetListAsSourceFiles(list, &output_as_sources); |
- for (size_t i = 0; i < output_as_sources.size(); i++) { |
- output->push_back(OutputFile(settings->build_settings(), |
- output_as_sources[i])); |
- } |
+ for (const auto& file : output_as_sources) |
+ output->push_back(OutputFile(settings->build_settings(), file)); |
} |
// static |
@@ -221,8 +217,7 @@ std::string SubstitutionWriter::ApplyPatternToSourceAsString( |
const SubstitutionPattern& pattern, |
const SourceFile& source) { |
std::string result_value; |
- for (size_t i = 0; i < pattern.ranges().size(); i++) { |
- const SubstitutionPattern::Subrange& subrange = pattern.ranges()[i]; |
+ for (const auto& subrange : pattern.ranges()) { |
if (subrange.type == SUBSTITUTION_LITERAL) { |
result_value.append(subrange.literal); |
} else { |
@@ -253,10 +248,8 @@ void SubstitutionWriter::ApplyListToSource( |
const SubstitutionList& list, |
const SourceFile& source, |
std::vector<SourceFile>* output) { |
- for (size_t i = 0; i < list.list().size(); i++) { |
- output->push_back(ApplyPatternToSource( |
- settings, list.list()[i], source)); |
- } |
+ for (const auto& item : list.list()) |
+ output->push_back(ApplyPatternToSource(settings, item, source)); |
} |
// static |
@@ -265,10 +258,8 @@ void SubstitutionWriter::ApplyListToSourceAsString( |
const SubstitutionList& list, |
const SourceFile& source, |
std::vector<std::string>* output) { |
- for (size_t i = 0; i < list.list().size(); i++) { |
- output->push_back(ApplyPatternToSourceAsString( |
- settings, list.list()[i], source)); |
- } |
+ for (const auto& item : list.list()) |
+ output->push_back(ApplyPatternToSourceAsString(settings, item, source)); |
} |
// static |
@@ -277,10 +268,8 @@ void SubstitutionWriter::ApplyListToSourceAsOutputFile( |
const SubstitutionList& list, |
const SourceFile& source, |
std::vector<OutputFile>* output) { |
- for (size_t i = 0; i < list.list().size(); i++) { |
- output->push_back(ApplyPatternToSourceAsOutputFile( |
- settings, list.list()[i], source)); |
- } |
+ for (const auto& item : list.list()) |
+ output->push_back(ApplyPatternToSourceAsOutputFile(settings, item, source)); |
} |
// static |
@@ -290,8 +279,8 @@ void SubstitutionWriter::ApplyListToSources( |
const std::vector<SourceFile>& sources, |
std::vector<SourceFile>* output) { |
output->clear(); |
- for (size_t i = 0; i < sources.size(); i++) |
- ApplyListToSource(settings, list, sources[i], output); |
+ for (const auto& source : sources) |
+ ApplyListToSource(settings, list, source, output); |
} |
// static |
@@ -301,8 +290,8 @@ void SubstitutionWriter::ApplyListToSourcesAsString( |
const std::vector<SourceFile>& sources, |
std::vector<std::string>* output) { |
output->clear(); |
- for (size_t i = 0; i < sources.size(); i++) |
- ApplyListToSourceAsString(settings, list, sources[i], output); |
+ for (const auto& source : sources) |
+ ApplyListToSourceAsString(settings, list, source, output); |
} |
// static |
@@ -312,8 +301,8 @@ void SubstitutionWriter::ApplyListToSourcesAsOutputFile( |
const std::vector<SourceFile>& sources, |
std::vector<OutputFile>* output) { |
output->clear(); |
- for (size_t i = 0; i < sources.size(); i++) |
- ApplyListToSourceAsOutputFile(settings, list, sources[i], output); |
+ for (const auto& source : sources) |
+ ApplyListToSourceAsOutputFile(settings, list, source, output); |
} |
// static |
@@ -323,14 +312,14 @@ void SubstitutionWriter::WriteNinjaVariablesForSource( |
const std::vector<SubstitutionType>& types, |
const EscapeOptions& escape_options, |
std::ostream& out) { |
- for (size_t i = 0; i < types.size(); i++) { |
+ for (const auto& type : types) { |
// Don't write SOURCE since that just maps to Ninja's $in variable, which |
// is implicit in the rule. |
- if (types[i] != SUBSTITUTION_SOURCE) { |
- out << " " << kSubstitutionNinjaNames[types[i]] << " = "; |
+ if (type != SUBSTITUTION_SOURCE) { |
+ out << " " << kSubstitutionNinjaNames[type] << " = "; |
EscapeStringToStream( |
out, |
- GetSourceSubstitution(settings, source, types[i], OUTPUT_RELATIVE, |
+ GetSourceSubstitution(settings, source, type, OUTPUT_RELATIVE, |
settings->build_settings()->build_dir()), |
escape_options); |
out << std::endl; |
@@ -402,8 +391,7 @@ OutputFile SubstitutionWriter::ApplyPatternToTargetAsOutputFile( |
const Tool* tool, |
const SubstitutionPattern& pattern) { |
std::string result_value; |
- for (size_t i = 0; i < pattern.ranges().size(); i++) { |
- const SubstitutionPattern::Subrange& subrange = pattern.ranges()[i]; |
+ for (const auto& subrange : pattern.ranges()) { |
if (subrange.type == SUBSTITUTION_LITERAL) { |
result_value.append(subrange.literal); |
} else { |
@@ -421,10 +409,8 @@ void SubstitutionWriter::ApplyListToTargetAsOutputFile( |
const Tool* tool, |
const SubstitutionList& list, |
std::vector<OutputFile>* output) { |
- for (size_t i = 0; i < list.list().size(); i++) { |
- output->push_back(ApplyPatternToTargetAsOutputFile( |
- target, tool, list.list()[i])); |
- } |
+ for (const auto& item : list.list()) |
+ output->push_back(ApplyPatternToTargetAsOutputFile(target, tool, item)); |
} |
// static |
@@ -482,8 +468,7 @@ OutputFile SubstitutionWriter::ApplyPatternToCompilerAsOutputFile( |
const SourceFile& source, |
const SubstitutionPattern& pattern) { |
OutputFile result; |
- for (size_t i = 0; i < pattern.ranges().size(); i++) { |
- const SubstitutionPattern::Subrange& subrange = pattern.ranges()[i]; |
+ for (const auto& subrange : pattern.ranges()) { |
if (subrange.type == SUBSTITUTION_LITERAL) { |
result.value().append(subrange.literal); |
} else { |
@@ -500,10 +485,8 @@ void SubstitutionWriter::ApplyListToCompilerAsOutputFile( |
const SourceFile& source, |
const SubstitutionList& list, |
std::vector<OutputFile>* output) { |
- for (size_t i = 0; i < list.list().size(); i++) { |
- output->push_back(ApplyPatternToCompilerAsOutputFile( |
- target, source, list.list()[i])); |
- } |
+ for (const auto& item : list.list()) |
+ output->push_back(ApplyPatternToCompilerAsOutputFile(target, source, item)); |
} |
// static |
@@ -528,8 +511,7 @@ OutputFile SubstitutionWriter::ApplyPatternToLinkerAsOutputFile( |
const Tool* tool, |
const SubstitutionPattern& pattern) { |
OutputFile result; |
- for (size_t i = 0; i < pattern.ranges().size(); i++) { |
- const SubstitutionPattern::Subrange& subrange = pattern.ranges()[i]; |
+ for (const auto& subrange : pattern.ranges()) { |
if (subrange.type == SUBSTITUTION_LITERAL) { |
result.value().append(subrange.literal); |
} else { |
@@ -545,10 +527,8 @@ void SubstitutionWriter::ApplyListToLinkerAsOutputFile( |
const Tool* tool, |
const SubstitutionList& list, |
std::vector<OutputFile>* output) { |
- for (size_t i = 0; i < list.list().size(); i++) { |
- output->push_back(ApplyPatternToLinkerAsOutputFile( |
- target, tool, list.list()[i])); |
- } |
+ for (const auto& item : list.list()) |
+ output->push_back(ApplyPatternToLinkerAsOutputFile(target, tool, item)); |
} |
// static |