Inline simple constructors

[builder.git] / source / virtualfilesystem.cpp

diff --git a/source/virtualfilesystem.cpp b/source/virtualfilesystem.cpp
index 7855e04ac99bc148bbbc2dbd4c685fafd01214e3..16d4de8584a37dab7e8c2d426d8125fb56569351 100644 (file)
--- a/source/virtualfilesystem.cpp
+++ b/source/virtualfilesystem.cpp
@@ -15,11 +15,6 @@
 using namespace std;
 using namespace Msp;
 
-VirtualFileSystem::VirtualFileSystem(Builder &b):
-       builder(b)
-{
-}
-
 FileTarget *VirtualFileSystem::get_target(const FS::Path &p) const
 {
        auto i = targets.find(p.str());
@@ -32,7 +27,7 @@ void VirtualFileSystem::register_path(const FS::Path &path, FileTarget *t)
 {
        targets.insert({ path, t });
        nonexistent.erase(path);
-       builder.get_logger().log("vfs", format("Path %s registered to %s", path, t->get_name()));
+       builder.get_logger().log("vfs", "Path %s registered to %s", path, t->get_name());
 }
 
 FileTarget *VirtualFileSystem::find_header(const string &name, Tool *tool, const SearchPath &path, bool use_syspath)
@@ -44,10 +39,10 @@ FileTarget *VirtualFileSystem::find_header(const string &name, Tool *tool, const
 
        tool->prepare();
 
-       list<FS::Path> combined_path(path.begin(), path.end());
+       SearchPath combined_path = path;
        if(use_syspath)
        {
-               const Tool::SearchPath &syspath = tool->get_system_path();
+               const SearchPath &syspath = tool->get_system_path();
                combined_path.insert(combined_path.end(), syspath.begin(), syspath.end());
        }
 
@@ -56,16 +51,16 @@ FileTarget *VirtualFileSystem::find_header(const string &name, Tool *tool, const
                FS::Path filename = p/name;
                if(FileTarget *tgt = get_target(filename))
                {
-                       builder.get_logger().log("vfs", format("Header %s found in %s as existing %s", name, p.str(), tgt->get_type()));
+                       builder.get_logger().log("vfs", "Header %s found in %s as existing %s", name, p.str(), tgt->get_type());
                        return tgt;
                }
                else if(file_exists(filename))
                {
-                       builder.get_logger().log("vfs", format("Header %s found in %s", name, p.str()));
+                       builder.get_logger().log("vfs", "Header %s found in %s", name, p.str());
                        return dynamic_cast<FileTarget *>(tool->create_source(filename));
                }
 
-               builder.get_logger().log("vfs", format("Header %s not found in %s", name, p.str()));
+               builder.get_logger().log("vfs", "Header %s not found in %s", name, p.str());
        }
 
        return 0;
@@ -73,18 +68,18 @@ FileTarget *VirtualFileSystem::find_header(const string &name, Tool *tool, const
 
 FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath &path, BuildInfo::LibraryMode mode, bool use_syspath)
 {
-       list<FS::Path> combined_path(path.begin(), path.end());
+       SearchPath combined_path = path;
        if(use_syspath)
        {
                Tool &linker = builder.get_toolchain().get_tool("LINK");
                linker.prepare();
-               const Tool::SearchPath &syspath = linker.get_system_path();
+               const SearchPath &syspath = linker.get_system_path();
                combined_path.insert(combined_path.end(), syspath.begin(), syspath.end());
        }
 
        const Architecture &arch = builder.get_current_arch();
 
-       list<string> shared_names;
+       vector<string> shared_names;
        bool use_import_lib = false;
        if(mode!=BuildInfo::FORCE_STATIC)
        {
@@ -93,24 +88,24 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
                        shared_names = Pattern::apply_list(arch.get_patterns<SharedLibrary>(), lib);
        }
 
-       list<string> static_names;
+       vector<string> static_names;
        if(mode!=BuildInfo::FORCE_DYNAMIC)
                static_names = Pattern::apply_list(arch.get_patterns<StaticLibrary>(), lib);
 
        for(const FS::Path &p: combined_path)
        {
-               const list<string> *cur_names = (mode>=BuildInfo::DYNAMIC ? &shared_names : &static_names);
+               const vector<string> *cur_names = (mode>=BuildInfo::DYNAMIC ? &shared_names : &static_names);
                for(auto j=cur_names->begin(); j!=cur_names->end(); )
                {
                        FS::Path filename = p / *j;
                        if(FileTarget *tgt = get_target(filename))
                        {
-                               builder.get_logger().log("vfs", format("Library %s (%s) found in %s as existing %s", lib, *j, p.str(), tgt->get_type()));
+                               builder.get_logger().log("vfs", "Library %s (%s) found in %s as existing %s", lib, *j, p.str(), tgt->get_type());
                                return tgt;
                        }
                        else if(file_exists(filename))
                        {
-                               builder.get_logger().log("vfs", format("Library %s (%s) found in %s", lib, *j, p.str()));
+                               builder.get_logger().log("vfs", "Library %s (%s) found in %s", lib, *j, p.str());
                                if(cur_names==&shared_names)
                                {
                                        if(use_import_lib)
@@ -133,7 +128,7 @@ FileTarget *VirtualFileSystem::find_library(const string &lib, const SearchPath
                        }
                }
 
-               builder.get_logger().log("vfs", format("Library %s not found in %s", lib, p.str()));
+               builder.get_logger().log("vfs", "Library %s not found in %s", lib, p.str());
        }
 
        return 0;
@@ -146,17 +141,21 @@ FileTarget *VirtualFileSystem::find_binary(const string &name)
                path.push_back("/");
        else
        {
-               string env_path = Msp::getenv("PATH");
-               if(!env_path.empty())
-               {
-                       for(const string &p: split(env_path, ':'))
-                               path.push_back(p);
-               }
-               else
+               if(sys_bin_path.empty())
                {
-                       path.push_back("/bin");
-                       path.push_back("/usr/bin");
+                       string env_path = Msp::getenv("PATH");
+                       if(!env_path.empty())
+                       {
+                               for(const string &p: split(env_path, ':'))
+                                       sys_bin_path.push_back(p);
+                       }
+                       else
+                       {
+                               sys_bin_path.push_back("/bin");
+                               sys_bin_path.push_back("/usr/bin");
+                       }
                }
+               path = sys_bin_path;
        }
 
        for(const FS::Path &p: path)
@@ -164,16 +163,16 @@ FileTarget *VirtualFileSystem::find_binary(const string &name)
                FS::Path filename = p/name;
                if(FileTarget *tgt = get_target(filename))
                {
-                       builder.get_logger().log("vfs", format("Binary %s found in %s as existing %s", name, p, tgt->get_type()));
+                       builder.get_logger().log("vfs", "Binary %s found in %s as existing %s", name, p, tgt->get_type());
                        return tgt;
                }
                else if(file_exists(filename))
                {
-                       builder.get_logger().log("vfs", format("Binary %s found in %s", name, p));
+                       builder.get_logger().log("vfs", "Binary %s found in %s", name, p);
                        return new Executable(builder, filename);
                }
 
-               builder.get_logger().log("vfs", format("Binary %s not found in %s", name, p));
+               builder.get_logger().log("vfs", "Binary %s not found in %s", name, p);
        }
 
        return 0;