revert bitfield comment, generate argument name

brson · Apr 23, 2012 · 0abb6b0 · 0abb6b0
1 parent 1507f8b
commit 0abb6b0
Show file tree

Hide file tree

Showing 2 changed files with 215 additions and 210 deletions.
diff --git a/bindgen.rs b/bindgen.rs
@@ -366,19 +366,6 @@ fn opaque_ty(ctx: @bind_ctx, ty: CXType) {
     }
 }
 
-crust fn visit_field(++cursor: CXCursor,
-                     ++_parent: CXCursor,
-                     data: CXClientData) -> c_uint unsafe {
-    let ctx = *(data as *@bind_ctx);
-    let suffix = if cursor.kind == CXCursor_IntegerLiteral {
-        " /* FIXME: bit field */"
-    } else {
-        ""
-    };
-    ctx.out.write_line(suffix);
-    ret CXChildVisit_Continue;
-}
-
 crust fn visit_struct(++cursor: CXCursor,
                       ++_parent: CXCursor,
                       data: CXClientData) -> c_uint unsafe {
@@ -390,11 +377,9 @@ crust fn visit_struct(++cursor: CXCursor,
             name = "field_unnamed" + uint::str(ctx.unnamed_field);
             ctx.unnamed_field += 1u;
         }
-        ctx.out.write_str(#fmt["    %s: %s,",
+        ctx.out.write_line(#fmt["    %s: %s,",
                                 rust_id(ctx, name),
                                 conv_ty(ctx, ty, cursor, true)]);
-        clang_visitChildren(cursor, visit_field,
-                            ptr::addr_of(ctx) as CXClientData);
     }
     ret CXChildVisit_Continue;
 }
@@ -558,19 +543,32 @@ crust fn visit_func_top(++cursor: CXCursor,
             ret CXChildVisit_Continue;
         }
 
-        let ty = clang_getCursorType(cursor);
         ctx.out.write_str(#fmt["fn %s(", rust_id(ctx, name)]);
-        let arg_n = clang_getNumArgTypes(ty) as int;
+        let arg_n = clang_Cursor_getNumArguments(cursor) as int;
         let mut i = 0;
+        let mut unnamed = 0;
         while i < arg_n {
             if i > 0 {
                 ctx.out.write_str(", ");
             }
-            let arg_ty = clang_getArgType(ty, i as c_uint);
-            ctx.out.write_str(#fmt["++arg%d: %s",
-                                   i, conv_ty(ctx, arg_ty, cursor, false)]);
+
+            let arg = clang_Cursor_getArgument(cursor, i as c_uint);
+            let arg_ty = clang_getCursorType(arg);
+            let mut arg_name = to_str(clang_getCursorSpelling(arg));
+
+            arg_name = if str::is_empty(arg_name) {
+                unnamed += 1;
+                #fmt["arg%d", unnamed]
+            } else {
+                rust_id(ctx, arg_name)
+            };
+
+            ctx.out.write_str(#fmt["++%s: %s",
+                                   arg_name,
+                                   conv_ty(ctx, arg_ty, cursor, false)]);
             i += 1;
         }
+        let ty = clang_getCursorType(cursor);
         if clang_isFunctionTypeVariadic(ty) as uint != 0u {
             ctx.out.write_str("/* FIXME: variadic function */");
         }