Changeset 5656 in orxonox.OLD

Timestamp:

Nov 20, 2005, 9:45:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: new Version of the String-splitter (without Escape-sequence for the time being)

Location:

trunk/src

Files:

• lib/event/command_chain.cc (modified) (1 diff)
• lib/event/command_chain.h (modified) (1 diff)
• lib/graphics/graphics_engine.cc (modified) (1 diff)
• lib/shell/shell_command.cc (modified) (1 diff)
• lib/shell/shell_completion.cc (modified) (1 diff)
• lib/util/executor/executor.h (modified) (4 diffs)
• lib/util/substring.cc (modified) (2 diffs)
• lib/util/substring.h (modified) (1 diff)
• util/track/track_manager.cc (modified) (2 diffs)

trunk/src/lib/event/command_chain.cc

@@ -430 +430 @@
   unsigned int fktPos = 1;                //< the position of the function (needed for finding it)
 //  long completeType = SHELLC_NONE;      //< the Type we'd like to complete.
-  SubString inputSplits(executionString, true);
+  SubString inputSplits(executionString, " \n\t,");
 
   if (inputSplits.getCount() == 0)

trunk/src/lib/event/command_chain.h

@@ -360 +360 @@
     virtual void executeCommand (BaseObject* object, const char* parameters)
     {
-      SubString sub(parameters, true);
+      SubString sub(parameters, " \n\t,");
 //! FUNCTOR_LIST is the List of Executive Functions
 #define FUNCTOR_LIST(x) CommandChainExecute ## x

trunk/src/lib/graphics/graphics_engine.cc

@@ -259 +259 @@
 
   if (this->hwExtensions == NULL && extensions != NULL)
-    this->hwExtensions = new SubString((char*)glGetString(GL_EXTENSIONS), true);
+    this->hwExtensions = new SubString((char*)glGetString(GL_EXTENSIONS), " \n\t,");
 
   PRINT(4)("Running on : %s %s %s\n", vendor, renderer, version);

trunk/src/lib/shell/shell_command.cc

@@ -170 +170 @@
   unsigned int fktPos = 1;                //< the position of the function (needed for finding it)
 //  long completeType = SHELLC_NONE;      //< the Type we'd like to complete.
-  SubString inputSplits(executionString, true);
+  SubString inputSplits(executionString, " \t\n,");
 
   if (inputSplits.getCount() == 0)

trunk/src/lib/shell/shell_completion.cc

@@ -95 +95 @@
   else
     completionLine = this->input->getInput() + strspn(this->input->getInput(), " \t\n");
-  SubString inputSplits(completionLine, true);
+  SubString inputSplits(completionLine, " \t\n,");
 
   // What String will be completed

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

@@ -38 +38 @@
     virtual Executor* clone () const = 0;
 
+    Executor* defaultValues(unsigned int count, va_list values);
     Executor* defaultValues(unsigned int count, ...);
-    Executor* defaultValues(unsigned int count, va_list values);
 
     /** executes a Command @param object the object to apply this to @param parameters the parameters the command takes */
@@ -56 +56 @@
 
     void cloning(Executor* executor) const;
+
+//    const SubString& getSubString(const char* string) const { return SubString(string); };
 
   protected:
@@ -261 +263 @@
     virtual void execute (BaseObject* object, const char* parameters)
     {
-      SubString sub(parameters, ',');  /// FIXME ///
+      SubString sub(parameters, " \n\t,", '\\');
 //! FUNCTOR_LIST is the List of Executive Functions
 #define FUNCTOR_LIST(x) ExecutorExecute ## x
@@ -323 +325 @@
     virtual void execute (BaseObject* object, const char* parameters)
     {
-  SubString sub(parameters, true);
+  SubString sub(parameters, " \n\t,");
 //! FUNCTOR_LIST is the List of Executive Functions
 #define FUNCTOR_LIST(x) ExecutorExecute ## x

trunk/src/lib/util/substring.cc

@@ -123 +123 @@
   assert (this->strings != NULL && this->offsets != NULL);
 
+
   // split the String into substrings
   int l = 0;
@@ -154 +155 @@
 }
 
+SubString::SubString(const char* string, const char* splitters, char escapeChar)
+{
+  this->splittersCount = 0;
+  if (string == NULL || splitters == NULL)
+  {
+    this->strings = NULL;
+    this->offsets = NULL;
+    return;
+  }
+
+  // chop the input to the beginning of something usefull
+  if (strlen(string) > 0)
+    string = string + strspn(string, splitters);
+
+  // count the Splitters
+  bool lastWasSplitter = false;
+  for(unsigned int i = 0; i < strlen(string); i++)
+  {
+
+    if( strchr(splitters, string[i] ))
+      lastWasSplitter = true;
+    else
+    {
+      if (lastWasSplitter)
+      {
+        this->splittersCount ++;
+        lastWasSplitter = false;
+      }
+    }
+  }
+  this->splittersCount += 1;
+
+  // allocate memory
+  this->strings = new char*[this->splittersCount];
+  this->offsets = new unsigned int[this->splittersCount];
+  assert (this->strings != NULL && this->offsets != NULL);
+
+
+  // split the String into substrings
+  int l = 0;
+  unsigned int i = 0;
+  if( this->splittersCount > 1)
+  {
+    const char* offset = string;
+    const char* end = offset + strcspn(offset, splitters);
+    for (i = 0; i < this->splittersCount; i++)
+    {
+      assert( i < this->splittersCount);
+      l = end - offset;
+      this->strings[i] = new char[l + 1];
+      assert( strings[i] != NULL);
+      strncpy( strings[i], offset, l);
+      strings[i][l] = '\0';
+      this->offsets[i] = offset - string;
+      end += strspn(end, splitters);
+      offset = end;
+      end = offset + strcspn(offset, splitters);
+    }
+  }
+  else
+  {
+    unsigned int length = strcspn(string, splitters);
+    this->strings[0] = new char[length+1];
+    strncpy(this->strings[0], string, length);
+    this->strings[0][length] = '\0';
+    offsets[0] = 0;
+  }
+}
+
+
 /**
  *  removes the object from memory

trunk/src/lib/util/substring.h

@@ -13 +13 @@
   SubString(const char* string, char splitter = ',');
   SubString(const char* string, bool whiteSpaces);
+  SubString(const char* string, const char* splitters, char escapeChar ='\\');
   ~SubString();
 

trunk/src/util/track/track_manager.cc

@@ -737 +737 @@
 void TrackManager::forkS(const char* forkString)
 {
-  SubString strings(forkString);
+  SubString strings(forkString, ',');
 
   int* trackIDs = new int[strings.getCount()];
@@ -878 +878 @@
 void TrackManager::joinS(const char* joinString)
 {
-  SubString strings(joinString);
+  SubString strings(joinString, ',');
 
   int* trackIDs = new int[strings.getCount()];