Retry parsing with unsigned integers if signed parsing fails

- Don't try to add 'u' if it's already there

Author: jyn514

src/clang.rs

@@ -785,7 +785,9 @@ impl ClangToken {
     pub fn as_swcc_token(
         &self,
     ) -> Option<saltwater::Locatable<saltwater::Token>> {
-        use saltwater::{Files, Lexer, Literal, Token};
+        use saltwater::{
+            error::LexError, Files, Lexer, Literal, Locatable, Token,
+        };
 
         match self.kind {
             // `saltwater` does not have a comment token
@@ -794,13 +796,40 @@ impl ClangToken {
             CXToken_Keyword => {
                 let spelling = std::str::from_utf8(self.spelling())
                     .expect("invalid utf8 in token");
-                let mut files = Files::new();
-                let id = files.add("", "".into());
-                let mut lexer = Lexer::new(id, spelling, false);
-                let mut token = lexer
-                    .next()
-                    .unwrap()
-                    .expect("saltwater failed to parse clang token");
+                let parse = |spelling| {
+                    let mut files = Files::new();
+                    let id = files.add("", "".into());
+                    let mut lexer = Lexer::new(id, spelling, false);
+                    lexer.next().unwrap()
+                };
+                let failed_parse = |err: Locatable<_>| {
+                    panic!(
+                        "saltwater failed to parse clang token '{}': {}",
+                        spelling, err.data
+                    );
+                };
+                let mut token = match parse(spelling) {
+                    Ok(token) => token,
+                    Err(Locatable {
+                        data:
+                            LexError::IntegerOverflow {
+                                is_signed: Some(true),
+                            },
+                        ..
+                    }) => {
+                        warn!("integer does not fit into `long long`, trying again with `unsigned long long`");
+                        // saltwater ignores trailing `LL`, but requires any `u` suffix to come before `LL`
+                        let mut spelling = String::from(
+                            spelling
+                                .trim_end_matches('l')
+                                .trim_end_matches('L'),
+                        );
+                        spelling.push('u');
+                        parse(&spelling).unwrap_or_else(failed_parse)
+                    }
+                    Err(err) => failed_parse(err),
+                };
+
                 // saltwater generates null-terminated string immediately,
                 // but bindgen only adds the null-terminator during codegen.
                 if let Token::Literal(Literal::Str(ref mut string)) =

tests/expectations/tests/jsval_layout_opaque.rs

@@ -92,9 +92,21 @@ where
         }
     }
 }
+pub const JSVAL_ALIGNMENT: u32 = 0;
 pub const JSVAL_TAG_SHIFT: u32 = 47;
 pub const JSVAL_PAYLOAD_MASK: u64 = 140737488355327;
 pub const JSVAL_TAG_MASK: i64 = -140737488355328;
+pub const JSVAL_TYPE_TO_TAG: u32 = 0;
+pub const JSVAL_LOWER_INCL_TAG_OF_OBJ_OR_NULL_SET: u32 = 0;
+pub const JSVAL_UPPER_EXCL_TAG_OF_PRIMITIVE_SET: u32 = 0;
+pub const JSVAL_UPPER_INCL_TAG_OF_NUMBER_SET: u32 = 0;
+pub const JSVAL_LOWER_INCL_TAG_OF_GCTHING_SET: u32 = 0;
+pub const JSVAL_LOWER_INCL_SHIFTED_TAG_OF_OBJ_OR_NULL_SET: u32 = 0;
+pub const JSVAL_UPPER_EXCL_SHIFTED_TAG_OF_PRIMITIVE_SET: u32 = 0;
+pub const JSVAL_UPPER_EXCL_SHIFTED_TAG_OF_NUMBER_SET: u32 = 0;
+pub const JSVAL_LOWER_INCL_SHIFTED_TAG_OF_GCTHING_SET: u32 = 0;
+pub const JS_VALUE_CONSTEXPR: u32 = 0;
+pub const JS_VALUE_CONSTEXPR_VAR: u32 = 0;
 pub type size_t = ::std::os::raw::c_ulonglong;
 #[repr(u8)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]

tests/expectations/tests/jsval_layout_opaque_1_0.rs

@@ -135,9 +135,21 @@ impl<T> ::std::cmp::PartialEq for __BindgenUnionField<T> {
     }
 }
 impl<T> ::std::cmp::Eq for __BindgenUnionField<T> {}
+pub const JSVAL_ALIGNMENT: u32 = 0;
 pub const JSVAL_TAG_SHIFT: u32 = 47;
 pub const JSVAL_PAYLOAD_MASK: u64 = 140737488355327;
 pub const JSVAL_TAG_MASK: i64 = -140737488355328;
+pub const JSVAL_TYPE_TO_TAG: u32 = 0;
+pub const JSVAL_LOWER_INCL_TAG_OF_OBJ_OR_NULL_SET: u32 = 0;
+pub const JSVAL_UPPER_EXCL_TAG_OF_PRIMITIVE_SET: u32 = 0;
+pub const JSVAL_UPPER_INCL_TAG_OF_NUMBER_SET: u32 = 0;
+pub const JSVAL_LOWER_INCL_TAG_OF_GCTHING_SET: u32 = 0;
+pub const JSVAL_LOWER_INCL_SHIFTED_TAG_OF_OBJ_OR_NULL_SET: u32 = 0;
+pub const JSVAL_UPPER_EXCL_SHIFTED_TAG_OF_PRIMITIVE_SET: u32 = 0;
+pub const JSVAL_UPPER_EXCL_SHIFTED_TAG_OF_NUMBER_SET: u32 = 0;
+pub const JSVAL_LOWER_INCL_SHIFTED_TAG_OF_GCTHING_SET: u32 = 0;
+pub const JS_VALUE_CONSTEXPR: u32 = 0;
+pub const JS_VALUE_CONSTEXPR_VAR: u32 = 0;
 pub type size_t = ::std::os::raw::c_ulonglong;
 #[repr(u8)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]