Allow excluding prefixes for objects

docs.md

@@ -609,6 +609,10 @@ exclude = ["Bad"]
 # default: no prefix is added
 prefix = "CAPI_"
 
+# If specific items should not get above prefix, they can be listed here
+# default: []
+prefix_excludes = ["ItemWithoutPrefix"]
+
 # Types of items that we'll generate. If empty, then all types of item are emitted.
 #
 # possible items: (TODO: explain these in detail)

src/bindgen/builder.rs

@@ -194,6 +194,15 @@ impl Builder {
         self
     }
 
+    #[allow(unused)]
+    pub fn exclude_item_prefix<S: AsRef<str>>(mut self, item_name: S) -> Builder {
+        self.config
+            .export
+            .prefix_excludes
+            .push(String::from(item_name.as_ref()));
+        self
+    }
+
     #[allow(unused)]
     pub fn with_parse_deps(mut self, parse_deps: bool) -> Builder {
         self.config.parse.parse_deps = parse_deps;

src/bindgen/config.rs

@@ -335,6 +335,8 @@ pub struct ExportConfig {
     pub body: HashMap<String, String>,
     /// A prefix to add before the name of every item
     pub prefix: Option<String>,
+    /// A list of items not to add a prefix to (should one be specified).
+    pub prefix_excludes: Vec<String>,
     /// Types of items to generate.
     pub item_types: Vec<ItemType>,
     /// Whether renaming overrides or extends prefixing.
@@ -376,7 +378,9 @@ impl ExportConfig {
             }
         }
         if let Some(ref prefix) = self.prefix {
-            item_name.insert_str(0, prefix);
+            if !self.prefix_excludes.contains(&item_name) {
+                item_name.insert_str(0, prefix);
+            }
         }
     }
 }

tests/expectations-symbols/prefix_exclude.c.sym

@@ -0,0 +1,3 @@
+{
+caller;
+};

tests/expectations/prefix_exclude.c

@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  uintptr_t id;
+} Struct1;
+
+typedef struct {
+  uintptr_t id;
+} PREFIX_Struct2;
+
+typedef int32_t PREFIX_Type1[3];
+
+typedef int32_t Type2[15];
+
+void caller(Struct1 s1, PREFIX_Struct2 s2, PREFIX_Type1 t1, Type2 t2);

tests/expectations/prefix_exclude.compat.c

@@ -0,0 +1,26 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct {
+  uintptr_t id;
+} Struct1;
+
+typedef struct {
+  uintptr_t id;
+} PREFIX_Struct2;
+
+typedef int32_t PREFIX_Type1[3];
+
+typedef int32_t Type2[15];
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void caller(Struct1 s1, PREFIX_Struct2 s2, PREFIX_Type1 t1, Type2 t2);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif  // __cplusplus

tests/expectations/prefix_exclude.cpp

@@ -0,0 +1,23 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <ostream>
+#include <new>
+
+struct Struct1 {
+  uintptr_t id;
+};
+
+struct PREFIX_Struct2 {
+  uintptr_t id;
+};
+
+using PREFIX_Type1 = int32_t[3];
+
+using Type2 = int32_t[15];
+
+extern "C" {
+
+void caller(Struct1 s1, PREFIX_Struct2 s2, PREFIX_Type1 t1, Type2 t2);
+
+}  // extern "C"

tests/expectations/prefix_exclude.pyx

@@ -0,0 +1,19 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef struct Struct1:
+    uintptr_t id;
+
+  ctypedef struct PREFIX_Struct2:
+    uintptr_t id;
+
+  ctypedef int32_t PREFIX_Type1[3];
+
+  ctypedef int32_t Type2[15];
+
+  void caller(Struct1 s1, PREFIX_Struct2 s2, PREFIX_Type1 t1, Type2 t2);

tests/expectations/prefix_exclude_both.c

@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Struct1 {
+  uintptr_t id;
+} Struct1;
+
+typedef struct PREFIX_Struct2 {
+  uintptr_t id;
+} PREFIX_Struct2;
+
+typedef int32_t PREFIX_Type1[3];
+
+typedef int32_t Type2[15];
+
+void caller(struct Struct1 s1, struct PREFIX_Struct2 s2, PREFIX_Type1 t1, Type2 t2);

tests/expectations/prefix_exclude_both.compat.c

@@ -0,0 +1,26 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef struct Struct1 {
+  uintptr_t id;
+} Struct1;
+
+typedef struct PREFIX_Struct2 {
+  uintptr_t id;
+} PREFIX_Struct2;
+
+typedef int32_t PREFIX_Type1[3];
+
+typedef int32_t Type2[15];
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void caller(struct Struct1 s1, struct PREFIX_Struct2 s2, PREFIX_Type1 t1, Type2 t2);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif  // __cplusplus

tests/expectations/prefix_exclude_tag.c

@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Struct1 {
+  uintptr_t id;
+};
+
+struct PREFIX_Struct2 {
+  uintptr_t id;
+};
+
+typedef int32_t PREFIX_Type1[3];
+
+typedef int32_t Type2[15];
+
+void caller(struct Struct1 s1, struct PREFIX_Struct2 s2, PREFIX_Type1 t1, Type2 t2);

tests/expectations/prefix_exclude_tag.compat.c

@@ -0,0 +1,26 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+struct Struct1 {
+  uintptr_t id;
+};
+
+struct PREFIX_Struct2 {
+  uintptr_t id;
+};
+
+typedef int32_t PREFIX_Type1[3];
+
+typedef int32_t Type2[15];
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+void caller(struct Struct1 s1, struct PREFIX_Struct2 s2, PREFIX_Type1 t1, Type2 t2);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif  // __cplusplus

tests/expectations/prefix_exclude_tag.pyx

@@ -0,0 +1,19 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  cdef struct Struct1:
+    uintptr_t id;
+
+  cdef struct PREFIX_Struct2:
+    uintptr_t id;
+
+  ctypedef int32_t PREFIX_Type1[3];
+
+  ctypedef int32_t Type2[15];
+
+  void caller(Struct1 s1, PREFIX_Struct2 s2, PREFIX_Type1 t1, Type2 t2);

tests/rust/prefix_exclude.rs

@@ -0,0 +1,15 @@
+pub type Type1 = [i32; 3];
+pub type Type2 = [i32; 15];
+
+#[repr(C)]
+pub struct Struct1 {
+    id: usize,
+}
+
+#[repr(C)]
+pub struct Struct2 {
+    id: usize,
+}
+
+#[no_mangle]
+pub extern "C" fn caller(s1: Struct1, s2: Struct2, t1: Type1, t2: Type2) {}

tests/rust/prefix_exclude.toml

@@ -0,0 +1,3 @@
+[export]
+prefix = "PREFIX_"
+prefix_excludes = ["Type2", "Struct1"]