Changeset 5641 in orxonox.OLD for trunk

Timestamp:

Nov 18, 2005, 9:22:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Passing Reference inastead of Pointer to create ShellCommand

Location:

trunk/src

Files:

• lib/shell/shell_command.cc (modified) (5 diffs)
• lib/shell/shell_command.h (modified) (4 diffs)
• lib/shell/shell_command_class.cc (modified) (1 diff)
• lib/util/executor/executor.cc (modified) (2 diffs)
• lib/util/executor/executor.h (modified) (7 diffs)
• lib/util/multi_type.cc (modified) (4 diffs)
• orxonox.cc (modified) (1 diff)

trunk/src/lib/shell/shell_command.cc

@@ -36 +36 @@
  * @param paramCount the count of parameters this command takes
  */
-ShellCommand::ShellCommand(const char* commandName, const char* className, Executor* executor)
+ShellCommand::ShellCommand(const char* commandName, const char* className, const Executor& executor)
 {
   this->setClassID(CL_SHELL_COMMAND, "ShellCommand");
@@ -54 +54 @@
   this->defaultValue = new MultiType[paramCount];
 
-  this->executor = executor;
+  this->executor = executor.clone();
 }
 
@@ -69 +69 @@
     delete this->alias;
   }
+  delete this->executor;
 }
 
@@ -74 +75 @@
  * registers a new ShellCommand
  */
-ShellCommand* ShellCommand::registerCommand(const char* commandName, const char* className, Executor* executor)
+ShellCommand* ShellCommand::registerCommand(const char* commandName, const char* className, const Executor& executor)
 {
   if (ShellCommand::isRegistered(commandName, className, executor))
@@ -132 +133 @@
  * This is checked in the registerCommand-function.
  */
-bool ShellCommand::isRegistered(const char* commandName, const char* className, Executor* executor)
+bool ShellCommand::isRegistered(const char* commandName, const char* className, const Executor& executor)
 {
   if (ShellCommandClass::commandClassList == NULL)

trunk/src/lib/shell/shell_command.h

@@ -41 +41 @@
 //        ShellCommand* shell_command_##class##_##command = ShellCommand<class>::registerCommand(#command, #class, &class::function)
 #define SHELL_COMMAND(command, class, function) \
-           ShellCommand* shell_command_##class##_##command = ShellCommand::registerCommand(#command, #class, new ExecutorObjective<class>(&class::function))
+           ShellCommand* shell_command_##class##_##command = ShellCommand::registerCommand(#command, #class, ExecutorObjective<class>(&class::function))
 
 /**
@@ -57 +57 @@
  */
 #define SHELL_COMMAND_STATIC(command, class, function) \
-           ShellCommand* shell_command_##class##_##command = ShellCommand::registerCommand(#command, #class, new ExecutorStatic<class>(function))
+           ShellCommand* shell_command_##class##_##command = ShellCommand::registerCommand(#command, #class, ExecutorStatic<class>(function))
 
 
@@ -72 +72 @@
     ShellCommand* defaultValues(unsigned int count, ...);
 
-    static ShellCommand* registerCommand(const char* commandName, const char* className, Executor* executor);
+    static ShellCommand* registerCommand(const char* commandName, const char* className, const Executor& executor);
 
     static void unregisterCommand(const char* commandName, const char* className);
@@ -79 +79 @@
 
   protected:
-    ShellCommand(const char* commandName, const char* className, Executor* executor);
+    ShellCommand(const char* commandName, const char* className, const Executor& executor);
     ~ShellCommand();
 
-    static bool isRegistered(const char* commandName, const char* className, Executor* executor);
+    static bool isRegistered(const char* commandName, const char* className, const Executor& executor);
     static const char* paramToString(long parameter);
 
   protected:
-    void*                            functionPointer;                      //!< The pointeer to the function of the Class (or static pointer if ClassID == CL_NULL )
     unsigned int                     paramCount;                           //!< the count of parameters.
     unsigned int*                    parameters;                           //!< Parameters the function of this Command takes.

trunk/src/lib/shell/shell_command_class.cc

@@ -217 +217 @@
   {
     ShellCommandClass::commandClassList = new tList<ShellCommandClass>;
-    ShellCommand::registerCommand("debug", "ShellCommand", new ExecutorStatic<ShellCommand>(ShellCommand::debug));
+    ShellCommand::registerCommand("debug", "ShellCommand", ExecutorStatic<ShellCommand>(ShellCommand::debug));
   }
 }

trunk/src/lib/util/executor/executor.cc

@@ -32 +32 @@
 // SHELL COMMAND BASE //
 ////////////////////////
+// empty constructor
+Executor::Executor()
+{
+  this->defaultValue = NULL;
+}
+
 /**
  * constructs and registers a new Command
@@ -63 +69 @@
   delete[] this->defaultValue;
 }
+
+/**
+ * clones this element into executor.
+ */
+void Executor::cloning(Executor* executor) const
+{
+  executor->functorType  = this->functorType;
+  executor->paramCount   = this->paramCount;
+  executor->defaultValue = new MultiType[this->paramCount];
+  for (unsigned int i = 0; i < this->paramCount; i++)
+    executor->defaultValue[i] = this->defaultValue[i];
+}
+
+
 
 /**

trunk/src/lib/util/executor/executor.h

@@ -22 +22 @@
 typedef enum {
   Executor_Objective   = 1,
-  Executor_Static    = 2,
+  Executor_Static      = 2,
 } Executor_Type;
 
@@ -32 +32 @@
 {
   public:
+    virtual ~Executor();
+
+    virtual Executor* clone () const = 0;
+
     Executor* defaultValues(unsigned int count, ...);
     Executor* defaultValues(unsigned int count, va_list values);
@@ -38 +42 @@
     virtual void execute (BaseObject* object, const char* parameters) = 0;
 
+    /** @returns the Type of this Function (either static or objective) */
+    inline Executor_Type getType() const { return this->functorType; };
+
     static void debug();
 
   protected:
+    Executor();
     Executor(unsigned int paramCount, ...);
-    ~Executor();
-
-    /** @returns the Type of this Function (either static or objective) */
-    inline Executor_Type getType() { return this->functorType; };
+
+    void cloning(Executor* executor) const;
 
   protected:
@@ -51 +57 @@
     unsigned int                     paramCount;                           //!< the count of parameters.
     MultiType*                       defaultValue;                         //!< Default Values.
-
-  private:
 };
 
