Changeset 7320 in orxonox.OLD

Timestamp:

Apr 17, 2006, 1:12:25 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: more cleanup stuff, subString slowly gets where i want it

Location:

trunk/src/lib

Files:

• shell/shell_command.cc (modified) (2 diffs)
• util/substring.cc (modified) (13 diffs)
• util/substring.h (modified) (3 diffs)

trunk/src/lib/shell/shell_command.cc

@@ -184 +184 @@
             {
 
-              (*alias)->getCommand()->executor->execute(objectList->front(), executionString.substr(inputSplits.getOffset(1))); /// TODO CHECK IF OK
+              (*alias)->getCommand()->executor->execute(objectList->front(), inputSplits.getSubSet(1).join()); /// TODO CHECK IF OK
             }
             else
@@ -241 +241 @@
               return false;
             if (inputSplits.size() > fktPos+1)
-              (*cmdIT)->executor->execute(objectPointer, executionString.substr(inputSplits.getOffset(fktPos +1))); /// TODO CHECK IF OK
+              (*cmdIT)->executor->execute(objectPointer, inputSplits.getSubSet(2).join()); /// TODO CHECK IF OK
             else
               (*cmdIT)->executor->execute(objectPointer, "");

trunk/src/lib/util/substring.cc

@@ -41 +41 @@
   split[0] = splitter;
   split[1] = '\0';
-  SubString::splitLine(this->strings, this->offsets,
-                       string, split);
+  SubString::splitLine(this->strings, string, split);
 }
 
@@ -52 +51 @@
 SubString::SubString(const std::string& string, bool whiteSpaces)
 {
-  SubString::splitLine(this->strings, this->offsets,
-                       string);
+  SubString::splitLine(this->strings, string);
 }
 
@@ -66 +64 @@
 SubString::SubString(const std::string& string, const std::string& splitters, char escapeChar,char safemode_char, char comment_char)
 {
-  SubString::splitLine(this->strings, this->offsets,
-                       string, splitters, escapeChar, safemode_char, comment_char);
+  SubString::splitLine(this->strings, string, splitters, escapeChar, safemode_char, comment_char);
 }
 
@@ -113 +110 @@
 SubString& SubString::operator=(const SubString& subString)
 {
-  this->offsets = subString.offsets;
   this->strings = subString.strings;
   return *this;
@@ -160 +156 @@
 unsigned int SubString::split(const std::string& string, char splitter)
 {
-  this->offsets.clear();
   this->strings.clear();
   char split[2];
   split[0] = splitter;
   split[1] = '\0';
-  SubString::splitLine(this->strings, this->offsets, string, split);
+  SubString::splitLine(this->strings, string, split);
   return strings.size();
 }
@@ -178 +173 @@
 unsigned int SubString::split(const std::string& string, bool whiteSpaces)
 {
-  this->offsets.clear();
   this->strings.clear();
-  SubString::splitLine(this->strings, this->offsets, string);
+  SubString::splitLine(this->strings, string);
   return strings.size();
 }
@@ -195 +189 @@
 unsigned int SubString::split(const std::string& string, const std::string& splitters, char escapeChar,char safemode_char, char comment_char)
 {
-  this->offsets.clear();
   this->strings.clear();
-  SubString::splitLine(this->strings, this->offsets,
-                       string, splitters, escapeChar, safemode_char);
+  SubString::splitLine(this->strings, string, splitters, escapeChar, safemode_char);
   return strings.size();
 }
@@ -248 +240 @@
 {
   return SubString(*this, subSetBegin, subSetEnd);
-}
-
-
-/**
- * @brief 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) const
-{
-  if( i < this->offsets.size() && i >= 0)
-    return this->offsets[i];
-  else
-    return 0;
 }
 
@@ -283 +261 @@
  *
  */
-SPLIT_LINE_STATE SubString::splitLine(std::vector<std::string>& ret, std::vector<unsigned int>& offsets,
-                                      const std::string& line, const std::string& delimiters,
-                                      char escape_char, char safemode_char, char comment_char,
+SPLIT_LINE_STATE SubString::splitLine(std::vector<std::string>& ret,
+                                      const std::string& line,
+                                      const std::string& delimiters,
+                                      char escape_char,
+                                      char safemode_char,
+                                      char comment_char,
                                       SPLIT_LINE_STATE start_state)
 {
@@ -317 +298 @@
           {
             ret.push_back(token);
-            offsets.push_back(i);
             token.clear();
           }
@@ -330 +310 @@
           {
             ret.push_back(token);
-            offsets.push_back(i);
             token.clear();
           }
@@ -384 +363 @@
           {
             ret.push_back(token);
-            offsets.push_back(i);
             token.clear();
           }
@@ -405 +383 @@
   {
     ret.push_back(token);
-    offsets.push_back(i);
     token.clear();
   }

trunk/src/lib/util/substring.h

@@ -48 +48 @@
   unsigned int split(const std::string& string, bool whiteSpaces);
   unsigned int split(const std::string& string, const std::string& splitters, char escapeChar ='\\', char safemode_char = '"', char comment_char = '\0');
-  std::string join(const std::string& delimiter) const;
+  std::string join(const std::string& delimiter = " ") const;
   ////////////////////////////////////////
 
@@ -57 +57 @@
   // retrieve Information from within
   inline unsigned int size() const { return this->strings.size(); };
-const std::string& getString(unsigned int i) const { return (i < this->strings.size()) ? this->strings[i] : emptyString; }
-  ; // safety-precaution
+  const std::string& getString(unsigned int i) const { return (i < this->strings.size()) ? this->strings[i] : emptyString; };
   const std::string& operator[](unsigned int i) const { return this->getString(i); };
-  unsigned int getOffset(unsigned int i) const;
 
   // the almighty algorithm.
-  static SPLIT_LINE_STATE splitLine(std::vector<std::string>& ret,std::vector<unsigned int>& offsets,
-                                    const std::string& line, const std::string& delimiters = " \t\r\n",
-                                    char escape_char = '\\', char safemode_char = '"', char comment_char = '\0',
+  static SPLIT_LINE_STATE splitLine(std::vector<std::string>& ret,
+                                    const std::string& line,
+                                    const std::string& delimiters = " \t\r\n",
+                                    char escape_char = '\\',
+                                    char safemode_char = '"',
+                                    char comment_char = '\0',
                                     SPLIT_LINE_STATE start_state = SL_NORMAL);
   // debugging.
@@ -72 +73 @@
 private:
   std::vector<std::string>  strings;                      //!< strings produced from a single string splitted in multiple strings
-  std::vector<unsigned int> offsets;                      //!< offsets of the beginning of the input-string to the beginning of each substring.
 
   static const std::string emptyString;