GN: Bug fixes in process_file_template

tools/gn/substitution_writer.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "tools/gn/substitution_writer.h"
 
 #include "tools/gn/build_settings.h"
 #include "tools/gn/escape.h"
 #include "tools/gn/filesystem_utils.h"
 #include "tools/gn/output_file.h"
@@ skipping 111 matching lines @@
 }
 
 SubstitutionWriter::~SubstitutionWriter() {
 }
 
 // static
 SourceFile SubstitutionWriter::ApplyPatternToSource(
       const Settings* settings,
       const SubstitutionPattern& pattern,
       const SourceFile& source) {
+  std::string result_value = ApplyPatternToSourceAsString(
+      settings, pattern, source);
+  CHECK(!result_value.empty() && result_value[0] == '/')
+      << "The result of the pattern \""
+      << pattern.AsString()
+      << "\" was not a path beginning in \"/\" or \"//\".";
+  return SourceFile(SourceFile::SWAP_IN, &result_value);
+}
+
+// static
+std::string SubstitutionWriter::ApplyPatternToSourceAsString(
+    const Settings* settings,
+    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];
     if (subrange.type == SUBSTITUTION_LITERAL) {
       result_value.append(subrange.literal);
     } else {
       result_value.append(
           GetSourceSubstitution(settings, source, subrange.type,
                                 OUTPUT_ABSOLUTE, SourceDir()));
     }
   }
-  CHECK(!result_value.empty() && result_value[0] == '/')
-      << "The result of the pattern \""
-      << pattern.AsString()
-      << "\" was not a path beginning in \"/\" or \"//\".";
-  return SourceFile(SourceFile::SWAP_IN, &result_value);
+  return result_value;
 }
 
 // static
 OutputFile SubstitutionWriter::ApplyPatternToSourceAsOutputFile(
     const Settings* settings,
     const SubstitutionPattern& pattern,
     const SourceFile& source) {
   SourceFile result_as_source = ApplyPatternToSource(settings, pattern, source);
   CHECK(result_as_source.is_source_absolute())
       << "The result of the pattern \""
@@ skipping 10 matching lines @@
     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));
   }
 }
 
 // static
+void SubstitutionWriter::ApplyListToSourceAsString(
+    const Settings* settings,
+    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));
+  }
+}
+
+// static
 void SubstitutionWriter::ApplyListToSourceAsOutputFile(
     const Settings* settings,
     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));
   }
 }
 
 // static
 void SubstitutionWriter::ApplyListToSources(
     const Settings* settings,
     const SubstitutionList& list,
     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);
 }
 
 // static
+void SubstitutionWriter::ApplyListToSourcesAsString(
+    const Settings* settings,
+    const SubstitutionList& list,
+    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);
+}
+
+// static
 void SubstitutionWriter::ApplyListToSourcesAsOutputFile(
     const Settings* settings,
     const SubstitutionList& list,
     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);
 }
 
@@ skipping 97 matching lines @@
       return std::string();
   }
 
   // If we get here, the result is a path that should be made relative or
   // absolute according to the output_style. Other cases (just file name or
   // extension extraction) will have been handled via early return above.
   if (output_style == OUTPUT_ABSOLUTE)
     return to_rebase;
   return RebaseSourceAbsolutePath(to_rebase, relative_to);
 }