@@ -226 +230 @@
 template<class T> class ExecutorObjective : public Executor
 {
-
   public:
+    ExecutorObjective() : Executor() { };
+    // COPY constuctor (virtual version)
+    virtual Executor* clone () const
+    {
+      ExecutorObjective<T>* executor = new ExecutorObjective<T>();
+      this->cloning(executor);
+      executor->fp = this->fp;
+      return executor;
+    }
+
 //! FUNCTOR_LIST is the List of CommandConstructors
 #define FUNCTOR_LIST(x) ExecutorConstructor ## x
@@ -279 +292 @@
 {
   public:
+    ExecutorStatic() : Executor() { };
+    // COPY constuctor
+    virtual Executor* clone () const
+    {
+      ExecutorStatic<T>* executor = new ExecutorStatic<T>();
+      this->cloning(executor);
+      executor->fp = this->fp;
+      return executor;
+    }
+
 //! FUNCTOR_LIST is the List of CommandConstructors
 #define FUNCTOR_LIST(x) ExecutorConstructor ## x
@@ -303 +326 @@
 };
 
-//! A Class, that handles aliases.
-class ExecutorAlias
-{
-  friend class ExecutorBase;
-  public:
-    /** @returns the Name of the Alias. */
-    const char* getName() const { return this->aliasName; };
-    /** @returns the Command, this Alias is asociated with */
-    ExecutorBase* getCommand() const { return this->command; };
-
-  private:
-    /** @param aliasName the name of the Alias @param command the Command, to associate this alias with */
-    ExecutorAlias(const char* aliasName, ExecutorBase* command) { this->aliasName = aliasName; this->command = command; };
-
-  private:
-    const char*         aliasName;       //!< the name of the Alias
-    ExecutorBase*       command;         //!< a pointer to the command, this alias executes.
-};
-
 #endif /* _EXECUTOR_H */

trunk/src/lib/util/multi_type.cc

@@ -101 +101 @@
   this->value = mt.value;
 
-  if (mt.type == MT_STRING)
+  if (mt.type == MT_STRING && mt.storedString != NULL)
   {
     this->storedString = new char[strlen (mt.storedString)+1];
@@ -107 +107 @@
     this->value.String = this->storedString;
   }
+  else
+    this->storedString = NULL;
 }
 
@@ -290 +292 @@
   {
     if (this->type & MT_BOOL) return (this->value.Bool)? "true" : "false";
-    else if (this->type & MT_CHAR) &this->value.Char;
-
     char tmpString[128];
     if (this->storedString != NULL)
@@ -298 +298 @@
       this->storedString = NULL;
     }
-
-    if (this->type & MT_INT)
+    if (this->type & MT_CHAR)
+    {
+      this->storedString = new char[2];
+      this->storedString[0] = this->value.Char;
+      this->storedString[1] = '\0';
+      return this->storedString;
+    }
+    else if (this->type & MT_INT)
     {
       sprintf(tmpString, "%d", this->value.Int);

trunk/src/orxonox.cc

@@ -49 +49 @@
 
 #include "class_list.h"
+#include "shell_command_class.h"
 #include "shell_command.h"
 #include "shell_buffer.h"