X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvalue.h;h=1b12db9a22db5f40e77578199bdfd7817fff4093;hb=a582163d380833b1370ba067a1fd0ad5c2984723;hp=f809c8fe4d3001cfba4660f45b9e9556a15d3ab8;hpb=de02b5618273df1b94085934f699371b4be31783;p=libs%2Fdatafile.git

diff --git a/source/value.h b/source/value.h
index f809c8f..1b12db9 100644
--- a/source/value.h
+++ b/source/value.h
@@ -1,91 +1,67 @@
 /* $Id$
 
 This file is part of libmspdatafile
-Copyright © 2006  Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2008, 2010  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
+
 #ifndef MSP_DATAFILE_VALUE_H_
 #define MSP_DATAFILE_VALUE_H_
 
-#include <sstream>
-#include <string>
 #include <vector>
-#include "error.h"
+#include <msp/core/meta.h>
+#include <msp/core/variant.h>
+#include "except.h"
+#include "type.h"
 
 namespace Msp {
 namespace DataFile {
 
 class Value
 {
+private:
+	char sig;
+	Variant data;
+
 public:
-	enum Type
-	{
-		INTEGER,
-		FLOAT,
-		STRING,
-		BOOLEAN,
-		ENUM
-	};
-
-	Value(Type t, const std::string &d): type(t), data(d) { }
 	template<typename T>
-	T get() const;
-private:
-	Type type;
-	std::string data;
-};
-typedef std::vector<Value> ValueArray;
+	Value(T d):
+		sig(TypeInfo<T>::signature),
+		data(static_cast<typename TypeInfo<T>::Store>(d))
+	{ }
 
-template<typename T> struct TypeResolver { static const Value::Type type=Value::ENUM; };
+	Value(Symbol d): sig(TypeInfo<Symbol>::signature), data(d) { }
 
-template<> struct TypeResolver<short>          { static const Value::Type type=Value::INTEGER; };
-template<> struct TypeResolver<unsigned short> { static const Value::Type type=Value::INTEGER; };
-template<> struct TypeResolver<int>            { static const Value::Type type=Value::INTEGER; };
-template<> struct TypeResolver<unsigned>       { static const Value::Type type=Value::INTEGER; };
-template<> struct TypeResolver<long>           { static const Value::Type type=Value::INTEGER; };
-template<> struct TypeResolver<unsigned long>  { static const Value::Type type=Value::INTEGER; };
-template<> struct TypeResolver<float>          { static const Value::Type type=Value::FLOAT; };
-template<> struct TypeResolver<double>         { static const Value::Type type=Value::FLOAT; };
-template<> struct TypeResolver<bool>           { static const Value::Type type=Value::BOOLEAN; };
+	template<typename T>
+	typename RemoveReference<T>::Type get() const
+	{ return get_<typename TypeInfo<T>::Store>(); }
 
-template<Value::Type T> inline bool check_type(Value::Type) { return false; }
+	char get_signature() const { return sig; }
+private:
+	template<typename T>
+	T get_() const;
+};
 
-template<> inline bool check_type<Value::INTEGER>(Value::Type t) { return t==Value::INTEGER; }
-template<> inline bool check_type<Value::FLOAT>(Value::Type t)   { return t==Value::INTEGER || t==Value::FLOAT; }
-template<> inline bool check_type<Value::BOOLEAN>(Value::Type t) { return t==Value::BOOLEAN; }
-template<> inline bool check_type<Value::STRING>(Value::Type t)  { return t==Value::STRING; }
-template<> inline bool check_type<Value::ENUM>(Value::Type t)    { return t==Value::ENUM; }
+typedef std::vector<Value> ValueArray __attribute__((deprecated));
 
 template<typename T>
-inline T Value::get() const
+inline T Value::get_() const
 {
-	if(!check_type<TypeResolver<T>::type>(type))
+	if(sig!=TypeInfo<T>::signature)
 		throw TypeError("Type mismatch");
 
-	std::istringstream ss(data);
-	T result;
-	ss>>result;
-	if(ss.fail())
-		//XXX
-		throw Exception("Invalid value");
-
-	return result;
+	return data.value<typename TypeInfo<T>::Store>();
 }
 
 template<>
-inline std::string Value::get<std::string>() const
+inline FloatType::Store Value::get_<FloatType::Store>() const
 {
-	if(type!=STRING)
-		throw TypeError("Value is not a string");
-	return data;
-}
+	if(sig==IntType::signature)
+		return data.value<IntType::Store>();
+	else if(sig!=FloatType::signature)
+		throw TypeError("Type mismatch");
 
-template<>
-inline const std::string &Value::get<const std::string&>() const
-{
-	if(type!=STRING)
-		throw TypeError("Value is not a string");
-	return data;
+	return data.value<FloatType::Store>();
 }
 
 } // namespace DataFile