ir: write declaration of global variable like struct fields

mozilla · Feb 25, 2020 · 4ead654 · 4ead654
1 parent dfa6e5f
commit 4ead654
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 2 deletions.
diff --git a/src/bindgen/ir/global.rs b/src/bindgen/ir/global.rs
@@ -112,7 +112,7 @@ impl Source for Static {
         } else if !self.mutable {
             out.write("const ");
         }
-        self.ty.write(config, out);
-        write!(out, " {};", self.export_name());
+        (self.export_name().to_owned(), self.ty.clone()).write(config, out);
+        out.write(";");
     }
 }
diff --git a/tests/expectations/both/global_variable.c b/tests/expectations/both/global_variable.c
@@ -0,0 +1,8 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+extern const char CONST_GLOBAL_ARRAY[128];
+
+extern char MUT_GLOBAL_ARRAY[128];
diff --git a/tests/expectations/both/global_variable.compat.c b/tests/expectations/both/global_variable.compat.c
@@ -0,0 +1,16 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+extern const char CONST_GLOBAL_ARRAY[128];
+
+extern char MUT_GLOBAL_ARRAY[128];
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff --git a/tests/expectations/global_variable.c b/tests/expectations/global_variable.c
@@ -0,0 +1,8 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+extern const char CONST_GLOBAL_ARRAY[128];
+
+extern char MUT_GLOBAL_ARRAY[128];
diff --git a/tests/expectations/global_variable.compat.c b/tests/expectations/global_variable.compat.c
@@ -0,0 +1,16 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+extern const char CONST_GLOBAL_ARRAY[128];
+
+extern char MUT_GLOBAL_ARRAY[128];
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff --git a/tests/expectations/global_variable.cpp b/tests/expectations/global_variable.cpp
@@ -0,0 +1,12 @@
+#include <cstdarg>
+#include <cstdint>
+#include <cstdlib>
+#include <new>
+
+extern "C" {
+
+extern const char CONST_GLOBAL_ARRAY[128];
+
+extern char MUT_GLOBAL_ARRAY[128];
+
+} // extern "C"
diff --git a/tests/expectations/tag/global_variable.c b/tests/expectations/tag/global_variable.c
@@ -0,0 +1,8 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+extern const char CONST_GLOBAL_ARRAY[128];
+
+extern char MUT_GLOBAL_ARRAY[128];
diff --git a/tests/expectations/tag/global_variable.compat.c b/tests/expectations/tag/global_variable.compat.c
@@ -0,0 +1,16 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+extern const char CONST_GLOBAL_ARRAY[128];
+
+extern char MUT_GLOBAL_ARRAY[128];
+
+#ifdef __cplusplus
+} // extern "C"
+#endif // __cplusplus
diff --git a/tests/rust/global_variable.rs b/tests/rust/global_variable.rs
@@ -0,0 +1,5 @@
+#[no_mangle]
+pub static mut MUT_GLOBAL_ARRAY: [c_char; 128] = [0; 128];
+
+#[no_mangle]
+pub static CONST_GLOBAL_ARRAY: [c_char; 128] = [0; 128];