Changeset 848 for code/branches/core/src/util/MultiTypeString.cc

Timestamp:

Mar 5, 2008, 1:29:47 AM (16 years ago)

Author:

landauf

Message:

several changes:

• XMLPort is now theoretically able to load something (but still buggy)
• Expanded Convert with several partial template specializations
• Expanded all MultiTypes with new functions, mostly to convert values
• Expanded SubString with a new functionality: chars inside parentheses aren't split

It's not yet working as it should (at least not in all cases - loading the objects name works)

File:

• code/branches/core/src/util/MultiTypeString.cc (modified) (2 diffs)

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

@@ -28 +28 @@
 
 #include "MultiTypeString.h"
+#include "Convert.h"
 
 MultiTypeString::MultiTypeString(MultiType type) : MultiTypePrimitive(type)
@@ -76 +77 @@
 }
 
+MultiTypeString::operator std::string() const
+{
+    return (this->type_ == MT_string) ? this->string_ : ConvertValueAndReturn<MultiTypePrimitive, std::string>(*this);
+}
+
+MultiTypeString::operator const char*() const
+{
+    return (this->type_ == MT_constchar) ? this->string_.c_str() : ConvertValueAndReturn<MultiTypePrimitive, const char*>(*this);
+}
+
 void MultiTypeString::setValue(const MultiTypeString& mts)
 {
     this->type_ = mts.type_;
     this->value_ = mts.value_;
+}
+
+std::string MultiTypeString::toString() const
+{
+    if (this->type_ == MT_constchar)
+        return this->string_;
+    else if (this->type_ == MT_string)
+        return this->string_;
+    else
+        return MultiTypePrimitive::toString();
+}
+
+bool MultiTypeString::fromString(const std::string value)
+{
+    if (this->type_ == MT_constchar)
+        this->string_ = value;
+    else if (this->type_ == MT_string)
+        this->string_ = value;
+    else
+        return MultiTypePrimitive::fromString(value);
+
+    return true;
 }