Merge pull request #1731 from r-lib/headers

lionel- · web-flow · commit 2fb076e63ac8 · 2024-07-10T13:49:21.000+02:00
Make rlang clangd-okay
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,5 @@ revdep/cloud.noindex
 src/config.h
 docs/
 .vscode
+compile_commands.json
+.cache
diff --git a/src/Makevars b/src/Makevars
@@ -56,7 +56,6 @@ internal-files = \
         internal/fn.c \
         internal/globals.c \
         internal/hash.c \
-        internal/init.c \
         internal/internal.c \
         internal/names.c \
         internal/nse-defuse.c \
diff --git a/src/internal/arg.c b/src/internal/arg.c
@@ -1,4 +1,5 @@
 #include <rlang.h>
+#include "globals.h"
 #include "internal.h"
 #include "nse-inject.h"
 #include "utils.h"
diff --git a/src/internal/call.c b/src/internal/call.c
@@ -1,6 +1,8 @@
 #include <rlang.h>
 #include "internal.h"
 #include "decl/call-decl.h"
+#include "utils.h"
+#include "vec.h"
 
 
 r_obj* ffi_is_call(r_obj* x, r_obj* name, r_obj* ffi_n, r_obj* ns) {
diff --git a/src/internal/decl/.clangd b/src/internal/decl/.clangd
@@ -0,0 +1,2 @@
+Diagnostics:
+  Suppress: '*'
diff --git a/src/internal/decl/vec-decl.h b/src/internal/decl/vec-decl.h
@@ -3,3 +3,9 @@ bool list_match(r_obj* const * v_x,
                 r_ssize n,
                 r_obj* value,
                 enum option_bool match);
+
+r_obj* rlang_ns_get(const char* name);
+
+// From rlang/vec.c
+void r_vec_poke_n(r_obj* x, r_ssize offset,
+                  r_obj* y, r_ssize from, r_ssize n);
diff --git a/src/internal/dots.c b/src/internal/dots.c
@@ -4,7 +4,6 @@
 #include "internal.h"
 #include "squash.h"
 #include "utils.h"
-#include "vec.h"
 
 enum dots_homonyms {
   DOTS_HOMONYMS_keep = 0,
diff --git a/src/internal/dots.h b/src/internal/dots.h
@@ -1,6 +1,10 @@
 #ifndef RLANG_INTERNAL_DOTS_H
 #define RLANG_INTERNAL_DOTS_H
 
+#include <rlang.h>
+
+bool is_splice_box(r_obj* x);
+r_obj* rlang_unbox(r_obj* x);
 
 enum dots_collect {
   DOTS_COLLECT_expr,
diff --git a/src/internal/env-binding.c b/src/internal/env-binding.c
@@ -1,5 +1,7 @@
 #include <rlang.h>
 #include "internal.h"
+#include "env.h"
+#include "quo.h"
 
 #include "decl/env-decl.h"
 
diff --git a/src/internal/eval-tidy.c b/src/internal/eval-tidy.c
@@ -1,5 +1,8 @@
 #include <rlang.h>
+#include "env.h"
 #include "internal.h"
+#include "quo.h"
+#include "utils.h"
 
 
 static r_obj* quo_mask_flag_sym = NULL;
diff --git a/src/internal/eval.c b/src/internal/eval.c
@@ -1,4 +1,5 @@
 #include <rlang.h>
+#include "call.h"
 #include "internal.h"
 
 
diff --git a/src/internal/exported.c b/src/internal/exported.c
@@ -1,6 +1,7 @@
 #include <rlang.h>
-#include "../internal/utils.h"
-#include "../internal/vec.h"
+#include "internal.h"
+#include "utils.h"
+#include "vec.h"
 
 // From rlang/vec.c
 void r_vec_poke_n(r_obj* x, r_ssize offset,
diff --git a/src/internal/fn.c b/src/internal/fn.c
@@ -1,6 +1,7 @@
 #include <rlang.h>
 
 #include "internal.h"
+#include "utils.h"
 
 
 r_obj* ffi_new_function(r_obj* args, r_obj* body, r_obj* env) {
diff --git a/src/internal/init.c b/src/internal/init.c
diff --git a/src/internal/internal.c b/src/internal/internal.c
diff --git a/src/internal/internal.h b/src/internal/internal.h
@@ -3,12 +3,6 @@
 
 #include <rlang.h>
 
-#include "arg.h"
-#include "call.h"
-#include "globals.h"
-#include "quo.h"
-#include "vec.h"
-
 struct rlang_globals_syms {
   r_obj* c_null;
   r_obj* handlers;
diff --git a/src/internal/names.c b/src/internal/names.c
@@ -1,8 +1,9 @@
 #include <rlang.h>
 #include <ctype.h>
-#include "internal.h"
+#include <stdlib.h>
 
 #include "decl/names-decl.h"
+#include "utils.h"
 
 // 3 leading '.' + 1 trailing '\0' + 24 characters
 #define MAX_IOTA_SIZE 28
diff --git a/src/internal/nse-defuse.c b/src/internal/nse-defuse.c
@@ -1,5 +1,4 @@
 #include <rlang.h>
-#include "utils.h"
 
 // Defined in capture.c
 r_obj* rlang_capturearginfo(r_obj* call, r_obj* op, r_obj* args, r_obj* rho);
diff --git a/src/internal/squash.c b/src/internal/squash.c
@@ -1,6 +1,8 @@
 #include <rlang.h>
-#include "export.h"
 #include "squash.h"
+#include "dots.h"
+#include "utils.h"
+#include "vec.h"
 
 static r_ssize r_vec_length(r_obj* x);
 
diff --git a/src/internal/utils.c b/src/internal/utils.c
@@ -1,4 +1,6 @@
 #include <rlang.h>
+#include "utils.h"
+#include "internal.h"
 
 
 r_obj* new_preserved_empty_list(void) {
diff --git a/src/internal/vec.c b/src/internal/vec.c
@@ -1,4 +1,5 @@
 #include <rlang.h>
+#include "vec.h"
 #include "decl/vec-decl.h"
 
 
diff --git a/src/internal/weakref.c b/src/internal/weakref.c
@@ -1,5 +1,4 @@
-#include <R.h>
-#include <Rdefines.h>
+#include <rlang.h>
 
 r_obj* ffi_new_weakref(r_obj* key, r_obj* value, r_obj* finalizer, r_obj* on_quit) {
   if (r_typeof(key) != ENVSXP && r_typeof(key) != EXTPTRSXP) {
diff --git a/src/rlang/altrep.h b/src/rlang/altrep.h
@@ -1,6 +1,9 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_ALTREP_H
 #define RLANG_ALTREP_H
 
+#include "rlang-types.h"
 
 #if (R_VERSION < R_Version(3, 5, 0)) ||                 \
   (defined(_WIN32) && R_VERSION == R_Version(3, 5, 0))
diff --git a/src/rlang/arg.h b/src/rlang/arg.h
@@ -1,6 +1,9 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_ARG_H
 #define RLANG_ARG_H
 
+#include "rlang-types.h"
 
 extern int (*r_arg_match)(r_obj* arg,
                           r_obj* values,
diff --git a/src/rlang/attrib.h b/src/rlang/attrib.h
@@ -1,8 +1,11 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_ATTRIB_H
 #define RLANG_ATTRIB_H
 
+#include "rlang-types.h"
+#include "globals.h"
 #include "node.h"
-#include "sym.h"
 
 
 static inline
diff --git a/src/rlang/c-utils.h b/src/rlang/c-utils.h
@@ -1,6 +1,11 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_C_UTILS_H
 #define RLANG_C_UTILS_H
 
+#include "rlang-types.h"
+
+#include <inttypes.h>
 #include <math.h>
 #include <float.h>
 #include "cnd.h"
diff --git a/src/rlang/call.h b/src/rlang/call.h
@@ -1,7 +1,9 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_LANG_H
 #define RLANG_LANG_H
 
-#include "node.h"
+#include "rlang-types.h"
 
 
 #define r_new_call Rf_lcons
diff --git a/src/rlang/cnd.h b/src/rlang/cnd.h
@@ -1,7 +1,10 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_CND_H
 #define RLANG_CND_H
 
-#include <stdbool.h>
+#include "rlang-types.h"
+#include "obj.h"
 
 
 void r_inform(const char* fmt, ...);
diff --git a/src/rlang/debug.h b/src/rlang/debug.h
@@ -1,6 +1,9 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_DEBUG_H
 #define RLANG_DEBUG_H
 
+#include "rlang-types.h"
 
 #define r_printf Rprintf
 void r_sexp_inspect(r_obj* x);
diff --git a/src/rlang/df.h b/src/rlang/df.h
@@ -1,6 +1,10 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_DF_H
 #define RLANG_DF_H
 
+#include "rlang-types.h"
+
 
 r_obj* r_alloc_df_list(r_ssize n_rows,
                        r_obj* names,
diff --git a/src/rlang/dict.h b/src/rlang/dict.h
@@ -1,6 +1,10 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_DICT_H
 #define RLANG_DICT_H
 
+#include "rlang-types.h"
+
 /**
  * This is a simple hash table of `r_obj*`. It is structured like R
  * environments and uses xxhash for hashing.
diff --git a/src/rlang/dyn-array.h b/src/rlang/dyn-array.h
@@ -1,6 +1,11 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_DYN_ARRAY_H
 #define RLANG_DYN_ARRAY_H
 
+#include "rlang-types.h"
+#include "c-utils.h"
+#include "cnd.h"
 #include "vec.h"
 
 
diff --git a/src/rlang/dyn-list-of.h b/src/rlang/dyn-list-of.h
@@ -1,6 +1,10 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_DYN_LIST_OF_H
 #define RLANG_DYN_LIST_OF_H
 
+#include "rlang-types.h"
+#include "dyn-array.h"
 
 struct r_dyn_list_of {
   r_obj* shelter;
diff --git a/src/rlang/env-binding.h b/src/rlang/env-binding.h
@@ -1,6 +1,9 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_ENV_BINDING_H
 #define RLANG_ENV_BINDING_H
 
+#include "rlang-types.h"
 
 enum r_env_binding_type {
   R_ENV_BINDING_TYPE_value = 0,
diff --git a/src/rlang/env.h b/src/rlang/env.h
@@ -1,8 +1,12 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_ENV_H
 #define RLANG_ENV_H
 
-#include <stdbool.h>
-#include <Rversion.h>
+#include "rlang-types.h"
+#include "cnd.h"
+#include "globals.h"
+#include "obj.h"
 
 
 extern r_obj* r_methods_ns_env;
diff --git a/src/rlang/eval.h b/src/rlang/eval.h
@@ -1,6 +1,11 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_EVAL_H
 #define RLANG_EVAL_H
 
+#include "rlang-types.h"
+#include "c-utils.h"
+#include "call.h"
 
 static inline
 r_obj* r_eval(r_obj* expr, r_obj* env) {
diff --git a/src/rlang/export.h b/src/rlang/export.h
@@ -1,9 +1,9 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_EXPORT_H
 #define RLANG_EXPORT_H
 
-#include <Rversion.h>
-#include <R_ext/Rdynload.h>
-
+#include "rlang-types.h"
 
 #if (defined(R_VERSION) && R_VERSION < R_Version(3, 4, 0))
 typedef union {void* p; DL_FUNC fn;} fn_ptr;
diff --git a/src/rlang/fn.h b/src/rlang/fn.h
@@ -1,6 +1,10 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_FN_H
 #define RLANG_FN_H
 
+#include "rlang-types.h"
+#include "obj.h"
 
 static inline
 r_obj* r_fn_body(r_obj* fn) {
diff --git a/src/rlang/formula.h b/src/rlang/formula.h
@@ -1,6 +1,9 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_FORMULA_H
 #define RLANG_FORMULA_H
 
+#include "rlang-types.h"
 
 bool r_is_formula(r_obj* x, int scoped, int lhs);
 
diff --git a/src/rlang/globals.h b/src/rlang/globals.h
@@ -1,6 +1,9 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_GLOBALS_H
 #define RLANG_GLOBALS_H
 
+#include "rlang-types.h"
 
 struct r_globals {
   r_obj* empty_lgl;
diff --git a/src/rlang/node.h b/src/rlang/node.h
@@ -1,6 +1,9 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_NODE_H
 #define RLANG_NODE_H
 
+#include "rlang-types.h"
 
 static inline r_obj* r_node_car(r_obj* x) { return CAR(x); }
 static inline r_obj* r_node_cdr(r_obj* x) { return CDR(x); }
diff --git a/src/rlang/obj.h b/src/rlang/obj.h
@@ -1,6 +1,11 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_OBJ_H
 #define RLANG_OBJ_H
 
+#include <stdbool.h>
+#include "rlang-types.h"
+
 #define r_missing_arg R_MissingArg
 
 
diff --git a/src/rlang/parse.h b/src/rlang/parse.h
@@ -1,6 +1,9 @@
+// IWYU pragma: private; include "rlang.h"
+
 #ifndef RLANG_PARSE_H
 #define RLANG_PARSE_H
 
+#include "rlang-types.h"
 
 r_obj* r_parse(const char* str);
 r_obj* r_parse_eval(const char* str, r_obj* env);
diff --git a/src/rlang/quo.h b/src/rlang/quo.h
diff --git a/src/rlang/rlang-types.h b/src/rlang/rlang-types.h
diff --git a/src/rlang/rlang.h b/src/rlang/rlang.h
diff --git a/src/rlang/session.h b/src/rlang/session.h
diff --git a/src/rlang/stack.h b/src/rlang/stack.h
diff --git a/src/rlang/state.h b/src/rlang/state.h
diff --git a/src/rlang/sym.h b/src/rlang/sym.h
diff --git a/src/rlang/vec-chr.h b/src/rlang/vec-chr.h
diff --git a/src/rlang/vec-lgl.h b/src/rlang/vec-lgl.h
diff --git a/src/rlang/vec.h b/src/rlang/vec.h
diff --git a/src/rlang/vendor.h b/src/rlang/vendor.h
diff --git a/src/rlang/walk.h b/src/rlang/walk.h

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include <rlang.h>`
	`2`	`+#include "globals.h"`
`2`	`3`	`#include "internal.h"`
`3`	`4`	`#include "nse-inject.h"`
`4`	`5`	`#include "utils.h"`