fix some C++ code flagged by CRAN warnings (#1386)

nimble-dev · Jan 11, 2024 · 7e6170b · 7e6170b
1 parent cdb1329
commit 7e6170b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/packages/nimble/inst/CppCode/RcppUtils.cpp b/packages/nimble/inst/CppCode/RcppUtils.cpp
@@ -234,7 +234,7 @@ vector<int> SEXP_2_vectorInt( SEXP Sn, int offset ) {
 
 int SEXP_2_int(SEXP Sn, int i ) {
   if(!(Rf_isNumeric(Sn) || Rf_isLogical(Sn))) PRINTF("Error: SEXP_2_int called for SEXP that is not numeric or logical\n");
-  if(LENGTH(Sn) <= i) PRINTF("Error: SEXP_2_int called for element %i% >= length of %i.\n", i, LENGTH(Sn));
+  if(LENGTH(Sn) <= i) PRINTF("Error: SEXP_2_int called for element %i% which is beyond the length of %i.\n", i, LENGTH(Sn));
   if(Rf_isInteger(Sn) || Rf_isLogical(Sn)) {
     if(Rf_isInteger(Sn))
       return(INTEGER(Sn)[i]);
@@ -270,7 +270,7 @@ SEXP bool_2_SEXP(bool ind){
 
 bool SEXP_2_bool(SEXP Sn, int i) {
   if(!(Rf_isNumeric(Sn) || Rf_isLogical(Sn))) PRINTF("Error: SEXP_2_bool called for SEXP that is not numeric or logical\n");
-  if(LENGTH(Sn) <= i) PRINTF("Error: SEXP_2_bool called for element %i% >= length of %i.\n", i, LENGTH(Sn));
+  if(LENGTH(Sn) <= i) PRINTF("Error: SEXP_2_bool called for element %i% which is beyond the length of %i.\n", i, LENGTH(Sn));
   if(Rf_isLogical(Sn)) {
     return(static_cast<bool>(LOGICAL(Sn)[i]));
   } else {

diff --git a/packages/nimble/inst/CppCode/Utils.cpp b/packages/nimble/inst/CppCode/Utils.cpp
@@ -62,8 +62,8 @@ bool decide(double lMHr) { // simple function accept or reject based on log Metr
   return(false);
 }
 
-void nimStop(string msg) {NIMERROR(msg.c_str());}
-void nimStop() {NIMERROR("");}
+void nimStop(string msg) {NIMERROR("%s", msg.c_str());}
+void nimStop() {NIMERROR("Error. Exiting from compiled execution.");}
 
 bool nimNot(bool x) {return(!x);}
 

diff --git a/packages/nimble/inst/CppCode/eigenUsingClasses.cpp b/packages/nimble/inst/CppCode/eigenUsingClasses.cpp
@@ -30,7 +30,7 @@ template<>
 void SEXP_2_NimArr<1>(SEXP Sn, NimArr<1, double> &ans) {
   NIM_ASSERT2(Rf_isNumeric(Sn) || Rf_isLogical(Sn),
     "SEXP_2_NimArr<1, double> called for SEXP that is not a numeric or logical: actual type %s\n",
-    Rf_type2str(TYPEOF(Sn)));
+    Rf_type2char(TYPEOF(Sn)));
   int nn = LENGTH(Sn);
   NIM_ASSERT1(ans.size() == 0, "trying to reset a NimArr that was already sized\n");
   ans.setSize(nn);
@@ -39,7 +39,7 @@ void SEXP_2_NimArr<1>(SEXP Sn, NimArr<1, double> &ans) {
   } else {
     NIM_ASSERT2(Rf_isInteger(Sn) || Rf_isLogical(Sn),
       "could not handle input of type %s to SEXP_2_NimArr<1, double>\n",
-      Rf_type2str(TYPEOF(Sn)));
+      Rf_type2char(TYPEOF(Sn)));
     int *iSn = Rf_isInteger(Sn) ? INTEGER(Sn) : LOGICAL(Sn);
     for(int i = 0; i < nn; ++i) {
       ans(i) = static_cast<double>(iSn[i]);
@@ -52,7 +52,7 @@ template<>
 void SEXP_2_NimArr<1>(SEXP Sn, NimArr<1, int> &ans) {
   NIM_ASSERT2(Rf_isNumeric(Sn) || Rf_isLogical(Sn),
     "SEXP_2_NimArr<1, int> called for SEXP that is not a numeric or logical: actual type %s\n",
-    Rf_type2str(TYPEOF(Sn)));
+    Rf_type2char(TYPEOF(Sn)));
   int nn = LENGTH(Sn);
   NIM_ASSERT1(ans.size() == 0, "trying to reset a NimArr that was already sized\n");
   ans.setSize(nn);
@@ -61,7 +61,7 @@ void SEXP_2_NimArr<1>(SEXP Sn, NimArr<1, int> &ans) {
   } else {
     NIM_ASSERT2(Rf_isInteger(Sn) || Rf_isLogical(Sn),
       "could not handle input of type %s to SEXP_2_NimArr<1, int>\n",
-      Rf_type2str(TYPEOF(Sn)));
+      Rf_type2char(TYPEOF(Sn)));
     int *iSn = Rf_isInteger(Sn) ? INTEGER(Sn) : LOGICAL(Sn);
     for(int i = 0; i < nn; ++i) {
       ans(i) = static_cast<double>(iSn[i]);

diff --git a/packages/nimble/inst/include/nimble/RcppNimbleUtils.h b/packages/nimble/inst/include/nimble/RcppNimbleUtils.h
@@ -239,11 +239,11 @@ template<int ndim>
 void SEXP_2_NimArr(SEXP Sn, NimArr<ndim, double> &ans) {
   NIM_ASSERT3(Rf_isNumeric(Sn) || Rf_isLogical(Sn),
     "SEXP_2_NimArr<%d, double> called for SEXP that is not a numeric or logical: actual type %s\n",
-    ndim, Rf_type2str(TYPEOF(Sn)));
+    ndim, Rf_type2char(TYPEOF(Sn)));
   vector<int> inputDims(getSEXPdims(Sn));
   NIM_ASSERT4(inputDims.size() == ndim,
     "Wrong number of input dimensions in SEXP_2_NimArr<%d, double> called for SEXP that is not a numeric: expected %d, actual %d\n",
-    ndim, ndim, inputDims.size());
+    ndim, ndim, static_cast<int>(inputDims.size()));
   // NIM_ASSERT(ans.size() == 0, "trying to reset a NimArr that was already sized\n");
   ans.setSize(inputDims);
   int nn = LENGTH(Sn);
@@ -252,7 +252,7 @@ void SEXP_2_NimArr(SEXP Sn, NimArr<ndim, double> &ans) {
   } else {
     NIM_ASSERT3(Rf_isInteger(Sn) || Rf_isLogical(Sn),
       "could not handle input of type %s to SEXP_2_NimArr<%d, double>\n",
-      Rf_type2str(TYPEOF(Sn)), ndim);
+      Rf_type2char(TYPEOF(Sn)), ndim);
     int *iSn = Rf_isInteger(Sn) ? INTEGER(Sn) : LOGICAL(Sn);
     std::copy(iSn, iSn + nn, ans.getPtr()); //v);
   }
@@ -263,7 +263,7 @@ template<int ndim>
 void SEXP_2_NimArr(SEXP Sn, NimArr<ndim, int> &ans) {
   NIM_ASSERT3(Rf_isNumeric(Sn) || Rf_isLogical(Sn),
     "SEXP_2_NimArr<%d, int> called for SEXP that is not a numeric or logical: actual type %s\n",
-    ndim, Rf_type2str(TYPEOF(Sn)));
+    ndim, Rf_type2char(TYPEOF(Sn)));
   vector<int> inputDims(getSEXPdims(Sn));
   NIM_ASSERT4(inputDims.size() == ndim,
     "Wrong number of input dimensions in SEXP_2_NimArr<%d, int> called for SEXP that is not a numeric: expected %d, actual %d\n",
@@ -276,7 +276,7 @@ void SEXP_2_NimArr(SEXP Sn, NimArr<ndim, int> &ans) {
   } else {
     NIM_ASSERT3(Rf_isInteger(Sn) || Rf_isLogical(Sn),
       "could not handle input type %s to SEXP_2_NimArr<%d, int>\n",
-      Rf_type2str(TYPEOF(Sn)), ndim);
+      Rf_type2char(TYPEOF(Sn)), ndim);
     int *iSn = Rf_isInteger(Sn) ? INTEGER(Sn) : LOGICAL(Sn);
     std::copy(iSn, iSn + nn, ans.getPtr()); //v);
   }
@@ -286,7 +286,7 @@ template<int ndim>
 void SEXP_2_NimArr(SEXP Sn, NimArr<ndim, bool> &ans) {
   NIM_ASSERT3(Rf_isNumeric(Sn) || Rf_isLogical(Sn),
     "SEXP_2_NimArr<%d, bool> called for SEXP that is not a numeric or logical: actual type %s\n",
-    ndim, Rf_type2str(TYPEOF(Sn)));
+    ndim, Rf_type2char(TYPEOF(Sn)));
   vector<int> inputDims(getSEXPdims(Sn));
   NIM_ASSERT4(inputDims.size() == ndim,
     "Wrong number of input dimensions in SEXP_2_NimArr<%d, bool> called for SEXP that is not a numeric: expected %d, actual %d\n",
@@ -299,7 +299,7 @@ void SEXP_2_NimArr(SEXP Sn, NimArr<ndim, bool> &ans) {
   } else {
     NIM_ASSERT3(Rf_isInteger(Sn) || Rf_isLogical(Sn),
       "could not handle input type %s to SEXP_2_NimArr<%d, bool>\n",
-      Rf_type2str(TYPEOF(Sn)), ndim);
+      Rf_type2char(TYPEOF(Sn)), ndim);
     int *iSn = Rf_isInteger(Sn) ? INTEGER(Sn) : LOGICAL(Sn);
     std::copy(iSn, iSn + nn, ans.getPtr()); //v);
   }