Cleanup member function textual_context::proxy::resolve

Signed-off-by: yamacir-kit <httperror@404-notfound.jp>

Author: yamacir-kit

README.md

@@ -102,9 +102,9 @@ Then, select one of the following targets and `make` it according to your purpos
 
 | Target      | Description
 |-------------|-------------
-| `all`       | Build shared-library `libmeevax.0.5.444.so` and executable `meevax`.
+| `all`       | Build shared-library `libmeevax.0.5.445.so` and executable `meevax`.
 | `install`   | Copy files into `/usr/local` directly.
-| `package`   | Generate debian package `meevax_0.5.444_amd64.deb` (only Ubuntu). The generated package can be installed by `sudo apt install build/meevax_0.5.444_amd64.deb`.
+| `package`   | Generate debian package `meevax_0.5.445_amd64.deb` (only Ubuntu). The generated package can be installed by `sudo apt install build/meevax_0.5.445_amd64.deb`.
 | `test`      | Test executable `meevax`. This target requires Valgrind to be installed.
 | `uninstall` | Remove files copied to `/usr/local` directly by target `install`.
 

VERSION

@@ -1 +1 @@
-0.5.444
+0.5.445

src/kernel/environment.cpp

@@ -205,8 +205,10 @@ namespace meevax::inline kernel
       {
         return std::get<1>(*iterator).as<library>().import_set();
       }
-
-      throw error(make<string>("No such library"), form);
+      else
+      {
+        throw error(make<string>("No such library"), form);
+      }
     }
   }
 

src/kernel/textual_context.cpp

@@ -38,36 +38,33 @@ namespace meevax::inline kernel
     return source_file().parent_path();
   }
 
-  auto textual_context::proxy::resolve(std::filesystem::path const& pathname) const -> std::filesystem::path
+  auto textual_context::proxy::resolve(std::filesystem::path const& given) const -> std::filesystem::path
   {
-    if (pathname.is_absolute())
+    if (std::filesystem::exists(given))
     {
-      return pathname;
+      return std::filesystem::canonical(given);
     }
-
-    if (auto directory = source_directory(); not directory.empty())
+    else if (auto p = source_directory() / given; std::filesystem::exists(p))
     {
-      if (auto p = directory / pathname; std::filesystem::exists(p))
-      {
-        return p;
-      }
+      return p;
     }
-
-    if (auto p = std::filesystem::current_path() / pathname; std::filesystem::exists(p))
+    else if (auto p = std::filesystem::current_path() / given; std::filesystem::exists(p))
     {
       return p;
     }
-
-    for (auto const& directory : configurator::directories)
+    else
     {
-      if (auto p = directory / pathname; std::filesystem::exists(p))
+      for (auto const& directory : configurator::directories)
       {
-        return p;
+        if (auto p = directory / given; std::filesystem::exists(p))
+        {
+          return p;
+        }
       }
-    }
 
-    throw error(make<string>("No such file"),
-                make<string>(pathname));
+      throw error(make<string>("No such file"),
+                  make<string>(given));
+    }
   }
 
   auto textual_context::cons(object const& a, object const& b, std::filesystem::path const& path) -> object