From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 28 Apr 2022 00:43:30 +0000 (+0100)
Subject: Rename PUO::Insert to InsertQuiet
X-Git-Tag: otter-1.1.0~433
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a4c39a4f2e204d17c93ace90f2e5bb7a47cf53cc;p=otter.git

Rename PUO::Insert to InsertQuiet

This doesn't produce a halo, so it's Quiet.  We're going to want one
which *does* produce a halo, so we must make room.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/apitest/atmain.rs b/apitest/atmain.rs
index 9ce5b36e..a6cbc9fa 100644
--- a/apitest/atmain.rs
+++ b/apitest/atmain.rs
@@ -574,7 +574,7 @@ impl UsualCtx {
         if k == "Piece";
         let piece = v["piece"].as_str().unwrap().to_string();
         let op = v["op"].as_object().unwrap();
-        if let Some(_) = op.get("Insert");
+        if let Some(_) = op.get("InsertQuiet");
         then { added.push(piece); }
       }
     )?;
diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index 6c1a93aa..2410e1d2 100644
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -1136,7 +1136,7 @@ fn execute_game_insn<'cs, 'igr, 'ig: 'igr>(
           ig.ipieces.as_mut(modperm).insert(piece, IPiece {
             p, occilk, special,
           });
-          updates.push((piece, PieceUpdateOp::Insert(())));
+          updates.push((piece, PieceUpdateOp::InsertQuiet(())));
         })(); // <- no ?, infallible (to avoid leaking ilk)
         pos = (pos + posd)?;
       }
@@ -1408,11 +1408,11 @@ impl UpdateHandler {
           use PieceUpdateOp::*;
           let oe = bulk.pieces.get(&upiece);
           let ne = match (oe, uuop) {
-            ( None               , e        ) => Some( e          ),
-            ( Some( Insert(()) ) , Delete() ) => None,
-            ( Some( Insert(()) ) , _        ) => Some( Insert(()) ),
-            ( Some( Delete(  ) ) , _        ) => Some( Modify(()) ),
-            ( _                  , _        ) => Some( Modify(()) ),
+            ( None                    , e        ) => Some( e               ),
+            ( Some( InsertQuiet(()) ) , Delete() ) => None,
+            ( Some( InsertQuiet(()) ) , _        ) => Some( InsertQuiet(()) ),
+            ( Some( Delete     (  ) ) , _        ) => Some( Modify     (()) ),
+            ( _                       , _        ) => Some( Modify     (()) ),
           };
           trace_dbg!("accumulate", upiece, oe, uuop, ne);
           match ne {
diff --git a/src/hidden.rs b/src/hidden.rs
index 1dcdf43c..5f523201 100644
--- a/src/hidden.rs
+++ b/src/hidden.rs
@@ -646,7 +646,7 @@ fn recalculate_occultation_general<
         kinds.new().at_all_visible(),
       ) {
         (false, false) => None,
-        (false, true ) => Some(PUO::Insert(())),
+        (false, true ) => Some(PUO::InsertQuiet(())),
         (true,  false) => Some(PUO::Delete()),
         (true,  true ) => Some(PUO::Modify(())),
       };
diff --git a/src/pcrender.rs b/src/pcrender.rs
index 807e131e..38350e80 100644
--- a/src/pcrender.rs
+++ b/src/pcrender.rs
@@ -99,7 +99,7 @@ impl PieceRenderInstructions {
     if matches_doesnot!(
       op,
       = Move(_) | MoveQuiet(_) | SetZLevel(_) | SetZLevelQuiet(_),
-      ! Delete() | Insert(_) | Modify(_) | ModifyQuiet(_),
+      ! Delete() | InsertQuiet(_) | Modify(_) | ModifyQuiet(_),
     ) {
       match self.occulted {
         Visible(_) | Occulted => (),
diff --git a/src/updates.rs b/src/updates.rs
index 52cf4944..e9967c07 100644
--- a/src/updates.rs
+++ b/src/updates.rs
@@ -155,7 +155,7 @@ pub struct DataLoadPlayer {
 // Quiet means not to produce the yellow halo (see `movements` in script.ts)
 pub enum PieceUpdateOp<NS,ZL> {
   Delete(),
-  Insert(NS),
+  InsertQuiet(NS),
   Modify(NS),
   ModifyQuiet(NS),
   Move(Pos),
@@ -428,7 +428,7 @@ impl<NS,ZC> PieceUpdateOp<NS,ZC> {
     use PieceUpdateOp::*;
     match self {
       Delete() => None,
-      Insert(ns) => Some(ns),
+      InsertQuiet(ns) => Some(ns),
       Modify(ns) => Some(ns),
       ModifyQuiet(ns) => Some(ns),
       Move(_) => None,
@@ -445,7 +445,7 @@ impl<NS,ZC> PieceUpdateOp<NS,ZC> {
     use PieceUpdateOp::*;
     Ok(match self {
       Delete() => Delete(),
-      Insert(ns) => Insert(f(ns)?),
+      InsertQuiet(ns) => InsertQuiet(f(ns)?),
       Modify(ns) => Modify(f(ns)?),
       ModifyQuiet(ns) => ModifyQuiet(f(ns)?),
       Move(pos) => Move(pos),
@@ -458,7 +458,7 @@ impl<NS,ZC> PieceUpdateOp<NS,ZC> {
     use PieceUpdateOp::*;
     match self {
       Delete() => Delete(),
-      Insert(ns) => Insert(ns),
+      InsertQuiet(ns) => InsertQuiet(ns),
       Modify(ns) => Modify(ns),
       ModifyQuiet(ns) => ModifyQuiet(ns),
       Move(pos) => Move(*pos),
@@ -483,7 +483,7 @@ impl<NS,ZC> PieceUpdateOp<NS,ZC> {
     use PieceUpdateOp::*;
     match self {
       Delete() => None,
-      Insert(_) => None,
+      InsertQuiet(_) => None,
       Modify(_) => None,
       ModifyQuiet(_) => None,
       Move(_) => None,
diff --git a/templates/script.ts b/templates/script.ts
index ee920fcd..d78da55b 100644
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -1789,7 +1789,7 @@ pieceops.Modify = <PieceHandler>function
   piece_modify(piece, p, info);
 }
 
-pieceops.Insert = <PieceHandler>function
+pieceops.InsertQuiet = <PieceHandler>function
 (piece: PieceId, xp: any, info: PreparedPieceState) {
   console.log('PIECE UPDATE INSERT ',piece,info)
   let delem = document.createElementNS(svg_ns,'defs');