Merge pull request #792 from krlmlr/f-fallthrough

fallthrough comments
RcppCore · Dec 21, 2017 · 4a47dcb · 4a47dcb
2 parents a9d8632 + 749175b
commit 4a47dcb
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 38 deletions.
diff --git a/inst/include/Rcpp/internal/wrap.h b/inst/include/Rcpp/internal/wrap.h
@@ -128,10 +128,13 @@ namespace Rcpp {
             switch (size - i) {
             case 3:
                 start[i] = first[i]; i++;
+                // fallthrough
             case 2:
                 start[i] = first[i]; i++;
+                // fallthrough
             case 1:
                 start[i] = first[i]; i++;
+                // fallthrough
             case 0:
             default:
                 {}

diff --git a/inst/include/Rcpp/macros/unroll.h b/inst/include/Rcpp/macros/unroll.h
@@ -44,46 +44,46 @@ switch (n - i){                                \
 }
 
 
-#define RCPP_LOOP_UNROLL(TARGET,SOURCE)           \
-R_xlen_t __trip_count = n >> 2 ;                  \
-R_xlen_t i = 0 ;                                  \
-for ( ; __trip_count > 0 ; --__trip_count) {      \
-	TARGET[i] = SOURCE[i] ; i++ ;                 \
-	TARGET[i] = SOURCE[i] ; i++ ;                 \
-	TARGET[i] = SOURCE[i] ; i++ ;                 \
-	TARGET[i] = SOURCE[i] ; i++ ;                 \
-}                                                 \
-switch (n - i){                                   \
-  case 3:                                         \
-      TARGET[i] = SOURCE[i] ; i++ ;               \
-  case 2:                                         \
-      TARGET[i] = SOURCE[i] ; i++ ;               \
-  case 1:                                         \
-      TARGET[i] = SOURCE[i] ; i++ ;               \
-  case 0:                                         \
-  default:                                        \
-      {}                                          \
+#define RCPP_LOOP_UNROLL(TARGET,SOURCE)               \
+R_xlen_t __trip_count = n >> 2 ;                      \
+R_xlen_t i = 0 ;                                      \
+for ( ; __trip_count > 0 ; --__trip_count) {          \
+        TARGET[i] = SOURCE[i] ; i++ ;                 \
+        TARGET[i] = SOURCE[i] ; i++ ;                 \
+        TARGET[i] = SOURCE[i] ; i++ ;                 \
+        TARGET[i] = SOURCE[i] ; i++ ;                 \
+}                                                     \
+switch (n - i){                                       \
+  case 3:                                             \
+      TARGET[i] = SOURCE[i] ; i++ ; /* fallthrough */ \
+  case 2:                                             \
+      TARGET[i] = SOURCE[i] ; i++ ; /* fallthrough */ \
+  case 1:                                             \
+      TARGET[i] = SOURCE[i] ; i++ ; /* fallthrough */ \
+  case 0:                                             \
+  default:                                            \
+      {}                                              \
 }
 
-#define RCPP_LOOP_UNROLL_LHSFUN(TARGET,FUN,SOURCE) \
-R_xlen_t __trip_count = n >> 2 ;                  \
-R_xlen_t i = 0 ;                                  \
-for ( ; __trip_count > 0 ; --__trip_count) {      \
-	TARGET[FUN(i)] = SOURCE[i] ; i++ ;            \
-	TARGET[FUN(i)] = SOURCE[i] ; i++ ;            \
-	TARGET[FUN(i)] = SOURCE[i] ; i++ ;            \
-	TARGET[FUN(i)] = SOURCE[i] ; i++ ;            \
-}                                                 \
-switch (n - i){                                   \
-  case 3:                                         \
-      TARGET[FUN(i)] = SOURCE[i] ; i++ ;          \
-  case 2:                                         \
-      TARGET[FUN(i)] = SOURCE[i] ; i++ ;          \
-  case 1:                                         \
-      TARGET[FUN(i)] = SOURCE[i] ; i++ ;          \
-  case 0:                                         \
-  default:                                        \
-      {}                                          \
+#define RCPP_LOOP_UNROLL_LHSFUN(TARGET,FUN,SOURCE)         \
+R_xlen_t __trip_count = n >> 2 ;                           \
+R_xlen_t i = 0 ;                                           \
+for ( ; __trip_count > 0 ; --__trip_count) {               \
+    TARGET[FUN(i)] = SOURCE[i] ; i++ ;                     \
+    TARGET[FUN(i)] = SOURCE[i] ; i++ ;                     \
+    TARGET[FUN(i)] = SOURCE[i] ; i++ ;                     \
+    TARGET[FUN(i)] = SOURCE[i] ; i++ ;                     \
+}                                                          \
+switch (n - i){                                            \
+  case 3:                                                  \
+      TARGET[FUN(i)] = SOURCE[i] ; i++ ; /* fallthrough */ \
+  case 2:                                                  \
+      TARGET[FUN(i)] = SOURCE[i] ; i++ ; /* fallthrough */ \
+  case 1:                                                  \
+      TARGET[FUN(i)] = SOURCE[i] ; i++ ; /* fallthrough */ \
+  case 0:                                                  \
+  default:                                                 \
+      {}                                                   \
 }
 
 #endif