Changeset 797 for code/branches/core/src/util

Timestamp:

Feb 11, 2008, 3:29:16 AM (17 years ago)

Author:

landauf

Message:

config-values are working again, now with a totally reworked ConfigValueContainer using MultiTypes (this commit is just a bugfix, the major work was done before, see r792)

added << operator to std::ostream for all MultiTypes

Location:

code/branches/core/src/util

Files:

• MultiTypeMath.cc (modified) (1 diff)
• MultiTypeMath.h (modified) (1 diff)
• MultiTypePrimitive.cc (modified) (1 diff)
• MultiTypePrimitive.h (modified) (2 diffs)
• MultiTypeString.cc (modified) (1 diff)
• MultiTypeString.h (modified) (2 diffs)

code/branches/core/src/util/MultiTypeMath.cc

@@ -105 +105 @@
     this->value_ = mtm.value_;
 }
+
+std::ostream& operator<<(std::ostream& out, MultiTypeMath& mtm)
+{
+    if (mtm.isA(MT_vector2))
+        out << mtm.getVector2();
+    else if (mtm.isA(MT_vector3))
+        out << mtm.getVector3();
+    else if (mtm.isA(MT_colourvalue))
+        out << mtm.getColourValue();
+    else if (mtm.isA(MT_quaternion))
+        out << mtm.getQuaternion();
+    else if (mtm.isA(MT_radian))
+        out << mtm.getRadian();
+    else if (mtm.isA(MT_degree))
+        out << mtm.getDegree();
+    else
+        out << ((MultiTypeString)mtm);
+
+    return out;
+}

code/branches/core/src/util/MultiTypeMath.h

@@ -121 +121 @@
 };
 
+std::ostream& operator<<(std::ostream& out, MultiTypeMath& mtm);
+
 #endif /* _MultiTypeMath_H__ */

code/branches/core/src/util/MultiTypePrimitive.cc

@@ -145 +145 @@
     this->value_ = mtp.value_;
 }
+
+std::ostream& operator<<(std::ostream& out, const MultiTypePrimitive& mtp)
+{
+    if (mtp.isA(MT_int))
+        out << mtp.getInt();
+    else if (mtp.isA(MT_uint))
+        out << mtp.getUnsignedInt();
+    else if (mtp.isA(MT_char))
+        out << mtp.getChar();
+    else if (mtp.isA(MT_uchar))
+        out << mtp.getUnsignedChar();
+    else if (mtp.isA(MT_short))
+        out << mtp.getShort();
+    else if (mtp.isA(MT_ushort))
+        out << mtp.getUnsignedShort();
+    else if (mtp.isA(MT_long))
+        out << mtp.getLong();
+    else if (mtp.isA(MT_ulong))
+        out << mtp.getUnsignedLong();
+    else if (mtp.isA(MT_float))
+        out << mtp.getFloat();
+    else if (mtp.isA(MT_double))
+        out << mtp.getDouble();
+    else if (mtp.isA(MT_longdouble))
+        out << mtp.getLongDouble();
+    else if (mtp.isA(MT_bool))
+        out << mtp.getBool();
+
+    return out;
+}

code/branches/core/src/util/MultiTypePrimitive.h

@@ -29 +29 @@
 #ifndef _MultiTypePrimitive_H__
 #define _MultiTypePrimitive_H__
+
+#include <ostream>
 
 #include "UtilPrereqs.h"
@@ -142 +144 @@
 };
 
+std::ostream& operator<<(std::ostream& out, const MultiTypePrimitive& mtp);
+
 #endif /* _MultiTypePrimitive_H__ */

code/branches/core/src/util/MultiTypeString.cc

@@ -81 +81 @@
     this->value_ = mts.value_;
 }
+
+std::ostream& operator<<(std::ostream& out, MultiTypeString& mts)
+{
+    if (mts.isA(MT_constchar))
+        out << mts.getConstChar();
+    else if (mts.isA(MT_string))
+        out << mts.getString();
+    else
+        out << ((MultiTypePrimitive)mts);
+
+    return out;
+}

code/branches/core/src/util/MultiTypeString.h

@@ -76 +76 @@
         void setValue(const MultiTypeString& mtp);
 
-        inline std::string& getString() { return this->string_; }
+        inline std::string& getString()    { return this->string_; }
+        inline const char*  getConstChar() { return this->string_.c_str(); }
 
         using MultiTypePrimitive::getValue;
-        inline void getValue(std::string* variable) const { (*variable) = std::string(this->string_); }
+        inline void getValue(std::string* variable) const { (*variable) = this->string_; }
+        inline void getValue(const char** variable) const { (*variable) = this->string_.c_str(); }
 
     protected:
@@ -85 +87 @@
 };
 
+std::ostream& operator<<(std::ostream& out, MultiTypeString& mts);
+
 #endif /* _MultiTypeString_H__ */