some more modernize

kevinushey · kevinushey · commit 82cbd7b866fc · 2014-02-15T23:05:24.000-08:00
diff --git a/inst/include/Rcpp/utils/tinyformat.h b/inst/include/Rcpp/utils/tinyformat.h
@@ -521,9 +521,9 @@ void FormatIterator::accept(const T& value)
         std::string result = tmpStream.str(); // allocates... yuck.
         if(m_extraFlags & Flag_SpacePadPositive)
         {
-            for(size_t i = 0, iend = result.size(); i < iend; ++i)
-                if(result[i] == '+')
-                    result[i] = ' ';
+            for(auto & elem : result)
+                if(elem == '+')
+                    elem = ' ';
         }
         if((m_extraFlags & Flag_TruncateToPrecision) &&
            (int)result.size() > (int)m_out.precision())
diff --git a/src/attributes.cpp b/src/attributes.cpp
@@ -944,8 +944,8 @@ namespace attributes {
                 rcppInterfacesWarning("No interfaces specified", lineNumber);
             }
             else {
-                for (std::size_t i=0; i<params.size(); i++) {
-                    std::string param = params[i].name();
+                for (auto & params_i : params) {
+                    std::string param = params_i.name();
                     if (param != kInterfaceR && param != kInterfaceCpp) {
                         rcppInterfacesWarning(
                             "Unknown interface '" + param + "'", lineNumber);
@@ -1420,13 +1420,12 @@ namespace attributes {
         // track cppExports and signatures (we use these at the end to
         // generate the ValidateSignature and RegisterCCallable functions)
         if (attributes.hasInterface(kInterfaceCpp)) {
-            for (auto 
-                       it = attributes.begin(); it != attributes.end(); ++it) {
-                if (it->isExportedFunction()) {
+            for (const auto & attribute : attributes) {
+                if (attribute.isExportedFunction()) {
                     // add it to the list if it's not hidden
-                    Function fun = it->function().renamedTo(it->exportedName());
+                    Function fun = attribute.function().renamedTo(attribute.exportedName());
                     if (!fun.isHidden())
-                        cppExports_.push_back(*it);
+                        cppExports_.push_back(attribute);
                 }
             }
         }
@@ -2059,11 +2058,10 @@ namespace attributes {
                      const std::string& contextId) {
         
         // process each attribute
-        for(auto 
-            it = attributes.begin(); it != attributes.end(); ++it) {
+        for(const auto & attribute : attributes) {
             
             // alias the attribute and function (bail if not export)
-            const Attribute& attribute = *it;
+            
             if (!attribute.isExportedFunction())
                 continue;
             const Function& function = attribute.function();
@@ -2479,10 +2477,10 @@ namespace {
                        const std::string& dllInfo) const
         {
             // process each attribute
-            for(auto it = attributes.begin(); it != attributes.end(); ++it) {
+            for(const auto & attribute : attributes) {
                 
                 // alias the attribute and function (bail if not export)
-                const Attribute& attribute = *it;
+                
                 if (!attribute.isExportedFunction()) continue;
                 const Function& function = attribute.function();
         
@@ -2685,9 +2683,8 @@ BEGIN_RCPP
     
     Rcpp::CharacterVector vDepends = Rcpp::as<Rcpp::CharacterVector>(sDepends);   
     std::set<std::string> depends;
-    for (Rcpp::CharacterVector::iterator 
-                        it = vDepends.begin(); it != vDepends.end(); ++it) {
-        depends.insert(std::string(*it));
+    for (auto & vDepend : vDepends) {
+        depends.insert(std::string(vDepend));
     }
 
     std::vector<std::string> cppFiles = 
diff --git a/tools/modernize.sh b/tools/modernize.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env sh
+
 IN_RCPP=`pwd | grep Rcpp11$`
 if [ ${#IN_RCPP} == 0 ]; then
     echo "Error: not in base Rcpp11 directory."
@@ -9,15 +11,25 @@ fi;
 ## the whole patch 'inst/include'
 find inst/include -name "*.h" -type f > tools/modernize-include.txt
 
+## NOTE: For some reason, clang-modernize tries to add a second
+## set of overrides to Rstreambuf.h, so we exclude it explicitly
+
+## I also currently get assertion errors if I try to use 
+## '-use-auto', hence I explicitly set some parameters for modernizing
+
 clang-modernize src/*.cpp \
+    -final-syntax-check \
     -include-from=tools/modernize-include.txt \
+    -exclude="inst/include/Rcpp/iostream/Rstreambuf.h" \
     -style="Chromium" \
     -risk=risky \
     -pass-by-value \
-    -use-auto \
+    -loop-convert \
+    -add-override \
+    -for-compilers=clang-3.5 \
     -- \
     -std=c++1y \
-    -Iinst/include \
-    -I/Library/Frameworks/R.framework/Headers \
     -I/Users/kevinushey/.llvm/libcxx/include \
-    -nostdinc++
+    -I/Library/Frameworks/R.framework/Headers \
+    -Iinst/include
+    

Original file line number	Diff line number	Diff line change
`@@ -521,9 +521,9 @@ void FormatIterator::accept(const T& value)`
`521`	`521`	`std::string result = tmpStream.str(); // allocates... yuck.`
`522`	`522`	`if(m_extraFlags & Flag_SpacePadPositive)`
`523`	`523`	`{`
`524`		`- for(size_t i = 0, iend = result.size(); i < iend; ++i)`
`525`		`- if(result[i] == '+')`
`526`		`- result[i] = ' ';`
	`524`	`+ for(auto & elem : result)`
	`525`	`+ if(elem == '+')`
	`526`	`+ elem = ' ';`
`527`	`527`	`}`
`528`	`528`	`if((m_extraFlags & Flag_TruncateToPrecision) &&`
`529`	`529`	`(int)result.size() > (int)m_out.precision())`