Changeset 6693 in orxonox.OLD for branches/network/src/lib/util

Timestamp:

Jan 25, 2006, 2:19:46 PM (18 years ago)

Author:

patrick

Message:

branches: removed spaceshipcontrol branche

Location:

branches/network/src/lib/util

Files:

• count_pointer.h (copied) (copied from trunk/src/lib/util/count_pointer.h)
• executor/executor.cc (modified) (1 diff)
• multi_type.cc (modified) (2 diffs)
• multi_type.h (modified) (4 diffs)
• substring.h (modified) (1 diff)

branches/network/src/lib/util/executor/executor.cc

@@ -60 +60 @@
   {
     int type = va_arg(parameterList, int);
-    this->defaultValue[i].setType(type);
+    this->defaultValue[i].setType((MT_Type)type);
   }
 }

branches/network/src/lib/util/multi_type.cc

@@ -122 +122 @@
 
 /**
+ * @brief checks if the two Multitypes match
+ * @param mt MultiType to check against this one
+ * @returns true on match. false otherwise
+ *
+ * Two MultiType match if and only if
+ *  1. the internal Type is the same
+ *  2. the stored values match
+ */
+bool MultiType::operator==(const MultiType& mt) const
+{
+  if (this->type != mt.type)
+    return false;
+
+  switch (this->type)
+  {
+    case MT_NULL:
+      return true;
+    case MT_BOOL:
+      return (this->value.Bool == mt.value.Bool);
+    case MT_INT:
+      return (this->value.Int == mt.value.Int);
+    case MT_CHAR:
+      return (this->value.Char == mt.value.Char);
+    case MT_FLOAT:
+      return (this->value.Float == mt.value.Float);
+    case MT_STRING:
+      if (this->value.String != NULL && mt.value.String != NULL)
+        return (!strcmp(this->value.String, mt.value.String));
+      else
+        return (this->value.String == NULL && mt.value.String == NULL);
+  }
+}
+
+/**
+ * @brief checks if the internal value matches the boolean value.
+ * @param value to check against this one
+ * @returns true on match. false otherwise
+ *
+ * Two MultiType match if and only if
+ *  1. the stored values match the given Value
+ */
+bool MultiType::operator==(const char* value) const
+{
+  if (this->value.String != NULL && value != NULL)
+    return (!strcmp(this->value.String, value));
+  else
+    return (this->value.String == NULL && value == NULL);
+}
+
+
+/**
  * initializes the MultiType
  */
@@ -136 +187 @@
  * @param type the new Type
  */
-void MultiType::setType(int type)
+void MultiType::setType(MT_Type type)
 {
   if (this->type != type)
-    this->type = (MT_Type)type;
+    this->type = type;
 }
 

branches/network/src/lib/util/multi_type.h

@@ -31 +31 @@
  */
 class MultiType {
-
   public:
     MultiType();
@@ -42 +41 @@
     virtual ~MultiType();
 
-    MultiType& operator= (const MultiType& mt);
+    MultiType& operator=(const MultiType& mt);
+    MultiType& operator=(bool value) { this->setBool(value); return *this; };
+    MultiType& operator=(int value) { this->setInt(value); return *this; };
+    MultiType& operator=(float value) { this->setFloat(value); return *this; };
+    MultiType& operator=(char value) { this->setChar(value); return *this; };
+    MultiType& operator=(const char* value) { this->setString(value); return *this; };
 
-    void setType(int type);
+    bool operator==(const MultiType& mt) const;
+    bool operator==(bool value) const { return (this->getBool() == value); };
+    bool operator==(int value) const { return (this->getInt() == value); };
+    bool operator==(float value) const { return (this->getFloat() ==  value); };
+    bool operator==(char value) const { return (this->getChar() == value); };
+    bool operator==(const char* value) const;
+    bool operator==(MT_Type type) const { return (this->type == type); }
+    bool operator!=(MT_Type type) const { return (this->type != type); }
+
+    void setType(MT_Type type);
 
     void setBool(bool value);
@@ -52 +65 @@
     void setString(const char* value);
 
+    // for your convenience.
     inline void setValue(bool value) { this->setBool(value); };
     inline void setValue(int value) { this->setInt(value); };
@@ -81 +95 @@
 
   private:
-
     union MultiTypeValue
     {

branches/network/src/lib/util/substring.h

@@ -16 +16 @@
   ~SubString();
 
+  const char* operator[](unsigned int i) { return this->getString(i); };
+
   inline unsigned int getCount() { return this->splittersCount; };
   const char* getString(unsigned int i);