From 49031af6be4bfb55a8ef64cea08a7161c3a763a4 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 16 Aug 2019 13:01:56 +0200
Subject: Minor cleanups

---
 libbuild2/file.cxx   |  4 +---
 libbuild2/file.hxx   | 35 ++++++++++++++++-------------------
 libbuild2/parser.cxx |  6 +++---
 3 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/libbuild2/file.cxx b/libbuild2/file.cxx
index 5966168..66f05f7 100644
--- a/libbuild2/file.cxx
+++ b/libbuild2/file.cxx
@@ -1570,10 +1570,8 @@ namespace build2
     }
     catch (const io_error& e)
     {
-      fail (loc) << "unable to read buildfile " << es << ": " << e;
+      fail (loc) << "unable to read buildfile " << es << ": " << e << endf;
     }
-
-    return names (); // Never reached.
   }
 
   const target*
diff --git a/libbuild2/file.hxx b/libbuild2/file.hxx
index e2e8aaa..4d668fe 100644
--- a/libbuild2/file.hxx
+++ b/libbuild2/file.hxx
@@ -203,25 +203,22 @@ namespace build2
   LIBBUILD2_SYMEXPORT pair<value, bool>
   extract_variable (const path&, const variable&);
 
-  // Import has two phases: the first is triggered by the import
-  // directive in the buildfile. It will try to find and load the
-  // project. Failed that, it will return the project-qualified
-  // name of the target which will be used to create a project-
-  // qualified prerequisite. This gives the rule that will be
-  // searching this prerequisite a chance to do some target-type
-  // specific search. For example, a C++ link rule can search
-  // for lib{} prerequisites in the C++ compiler default library
-  // search paths (so that we end up with functionality identical
-  // to -lfoo). If, however, the rule didn't do any of that (or
-  // failed to find anything usable), it calls the standard
-  // prerequisite search() function which sees this is a project-
-  // qualified prerequisite and goes straight to the second phase
-  // of import. Here, currently, we simply fail but in the future
-  // this will be the place where we can call custom "last resort"
-  // import hooks. For example, we can hook a package manager that
-  // will say, "Hey, I see you are trying to import foo and I see
-  // there is a package foo available in repository bar. Wanna
-  // download and use it?"
+  // Import has two phases: the first is triggered by the import directive in
+  // the buildfile. It will try to find and load the project. Failed that, it
+  // will return the project-qualified name of the target which will be used
+  // to create a project-qualified prerequisite. This gives the rule that will
+  // be searching this prerequisite a chance to do some target-type specific
+  // search. For example, a C++ link rule can search for lib{} prerequisites
+  // in the C++ compiler default library search paths (so that we end up with
+  // functionality identical to -lfoo). If, however, the rule didn't do any of
+  // that (or failed to find anything usable), it calls the standard
+  // prerequisite search() function which sees this is a project-qualified
+  // prerequisite and goes straight to the second phase of import. Here,
+  // currently, we simply fail but in the future this will be the place where
+  // we can call custom "last resort" import hooks. For example, we can hook a
+  // package manager that will say, "Hey, dude, I see you are trying to import
+  // foo and I see there is a package foo available in repository bar. Wanna,
+  // like, download and use it or something?"
   //
   LIBBUILD2_SYMEXPORT names
   import (scope& base, name, const location&);
diff --git a/libbuild2/parser.cxx b/libbuild2/parser.cxx
index 4df2ce3..4c48440 100644
--- a/libbuild2/parser.cxx
+++ b/libbuild2/parser.cxx
@@ -1812,9 +1812,9 @@ namespace build2
       if (n.pair)
         fail (l) << "unexpected pair in import";
 
-      // build2::import() will check the name, if required.
+      // import() will check the name, if required.
       //
-      names r (build2::import (*scope_, move (n), l));
+      names r (import (*scope_, move (n), l));
 
       if (val != nullptr)
       {
@@ -1850,7 +1850,7 @@ namespace build2
       fail (t) << "export outside export stub";
 
     // The rest is a value. Parse it as a variable value to get expansion,
-    // attributes, etc. build2::import() will check the names, if required.
+    // attributes, etc. Note that import() will check the names, if required.
     //
     location l (get_location (t));
     value rhs (parse_variable_value (t, tt));
-- 
cgit v1.1