Merge pull request #46 from fitzgen/libiberty-test-compat

Match libiberty's binary operator demangling

build.rs

@@ -68,7 +68,7 @@ fn test_afl_seed_{}() {{
 // Ratcheting number that is increased as more libiberty tests start
 // passing. Once they are all passing, this can be removed and we can enable all
 // of them by default.
-const LIBIBERTY_TEST_THRESHOLD: usize = 20;
+const LIBIBERTY_TEST_THRESHOLD: usize = 24;
 
 /// Read `tests/libiberty-demangle-expected`, parse its input mangled symbols,
 /// and expected output demangled symbols, and generate test cases for them.

src/ast.rs

@@ -3201,11 +3201,14 @@ impl Demangle for Expression {
                 expr.demangle(ctx, stack)
             }
             Expression::Binary(ref op, ref lhs, ref rhs) => {
+                try!(write!(ctx, "("));
                 try!(lhs.demangle(ctx, stack));
-                try!(write!(ctx, " "));
+                try!(write!(ctx, ")"));
                 try!(op.demangle(ctx, stack));
-                try!(write!(ctx, " "));
-                rhs.demangle(ctx, stack)
+                try!(write!(ctx, "("));
+                try!(rhs.demangle(ctx, stack));
+                try!(write!(ctx, ")"));
+                Ok(())
             }
             Expression::Ternary(OperatorName::Question,
                                 ref condition,