X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Farchitecture.h;h=a31ad9fc6fd1c979bac3c8b5502282e573e7d1e6;hb=aa053d637e8259755af7d2e4b510a242f4d29c7b;hp=cec397f8a29e1968a598d83abc949088a64d51ed;hpb=cee450d7cc932811b0d119a132bc9981eb480584;p=builder.git

diff --git a/source/architecture.h b/source/architecture.h
index cec397f..a31ad9f 100644
--- 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"
@@ -20,20 +21,18 @@ public:
 		Loader(Architecture &);
 	};
 
-	typedef std::list<Pattern> PatternList;
-
 private:
 	Builder &builder;
 	std::string type;
 	std::string cpu;
+	std::string fpu;
 	std::string system;
 	unsigned bits;
+	std::string toolchain;
 	std::string name;
 	bool native;
 	std::string cross_prefix;
-	PatternList sharedlib_patterns;
-	PatternList staticlib_patterns;
-	PatternList executable_patterns;
+	std::map<std::string, std::vector<Pattern>> filename_patterns;
 
 public:
 	Architecture(Builder &b, const std::string &spec);
@@ -43,19 +42,46 @@ public:
 	const std::string &get_system() const { return system; }
 	unsigned get_bits() const { return bits; }
 	const std::string &get_cpu() const { return cpu; }
-	bool match_name(const std::string &) const;
+	const std::string &get_fpu() const { return fpu; }
+	const std::string &get_toolchain() const { return toolchain; }
+	bool match_name(const std::string &, unsigned * = 0) 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_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 std::vector<Pattern> &get_patterns() const;
+
+	template<typename T>
+	std::string create_filename(const std::string &) const;
 
 private:
-	std::string resolve_alias(const std::string &) const;
+	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 std::vector<Pattern> &Architecture::get_patterns() const
+{
+	auto i = filename_patterns.find(typeid(T).name());
+	if(i!=filename_patterns.end())
+		return i->second;
+
+	static std::vector<Pattern> empty;
+	return empty;
+}
+
+template<typename T>
+inline std::string Architecture::create_filename(const std::string &base) const
+{
+	const std::vector<Pattern> &patterns = get_patterns<T>();
+	return patterns.empty() ? base : patterns.front().apply(base);
+}
+
 #endif