From 55a24a3b7d1b3fcc07f0bb8e53b00abf23e651b3 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sat, 10 Sep 2022 14:49:38 -0400 Subject: Add nav bar with context --- webapp/src/bridge_engine.rs | 55 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'webapp/src/bridge_engine.rs') diff --git a/webapp/src/bridge_engine.rs b/webapp/src/bridge_engine.rs index fd52c33..2161a53 100644 --- a/webapp/src/bridge_engine.rs +++ b/webapp/src/bridge_engine.rs @@ -243,12 +243,31 @@ pub enum ContractModifier { Redoubled, } +impl fmt::Display for ContractModifier { + fn fmt(&self, f: &mut fmt::Formatter) -> std::result::Result<(), std::fmt::Error> { + match self { + ContractModifier::None => Ok(()), + ContractModifier::Doubled => write!(f, "x"), + ContractModifier::Redoubled => write!(f, "xx"), + } + } +} + #[derive(Debug, PartialEq, Eq, Copy, Clone)] pub struct Contract { highest_bid: Option, modifier: ContractModifier, } +impl fmt::Display for Contract { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> std::result::Result<(), fmt::Error> { + match self.highest_bid { + None => write!(f, "Passed"), + Some(bid) => write!(f, "{}{}", bid, self.modifier), + } + } +} + #[derive(Debug, PartialEq, Eq, Clone)] pub struct Bidding { pub dealer: Player, @@ -388,6 +407,42 @@ mod tests { assert_eq!(checked_raises, 35); } + #[test] + fn fmt_contract() { + assert_eq!( + format!( + "{}", + Contract { + highest_bid: None, + modifier: ContractModifier::None + } + ), + "Passed" + ); + + assert_eq!( + format!( + "{}", + Contract { + highest_bid: Some("1♥".parse().unwrap()), + modifier: ContractModifier::None + } + ), + "1♡" + ); + + assert_eq!( + format!( + "{}", + Contract { + highest_bid: Some("1♥".parse().unwrap()), + modifier: ContractModifier::Doubled + } + ), + "1♡x" + ); + } + #[test] fn bid_ord() { let bid = |s| Raise::from_str(s).unwrap(); -- cgit v1.2.3