luser
diff --git a/‎README.md
Lines changed: 47 additions & 16 deletions b/‎README.md
Lines changed: 47 additions & 16 deletions
diff --git a/‎bindgen_plugin/src/bgmacro.rs
Lines changed: 5 additions & 5 deletions b/‎bindgen_plugin/src/bgmacro.rs
Lines changed: 5 additions & 5 deletions
diff --git a/‎build.rs
Lines changed: 9 additions & 10 deletions b/‎build.rs
Lines changed: 9 additions & 10 deletions
diff --git a/‎src/bin/bindgen.rs
Lines changed: 32 additions & 16 deletions b/‎src/bin/bindgen.rs
Lines changed: 32 additions & 16 deletions
@@ -6,16 +6,37 @@ rust-bindgen
 [![][travis-status-shield]](https://travis-ci.org/crabtw/rust-bindgen/)
 
 A binding generator for the rust language.
+This is a fork designed to work on Spidermonkey headers.
 It is ported from [clay's bindgen][].
 
 Requirements
 ------------
 
-* clang 3.4 and up
+* clang 3.7 with patches https://github.com/michaelwu/clang/tree/release_37_smhacks or clang 3.8+
 
-Note: The libclang.so has to be statically linked with LLVM or you will
-encounter [issue 89][]. You can also use LD_PRELOAD=/path/to/libclang.so to
-workaround the problem.
+This bindgen fork requires a patched clang or clang 3.8+ to work properly. This is one way to build a patched clang:
+```
+git clone https://github.com/llvm-mirror/llvm
+cd llvm
+git checkout release_37
+cd tools
+git clone https://github.com/llvm-mirror/clang
+cd clang
+git remote add mwu https://github.com/michaelwu/clang
+git fetch mwu
+git checkout release_37_smhacks
+cd ../.. # llvm root dir
+mkdir build
+cd build
+../configure --enable-optimized
+make
+```
+
+Then before building, make sure to export the path to this copy of clang:
+
+    export LIBCLANG_PATH=~/llvm/build/Release+Asserts/lib
+
+This path also needs to be set in LD_LIBRARY_PATH (Linux) or DYLD_LIBRARY_PATH (OSX) when running bindgen.
 
 Building
 --------
@@ -71,6 +92,28 @@ Options:
     Options other than stated above are passed to clang
 ```
 
+C++ Usage
+---------
+This fork of rust-bindgen can handle a number of C++ features. Because it currently uses a fork of clang though, it may require adding extra arguments to find certain headers. On OpenSUSE 13.2, these additional include pathes can be used:
+
+    -isystem /usr/lib64/gcc/x86_64-suse-linux/4.8/include -isystem /usr/lib64/gcc/x86_64-suse-linux/4.8/include-fixed
+
+On OSX, this include path seems to work:
+
+    -isystem /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1
+
+When passing in header files, the file will automatically be treated as C++ if it ends in ``.hpp``. If it doesn't, ``-x c++`` can be used to force C++ mode.
+
+Annotations
+-----------
+The translation of classes, structs, enums, and typedefs can be adjusted using annotations. Annotations are specifically formatted html tags inside doxygen style comments. The opaque annotation instructs bindgen to ignore all fields defined in a struct/class.
+
+    /// <div rust-bindgen opaque></div>
+
+The hide annotation instructs bindgen to ignore the struct/class/field/enum completely.
+
+    /// <div rust-bindgen hide></div>
+
 Macro Usage
 -----------
 
@@ -118,15 +161,3 @@ main.rs
     mod mysql_bindings {
         bindgen!("/usr/include/mysql/mysql.h", match="mysql.h", link="mysql")
     }
-
-TODO
-----
-
-* bitfield accessors
-
-[clay's bindgen]: https://github.com/jckarter/clay/blob/master/tools/bindgen.clay
-[crates-version-shield]: https://img.shields.io/crates/v/bindgen.svg?style=flat-square
-[crates-downloads-shield]: https://img.shields.io/crates/d/bindgen.svg?style=flat-square
-[crates-license-shield]: https://img.shields.io/crates/l/bindgen.svg?style=flat-square
-[travis-status-shield]: https://img.shields.io/travis/crabtw/rust-bindgen.svg?label=travis&style=flat-square
-[issue 89]: https://github.com/crabtw/rust-bindgen/issues/89
 
@@ -25,8 +25,8 @@ pub fn bindgen_macro(cx: &mut base::ExtCtxt, sp: codemap::Span, tts: &[ast::Toke
     }
 
     // Reparse clang_args as it is passed in string form
-    let clang_args = visit.options.clang_args.join(" ");
-    visit.options.clang_args = parse_process_args(&clang_args[..]);
+    let clang_args = visit.options.clang_args.connect(" ");
+    visit.options.clang_args = parse_process_args(&clang_args);
 
     if let Some(path) = bindgen::get_include_dir() {
         visit.options.clang_args.push("-I".to_owned());
@@ -66,7 +66,7 @@ pub fn bindgen_macro(cx: &mut base::ExtCtxt, sp: codemap::Span, tts: &[ast::Toke
             }
 
             Box::new(BindgenResult { items: Some(SmallVector::many(items)) }) as Box<base::MacResult>
-            
+
         }
         Err(_) => base::DummyResult::any(sp)
     };
@@ -223,7 +223,7 @@ fn parse_macro_opts(cx: &mut base::ExtCtxt, tts: &[ast::TokenTree], visit: &mut
 // I'm sure there's a nicer way of doing it
 fn as_str<'a>(owned: &'a Option<String>) -> Option<&'a str> {
     match owned {
-        &Some(ref s) => Some(&s[..]),
+        &Some(ref s) => Some(s),
         &None => None
     }
 }
@@ -289,7 +289,7 @@ fn parse_process_args(s: &str) -> Vec<String> {
 
                     if part.len() > 0 {
                         // Remove any extra whitespace outside the quotes
-                        let part = &part[..].trim();
+                        let part = part.trim();
                         // Replace quoted characters
                         let part = part.replace("\\\"", "\"");
                         let part = part.replace("\\\'", "\'");
 
@@ -6,6 +6,7 @@ use std::process::Command;
 const LINUX_CLANG_DIRS: &'static [&'static str] = &[
     "/usr/lib",
     "/usr/lib/llvm",
+    "/usr/lib/llvm-3.8/lib",
     "/usr/lib/llvm-3.7/lib",
     "/usr/lib/llvm-3.6/lib",
     "/usr/lib/llvm-3.5/lib",
@@ -21,10 +22,7 @@ const MAC_CLANG_DIR: &'static [&'static str] = &[
 const WIN_CLANG_DIRS: &'static [&'static str] = &["C:\\Program Files\\LLVM\\bin", "C:\\Program Files\\LLVM\\lib"];
 
 fn path_exists(path: &Path) -> bool {
-    match fs::metadata(path) {
-        Ok(_) => true,
-        Err(_) => false
-    }
+    fs::metadata(path).is_ok()
 }
 
 fn main() {
@@ -37,16 +35,16 @@ fn main() {
     } else if cfg!(target_os = "macos") {
         MAC_CLANG_DIR.iter().map(ToString::to_string).collect()
     } else if cfg!(target_os = "windows") {
-		WIN_CLANG_DIRS.iter().map(ToString::to_string).collect()
+        WIN_CLANG_DIRS.iter().map(ToString::to_string).collect()
     } else {
         panic!("Platform not supported");
     };
 
     let clang_lib = if cfg!(target_os = "windows") {
-			format!("libclang{}", env::consts::DLL_SUFFIX)
-		} else {
-			format!("{}clang{}", env::consts::DLL_PREFIX, env::consts::DLL_SUFFIX)
-		};
+        format!("libclang{}", env::consts::DLL_SUFFIX)
+    } else {
+        format!("{}clang{}", env::consts::DLL_PREFIX, env::consts::DLL_SUFFIX)
+    };
 
     //may contain path to libclang detected via ldconfig
     let mut libclang_path_string = String::new();
@@ -60,7 +58,8 @@ fn main() {
             None
         }
     }).next();
-    if maybe_clang_dir == None && cfg!(target_os = "linux") {
+
+    if maybe_clang_dir.is_none() && cfg!(target_os = "linux") {
         //try to find via lddconfig
         //may return line, like
         //libclang.so.3.7 (libc6,x86-64) => /usr/lib64/libclang.so.3.7
 
@@ -2,7 +2,8 @@
 #![crate_type = "bin"]
 
 extern crate bindgen;
-#[macro_use] extern crate log;
+#[macro_use]
+extern crate log;
 
 use bindgen::{Bindings, BindgenOptions, LinkType, Logger};
 use std::io;
@@ -16,25 +17,24 @@ struct StdLogger;
 
 impl Logger for StdLogger {
     fn error(&self, msg: &str) {
-        error!("{}", msg);
+        println!("{}", msg);
     }
 
     fn warn(&self, msg: &str) {
-        warn!("{}", msg);
+        println!("{}", msg);
     }
 }
 
 enum ParseResult {
     CmdUsage,
-    ParseOk(BindgenOptions, Box<io::Write+'static>),
+    ParseOk(BindgenOptions, Box<io::Write>),
     ParseErr(String)
 }
 
 fn parse_args(args: &[String]) -> ParseResult {
     let args_len = args.len();
 
     let mut options: BindgenOptions = Default::default();
-    options.derive_debug = false;
     let mut out = Box::new(io::BufWriter::new(io::stdout())) as Box<io::Write>;
 
     if args_len == 0 {
@@ -47,7 +47,7 @@ fn parse_args(args: &[String]) -> ParseResult {
             options.links.push((args[ix][2..].to_string(), LinkType::Default));
             ix += 1;
         } else {
-            match &args[ix][..] {
+            match &*args[ix] {
                 "--help" | "-h" => {
                     return ParseResult::CmdUsage;
                 }
@@ -98,12 +98,8 @@ fn parse_args(args: &[String]) -> ParseResult {
                     options.builtins = true;
                     ix += 1;
                 }
-                "-no-rust-enums" => {
-                    options.rust_enums = false;
-                    ix += 1;
-                }
-                "-derive-debug" => {
-                    options.derive_debug = true;
+                "-ignore-functions" => {
+                    options.ignore_functions = true;
                     ix += 1;
                 }
                 "-allow-unknown-types" => {
@@ -117,6 +113,14 @@ fn parse_args(args: &[String]) -> ParseResult {
                     options.override_enum_ty = args[ix + 1].clone();
                     ix += 2;
                 }
+                "-enable-cxx-namespaces" => {
+                    options.enable_cxx_namespaces = true;
+                    ix += 1;
+                }
+                "-no-type-renaming" => {
+                    options.rename_types = false;
+                    ix += 1;
+                }
                 _ => {
                     options.clang_args.push(args[ix].clone());
                     ix += 1;
@@ -129,7 +133,7 @@ fn parse_args(args: &[String]) -> ParseResult {
 }
 
 fn print_usage(bin: String) {
-    let mut s = format!("Usage: {} [options] input.h", &bin[..]);
+    let mut s = format!("Usage: {} [options] input.h", &bin);
     s.push_str(
 "
 Options:
@@ -145,6 +149,10 @@ Options:
                                matching any rule are bound to.
     -builtins                  Output bindings for builtin definitions
                                (for example __builtin_va_list)
+    -ignore-functions          Don't generate bindings for functions and methods.
+                               This is useful when you only care about struct layouts.
+    -enable-cxx-namespaces     Enable support for C++ namespaces.
+    -no-type-renaming          Don't rename types.
     -allow-unknown-types       Don't fail if we encounter types we do not support,
                                instead treat them as void
     -emit-clang-ast            Output the ast (for debugging purposes)
@@ -163,14 +171,22 @@ Options:
     Options other than stated above are passed to clang.
 "
     );
-    print!("{}", &s[..]);
+    println!("{}", &s);
 }
 
 pub fn main() {
     let mut bind_args: Vec<_> = env::args().collect();
     let bin = bind_args.remove(0);
 
-    match parse_args(&bind_args[..]) {
+    match bindgen::get_include_dir() {
+        Some(path) => {
+            bind_args.push("-I".to_owned());
+            bind_args.push(path);
+        }
+        None => (),
+    }
+
+    match parse_args(&bind_args) {
         ParseResult::ParseErr(e) => panic!(e),
         ParseResult::CmdUsage => print_usage(bin),
         ParseResult::ParseOk(options, out) => {
@@ -179,7 +195,7 @@ pub fn main() {
                 Ok(bindings) => match bindings.write(out) {
                     Ok(()) => (),
                     Err(e) => {
-                        logger.error(&format!("Unable to write bindings to file. {}", e)[..]);
+                        logger.error(&format!("Unable to write bindings to file. {}", e));
                         exit(-1);
                     }
                 },