Changeset 1020 for code/branches/core2/src/util

Timestamp:

Apr 10, 2008, 4:39:06 PM (17 years ago)

Author:

landauf

Message:

changed ConfigValueContainer to use ConfigFileManager, but there is still an error

Location:

code/branches/core2/src/util

Files:

• MultiTypeMath.cc (modified) (2 diffs)
• String.cc (modified) (3 diffs)
• String.h (modified) (1 diff)

code/branches/core2/src/util/MultiTypeMath.cc

@@ -169 +169 @@
         ConvertValue(&output, this->vector3_);
     else if (this->type_ == MT_colourvalue)
-    { std::cout << "3_1\n";
-        ConvertValue(&output, this->colourvalue_);}
+        ConvertValue(&output, this->colourvalue_);
     else if (this->type_ == MT_quaternion)
         ConvertValue(&output, this->quaternion_);
@@ -190 +189 @@
         return ConvertValue(&this->vector3_, value, orxonox::Vector3(0, 0, 0));
     else if (this->type_ == MT_colourvalue)
-    { std::cout << "4_1\n";
-        return ConvertValue(&this->colourvalue_, value, orxonox::ColourValue(0, 0, 0, 0)); }
+        return ConvertValue(&this->colourvalue_, value, orxonox::ColourValue(0, 0, 0, 0));
     else if (this->type_ == MT_quaternion)
         return ConvertValue(&this->quaternion_, value, orxonox::Quaternion(1, 0, 0, 0));

code/branches/core2/src/util/String.cc

@@ -62 +62 @@
 std::string removeTrailingWhitespaces(const std::string& str)
 {
+    unsigned int pos1 = 0;
+    unsigned int pos2 = str.size() - 1;
+    for (; pos1 < str.size() && (str[pos1] == ' ' || str[pos1] == '\t' || str[pos1] == '\n'); pos1++);
+    for (; pos2 >= 0         && (str[pos2] == ' ' || str[pos2] == '\t' || str[pos2] == '\n'); pos2--);
+    return str.substr(pos1, pos2 - pos1 + 1);
+}
+
+/**
+    @brief Returns the position of the next quote in the string, starting with start.
+    @param str The string
+    @param start The startposition
+    @return The position of the next quote (std::string::npos if there is no next quote)
+*/
+unsigned int getNextQuote(const std::string& str, unsigned int start)
+{
+    unsigned int quote = start - 1;
+
+    while ((quote = str.find('\"', quote + 1)) != std::string::npos)
+    {
+        unsigned int backslash = quote;
+        unsigned int numbackslashes = 0;
+        for (; backslash > 0; backslash--, numbackslashes++)
+            if (str[backslash - 1] != '\\')
+                break;
+
+        if (numbackslashes % 2 == 0)
+            break;
+    }
+
+    return quote;
 }
 
@@ -71 +101 @@
 bool hasStringBetweenQuotes(const std::string& str)
 {
+    unsigned int pos1 = getNextQuote(str, 0);
+    unsigned int pos2 = getNextQuote(str, pos1 + 1);
+    return (pos1 != std::string::npos && pos2 != std::string::npos && pos2 > pos1 + 1);
 }
 
@@ -80 +113 @@
 std::string getStringBetweenQuotes(const std::string& str)
 {
+    unsigned int pos1 = getNextQuote(str, 0);
+    unsigned int pos2 = getNextQuote(str, pos1 + 1);
+    if (pos1 != std::string::npos && pos2 != std::string::npos)
+        return str.substr(pos1, pos2 - pos1 + 1);
+    else
+        return "";
 }
 

code/branches/core2/src/util/String.h

@@ -38 +38 @@
 
 _UtilExport std::string  removeTrailingWhitespaces(const std::string& str);
+
+_UtilExport unsigned int getNextQuote(const std::string& str, unsigned int start);
 
 _UtilExport bool         hasStringBetweenQuotes(const std::string& str);