Changeset 849

Timestamp:

Mar 5, 2008, 1:33:08 AM (16 years ago)

Author:

landauf

Message:

and here comes the extended SubString class (added parenthesis support), I had problems with svn

Location:

code/branches/core/src/util

Files:

• SubString.cc (modified) (6 diffs)
• SubString.h (modified) (6 diffs)

code/branches/core/src/util/SubString.cc

@@ -45 +45 @@
 /**
  * @brief create a SubString from
- * @param string the String to Spilit
+ * @param string the String to Split
  * @param delimiter the Character at which to split string (delimiter)
  */
@@ -66 +66 @@
 SubString::SubString(const std::string& string,
                      const std::string& delimiters, const std::string& delimiterNeighbours, bool emptyEntries,
-                     char escapeChar, char safemode_char, char comment_char)
-{
-  SubString::splitLine(this->strings, string, delimiters, delimiterNeighbours, emptyEntries, escapeChar, safemode_char, comment_char);
+                     char escapeChar, char safemode_char, char openparenthesis_char, char closeparenthesis_char, char comment_char)
+{
+  SubString::splitLine(this->strings, string, delimiters, delimiterNeighbours, emptyEntries, escapeChar, safemode_char, openparenthesis_char, closeparenthesis_char, comment_char);
 }
 
@@ -223 +223 @@
 unsigned int SubString::split(const std::string& string,
                               const std::string& delimiters, const std::string& delimiterNeighbours, bool emptyEntries,
-                              char escapeChar,char safemode_char, char comment_char)
+                              char escapeChar, char safemode_char, char openparenthesis_char, char closeparenthesis_char, char comment_char)
 {
   this->strings.clear();
-  SubString::splitLine(this->strings, string, delimiters, delimiterNeighbours, emptyEntries, escapeChar, safemode_char, comment_char);
+  SubString::splitLine(this->strings, string, delimiters, delimiterNeighbours, emptyEntries, escapeChar, safemode_char, openparenthesis_char, closeparenthesis_char, comment_char);
   return this->strings.size();
 }
@@ -308 +308 @@
                      char escape_char,
                      char safemode_char,
+                     char openparenthesis_char,
+                     char closeparenthesis_char,
                      char comment_char,
                      SPLIT_LINE_STATE start_state)
@@ -335 +337 @@
         {
           state = SL_SAFEMODE;
+        }
+        else if(line[i] == openparenthesis_char)
+        {
+          state = SL_PARENTHESES;
         }
         else if(line[i] == comment_char)
@@ -419 +425 @@
         break;
 
+      case SL_PARENTHESES:
+        if(line[i] == closeparenthesis_char)
+        {
+          state = SL_NORMAL;
+        }
+        else if(line[i] == escape_char)
+        {
+          state = SL_PARENTHESESESCAPE;
+        }
+        else
+        {
+          token += line[i];       // EAT
+        }
+        break;
+
+      case SL_PARENTHESESESCAPE:
+        if(line[i] == 'n') token += '\n';
+        else if(line[i] == 't') token += '\t';
+        else if(line[i] == 'v') token += '\v';
+        else if(line[i] == 'b') token += '\b';
+        else if(line[i] == 'r') token += '\r';
+        else if(line[i] == 'f') token += '\f';
+        else if(line[i] == 'a') token += '\a';
+        else if(line[i] == '?') token += '\?';
+        else token += line[i];  // EAT
+        state = SL_PARENTHESES;
+        break;
+
       case SL_COMMENT:
         if(line[i] == '\n')

code/branches/core/src/util/SubString.h

@@ -23 +23 @@
  *   Co-authors:
  *      Benjamin Grauer
+ *      Fabian 'x3n' Landau
  *
-//
+
 //  splitLine
 //  STL string tokenizer
@@ -31 +32 @@
 //  Version 1.0
 //  Copyright (c) 2005 Clemens Wacha. All rights reserved.
-//
+
+ * Extended by Fabian 'x3n' Landau with the SL_PARENTHESES mode.
  */
 
@@ -76 +78 @@
     SL_SAFEESCAPE,        //!< In safe mode with the internal escape character, that escapes even the savemode character.
     SL_COMMENT,           //!< In Comment mode.
+    SL_PARENTHESES,       //!< Between parentheses (usually '(' and ')')
+    SL_PARENTHESESESCAPE, //!< Between parentheses with the internal escape character, that escapes even the closing paranthesis character.
   } SPLIT_LINE_STATE;
 
@@ -84 +88 @@
   SubString(const std::string& string,
             const std::string& delimiters, const std::string& delimiterNeighbours = "", bool emptyEntries=false,
-            char escapeChar ='\\', char safemode_char = '"', char comment_char = '\0');
+            char escapeChar ='\\', char safemode_char = '"', char openparenthesis_char = '(', char closeparenthesis_char = ')', char comment_char = '\0');
   SubString(unsigned int argc, const char** argv);
   /** @brief create a Substring as a copy of another one. @param subString the SubString to copy. */
@@ -107 +111 @@
   unsigned int split(const std::string& string,
                      const std::string& delimiters, const std::string& delimiterNeighbours = "", bool emptyEntries = false,
-                     char escapeChar ='\\', char safemode_char = '"', char comment_char = '\0');
+                     char escapeChar ='\\', char safemode_char = '"', char openparenthesis_char = '(', char closeparenthesis_char = ')', char comment_char = '\0');
   std::string join(const std::string& delimiter = " ") const;
   ////////////////////////////////////////
@@ -139 +143 @@
                                     char escape_char = '\\',
                                     char safemode_char = '"',
+                                    char openparenthesis_char = '(',
+                                    char closeparenthesis_char = ')',
                                     char comment_char = '\0',
                                     SPLIT_LINE_STATE start_state = SL_NORMAL);