Changeset 7270

Timestamp:

Aug 30, 2010, 7:52:33 PM (14 years ago)

Author:

landauf

Message:

pushFunction() (which explicitly adds a new level to the console command stack) was not forwarded to ConsoleCommandManipulator

also fixed a bug which was caused by pushFunction() with a subsequent call to setFunction(…) because it may have unexpectedly changed the functor of the lower stack levels. now pushFunction() not only copyconstructs the executor, but also the Functor (with a clone() function)

Location:

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

Files:

• ConsoleCommand.cc (modified) (2 diffs)
• ConsoleCommand.h (modified) (1 diff)
• Executor.cc (modified) (1 diff)
• Executor.h (modified) (1 diff)
• Functor.h (modified) (2 diffs)

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

@@ -193 +193 @@
     {
         Command command;
-        command.executor_ = this->getExecutor();
+        command.executor_ = this->executor_;
         if (command.executor_)
-            command.functor_ = this->getExecutor()->getFunctor();
+            command.functor_ = this->executor_->getFunctor();
 
         if (this->setFunction(executor, bForce))
@@ -204 +204 @@
     {
         Command command;
-        command.executor_ = this->getExecutor();
+        command.executor_ = this->executor_;
         if (command.executor_)
-            command.functor_ = this->getExecutor()->getFunctor();
+            command.functor_ = this->executor_->getFunctor();
 
         if (this->setFunction(functor, bForce))

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

@@ -142 +142 @@
                         { if (this->command_) { this->command_->setFunction(executor, bForce); } return *this; }
 
+                    inline ConsoleCommandManipulator& pushFunction()
+                        { if (this->command_) { this->command_->pushFunction(); } return *this; }
                     template <class F>
                     inline ConsoleCommandManipulator& pushFunction(F function, bool bForce = false)

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

@@ -44 +44 @@
         this->functor_ = functor;
         this->name_ = name;
+    }
+
+    Executor::Executor(const Executor& other) : name_(other.name_), defaultValue_(other.defaultValue_)
+    {
+        this->functor_ = other.functor_->clone();
     }
 

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

@@ -44 +44 @@
         public:
             Executor(const FunctorPtr& functor, const std::string& name = "");
+            Executor(const Executor& other);
             virtual ~Executor();
 

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

@@ -85 +85 @@
         public:
             virtual MultiType operator()(const MultiType& param1 = MT_Type::Null, const MultiType& param2 = MT_Type::Null, const MultiType& param3 = MT_Type::Null, const MultiType& param4 = MT_Type::Null, const MultiType& param5 = MT_Type::Null) = 0;
+
+            virtual FunctorPtr clone() = 0;
 
             virtual Type::Enum getType() const = 0;
@@ -269 +271 @@
             }
 
+            FunctorPtr clone()
+            {
+                return new FunctorTemplate(*this);
+            }
+
             void evaluateParam(unsigned int index, MultiType& param) const
             {