From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 18 Jul 2021 20:57:40 +0000 (+0100)
Subject: jstest: Pass lastg to ZUpdateSpec::next
X-Git-Tag: otter-0.7.2~44
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9a868e400f2e6287903bcf2b1c4122faf5166ea8;p=otter.git

jstest: Pass lastg to ZUpdateSpec::next

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

diff --git a/jstest/jst-lower.rs b/jstest/jst-lower.rs
index 553039fb..26500ab6 100644
--- a/jstest/jst-lower.rs
+++ b/jstest/jst-lower.rs
@@ -67,11 +67,12 @@ pub enum ZUpdateSpec {
 use ZUpdateSpec as ZUS;
 
 impl ZUpdateSpec {
-  pub fn next(&self, last: &mut zcoord::Mutable) -> ZLevel {
+  pub fn next(&self, last: &mut zcoord::Mutable, lastg: &mut Generation)
+              -> ZLevel {
     match self {
       ZUS::Auto => ZLevel {
         z: last.increment().unwrap(),
-        zg: Generation(1000),
+        zg: { lastg.increment(); *lastg },
       },
     }
   }
@@ -295,11 +296,12 @@ impl TestsAccumulator {
       if name != only { return; }
     }
     let mut zlast = ZCoord::default().clone_mut();
+    let mut zlastg = Generation(1000);
 
     let pieces: IndexMap<Vpid,StartPiece> = pieces.into_iter().map(
       |StartPieceSpec { id, pinned, moveable }| {
         let id = id.try_into().unwrap();
-        let zlevel = zupd.next(&mut zlast);
+        let zlevel = zupd.next(&mut zlast, &mut zlastg);
         (id, StartPiece { pinned, moveable, zlevel })
       }
     ).collect();