X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftype.h;h=f40657eb14a07003a295cb979ae4813523183d17;hb=b39ce68f12c30eedb272b65fe78baec5864d89ca;hp=6959e98526669e4482c34d59b26530450c12fedd;hpb=7df5e45c7f414f6a07681dc4ec2abb63b091a309;p=libs%2Fdatafile.git

diff --git a/source/type.h b/source/type.h
index 6959e98..f40657e 100644
--- a/source/type.h
+++ b/source/type.h
@@ -1,6 +1,7 @@
 #ifndef MSP_DATAFILE_TYPE_H_
 #define MSP_DATAFILE_TYPE_H_
 
+#include <msp/core/inttypes.h>
 #include <msp/strings/lexicalcast.h>
 
 namespace Msp {
@@ -10,8 +11,10 @@ struct Symbol
 {
 	std::string name;
 
+	Symbol() { }
+
 	template<typename T>
-	Symbol(const T &n): name(lexical_cast(n)) { }
+	Symbol(const T &n): name(lexical_cast<std::string>(n)) { }
 
 	template<typename T> operator T() const { return lexical_cast<T>(name); }
 };
@@ -19,25 +22,29 @@ struct Symbol
 struct IntType
 {
 	static const char signature = 'i';
-	typedef long long int Store;
+	typedef Int64 Store;
+	typedef Store Load;
 };
 
 struct FloatType
 {
 	static const char signature = 'f';
 	typedef double Store;
+	typedef Store Load;
 };
 
 struct BoolType
 {
 	static const char signature = 'b';
 	typedef bool Store;
+	typedef Store Load;
 };
 
 struct StringType
 {
 	static const char signature = 's';
 	typedef std::string Store;
+	typedef Store Load;
 };
 
 struct SymbolType
@@ -47,50 +54,96 @@ struct SymbolType
 	typedef Symbol Store;
 };
 
+const char valid_signatures[] =
+{
+	IntType::signature,
+	FloatType::signature,
+	BoolType::signature,
+	StringType::signature,
+	SymbolType::signature,
+	0
+};
+
 template<typename T>
-struct TypeInfo: SymbolType { };
+struct HasLoadType
+{
+	struct Yes { char c[2]; };
+	struct No { char c; };
+
+	template<typename U>
+	static Yes f(typename U::LoadType *);
+	template<typename U>
+	static No f(...);
+
+	enum { value = (sizeof(f<T>(0))==sizeof(Yes)) };
+};
+
+template<typename T, bool lt = HasLoadType<T>::value>
+struct TypeInfo;
 
 template<>
-struct TypeInfo<short int>: IntType { };
+struct TypeInfo<short int, false>: IntType { };
 
 template<>
-struct TypeInfo<unsigned short int>: IntType { };
+struct TypeInfo<unsigned short int, false>: IntType { };
 
 template<>
-struct TypeInfo<int>: IntType { };
+struct TypeInfo<int, false>: IntType { };
 
 template<>
-struct TypeInfo<unsigned int>: IntType { };
+struct TypeInfo<unsigned int, false>: IntType { };
 
 template<>
-struct TypeInfo<long int>: IntType { };
+struct TypeInfo<long int, false>: IntType { };
 
 template<>
-struct TypeInfo<unsigned long int>: IntType { };
+struct TypeInfo<unsigned long int, false>: IntType { };
 
+#if defined(_MSC_VER)
 template<>
-struct TypeInfo<long long int>: IntType { };
+struct TypeInfo<__int64, false>: IntType { };
 
 template<>
-struct TypeInfo<unsigned long long int>: IntType { };
+struct TypeInfo<unsigned __int64, false>: IntType { };
+#elif defined(__GNUC__)
+template<>
+struct TypeInfo<long long int, false>: IntType { };
 
 template<>
-struct TypeInfo<float>: FloatType { };
+struct TypeInfo<unsigned long long int, false>: IntType { };
+#endif
 
 template<>
-struct TypeInfo<double>: FloatType { };
+struct TypeInfo<float, false>: FloatType { };
 
 template<>
-struct TypeInfo<bool>: BoolType { };
+struct TypeInfo<double, false>: FloatType { };
 
 template<>
-struct TypeInfo<std::string>: StringType { };
+struct TypeInfo<bool, false>: BoolType { };
+
+template<>
+struct TypeInfo<std::string, false>: StringType { };
+
+template<>
+struct TypeInfo<char *, false>: StringType { };
+
+template<>
+struct TypeInfo<const char *, false>: StringType { };
+
+template<typename T>
+struct TypeInfo<const T, false>: TypeInfo<T> { };
+
+template<typename T>
+struct TypeInfo<T &, false>: TypeInfo<T> { };
 
 template<typename T>
-struct TypeInfo<const T>: TypeInfo<T> { };
+struct TypeInfo<T, true>: TypeInfo<typename T::LoadType>
+{ typedef typename T::LoadType Load; };
 
 template<typename T>
-struct TypeInfo<T &>: TypeInfo<T> { };
+struct TypeInfo<T, false>: SymbolType
+{ typedef T Load; };
 
 } // namespace DataFile
 } // namespace Msp