More flexible way to manage filename patterns

[builder.git] / source / architecture.h

diff --git a/source/architecture.h b/source/architecture.h
index 6828ad88337d3cd2b7c17a5b565e922b8e25fd55..360f3dd9f6321919df742d4fa7992ffbce0f9e27 100644 (file)
--- a/source/architecture.h
+++ b/source/architecture.h
@@ -1,6 +1,7 @@
 #ifndef ARCHITECTURE_H_
 #define ARCHITECTURE_H_
 
+#include <typeinfo>
 #include <msp/datafile/loader.h>
 #include "buildinfo.h"
 #include "pattern.h"
@@ -33,10 +34,7 @@ private:
        std::string name;
        bool native;
        std::string cross_prefix;
-       PatternList object_patterns;
-       PatternList sharedlib_patterns;
-       PatternList staticlib_patterns;
-       PatternList executable_patterns;
+       std::map<std::string, PatternList> filename_patterns;
 
 public:
        Architecture(Builder &b, const std::string &spec);
@@ -49,20 +47,43 @@ public:
        const std::string &get_fpu() const { return fpu; }
        const std::string &get_toolchain() const { return toolchain; }
        bool match_name(const std::string &) const;
-       std::string best_match(const std::list<std::string> &) const;
+       std::string best_match(const std::vector<std::string> &) const;
        bool is_native() const { return native; }
        bool is_cross() const { return !cross_prefix.empty(); }
 
        const std::string &get_cross_prefix() const { return cross_prefix; }
 
-       const PatternList &get_object_patterns() const { return object_patterns; }
-       const PatternList &get_shared_library_patterns() const { return sharedlib_patterns; }
-       const PatternList &get_static_library_patterns() const { return staticlib_patterns; }
-       const PatternList &get_executable_patterns() const { return executable_patterns; }
+       template<typename T>
+       const PatternList &get_patterns() const;
+
+       template<typename T>
+       std::string create_filename(const std::string &) const;
+
+private:
+       template<typename T>
+       void add_pattern(const std::string &);
 
 private:
        static void resolve_aliases(std::vector<std::string> &);
        void parse_specification(const std::string &);
 };
 
+template<typename T>
+inline const Architecture::PatternList &Architecture::get_patterns() const
+{
+       std::map<std::string, PatternList>::const_iterator i = filename_patterns.find(typeid(T).name());
+       if(i!=filename_patterns.end())
+               return i->second;
+
+       static PatternList empty;
+       return empty;
+}
+
+template<typename T>
+inline std::string Architecture::create_filename(const std::string &base) const
+{
+       const PatternList &patterns = get_patterns<T>();
+       return patterns.empty() ? base : patterns.front().apply(base);
+}
+
 #endif