Changeset 7187 for code/branches

Timestamp:

Aug 19, 2010, 2:42:40 AM (14 years ago)

Author:

landauf

Message:

added new function to MultiType to check whether or not it contains a value. using this in executor to improve handling of default values.

Location:

code/branches/consolecommands3/src/libraries

Files:

• core/Executor.cc (modified) (12 diffs)
• core/Executor.h (modified) (2 diffs)
• util/MultiType.h (modified) (1 diff)

code/branches/consolecommands3/src/libraries/core/Executor.cc

@@ -43 +43 @@
         this->functor_ = functor;
         this->name_ = name;
-
-        this->bAddedDefaultValue_[0] = false;
-        this->bAddedDefaultValue_[1] = false;
-        this->bAddedDefaultValue_[2] = false;
-        this->bAddedDefaultValue_[3] = false;
-        this->bAddedDefaultValue_[4] = false;
     }
 
@@ -73 +67 @@
                 (*this->functor_)(MultiType(params));
             }
-            else if (this->bAddedDefaultValue_[0])
+            else if (!this->defaultValue_[0].null())
             {
                 COUT(5) << "Calling Executor " << this->name_ << " through parser with one parameter, using default value: " << this->defaultValue_[0] << std::endl;
@@ -90 +84 @@
             for (unsigned int i = tokens.size(); i < this->functor_->getParamCount(); i++)
             {
-                if (!this->bAddedDefaultValue_[i])
+                if (this->defaultValue_[i].null())
                 {
                     COUT(2) << "Warning: Can't call executor " << this->name_ << " through parser: Not enough parameters or default values given (input:" << params << ")." << std::endl;
@@ -156 +150 @@
                 return true;
             }
-            else if (this->bAddedDefaultValue_[0])
+            else if (!this->defaultValue_[0].null())
             {
                 param[0] = this->defaultValue_[0];
@@ -171 +165 @@
             // if there are not enough params given, check if there are default values
             for (unsigned int i = tokens.size(); i < this->functor_->getParamCount(); i++)
-                if (!this->bAddedDefaultValue_[i])
+                if (this->defaultValue_[i].null())
                     return false;
 
@@ -193 +187 @@
     {
         this->defaultValue_[0] = param1;
-        this->bAddedDefaultValue_[0] = true;
 
         return (*this);
@@ -201 +194 @@
     {
         this->defaultValue_[0] = param1;
-        this->bAddedDefaultValue_[0] = true;
-        this->defaultValue_[1] = param2;
-        this->bAddedDefaultValue_[1] = true;
+        this->defaultValue_[1] = param2;
 
         return (*this);
@@ -211 +202 @@
     {
         this->defaultValue_[0] = param1;
-        this->bAddedDefaultValue_[0] = true;
-        this->defaultValue_[1] = param2;
-        this->bAddedDefaultValue_[1] = true;
+        this->defaultValue_[1] = param2;
         this->defaultValue_[2] = param3;
-        this->bAddedDefaultValue_[2] = true;
 
         return (*this);
@@ -223 +211 @@
     {
         this->defaultValue_[0] = param1;
-        this->bAddedDefaultValue_[0] = true;
-        this->defaultValue_[1] = param2;
-        this->bAddedDefaultValue_[1] = true;
+        this->defaultValue_[1] = param2;
         this->defaultValue_[2] = param3;
-        this->bAddedDefaultValue_[2] = true;
         this->defaultValue_[3] = param4;
-        this->bAddedDefaultValue_[3] = true;
 
         return (*this);
@@ -237 +221 @@
     {
         this->defaultValue_[0] = param1;
-        this->bAddedDefaultValue_[0] = true;
-        this->defaultValue_[1] = param2;
-        this->bAddedDefaultValue_[1] = true;
+        this->defaultValue_[1] = param2;
         this->defaultValue_[2] = param3;
-        this->bAddedDefaultValue_[2] = true;
         this->defaultValue_[3] = param4;
-        this->bAddedDefaultValue_[3] = true;
         this->defaultValue_[4] = param5;
-        this->bAddedDefaultValue_[4] = true;
 
         return (*this);
@@ -253 +232 @@
     {
         if (index < MAX_FUNCTOR_ARGUMENTS)
-        {
             this->defaultValue_[index] = param;
-            this->bAddedDefaultValue_[index] = true;
-        }
+
         return (*this);
     }
@@ -263 +240 @@
     {
         for (unsigned int i = 0; i < this->functor_->getParamCount(); i++)
-            if (!this->bAddedDefaultValue_[i])
+            if (this->defaultValue_[i].null())
                 return false;
 

code/branches/consolecommands3/src/libraries/core/Executor.h

@@ -101 +101 @@
             {
                 if (index < MAX_FUNCTOR_ARGUMENTS)
-                    return this->bAddedDefaultValue_[index];
+                    return !this->defaultValue_[index].null();
 
                 return false;
@@ -110 +110 @@
             std::string name_;
             MultiType defaultValue_[MAX_FUNCTOR_ARGUMENTS];
-            bool bAddedDefaultValue_[MAX_FUNCTOR_ARGUMENTS];
     };
 

code/branches/consolecommands3/src/libraries/util/MultiType.h

@@ -351 +351 @@
 
             /** @brief Checks whether the value is a default one. */
-            bool                              hasDefaultValue()         const { return this->value_->hasDefaultValue(); }
+            bool                              hasDefaultValue() const { return this->value_->hasDefaultValue(); }
+
+            /** @brief Checks if the MT contains no value. */
+            bool                              null() const { return (!this->value_); }
 
             operator char()                  const;