Changeset 5200 in orxonox.OLD for trunk

Timestamp:

Sep 18, 2005, 3:49:21 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: aliases now can also take arguments

Location:

trunk/src/lib

Files:

• shell/shell_command.cc (modified) (4 diffs)
• util/substring.cc (modified) (11 diffs)
• util/substring.h (modified) (2 diffs)

trunk/src/lib/shell/shell_command.cc

@@ -378 +378 @@
  * @return true on success, false otherwise.
  */
+#include  "stdlibincl.h"
 bool ShellCommandBase::execute(const char* executionString)
 {
@@ -395 +396 @@
   if (inputSplits.getCount() == 0)
     return false;
-  // CHECK FOR ALIAS
   if (inputSplits.getCount() >= 1)
   {
+    // CHECK FOR ALIAS
     if (ShellCommandClass::aliasList != NULL)
     {
@@ -410 +411 @@
           if (objectList != NULL)
           {
-            elemAL->getCommand()->executeCommand(objectList->firstElement(), "");
+            elemAL->getCommand()->executeCommand(objectList->firstElement(), executionString+inputSplits.getOffset(1));
+            delete itAL;
             return true;
           }
@@ -418 +420 @@
       delete itAL;
     }
+
   }
 

trunk/src/lib/util/substring.cc

@@ -34 +34 @@
   {
     this->strings = NULL;
+    this->offsets = NULL;
     return;
   }
@@ -44 +45 @@
 
   this->strings = new char*[this->splittersCount];
-  assert (strings != NULL);
+  this->offsets = new unsigned int[this->splittersCount];
+  assert (this->strings != NULL && this->offsets != NULL);
 
   int i = 0;
@@ -61 +63 @@
       strncpy( strings[i], offset, l);
       strings[i][l] = '\0';
+      this->offsets[i] = offset - string;
       i++;
       end++;
@@ -71 +74 @@
     strncpy( strings[i], offset, l);
     strings[i][l] = '\0';
+    this->offsets[i] = offset - string;
   }
   else
@@ -76 +80 @@
     this->strings[0] = new char[strlen(string)+1];
     strcpy(this->strings[0], string);
+    this->offsets[0] = 0;
   }
 }
@@ -92 +97 @@
   {
     this->strings = NULL;
+    this->offsets = NULL;
     return;
   }
@@ -114 +120 @@
   // allocate memory
   this->strings = new char*[this->splittersCount];
-  assert (strings != NULL);
+  this->offsets = new unsigned int[this->splittersCount];
+  assert (this->strings != NULL && this->offsets != NULL);
 
   // split the String into substrings
@@ -131 +138 @@
       strncpy( strings[i], offset, l);
       strings[i][l] = '\0';
+      this->offsets[i] = offset - string;
       end += strspn(end, " \t\n");
       offset = end;
@@ -142 +150 @@
     strncpy(this->strings[0], string, length);
     this->strings[0][length] = '\0';
+    offsets[0] = 0;
   }
 }
@@ -156 +165 @@
     delete[] this->strings;
   }
+  delete[] this->offsets;
 }
 
@@ -169 +179 @@
   else
     return NULL;
+}
+
+/**
+ * get a particular substring's offset
+ * @param i the ID of the substring to get the offset from
+ * @returns the offset or NULL if an invalid ID was given
+ */
+unsigned int SubString::getOffset(unsigned int i)
+{
+  if( i < this->splittersCount && i >= 0)
+    return this->offsets[i];
+  else
+    return 0;
 }
 

trunk/src/lib/util/substring.h

@@ -17 +17 @@
   inline unsigned int getCount() { return this->splittersCount; };
   const char* getString(unsigned int i);
+  unsigned int getOffset(unsigned int i);
 
   void debug() const;
@@ -22 +23 @@
  private:
   char**          strings;                      //!< strings produced from a single string splitted in multiple strings
+  unsigned int*   offsets;                      //!< offsets of the beginning of the input-string to the beginning of each substring.
   unsigned int    splittersCount;               //!< how many splitted parts
 };