re-format macros for legibility

Author: kevinushey

ChangeLog

@@ -1,3 +1,7 @@
+2014-12-29  Kevin Ushey  <[email protected]>
+
+        * inst/include/Rcpp/macros/macros.h: reformat for legibility
+
 2014-12-11  Yixuan Qiu <[email protected]>
 
         * inst/include/Rcpp/internal/r_vector.h: Internal functions to

inst/include/Rcpp/macros/macros.h

@@ -23,26 +23,47 @@
 #define Rcpp_macros_macros_h
 
 #define RCPP_DECORATE(__FUN__) __FUN__##__rcpp__wrapper__
-#define RCPP_GET_NAMES(x)       Rf_getAttrib(x, R_NamesSymbol)
-#define RCPP_GET_CLASS(x)       Rf_getAttrib(x, R_ClassSymbol)
+#define RCPP_GET_NAMES(x) Rf_getAttrib(x, R_NamesSymbol)
+#define RCPP_GET_CLASS(x) Rf_getAttrib(x, R_ClassSymbol)
 
 #ifndef BEGIN_RCPP
-#define BEGIN_RCPP try{
+#define BEGIN_RCPP try {
 #endif
 
 #ifndef VOID_END_RCPP
-#define VOID_END_RCPP } catch( Rcpp::internal::InterruptedException& __ex__ ) { Rf_onintr(); } catch( std::exception& __ex__ ){ forward_exception_to_r( __ex__ ) ; } catch(...){ ::Rf_error( "c++ exception (unknown reason)" ) ; }
+#define VOID_END_RCPP                                                          \
+  }                                                                            \
+  catch (Rcpp::internal::InterruptedException &__ex__) {                       \
+    Rf_onintr();                                                               \
+  }                                                                            \
+  catch (std::exception &__ex__) {                                             \
+    forward_exception_to_r(__ex__);                                            \
+  }                                                                            \
+  catch (...) {                                                                \
+    ::Rf_error("c++ exception (unknown reason)");                              \
+  }
 #endif
 
 #ifndef END_RCPP
 #define END_RCPP VOID_END_RCPP return R_NilValue;
 #endif
 
 #ifndef END_RCPP_RETURN_ERROR
-#define END_RCPP_RETURN_ERROR } catch( Rcpp::internal::InterruptedException& __ex__ ) { return Rcpp::internal::interruptedError(); } catch( std::exception& __ex__ ){ return exception_to_try_error( __ex__ ) ; } catch(...){ return string_to_try_error( "c++ exception (unknown reason)" ) ; } return R_NilValue;
+#define END_RCPP_RETURN_ERROR                                                  \
+  }                                                                            \
+  catch (Rcpp::internal::InterruptedException &__ex__) {                       \
+    return Rcpp::internal::interruptedError();                                 \
+  }                                                                            \
+  catch (std::exception &__ex__) {                                             \
+    return exception_to_try_error(__ex__);                                     \
+  }                                                                            \
+  catch (...) {                                                                \
+    return string_to_try_error("c++ exception (unknown reason)");              \
+  }                                                                            \
+  return R_NilValue;
 #endif
 
-#define Rcpp_error(MESSAGE) throw Rcpp::exception( MESSAGE, __FILE__, __LINE__ )
+#define Rcpp_error(MESSAGE) throw Rcpp::exception(MESSAGE, __FILE__, __LINE__)
 
 #include <Rcpp/macros/debug.h>
 #include <Rcpp/macros/unroll.h>