To Be Squashed

miikkas · miikkas · commit 1abd56d9e8d8 · 2025-07-15T20:18:28.000+03:00
- Gate the integer literal radix retaining functionality behind option
  `keep_integer_radices`, defaulting to `false` for now.
- Add the new `--keep-integer-radices` flag to test headers that are
  affected by it.
diff --git a/bindgen-tests/tests/headers/class_static_const.hpp b/bindgen-tests/tests/headers/class_static_const.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --keep-integer-radices
 using int32_t = int;
 typedef unsigned int uint32_t;
 
diff --git a/bindgen-tests/tests/headers/constant-evaluate.h b/bindgen-tests/tests/headers/constant-evaluate.h
@@ -1,5 +1,5 @@
 // bindgen-unstable
-// bindgen-flags: --rustified-enum ".*"
+// bindgen-flags: --rustified-enum ".*" --keep-integer-radices
 
 enum {
   foo = 4,
diff --git a/bindgen-tests/tests/headers/default-macro-constant-type-signed.h b/bindgen-tests/tests/headers/default-macro-constant-type-signed.h
@@ -1,3 +1,3 @@
-// bindgen-flags: --default-macro-constant-type signed
+// bindgen-flags: --default-macro-constant-type signed --keep-integer-radices
 // All values are i32 if they fit; otherwise i64.
 #include "default-macro-constant-type.h"
diff --git a/bindgen-tests/tests/headers/default-macro-constant-type-unsigned.h b/bindgen-tests/tests/headers/default-macro-constant-type-unsigned.h
@@ -1,3 +1,3 @@
-// bindgen-flags: --default-macro-constant-type unsigned
+// bindgen-flags: --default-macro-constant-type unsigned --keep-integer-radices
 // Negative values are i32 or i64; others are u32 or u64.
 #include "default-macro-constant-type.h"
diff --git a/bindgen-tests/tests/headers/default-macro-constant-type.h b/bindgen-tests/tests/headers/default-macro-constant-type.h
@@ -1,3 +1,4 @@
+// bindgen-flags: --keep-integer-radices
 // Test default of --default-macro-constant-type
 // Negative values are i32 or i64; others are u32 or u64.
 
diff --git a/bindgen-tests/tests/headers/different_radix_literals.hpp b/bindgen-tests/tests/headers/different_radix_literals.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: -- -std=c++14
+// bindgen-flags: --keep-integer-radices -- -std=c++14
 // (C23 is not available in clang 9.0, but C++14 supports the same literals)
 
 // Binary integer literals (C23) - 0b10 is 2 in decimal
diff --git a/bindgen-tests/tests/headers/fit-macro-constant-types-signed.h b/bindgen-tests/tests/headers/fit-macro-constant-types-signed.h
@@ -1,2 +1,2 @@
-// bindgen-flags: --default-macro-constant-type=signed --fit-macro-constant-types
+// bindgen-flags: --default-macro-constant-type=signed --fit-macro-constant-types --keep-integer-radices
 #include "default-macro-constant-type.h"
diff --git a/bindgen-tests/tests/headers/fit-macro-constant-types.h b/bindgen-tests/tests/headers/fit-macro-constant-types.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --fit-macro-constant-types
+// bindgen-flags: --fit-macro-constant-types --keep-integer-radices
 // Test fitting macro constants into smaller integer types
 // Negative values are i8, i16, i32 or i64; others are u8, u16, u32 or u64.
 #include "default-macro-constant-type.h"
diff --git a/bindgen-tests/tests/headers/jsval_layout_opaque.hpp b/bindgen-tests/tests/headers/jsval_layout_opaque.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*"
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*" --keep-integer-radices
 // bindgen-flags: -- -std=c++11
 
 /**
diff --git a/bindgen-tests/tests/headers/layout_eth_conf.h b/bindgen-tests/tests/headers/layout_eth_conf.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*" --rust-target 1.40
+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --rustified-enum ".*" --rust-target 1.40 --keep-integer-radices
 typedef unsigned char uint8_t;
 typedef unsigned short uint16_t;
 typedef unsigned int uint32_t;
diff --git a/bindgen-tests/tests/headers/overflowed_enum.hpp b/bindgen-tests/tests/headers/overflowed_enum.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --rustified-enum ".*" -- -std=c++11 -Wno-narrowing
+// bindgen-flags: --rustified-enum ".*" --keep-integer-radices -- -std=c++11 -Wno-narrowing
 
 enum Foo {
     BAP_ARM = 0x93fcb9,
diff --git a/bindgen-tests/tests/headers/prepend-enum-constified-variant.h b/bindgen-tests/tests/headers/prepend-enum-constified-variant.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --no-prepend-enum-name --rustified-enum ".*"
+// bindgen-flags: --no-prepend-enum-name --rustified-enum ".*" --keep-integer-radices
 
 enum AVCodecID {
   AV_CODEC_ID_FIRST_UNKNOWN = 0x18000,
diff --git a/bindgen-tests/tests/headers/short-enums.hpp b/bindgen-tests/tests/headers/short-enums.hpp
@@ -1,4 +1,4 @@
-// bindgen-flags: --rustified-enum ".*" -- -std=c++11 -fshort-enums
+// bindgen-flags: --rustified-enum ".*" --keep-integer-radices -- -std=c++11 -fshort-enums
 
 typedef enum {
     SOME_VALUE = 0x1,
diff --git a/bindgen-tests/tests/headers/wrap-static-fns.h b/bindgen-tests/tests/headers/wrap-static-fns.h
@@ -1,4 +1,4 @@
-// bindgen-flags: --wrap-static-fns
+// bindgen-flags: --wrap-static-fns --keep-integer-radices
 // bindgen-parse-callbacks: wrap-as-variadic-fn
 
 // to avoid polluting the expectation tests we put the stdarg.h behind a conditional
diff --git a/bindgen/ir/enum_ty.rs b/bindgen/ir/enum_ty.rs
@@ -105,7 +105,11 @@ impl Enum {
 
                 if let Some(val) = value {
                     let name = cursor.spelling();
-                    let radix = cursor.get_literal_radix();
+                    let radix = if ctx.options().keep_integer_radices {
+                        cursor.get_literal_radix()
+                    } else {
+                        None
+                    };
                     let annotations = Annotations::new(&cursor);
                     let custom_behavior = ctx
                         .options()
diff --git a/bindgen/ir/var.rs b/bindgen/ir/var.rs
@@ -370,7 +370,11 @@ impl ClangSubItemParser for Var {
                                 default_macro_constant_type(ctx, value)
                             });
 
-                        let radix = cursor.get_literal_radix();
+                        let radix = if ctx.options().keep_integer_radices {
+                            cursor.get_literal_radix()
+                        } else {
+                            None
+                        };
 
                         (TypeKind::Int(kind), VarType::Int(value), radix)
                     }
@@ -455,7 +459,11 @@ impl ClangSubItemParser for Var {
                     };
 
                     let mut val = cursor.evaluate().and_then(|v| v.as_int());
-                    let radix = cursor.get_literal_radix_of_identifier(&name);
+                    let radix = if ctx.options().keep_integer_radices {
+                        cursor.get_literal_radix_of_identifier(&name)
+                    } else {
+                        None
+                    };
 
                     if val.is_none() || !kind.signedness_matches(val.unwrap()) {
                         val = get_integer_literal_from_cursor(&cursor);
diff --git a/bindgen/options/cli.rs b/bindgen/options/cli.rs
@@ -525,6 +525,9 @@ struct BindgenCommand {
     /// be called.
     #[arg(long)]
     generate_private_functions: bool,
+    /// Whether to retain integer literal radices in generated Rust code.
+    #[arg(long)]
+    keep_integer_radices: bool,
     /// Whether to emit diagnostics or not.
     #[cfg(feature = "experimental")]
     #[arg(long, requires = "experimental")]
@@ -676,6 +679,7 @@ where
         generate_deleted_functions,
         generate_pure_virtual_functions,
         generate_private_functions,
+        keep_integer_radices,
         #[cfg(feature = "experimental")]
         emit_diagnostics,
         generate_shell_completions,
@@ -971,6 +975,7 @@ where
             generate_deleted_functions,
             generate_pure_virtual_functions,
             generate_private_functions,
+            keep_integer_radices,
         }
     );
 
diff --git a/bindgen/options/mod.rs b/bindgen/options/mod.rs
@@ -2283,4 +2283,20 @@ options! {
         },
         as_args: "--generate-private-functions",
     },
+    /// Whether to retain integer literal radices in generated Rust code.
+    keep_integer_radices: bool {
+        default: false,
+        methods: {
+            /// Set whether to retain number bases of C/C++ integer literals.
+            ///
+            /// Integer literals defined as binary `0b…`, octal `0…`, and hexadecimal `0x…` have the
+            /// equivalent notation in the generated Rust code, i.e., `0b…`, `0o…`, and `0x…`
+            /// respectively.
+            pub fn keep_integer_radices(mut self, doit: bool) -> Self {
+                self.options.keep_integer_radices = doit;
+                self
+            }
+        },
+        as_args: "--keep-integer-radices",
+    },
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq`
	`1`	`+// bindgen-flags: --with-derive-hash --with-derive-partialeq --with-derive-eq --keep-integer-radices`
`2`	`2`	`using int32_t = int;`
`3`	`3`	`typedef unsigned int uint32_t;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// bindgen-flags: --keep-integer-radices`
`1`	`2`	`// Test default of --default-macro-constant-type`
`2`	`3`	`// Negative values are i32 or i64; others are u32 or u64.`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// bindgen-flags: -- -std=c++14`
	`1`	`+// bindgen-flags: --keep-integer-radices -- -std=c++14`
`2`	`2`	`// (C23 is not available in clang 9.0, but C++14 supports the same literals)`
`3`	`3`
`4`	`4`	`// Binary integer literals (C23) - 0b10 is 2 in decimal`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-// bindgen-flags: --default-macro-constant-type=signed --fit-macro-constant-types`
	`1`	`+// bindgen-flags: --default-macro-constant-type=signed --fit-macro-constant-types --keep-integer-radices`
`2`	`2`	`#include "default-macro-constant-type.h"`