minor cleanup

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,8 @@
+2017-05-19  Dirk Eddelbuettel  <[email protected]>
+
+        * inst/NEWS.Rd: Removed one duplicate entry
+        * inst/include/Rcpp/api/meat/Rcpp_eval.h (Rcpp): Minor whitespace changes
+
 2017-05-18  Dirk Eddelbuettel  <[email protected]>
 
         * DESCRIPTION (Version, Date): Roll Date and Version once more

inst/NEWS.Rd

@@ -22,8 +22,6 @@
       \ghit{184}).
       \item One more instance of \code{Rf_mkString} is protected from garbage
       collection (Dirk in \ghpr{686} addressing \ghit{685}).
-      \item Several compiler warnings for \code{-Wconversions} are no longer
-      generated (Kirill Mueller in \ghpr{687} and \ghpr{688})
       \item Two exception specification that are no longer tolerated by
       \code{g++-7.1} or later were removed (Dirk in \ghpr{690} addressing
       \ghit{689})

inst/include/Rcpp/api/meat/Rcpp_eval.h

@@ -25,31 +25,17 @@ namespace Rcpp {
 inline SEXP Rcpp_eval(SEXP expr, SEXP env) {
 
     // 'identity' function used to capture errors, interrupts
-    SEXP identity = Rf_findFun(
-        ::Rf_install("identity"),
-        R_BaseNamespace
-    );
+    SEXP identity = Rf_findFun(::Rf_install("identity"), R_BaseNamespace);
 
     if (identity == R_UnboundValue) {
         stop("Failed to find 'base::identity()'");
     }
 
-    // define the evalq call -- the actual R evaluation we
-    // want to execute
-    Shield<SEXP> evalqCall(Rf_lang3(
-        ::Rf_install("evalq"),
-        expr,
-        env
-    ));
+    // define the evalq call -- the actual R evaluation we want to execute
+    Shield<SEXP> evalqCall(Rf_lang3(::Rf_install("evalq"), expr, env));
 
-    // define the call -- enclose with `tryCatch` so we can record
-    // and later forward error messages
-    Shield<SEXP> call(Rf_lang4(
-        ::Rf_install("tryCatch"),
-        evalqCall,
-        identity,
-        identity
-    ));
+    // define the call -- enclose with `tryCatch` so we can record and forward error messages
+    Shield<SEXP> call(Rf_lang4(::Rf_install("tryCatch"), evalqCall, identity, identity));
     SET_TAG(CDDR(call), ::Rf_install("error"));
     SET_TAG(CDDR(CDR(call)), ::Rf_install("interrupt"));
 
@@ -61,10 +47,7 @@ inline SEXP Rcpp_eval(SEXP expr, SEXP env) {
 
         if (Rf_inherits(res, "error")) {
 
-            Shield<SEXP> conditionMessageCall(::Rf_lang2(
-                    ::Rf_install("conditionMessage"),
-                    res
-            ));
+            Shield<SEXP> conditionMessageCall(::Rf_lang2(::Rf_install("conditionMessage"), res));
 
             Shield<SEXP> conditionMessage(::Rf_eval(conditionMessageCall, R_GlobalEnv));
             throw eval_error(CHAR(STRING_ELT(conditionMessage, 0)));