Changeset 7272

Timestamp:

Aug 30, 2010, 10:09:08 PM (14 years ago)

Author:

landauf

Message:

using object stack and function stack together works now

Location:

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

Files:

• ConsoleCommand.cc (modified) (8 diffs)
• ConsoleCommand.h (modified) (3 diffs)

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

@@ -163 +163 @@
         {
             this->executor_ = executor;
+            this->objectStack_.clear();
             return true;
         }
@@ -180 +181 @@
             else if (functor)
                 this->executor_ = createExecutor(functor);
+            this->objectStack_.clear();
 
             return true;
@@ -196 +198 @@
         if (command.executor_)
             command.functor_ = this->executor_->getFunctor();
+        command.objectStack_ = this->objectStack_;
 
         if (this->setFunction(executor, bForce))
@@ -207 +210 @@
         if (command.executor_)
             command.functor_ = this->executor_->getFunctor();
+        command.objectStack_ = this->objectStack_;
 
         if (this->setFunction(functor, bForce))
@@ -232 +236 @@
         if (command.executor_)
             this->executor_->setFunctor(command.functor_);
+        this->objectStack_ = command.objectStack_;
     }
 
@@ -238 +243 @@
         if (this->executor_)
             this->executor_->setFunctor(0);
+        this->objectStack_.clear();
     }
 
@@ -267 +273 @@
         void* oldobject = this->getObject();
         if (this->setObject(object))
-            this->objectStack_.push(oldobject);
+            this->objectStack_.push_back(oldobject);
     }
 
@@ -275 +281 @@
         if (!this->objectStack_.empty())
         {
-            newobject = this->objectStack_.top();
-            this->objectStack_.pop();
+            newobject = this->objectStack_.back();
+            this->objectStack_.pop_back();
         }
         this->setObject(newobject);

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

@@ -33 +33 @@
 
 #include <stack>
+#include <vector>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/facilities/expand.hpp>
@@ -98 +99 @@
             ExecutorPtr executor_;
             FunctorPtr functor_;
+            std::vector<void*> objectStack_;
         };
 
@@ -317 +319 @@
             ExecutorPtr executor_;
             std::stack<Command> commandStack_;
-            std::stack<void*> objectStack_;
+            std::vector<void*> objectStack_;
 
             ArgumentCompleter* argumentCompleter_[5];