Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5642 in orxonox.OLD for trunk/src


Ignore:
Timestamp:
Nov 19, 2005, 12:16:12 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: valgrind sweep

Location:
trunk/src/lib
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/lang/base_object.cc

    r5626 r5642  
    151151/**
    152152 *  displays everything this class is
     153 * @TODO REIMPLEMENT WITH SENSE.
    153154 */
    154155void BaseObject::whatIs() const
     
    193194      PRINT(0)(" -Weapon-");
    194195    PRINT(0)("\n");
    195   }
    196196}
     197}
  • trunk/src/lib/shell/shell_command.cc

    r5641 r5642  
    4242  this->description = NULL;
    4343  this->alias = NULL;
     44  this->executor = executor.clone();
    4445
    4546//  this->classID = classID;
     
    4748  if (this->shellClass != NULL)
    4849    this->shellClass->commandList->add(this);
    49   // handling parameters, and storing them:
    50   if (paramCount > FUNCTOR_MAX_ARGUMENTS)
    51     paramCount = FUNCTOR_MAX_ARGUMENTS;
    52   this->paramCount = paramCount;
    53   this->parameters = new unsigned int[paramCount];
    54   this->defaultValue = new MultiType[paramCount];
    55 
    56   this->executor = executor.clone();
    5750}
    5851
     
    6255ShellCommand::~ShellCommand()
    6356{
    64   delete[] this->parameters;
    65   delete[] this->defaultValue;
    6657  if (this->alias != NULL && ShellCommandClass::aliasList != NULL)
    6758  {
     
    369360    while(elem != NULL)
    370361    {
    371       PRINT(0)("  command:'%s' : params:%d: ", elem->getName(), elem->paramCount);
    372       for (unsigned int i = 0; i< elem->paramCount; i++)
    373        printf("%s ", ShellCommand::paramToString(elem->parameters[i]));
     362      PRINT(0)("  command:'%s' : params:%d: ", elem->getName(), elem->executor->getParamCount());
     363      /// FIXME
     364      /*      for (unsigned int i = 0; i< elem->paramCount; i++)
     365       printf("%s ", ShellCommand::paramToString(elem->parameters[i]));*/
    374366      if (elem->description != NULL)
    375367       printf("- %s", elem->description);
  • trunk/src/lib/shell/shell_command.h

    r5641 r5642  
    8686
    8787  protected:
    88     unsigned int                     paramCount;                           //!< the count of parameters.
    89     unsigned int*                    parameters;                           //!< Parameters the function of this Command takes.
    9088    MultiType*                       defaultValue;                         //!< Default Values.
    9189
     
    9593
    9694    const char*                      description;                          //!< A description for this commnand. (initially NULL). Assigned with (create)->describe("blablabla");
    97     Executor*                        executor;
     95    Executor*                        executor;                             //!< The Executor, that really executes the Function.
    9896
    9997};
  • trunk/src/lib/shell/shell_command_class.cc

    r5641 r5642  
    238238        while(elem != NULL)
    239239        {
    240           PRINT(0)("  command:'%s' : params:%d: ", elem->getName(), elem->paramCount);
    241           for (unsigned int i = 0; i< elem->paramCount; i++)
    242             PRINT(0)("%s ", ShellCommand::paramToString(elem->parameters[i]));
     240          PRINT(0)("  command:'%s' : params:%d: ", elem->getName(), elem->executor->getParamCount());
     241          /// FIXME
     242          /*          for (unsigned int i = 0; i< elem->paramCount; i++)
     243            PRINT(0)("%s ", ShellCommand::paramToString(elem->parameters[i]));*/
    243244          if (elem->description != NULL)
    244245            PRINT(0)("- %s", elem->description);
  • trunk/src/lib/util/executor/executor.h

    r5641 r5642  
    4444    /** @returns the Type of this Function (either static or objective) */
    4545    inline Executor_Type getType() const { return this->functorType; };
     46    /** @returns the Count of Parameters this Executor takes */
     47    inline unsigned int getParamCount() const { return this->paramCount; };
    4648
    4749    static void debug();
     
    5456
    5557  protected:
    56     Executor_Type                    functorType;                          //!< The type of Function we've got (either static or objective).
    57     unsigned int                     paramCount;                           //!< the count of parameters.
    58     MultiType*                       defaultValue;                         //!< Default Values.
     58    Executor_Type                    functorType;      //!< The type of Function we've got (either static or objective).
     59    unsigned int                     paramCount;       //!< the count of parameters.
     60    MultiType*                       defaultValue;     //!< Default Values.
    5961};
    6062
  • trunk/src/lib/util/multi_type.cc

    r5641 r5642  
    9696 * @returns a Copy of itself. (strings inside are copied as well)
    9797 */
    98 MultiType MultiType::operator= (const MultiType& mt)
    99 {
    100   this->type = mt.type;
    101   this->value = mt.value;
    102 
    103   if (mt.type == MT_STRING && mt.storedString != NULL)
    104   {
    105     this->storedString = new char[strlen (mt.storedString)+1];
    106     strcpy(this->storedString, mt.storedString);
    107     this->value.String = this->storedString;
    108   }
    109   else
    110     this->storedString = NULL;
    111 }
     98// MultiType MultiType::operator= (const MultiType& mt)
     99// {
     100//   this->type = mt.type;
     101//   this->value = mt.value;
     102//
     103//   if (mt.type == MT_STRING && mt.storedString != NULL)
     104//   {
     105//     this->storedString = new char[strlen (mt.storedString)+1];
     106//     strcpy(this->storedString, mt.storedString);
     107//     this->value.String = this->storedString;
     108//   }
     109//   else
     110//     this->storedString = NULL;
     111//   return *this;
     112// }
    112113
    113114/**
     
    126127  this->type = (MT_Type)type;
    127128
     129  if (this->type != type)
     130  {
     131    if (this->type == MT_NULL)
     132      this->setString("");
     133
     134  }
    128135  /// @todo check if this works...
    129136
     
    158165  this->type = MT_FLOAT;
    159166  this->value.Float = value;
    160 
    161167}
    162168
     
    308314    {
    309315      sprintf(tmpString, "%d", this->value.Int);
    310       this->storedString = new char[strlen (tmpString)+1];
     316      this->storedString = new char[strlen(tmpString)+1];
    311317      strcpy (this->storedString, tmpString);
    312318      return this->storedString;
  • trunk/src/lib/util/multi_type.h

    r5633 r5642  
    4242    virtual ~MultiType();
    4343
    44     MultiType operator= (const MultiType& mt);
     44//    MultiType operator= (const MultiType& mt);
    4545
    4646    void setType(int type);
Note: See TracChangeset for help on using the changeset viewer.