GN: Make file/dir resolving return errors.

tools/gn/function_get_path_info.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/err.h"
 #include "tools/gn/filesystem_utils.h"
 #include "tools/gn/functions.h"
 #include "tools/gn/parse_tree.h"
 #include "tools/gn/scope.h"
 #include "tools/gn/value.h"
@@ skipping 10 matching lines @@
   WHAT_DIR,
   WHAT_ABSPATH,
   WHAT_GEN_DIR,
   WHAT_OUT_DIR,
 };
 
 // Returns the directory containing the input (resolving it against the
 // |current_dir|), regardless of whether the input is a directory or a file.
 SourceDir DirForInput(const Settings* settings,
                       const SourceDir& current_dir,
-                      const std::string& input_string) {
+                      const Value& input,
+                      Err* err) {
+  // Input should already have been validated as a string.
+  const std::string& input_string = input.string_value();
+
   if (!input_string.empty() && input_string[input_string.size() - 1] == '/') {
     // Input is a directory.
-    return current_dir.ResolveRelativeDir(input_string,
+    return current_dir.ResolveRelativeDir(input, err,
         settings->build_settings()->root_path_utf8());
   }
 
   // Input is a directory.
-  return current_dir.ResolveRelativeFile(input_string,
+  return current_dir.ResolveRelativeFile(input, err,
       settings->build_settings()->root_path_utf8()).GetDir();
 }
 
 std::string GetOnePathInfo(const Settings* settings,
                            const SourceDir& current_dir,
                            What what,
                            const Value& input,
                            Err* err) {
   if (!input.VerifyTypeIs(Value::STRING, err))
     return std::string();
@@ skipping 28 matching lines @@
       if (dir_incl_slash == "/")
         return std::string("/.");
       if (dir_incl_slash == "//")
         return std::string("//.");
       return dir_incl_slash.substr(0, dir_incl_slash.size() - 1).as_string();
     }
     case WHAT_GEN_DIR: {
       return DirectoryWithNoLastSlash(
           GetGenDirForSourceDir(settings,
                                 DirForInput(settings, current_dir,
-                                            input_string)));
+                                            input, err)));
     }
     case WHAT_OUT_DIR: {
       return DirectoryWithNoLastSlash(
           GetOutputDirForSourceDir(settings,
                                    DirForInput(settings, current_dir,
-                                               input_string)));
+                                               input, err)));
     }
     case WHAT_ABSPATH: {
       if (!input_string.empty() &&
           input_string[input_string.size() - 1] == '/') {
-        return current_dir.ResolveRelativeDir(input_string,
+        return current_dir.ResolveRelativeDir(input, err,
             settings->build_settings()->root_path_utf8()).value();
       } else {
-        return current_dir.ResolveRelativeFile(input_string,
+        return current_dir.ResolveRelativeFile(input, err,
             settings->build_settings()->root_path_utf8()).value();
       }
     }
     default:
       NOTREACHED();
       return std::string();
   }
 }
 
 }  // namespace
@@ skipping 125 matching lines @@
         return Value();
     }
     return result;
   }
 
   *err = Err(args[0], "Path must be a string or a list of strings.");
   return Value();
 }
 
 }  // namespace functions