Auto merge of #30 - Manishearth:ignore_methods, r=emilio

Add ignore_methods to bindgen

I'm defining a struct inline in ServoBindings.h via a macro (for the already_addrefed stuff), and I need to forbid its ignore_methods from getting generated without forbidding functions as well.

r? @bholley

Author: bors-servo

src/bin/bindgen.rs

@@ -117,6 +117,10 @@ fn parse_args(args: &[String]) -> ParseResult {
                     options.ignore_functions = true;
                     ix += 1;
                 }
+                "-ignore-methods" => {
+                    options.ignore_methods = true;
+                    ix += 1;
+                }
                 "-no-bitfield-methods" => {
                     options.gen_bitfield_methods = false;
                     ix += 1;

src/lib.rs

@@ -159,6 +159,7 @@ pub struct BindgenOptions {
     pub links: Vec<(String, LinkType)>,
     pub emit_ast: bool,
     pub ignore_functions: bool,
+    pub ignore_methods: bool,
     pub gen_bitfield_methods: bool,
     pub fail_on_unknown_type: bool,
     pub enable_cxx_namespaces: bool,
@@ -190,6 +191,7 @@ impl Default for BindgenOptions {
             links: vec![],
             emit_ast: false,
             ignore_functions: false,
+            ignore_methods: false,
             gen_bitfield_methods: true,
             fail_on_unknown_type: true,
             rename_types: true,
@@ -322,6 +324,7 @@ fn parse_headers(options: &BindgenOptions, logger: &Logger) -> Result<ModuleMap,
         class_constants: options.class_constants,
         namespaced_constants: options.namespaced_constants,
         ignore_functions: options.ignore_functions,
+        ignore_methods: options.ignore_methods,
         fail_on_unknown_type: options.fail_on_unknown_type,
         enable_cxx_namespaces: options.enable_cxx_namespaces,
         override_enum_ty: str_to_ikind(&options.override_enum_ty),

src/parser.rs

@@ -24,6 +24,7 @@ pub struct ClangParserOptions {
     pub emit_ast: bool,
     pub fail_on_unknown_type: bool,
     pub ignore_functions: bool,
+    pub ignore_methods: bool,
     pub enable_cxx_namespaces: bool,
     pub class_constants: bool,
     pub namespaced_constants: bool,
@@ -1023,7 +1024,7 @@ fn visit_composite(cursor: &Cursor, parent: &Cursor,
             vi.is_static = cursor.method_is_static();
             vi.is_const = cursor.cur_type().is_const();
 
-            if ctx.options.ignore_functions {
+            if ctx.options.ignore_methods {
                 return CXChildVisit_Continue;
             }