Merge pull request #30 from EmilHvitfeldt/file-reorder

rename c files
r-lib · May 6, 2024 · 6657162 · 6657162
2 parents 199ea2a + 1c2fc6a
commit 6657162
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/src/altrep-sparse-real.c b/src/altrep-sparse-real.c
@@ -2,7 +2,7 @@
 #include <Rinternals.h>
 #include <R_ext/Altrep.h>
 
-#include "altrep-sparse-utils.h"
+#include "sparse-utils.h"
 
 // Initialised at load time
 R_altrep_class_t altrep_sparse_real_class;

diff --git a/src/init.c b/src/init.c
@@ -1,6 +1,6 @@
 #include <Rinternals.h>
-#include "altrep-sparse-extractors.h"
-#include "altrep-sparse-utils.h"
+#include "sparse-extractors.h"
+#include "sparse-utils.h"
 
 // Defined in altrep-sparse-real.c
 extern SEXP ffi_altrep_new_sparse_real(SEXP);
@@ -11,8 +11,7 @@ static const R_CallMethodDef CallEntries[] = {
     {"ffi_altrep_sparse_positions", (DL_FUNC) &ffi_altrep_sparse_positions, 1},
     {"ffi_altrep_sparse_values", (DL_FUNC) &ffi_altrep_sparse_values, 1},
     {"ffi_extract_altrep_class", (DL_FUNC) &ffi_extract_altrep_class, 1},
-    {NULL, NULL, 0}
-};
+    {NULL, NULL, 0}};
 
 void R_init_sparsevctrs(DllInfo* dll) {
   R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);

diff --git a/src/altrep-sparse-extractors.c → src/sparse-extractors.c b/src/altrep-sparse-extractors.c → src/sparse-extractors.c
@@ -1,7 +1,4 @@
-#define R_NO_REMAP
-#include <R.h>
-#include <Rinternals.h>
-#include "altrep-sparse-utils.h"
+#include "sparse-extractors.h"
 
 SEXP ffi_altrep_sparse_positions(SEXP x) {
   SEXP out = extract_pos(x);

diff --git a/src/altrep-sparse-extractors.h → src/sparse-extractors.h b/src/altrep-sparse-extractors.h → src/sparse-extractors.h
@@ -1,7 +1,9 @@
 #ifndef SPARSEVCTRS_SPARSE_EXTRACTORS_H
 #define SPARSEVCTRS_SPARSE_EXTRACTORS_H
 
+#define R_NO_REMAP
 #include <Rinternals.h>
+#include "sparse-utils.h"
 
 SEXP ffi_altrep_sparse_positions(SEXP x);
 

diff --git a/src/altrep-sparse-utils.c → src/sparse-utils.c b/src/altrep-sparse-utils.c → src/sparse-utils.c
@@ -1,4 +1,4 @@
-#include "altrep-sparse-utils.h"
+#include "sparse-utils.h"
 
 SEXP extract_val(SEXP x) {
   SEXP data1 = R_altrep_data1(x);

diff --git a/src/altrep-sparse-utils.h → src/sparse-utils.h b/src/altrep-sparse-utils.h → src/sparse-utils.h