From 12146fc8d8bd0f4dbba9758b3363ddf9a2b916d4 Mon Sep 17 00:00:00 2001
From: Jason Williams <jason.williams01@bbc.co.uk>
Date: Tue, 4 Sep 2018 10:31:52 +0100
Subject: [PATCH] building stable branch

---
 src/lib/syntax/ast/mod.rs |  2 +-
 src/lib/syntax/ast/op.rs  | 18 +++++++++---------
 src/lib/syntax/mod.rs     |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/lib/syntax/ast/mod.rs b/src/lib/syntax/ast/mod.rs
index 03cbbd536c..3f4a1c6b24 100644
--- a/src/lib/syntax/ast/mod.rs
+++ b/src/lib/syntax/ast/mod.rs
@@ -1,5 +1,5 @@
 pub mod constant;
-pub mod expr;
+// pub mod expr;
 pub mod keyword;
 pub mod op;
 pub mod pos;
diff --git a/src/lib/syntax/ast/op.rs b/src/lib/syntax/ast/op.rs
index dd9f9334bd..f8b318cbd2 100644
--- a/src/lib/syntax/ast/op.rs
+++ b/src/lib/syntax/ast/op.rs
@@ -201,11 +201,11 @@ impl Operator for BinOp {
             | BinOp::Comp(CompOp::NotEqual)
             | BinOp::Comp(CompOp::StrictEqual)
             | BinOp::Comp(CompOp::StrictNotEqual) => 9,
-            BinOp::Bit(BitAnd) => 10,
-            BinOp::Bit(BitXor) => 11,
-            BinOp::Bit(BitOr) => 12,
-            BinOp::Log(LogAnd) => 13,
-            BinOp::Log(LogOr) => 14,
+            BinOp::Bit(BitOp::And) => 10,
+            BinOp::Bit(BitOp::Xor) => 11,
+            BinOp::Bit(BitOp::Or) => 12,
+            BinOp::Log(LogOp::And) => 13,
+            BinOp::Log(LogOp::Or) => 14,
         }
     }
 }
@@ -216,10 +216,10 @@ impl Display for BinOp {
             f,
             "{}",
             match *self {
-                BinOp::Num(op) => op.to_string(),
-                BinOp::Bit(op) => op.to_string(),
-                BinOp::Comp(op) => op.to_string(),
-                BinOp::Log(op) => op.to_string(),
+                BinOp::Num(ref op) => op.to_string(),
+                BinOp::Bit(ref op) => op.to_string(),
+                BinOp::Comp(ref op) => op.to_string(),
+                BinOp::Log(ref op) => op.to_string(),
             }
         )
     }
diff --git a/src/lib/syntax/mod.rs b/src/lib/syntax/mod.rs
index 44bc2efb36..dfa12be5fc 100644
--- a/src/lib/syntax/mod.rs
+++ b/src/lib/syntax/mod.rs
@@ -2,5 +2,5 @@
 pub mod ast;
 /// Parses a string stream into a sequence of tokens
 pub mod lexer;
-/// Parses a sequence of tokens into expressions
-pub mod parser;
+// Parses a sequence of tokens into expressions
+// pub mod parser;