resolved merge conflicts

src/tests.rs

@@ -707,6 +707,17 @@ fn test_hex_literal() {
     }
 }
 
+#[test]
+fn test_modulo_equals() {
+    let mut engine = Engine::new();
+
+    if let Ok(result) = engine.eval::<i64>("let x = 10; x %= 4; x") {
+        assert_eq!(result, 2);
+    } else {
+        assert!(false);
+    }
+}
+
 #[test]
 fn test_octal_literal() {
     let mut engine = Engine::new();
@@ -714,7 +725,7 @@ fn test_octal_literal() {
     if let Ok(result) = engine.eval::<i64>("let x = 0o77; x") {
         assert_eq!(result, 63);
     } else {
-        assert!(false);
+        assert!(false)
     }
 
     if let Ok(result) = engine.eval::<i64>("let x = 0o1234; x") {
@@ -739,4 +750,45 @@ fn test_binary_literal() {
     } else {
         assert!(false);
     }
+}
+
+#[test]
+fn test_binary_ops() {
+    let mut engine = Engine::new();
+
+    if let Ok(result) = engine.eval::<i64>("10 % 4") {
+        assert_eq!(result, 2);
+    } else {
+        assert!(false);
+    }
+
+    if let Ok(result) = engine.eval::<i64>("10 << 4") {
+        assert_eq!(result, 160);
+    } else {
+        assert!(false);
+    }
+
+    if let Ok(result) = engine.eval::<i64>("10 >> 4") {
+        assert_eq!(result, 0);
+    } else {
+        assert!(false);
+    }
+
+    if let Ok(result) = engine.eval::<i64>("10 & 4") {
+        assert_eq!(result, 0);
+    } else {
+        assert!(false);
+    }
+
+    if let Ok(result) = engine.eval::<i64>("10 | 4") {
+        assert_eq!(result, 14);
+    } else {
+        assert!(false);
+    }
+
+    if let Ok(result) = engine.eval::<i64>("10 ^ 4") {
+        assert_eq!(result, 14);
+    } else {
+        assert!(false);
+    }
 }