Changeset 7267

Timestamp:

Aug 30, 2010, 6:27:59 PM (14 years ago)

Author:

landauf

Message:

use a base-functor instead of a base-executor in ConsoleCommand because the functor of a static executor changes if new functions are assigned to the command.

Location:

code/branches/consolecommands3/src/libraries/core/command

Files:

• ConsoleCommand.cc (modified) (4 diffs)
• ConsoleCommand.h (modified) (2 diffs)

code/branches/consolecommands3/src/libraries/core/command/ConsoleCommand.cc

@@ -43 +43 @@
 
         this->baseName_ = name;
-        this->baseExecutor_ = executor;
+        this->baseFunctor_ = executor->getFunctor();
 
         this->argumentCompleter_[0] = 0;
@@ -112 +112 @@
     bool ConsoleCommand::headersMatch(const FunctorPtr& functor)
     {
-        unsigned int minparams = std::min(this->baseExecutor_->getParamCount(), functor->getParamCount());
-
-        if (this->baseExecutor_->getFunctor()->getHeaderIdentifier(minparams) != functor->getHeaderIdentifier(minparams))
+        unsigned int minparams = std::min(this->baseFunctor_->getParamCount(), functor->getParamCount());
+
+        if (this->baseFunctor_->getHeaderIdentifier(minparams) != functor->getHeaderIdentifier(minparams))
             return false;
-        else if (functor->getParamCount() <= this->baseExecutor_->getParamCount())
+        else if (functor->getParamCount() <= this->baseFunctor_->getParamCount())
             return true;
         else if (!this->executor_)
@@ -122 +122 @@
         else
         {
-            for (unsigned int i = this->baseExecutor_->getParamCount(); i < functor->getParamCount(); ++i)
+            for (unsigned int i = this->baseFunctor_->getParamCount(); i < functor->getParamCount(); ++i)
+            {
                 if (!this->executor_->defaultValueSet(i))
+                {
+                    COUT(2) << "Default value " << i << " is missing" << std::endl;
                     return false;
+                }
+            }
 
             return true;
@@ -132 +137 @@
     bool ConsoleCommand::headersMatch(const ExecutorPtr& executor)
     {
-        unsigned int minparams = std::min(this->baseExecutor_->getParamCount(), executor->getParamCount());
-
-        if (this->baseExecutor_->getFunctor()->getHeaderIdentifier(minparams) != executor->getFunctor()->getHeaderIdentifier(minparams))
+        unsigned int minparams = std::min(this->baseFunctor_->getParamCount(), executor->getParamCount());
+
+        if (this->baseFunctor_->getHeaderIdentifier(minparams) != executor->getFunctor()->getHeaderIdentifier(minparams))
             return false;
-        else if (executor->getParamCount() <= this->baseExecutor_->getParamCount())
+        else if (executor->getParamCount() <= this->baseFunctor_->getParamCount())
             return true;
         else
         {
-            for (unsigned int i = this->baseExecutor_->getParamCount(); i < executor->getParamCount(); ++i)
+            for (unsigned int i = this->baseFunctor_->getParamCount(); i < executor->getParamCount(); ++i)
+            {
                 if (!executor->defaultValueSet(i))
+                {
+                    COUT(2) << "Default value " << i << " is missing" << std::endl;
                     return false;
+                }
+            }
 
             return true;

code/branches/consolecommands3/src/libraries/core/command/ConsoleCommand.h

@@ -223 +223 @@
 
             const ExecutorPtr& getExecutor() const;
-            inline const ExecutorPtr& getBaseExecutor() const
-                { return this->baseExecutor_; }
+            inline const FunctorPtr& getBaseFunctor() const
+                { return this->baseFunctor_; }
 
             inline ConsoleCommand& setActive(bool bActive)
@@ -311 +311 @@
             AccessLevel::Enum accessLevel_;
             std::string baseName_;
-            ExecutorPtr baseExecutor_;
+            FunctorPtr baseFunctor_;
 
             ExecutorPtr executor_;