Changeset 9328 in orxonox.OLD for branches

Timestamp:

Jul 18, 2006, 7:28:06 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: substring nicer now

Location:

branches/proxy/src/lib

Files:

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

branches/proxy/src/lib/shell/shell_command.cc

@@ -299 +299 @@
       {
         PRINT(0)("Command '%s' on '%s::%s'\n", sc->getName(), (*bo)->getClassName(), (*bo)->getName());
-        (*sc->executor)((*bo), inputSplits.getSubSet(paramBegin));
+        (*sc->executor)((*bo), inputSplits.subSet(paramBegin));
       }
       return true;
@@ -375 +375 @@
 //       if(this->completors[parameter] == NULL)
 //       delete this->completors[parameter];
-//       this->completors[parameter] = completorPlugin.clone(); 
+//       this->completors[parameter] = completorPlugin.clone();
     }
     return this;

branches/proxy/src/lib/util/substring.cc

@@ -249 +249 @@
  * SubString::SubString(const SubString& subString, unsigned int subSetBegin)
  */
-SubString SubString::getSubSet(unsigned int subSetBegin) const
+SubString SubString::subSet(unsigned int subSetBegin) const
 {
   return SubString(*this, subSetBegin);
@@ -264 +264 @@
  * SubString::SubString(const SubString& subString, unsigned int subSetBegin)
  */
-SubString SubString::getSubSet(unsigned int subSetBegin, unsigned int subSetEnd) const
+SubString SubString::subSet(unsigned int subSetBegin, unsigned int subSetEnd) const
 {
   return SubString(*this, subSetBegin, subSetEnd);
@@ -288 +288 @@
  * Supports delimiters, escape characters,
  * ignores special  characters between safemode_char and between comment_char and linend '\n'.
- *
- *
  */
 SubString::SPLIT_LINE_STATE

branches/proxy/src/lib/util/substring.h

@@ -75 +75 @@
 
   // retrieve a SubSet from the String
-  SubString getSubSet(unsigned int subSetBegin) const;
-  SubString getSubSet(unsigned int subSetBegin, unsigned int subSetEnd) const;
+  SubString subSet(unsigned int subSetBegin) const;
+  SubString subSet(unsigned int subSetBegin, unsigned int subSetEnd) const;
 
   // retrieve Information from within
@@ -84 +84 @@
   inline unsigned int size() const { return this->strings.size(); };
   /** @param i the i'th String @returns the i'th string from the subset of Strings */
-  inline const std::string& operator[](unsigned int i) const { return /*(i < this->strings.size()) ? */this->strings[i] /*: emptyString*/; };
+  inline const std::string& operator[](unsigned int i) const { return this->strings[i]; };
   /** @param i the i'th String @returns the i'th string from the subset of Strings */
   inline const std::string& getString(unsigned int i) const { return (*this)[i]; };
@@ -113 +113 @@
 private:
   std::vector<std::string>  strings;                      //!< strings produced from a single string splitted in multiple strings
-
-//   static const std::string emptyString;
 };