Merge pull request #1 from ecoal95/sm-hacks

gen: Allow empty union bitfield members

Author: bholley

src/gen.rs

@@ -759,7 +759,7 @@ fn cstruct_to_rs(ctx: &mut GenCtx, name: String, ci: CompInfo) -> Vec<P<ast::Ite
                     ast::Public,
                 ),
                 id: ast::DUMMY_NODE_ID,
-                ty: quote_ty!(&ctx.ext_cx, PhantomData<$inner_type>),
+                ty: quote_ty!(&ctx.ext_cx, ::std::marker::PhantomData<$inner_type>),
                 attrs: vec!(),
             }));
         }
@@ -1246,17 +1246,25 @@ fn gen_bitfield_method(ctx: &mut GenCtx, bindgen_name: &String,
 }
 
 fn gen_fullbitfield_method(ctx: &mut GenCtx, bindgen_name: &String,
-                           field_type: &Type, bitfields: &Vec<(String, u32)>) -> ast::ImplItem {
+                           field_type: &Type, bitfields: &[(String, u32)]) -> ast::ImplItem {
     let field_type = cty_to_rs(ctx, field_type, false);
     let mut args = vec!();
+    let mut unnamed: usize = 0;
     for &(ref name, width) in bitfields.iter() {
+        let ident = if name.is_empty() {
+            unnamed += 1;
+            let dummy = format!("unnamed_bitfield{}", unnamed);
+            ctx.ext_cx.ident_of(&dummy)
+        } else {
+            ctx.ext_cx.ident_of(name)
+        };
         args.push(ast::Arg {
             ty: P(type_for_bitfield_width(ctx, width)),
             pat: P(ast::Pat {
                 id: ast::DUMMY_NODE_ID,
                 node: ast::PatIdent(
                     ast::BindingMode::ByValue(ast::MutImmutable),
-                    respan(ctx.span, ctx.ext_cx.ident_of(name)),
+                    respan(ctx.span, ident),
                     None
                 ),
                 span: ctx.span
@@ -1275,8 +1283,15 @@ fn gen_fullbitfield_method(ctx: &mut GenCtx, bindgen_name: &String,
 
     let mut offset = 0;
     let mut exprs = quote_expr!(&ctx.ext_cx, 0);
+    let mut unnamed: usize = 0;
     for &(ref name, width) in bitfields.iter() {
-        let name_ident = ctx.ext_cx.ident_of(&name);
+        let name_ident = if name.is_empty() {
+            unnamed += 1;
+            let dummy = format!("unnamed_bitfield{}", unnamed);
+            ctx.ext_cx.ident_of(&dummy)
+        } else {
+            ctx.ext_cx.ident_of(name)
+        };
         exprs = quote_expr!(&ctx.ext_cx,
             $exprs | (($name_ident as $field_type) << $offset)
         );

tests/support.rs

@@ -38,7 +38,7 @@ pub fn assert_bind_eq(filename: &str, reference_items_str: &str)
 
     let mut parser = parse::new_parser_from_source_str(ext_cx.parse_sess(), ext_cx.cfg(), "".to_string(), reference_items_str.to_string());
     let mut reference_items = Vec::new();
-    while let Some(item) = parser.parse_item() {
+    while let Ok(Some(item)) = parser.parse_item() {
         reference_items.push(item);
     }
 
@@ -47,7 +47,7 @@ pub fn assert_bind_eq(filename: &str, reference_items_str: &str)
     // rendered versions, which is not beautiful, but should work.
     let reference_rendered = render_items(&reference_items);
     let generated_rendered = render_items(&generated_items);
-    
+
     if reference_rendered != generated_rendered {
         println!("Generated bindings for {} do not match the reference bindings.", filename);
         println!("");