Changeset 7398 in orxonox.OLD

Timestamp:

Apr 27, 2006, 4:23:55 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: SubString more functionality

Location:

trunk/src/lib

Files:

• shell/shell_command.cc (modified) (3 diffs)
• shell/shell_command.h (modified) (2 diffs)
• util/substring.cc (modified) (8 diffs)
• util/substring.h (modified) (1 diff)

trunk/src/lib/shell/shell_command.cc

@@ -41 +41 @@
     PRINTF(5)("create shellcommand %s %s\n", commandName, className);
     this->setName(commandName);
+
+    // copy the executor:
     this->executor = executor.clone();
     this->executor->setName(commandName);
+
     this->alias = NULL;
 
     //  this->classID = classID;
     this->shellClass = ShellCommandClass::getCommandClass(className);
-    if (this->shellClass != NULL)
-      this->shellClass->commandList.push_back(this);
+    assert (this->shellClass != NULL);
+    this->shellClass->commandList.push_back(this);
   }
 
@@ -62 +65 @@
 
   /**
-   * registers a new ShellCommand
+   * @brief registers a new ShellCommand
    */
   ShellCommand* ShellCommand::registerCommand(const std::string& commandName, const std::string& className, const Executor& executor)
@@ -74 +77 @@
 
   /**
-   * unregister an existing commandName
+   * @brief unregister an existing commandName
    * @param className the name of the Class the command belongs to.
    * @param commandName the name of the command itself

trunk/src/lib/shell/shell_command.h

@@ -23 +23 @@
 
   /**
-   * an easy to use Macro to create a Command
+   * @brief an easy to use Macro to create a Command
    * @param command the name of the command (without "" around the string)
    * @param class the name of the class to apply this command to (without the "" around the string)
@@ -41 +41 @@
 
   /**
-   * an easy to use Macro to create a Command
+   * @brief an easy to use Macro to create a Command
    * @param command the name of the command (without "" around the string)
    * @param class the name of the class to apply this command to (without the "" around the string)

trunk/src/lib/util/substring.cc

@@ -36 +36 @@
  */
 SubString::SubString()
-{
-}
+{}
 
 
@@ -122 +121 @@
  * @returns true if the Stored Strings match
  */
-bool SubString::operator==(const SubString& subString)
+bool SubString::operator==(const SubString& subString) const
 {
   return (this->strings == subString.strings);
+}
+
+/**
+ * @brief comparator.
+ * @param subString the SubString to compare against this one.
+ * @returns true if the Stored Strings match
+ */
+bool SubString::compare(const SubString& subString) const
+{
+  return (*this == subString);
+}
+
+/**
+ * @brief comparator.
+ * @param subString the SubString to compare against this one.
+ * @returns true if the Stored Strings match
+ */
+bool SubString::compare(const SubString& subString, unsigned int length) const
+{
+  if (length > this->size() || length > subString.size())
+    return false;
+
+  for (unsigned int i = 0; i < length; i++)
+    if (this->strings[i] != subString.strings[i])
+      return false;
+  return true;
 }
 
@@ -272 +297 @@
     switch(state)
     {
-      case SL_NORMAL:
+        case SL_NORMAL:
         if(line[i] == escape_char)
         {
@@ -307 +332 @@
         }
         break;
-      case SL_ESCAPE:
+        case SL_ESCAPE:
         if(line[i] == 'n') token += '\n';
         else if(line[i] == 't') token += '\t';
@@ -319 +344 @@
         state = SL_NORMAL;
         break;
-      case SL_SAFEMODE:
+        case SL_SAFEMODE:
         if(line[i] == safemode_char)
         {
@@ -333 +358 @@
         }
         break;
-      case SL_SAFEESCAPE:
+        case SL_SAFEESCAPE:
         if(line[i] == 'n') token += '\n';
         else if(line[i] == 't') token += '\t';
@@ -345 +370 @@
         state = SL_SAFEMODE;
         break;
-      case SL_COMMENT:
+        case SL_COMMENT:
         if(line[i] == '\n')
         {
@@ -361 +386 @@
         }
         break;
-      default:
+        default:
         // nothing
         break;

trunk/src/lib/util/substring.h

@@ -37 +37 @@
   // operate on the SubString
   SubString& operator=(const SubString& subString);
-  bool operator==(const SubString& subString);
+  bool operator==(const SubString& subString) const;
+  bool compare(const SubString& subString) const;
+  bool compare(const SubString& subString, unsigned int length) const;
   SubString operator+(const SubString& subString) const;
   SubString& operator+=(const SubString& subString);