GN: Bug fixes in process_file_template

tools/gn/function_process_file_template.cc

 // Copyright (c) 2013 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/functions.h"
 #include "tools/gn/parse_tree.h"
 #include "tools/gn/scope.h"
 #include "tools/gn/settings.h"
 #include "tools/gn/substitution_list.h"
 #include "tools/gn/substitution_writer.h"
@@ skipping 19 matching lines @@
     "  when that function can't be used (like there's no target or the target\n"
     "  is defined in another build file).\n"
     "\n"
     "Arguments:\n"
     "\n"
     "  The source_list is a list of file names.\n"
     "\n"
     "  The template can be a string or a list. If it is a list, multiple\n"
     "  output strings are generated for each input.\n"
     "\n"
-    "  The following template substrings are used in the template arguments\n"
-    "  and are replaced with the corresponding part of the input file name:\n"
-    "\n"
-    "    {{source}}\n"
-    "        The entire source name.\n"
-    "\n"
-    "    {{source_name_part}}\n"
-    "        The source name with no path or extension.\n"
+    "  The template should contain source expansions to which each name in\n"
+    "  the source list is applied. See \"gn help source_expansion\".\n"
     "\n"
     "Example:\n"
     "\n"
     "  sources = [\n"
     "    \"foo.idl\",\n"
     "    \"bar.idl\",\n"
     "  ]\n"
     "  myoutputs = process_file_template(\n"
     "      sources,\n"
     "      [ \"$target_gen_dir/{{source_name_part}}.cc\",\n"
@@ skipping 13 matching lines @@
     *err = Err(function->function(), "Expected two arguments");
     return Value();
   }
 
   // Source list.
   Target::FileList input_files;
   if (!ExtractListOfRelativeFiles(scope->settings()->build_settings(), args[0],
                                   scope->GetSourceDir(), &input_files, err))
     return Value();
 
+  std::vector<std::string> result_files;
+  SubstitutionList subst;
+
   // Template.
-  SubstitutionList subst;
-  if (!subst.Parse(args[1], err))
+  if (args[1].type() == Value::STRING) {

[jamesr, 2014/08/12 20:20:33]

could you hoist args[1] into a local var of type const Value&? it'd make this
easier to read if it had a proper name imho

+    // Convert the string to a SubstitutionList with one pattern in it to
+    // simplify the code below.
+    std::vector<std::string> list;
+    list.push_back(args[1].string_value());
+    if (!subst.Parse(list, args[1].origin(), err))
+      return Value();
+  } else if (args[1].type() == Value::LIST) {
+    if (!subst.Parse(args[1], err))
+      return Value();
+  } else {
+    *err = Err(args[1], "Not a string or a list.");
     return Value();
+  }
 
-  std::vector<SourceFile> result_files;
-  SubstitutionWriter::ApplyListToSources(
+  SubstitutionWriter::ApplyListToSourcesAsString(
       scope->settings(), subst, input_files, &result_files);
 
+  // Convert the list of strings to the return Value.
   Value ret(function, Value::LIST);
   ret.list_value().reserve(result_files.size());
   for (size_t i = 0; i < result_files.size(); i++)
-    ret.list_value().push_back(Value(function, result_files[i].value()));
+    ret.list_value().push_back(Value(function, result_files[i]));
 
   return ret;
 }
 
 }  // namespace functions