WIP: Parse macros with cexpr.

Author: emilio

src/clang.rs

@@ -1056,15 +1056,8 @@ impl TranslationUnit {
                 return None;
             }
 
-            // The extent always includes an extra token for no good reason.
-            let real_count = if num_tokens > 0 {
-                num_tokens - 1
-            } else {
-                num_tokens
-            };
-
             let token_array = slice::from_raw_parts(token_ptr,
-                                                    real_count as usize);
+                                                    num_tokens as usize);
             for &token in token_array.iter() {
                 let kind = clang_getTokenKind(token);
                 let spelling = clang_getTokenSpelling(self.x, token).into();
@@ -1089,6 +1082,9 @@ impl TranslationUnit {
             None => return None,
         };
 
+        // FIXME(emilio): LLVM 3.9 at least always include an extra token for no
+        // good reason (except if we're at EOF). Let's try with 3.8 to see
+        // what's up with that.
         Some(tokens.into_iter().filter_map(|token| {
             let kind = match token.kind {
                 CXToken_Punctuation => token::Kind::Punctuation,

tests/expectations/tests/jsval_layout_opaque.rs

@@ -24,9 +24,6 @@ impl <T> ::std::clone::Clone for __BindgenUnionField<T> {
     fn clone(&self) -> Self { Self::new() }
 }
 impl <T> ::std::marker::Copy for __BindgenUnionField<T> { }
-pub const JSVAL_TAG_SHIFT: ::std::os::raw::c_uint = 47;
-pub const JSVAL_PAYLOAD_MASK: ::std::os::raw::c_ulonglong = 140737488355327;
-pub const JSVAL_TAG_MASK: ::std::os::raw::c_longlong = -140737488355328;
 #[repr(u8)]
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum JSValueType {

tests/expectations/tests/macro-expr-basic.rs

@@ -0,0 +1,7 @@
+/* automatically generated by rust-bindgen */
+
+
+#![allow(non_snake_case)]
+
+
+

tests/expectations/tests/whitelist_vars.rs

@@ -4,7 +4,4 @@
 #![allow(non_snake_case)]
 
 
-pub const NONE: ::std::os::raw::c_uint = 0;
-pub const FOO: ::std::os::raw::c_uint = 5;
-pub const FOOB: ::std::os::raw::c_int = -2;
 pub const FOOBAR: ::std::os::raw::c_int = -10;

tests/headers/macro-expr-basic.h

@@ -0,0 +1,7 @@
+#define FOO 1
+#define BAR 4
+#define BAZ (FOO + BAR)
+
+#define BARR (0 << 1)
+#define BAZZ (0 << 2)
+#define I_RAN_OUT_OF_DUMB_NAMES (BARR | BAZZ)