Replace basic for loops with range-based loops or algorithms

[builder.git] / source / architecture.cpp

diff --git a/source/architecture.cpp b/source/architecture.cpp
index 3dd76fbf19f86e0e52fca14fee800fee04675dd6..2efcd5e3e4ee23dc9294cfb04f261ab06ce8f1c8 100644 (file)
--- a/source/architecture.cpp
+++ b/source/architecture.cpp
@@ -3,6 +3,11 @@
 #include <msp/strings/utils.h>
 #include "architecture.h"
 #include "builder.h"
+#include "executable.h"
+#include "importlibrary.h"
+#include "objectfile.h"
+#include "sharedlibrary.h"
+#include "staticlibrary.h"
 #include "sysutils.h"
 
 using namespace std;
@@ -44,6 +49,8 @@ const char *fpus[] =
 {
        "387",   "x86",
        "sse",   "x86",
+       "sse3",  "x86",
+       "sse4.1", "x86",
        "vfpv3", "arm",
        "neon",  "arm",
        0
@@ -63,6 +70,7 @@ const char *toolchains[] =
 {
        "gnu",
        "clang",
+       "msvc",
        0
 };
 
@@ -70,6 +78,7 @@ const char *aliases[] =
 {
        "pc",              "x86",
        "x86_64",          "x86-64",
+       "x64",             "x86-64",
        "amd64",           "x86-64",
        "i586",            "pentium",
        "i686",            "pentiumpro",
@@ -125,6 +134,8 @@ Architecture::Architecture(Builder &b, const string &spec):
        {
                if((system=="darwin" || system=="freebsd") && builder.get_vfs().find_binary("clang"))
                        toolchain = "clang";
+               else if(system=="windows" && native)
+                       toolchain = "msvc";
                else
                        toolchain = "gnu";
        }
@@ -136,26 +147,33 @@ Architecture::Architecture(Builder &b, const string &spec):
                name += format("-%s", fpu);
        name += format("-%d-%s-%s", bits, system, toolchain);
 
-       object_patterns.push_back(Pattern("%.o"));
        if(system=="windows")
        {
-               sharedlib_patterns.push_back(Pattern("%.dll"));
-               sharedlib_patterns.push_back(Pattern("lib%.dll"));
-               /* XXX Hack: Consider import libraries (*.dll.a) as dynamic libraries,
-               even though technically they are linked statically. */
-               sharedlib_patterns.push_back(Pattern("lib%.dll.a"));
-               staticlib_patterns.push_back(Pattern("lib%.a"));
-               staticlib_patterns.push_back(Pattern("%.lib"));
-               executable_patterns.push_back(Pattern("%.exe"));
+               add_pattern<SharedLibrary>("%.dll");
+               if(toolchain=="msvc")
+               {
+                       add_pattern<ObjectFile>("%.obj");
+                       add_pattern<ImportLibrary>("%.lib");
+                       add_pattern<StaticLibrary>("%_static.lib");
+               }
+               else
+               {
+                       add_pattern<ObjectFile>("%.o");
+                       add_pattern<SharedLibrary>("lib%.dll");
+                       add_pattern<ImportLibrary>("lib%.dll.a");
+                       add_pattern<StaticLibrary>("lib%.a");
+               }
+               add_pattern<Executable>("%.exe");
        }
        else
        {
+               add_pattern<ObjectFile>("%.o");
                if(system=="darwin")
-                       sharedlib_patterns.push_back(Pattern("lib%.dylib"));
+                       add_pattern<SharedLibrary>("lib%.dylib");
                else
-                       sharedlib_patterns.push_back(Pattern("lib%.so"));
-               staticlib_patterns.push_back(Pattern("lib%.a"));
-               executable_patterns.push_back(Pattern("%"));
+                       add_pattern<SharedLibrary>("lib%.so");
+               add_pattern<StaticLibrary>("lib%.a");
+               add_pattern<Executable>("%");
        }
 }
 
@@ -164,11 +182,11 @@ bool Architecture::match_name(const string &pattern) const
        bool negate = (pattern[0]=='!');
        vector<string> parts = split(pattern.substr(negate), "-");
        resolve_aliases(parts);
-       for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+       for(const string &p: parts)
        {
-               if((*i=="32" && bits==32) || (*i=="64" && bits==64))
+               if((p=="32" && bits==32) || (p=="64" && bits==64))
                        ;
-               else if(*i!=type && *i!=cpu && *i!=fpu && *i!=system && *i!=toolchain)
+               else if(p!=type && p!=cpu && p!=fpu && p!=system && p!=toolchain)
                        return negate;
        }
        return !negate;
@@ -178,19 +196,19 @@ string Architecture::best_match(const vector<string> &names) const
 {
        string best;
        unsigned best_size = 0;
-       for(vector<string>::const_iterator i=names.begin(); i!=names.end(); ++i)
-               if(match_name(*i))
+       for(const string &n: names)
+               if(match_name(n))
                {
                        /* TODO Do full parse and alias resolution here?  Otherwise x86 and
                        x86_64 are treated as equally good, even though the latter is more
                        specific. */
                        unsigned size = 1;
-                       for(string::const_iterator j=i->begin(); j!=i->end(); ++j)
-                               size += (*j=='-');
+                       for(char c: n)
+                               size += (c=='-');
 
                        if(size>best_size)
                        {
-                               best = *i;
+                               best = n;
                                best_size = size;
                        }
                }
@@ -198,6 +216,12 @@ string Architecture::best_match(const vector<string> &names) const
        return best;
 }
 
+template<typename T>
+void Architecture::add_pattern(const string &pat)
+{
+       filename_patterns[typeid(T).name()].push_back(Pattern(pat));
+}
+
 void Architecture::resolve_aliases(vector<string> &parts)
 {
        for(unsigned i=0; i<parts.size(); ++i)
@@ -231,61 +255,61 @@ void Architecture::parse_specification(const string &spec)
 {
        vector<string> parts = split(spec, "-");
        resolve_aliases(parts);
-       for(vector<string>::const_iterator i=parts.begin(); i!=parts.end(); ++i)
+       for(const string &p: parts)
        {
                bool ok = false;
 
                for(unsigned j=0; (!ok && types[j]); ++j)
-                       if(*i==types[j])
+                       if(p==types[j])
                        {
-                               if(!type.empty() && *i!=type)
+                               if(!type.empty() && p!=type)
                                        throw invalid_argument("Conflicting type specification");
-                               type = *i;
+                               type = p;
                                ok = true;
                        }
 
                for(unsigned j=0; (!ok && cpus[j]); j+=2)
-                       if(*i==cpus[j])
+                       if(p==cpus[j])
                        {
                                if(type.empty())
                                        type = cpus[j+1];
                                else if(cpus[j+1]!=type)
                                        throw invalid_argument("Conflicting CPU specification");
-                               cpu = *i;
+                               cpu = p;
                                ok = true;
                        }
 
                for(unsigned j=0; (!ok && fpus[j]); j+=2)
-                       if(*i==fpus[j])
+                       if(p==fpus[j])
                        {
                                if(fpus[j+1]!=type)
                                        throw invalid_argument("Conflicting FPU specification");
-                               fpu = *i;
+                               fpu = p;
                                ok = true;
                        }
 
                for(unsigned j=0; (!ok && systems[j]); ++j)
-                       if(*i==systems[j])
+                       if(p==systems[j])
                        {
-                               system = *i;
+                               system = p;
                                ok = true;
                        }
 
                for(unsigned j=0; (!ok && toolchains[j]); ++j)
-                       if(*i==toolchains[j])
+                       if(p==toolchains[j])
                        {
-                               toolchain = *i;
+                               toolchain = p;
                                ok = true;
                        }
 
-               if(!ok && (*i=="32" || *i=="64"))
+               if(!ok && (p=="32" || p=="64"))
                {
-                       bits = lexical_cast<unsigned>(*i);
+                       bits = lexical_cast<unsigned>(p);
                        ok = true;
                }
 
                if(!ok)
-                       throw invalid_argument("Unrecognized part in arch specification: "+*i);
+                       throw invalid_argument("Unrecognized part in arch specification: "+p);
        }
 }