Improve error messages

r-lib · May 28, 2024 · ce3e2f9 · ce3e2f9
1 parent 5c1f428
commit ce3e2f9
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/src/protect.h b/src/protect.h
@@ -1,8 +1,10 @@
 #pragma once
 
+#include <string>
 #include <Rdefines.h>
 
-#define STR(x) #x
+#define STR(x) STR2(x)
+#define STR2(x) #x
 
 #define R_API_START()                                                    \
   SEXP err_ = R_NilValue;                                                \
@@ -18,7 +20,7 @@
   } catch(std::string& ex) {                                             \
     strncpy(error_buffer_, ex.c_str(), sizeof(error_buffer_) - 1);       \
   } catch(...) {                                                         \
-    Rf_error("error in " STR(__FILE__) " @ " STR(__PRETTY_FUNCTION__));  \
+    Rf_error("nanoparquet error @ " __FILE__ ":" STR(__LINE__));         \
   }                                                                      \
   if (!Rf_isNull(err_)) {                                                \
     R_ContinueUnwind(err_);                                              \

diff --git a/src/read.cpp b/src/read.cpp
@@ -187,8 +187,9 @@ SEXP nanoparquet_read(SEXP filesxp) {
       default:
         auto it = parquet::format::_ConvertedType_VALUES_TO_NAMES.find(
             s_ele->converted_type);
-        // TODO: better error message
-        throw np_error({ uwtoken });
+        string msg = string("nanoparquet_read: Unknown FLBA type ") +
+          it->second + " @ " __FILE__ ":" STR(__LINE__) " (" + __func__ + ")";
+        throw msg;
       }
       break;
     }
@@ -198,7 +199,9 @@ SEXP nanoparquet_read(SEXP filesxp) {
     default:
       auto it = parquet::format::_Type_VALUES_TO_NAMES.find(
           f.columns[col_idx]->type);
-      throw np_error({ uwtoken });
+      string msg = string("nanoparquet_read: Unknown column type ") +
+        it->second + " @ " __FILE__ ":" STR(__LINE__) " (" + __func__ + ")";
+      throw msg;
     }
     SET_VECTOR_ELT(retlist, col_idx, varvalue);
     UNPROTECT(1); /* varvalue */
@@ -258,7 +261,10 @@ SEXP nanoparquet_read(SEXP filesxp) {
             default:
               auto it = parquet::format::_ConvertedType_VALUES_TO_NAMES.find(
                   s_ele->converted_type);
-              throw np_error({ uwtoken });
+              string msg = string("nanoparquet_read: Unknown column type ") +
+                it->second + " @ " __FILE__ ":" STR(__LINE__) " (" +
+                __func__ + ")";
+              throw msg;
             }
             break;
           }
@@ -270,7 +276,10 @@ SEXP nanoparquet_read(SEXP filesxp) {
           default: {
             auto it = parquet::format::_Type_VALUES_TO_NAMES.find(
                 f.columns[col_idx]->type);
-            throw np_error({ uwtoken });
+            string msg = string("nanoparquet_read: Unknown column type ") +
+              it->second + " @ " __FILE__ ":" STR(__LINE__) " (" +
+              __func__ + ")";
+            throw msg;
             }
           }
           continue;
@@ -334,7 +343,10 @@ SEXP nanoparquet_read(SEXP filesxp) {
           default:
             auto it = parquet::format::_ConvertedType_VALUES_TO_NAMES.find(
                 s_ele->converted_type);
-            throw np_error({ uwtoken });
+            string msg = string("nanoparquet_read: Unknown FLBA type ") +
+              it->second + " @ " __FILE__ ":" STR(__LINE__) " (" +
+              __func__ + ")";
+            throw msg;
             break;
           }
         }
@@ -347,7 +359,9 @@ SEXP nanoparquet_read(SEXP filesxp) {
         default: {
           auto it = parquet::format::_Type_VALUES_TO_NAMES.find(
               f.columns[col_idx]->type);
-          throw np_error({ uwtoken });
+          string msg = string("nanoparquet_read: Unknown column type ") +
+            it->second + " @ " __FILE__ ":" STR(__LINE__) " (" + __func__ + ")";
+          throw msg;
         }
         }
       }