From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 27 Jun 2020 12:26:00 +0000 (+0100)
Subject: VisiblePieceId uncensored before undo again
X-Git-Tag: otter-0.2.0~1533
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d09ab7b98ea163b02f4336d93e79817dd2fb67f6;p=otter.git

VisiblePieceId uncensored before undo again
---

diff --git a/src/bin/server.rs b/src/bin/server.rs
index 24e06b58..119b6f0c 100644
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -77,7 +77,7 @@ fn session(form : Json<SessionForm>) -> Result<Template,RE> {
     for (gpid, pr) in &g.gs.pieces {
       let id : slotmap::KeyData = gpid.into();
       let pri = PieceRenderInstructions {
-        id : VisiblePieceId(id.as_ffi()),
+        id : VisiblePieceId { uncensored : id },
         face : pr.face,
       };
       defs.push(format!(r##"<g id="{}">{}</g>"##,
diff --git a/src/gamestate.rs b/src/gamestate.rs
index f79bceee..efb6f40f 100644
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -8,7 +8,7 @@ slotmap::new_key_type!{
 #[derive(Copy,Clone,Serialize,Deserialize)]
 #[serde(into="String")]
 #[serde(try_from="&str")]
-pub struct VisiblePieceId (pub u64);
+pub struct VisiblePieceId { pub uncensored : slotmap::KeyData }
 
 #[derive(Debug)]
 pub struct PieceRenderInstructions {
@@ -20,7 +20,8 @@ pub type VisiblePieceIdSvgIds = &'static [&'static str];
 
 impl Display for VisiblePieceId {
   fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-    write!(f, "{}.{}", self.0 >> 32, self.0 & 0xffffffff)
+    let v = self.uncensored.as_ffi();
+    write!(f, "{}.{}", v >> 32, v & 0xffffffff)
   }
 }
 display_consequential_impls!{VisiblePieceId}
@@ -28,7 +29,9 @@ display_consequential_impls!{VisiblePieceId}
 impl TryFrom<&str> for VisiblePieceId {
   type Error = AE;
   #[throws(AE)]
-  fn try_from(s : &str) -> VisiblePieceId { VisiblePieceId(slotkey_parse(s)?) }
+  fn try_from(s : &str) -> VisiblePieceId {
+    VisiblePieceId{ uncensored : slotkey_parse(s)? }
+  }
 }
 
 impl PieceRenderInstructions {
diff --git a/src/keydata.rs b/src/keydata.rs
index 452816b4..f8edaa52 100644
--- a/src/keydata.rs
+++ b/src/keydata.rs
@@ -18,10 +18,11 @@ macro_rules! display_consequential_impls {
 pub use crate::display_consequential_impls; // this is madness!
 
 #[throws(AE)]
-pub fn slotkey_parse(s : &str) -> u64 {
+pub fn slotkey_parse(s : &str) -> slotmap::KeyData {
   let e = || anyhow!("could not deserialise visibile piece id");
   let mut i = s.splitn(2,'.').map(|s| s.parse().map_err(|_| e()));
   let h : u32 = i.next().ok_or_else(e)??;
   let l : u32 = i.next().ok_or_else(e)??;
-  ((h as u64) << 32) | (l as u64)
+  let v = ((h as u64) << 32) | (l as u64);
+  slotmap::KeyData::from_ffi(v)
 }