Changeset 10821 for code/branches/cpp11_v2/src/libraries/util/StringUtils.cc

Timestamp:

Nov 21, 2015, 7:05:53 PM (8 years ago)

Author:

muemart

Message:

Run clang-modernize -loop-convert

• Again, not all possible loops were converted
• It can do pretty cool transformations, but I had to fix a few compile errors, so there might be some runtime errors lurking around too

File:

• code/branches/cpp11_v2/src/libraries/util/StringUtils.cc (modified) (5 diffs)

code/branches/cpp11_v2/src/libraries/util/StringUtils.cc

@@ -262 +262 @@
         std::string output(str.size() * 2, ' ');
         size_t i = 0;
-        for (size_t pos = 0; pos < str.size(); ++pos)
-        {
-            switch (str[pos])
+        for (auto & elem : str)
+        {
+            switch (elem)
             {
             case '\\': output[i] = '\\'; output[i + 1] = '\\'; break;
@@ -276 +276 @@
             case  '"': output[i] = '\\'; output[i + 1] =  '"'; break;
             case '\0': output[i] = '\\'; output[i + 1] =  '0'; break;
-            default  : output[i] = str[pos]; ++i; continue;
+            default  : output[i] = elem; ++i; continue;
             }
             i += 2;
@@ -336 +336 @@
     void lowercase(std::string* str)
     {
-        for (size_t i = 0; i < str->size(); ++i)
-        {
-            (*str)[i] = static_cast<char>(tolower((*str)[i]));
+        for (auto & elem : *str)
+        {
+            elem = static_cast<char>(tolower(elem));
         }
     }
@@ -353 +353 @@
     void uppercase(std::string* str)
     {
-        for (size_t i = 0; i < str->size(); ++i)
-        {
-            (*str)[i] = static_cast<char>(toupper((*str)[i]));
+        for (auto & elem : *str)
+        {
+            elem = static_cast<char>(toupper(elem));
         }
     }
@@ -460 +460 @@
     {
         size_t j = 0;
-        for (size_t i = 0; i < str.size(); ++i)
-        {
-            if (str[i] == target)
+        for (auto & elem : str)
+        {
+            if (elem == target)
             {
-                str[i] = replacement;
+                elem = replacement;
                 ++j;
             }