More anarchy

arnodb · Nov 22, 2023 · e27f90f · e27f90f
1 parent 25bdfc0
commit e27f90f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/branch/mod.rs b/src/branch/mod.rs
@@ -26,10 +26,6 @@ macro_rules! alt_trait_impl(
     ($len:expr; $($id:ident)+) => (
         impl<R, B, $($id),+>  Alt<R, B> for ( $($id),+ ) where R: AntiNomRng, B: Buffer, $($id: Generator<R, B>),* {
             fn choice(&mut self, rng: &mut R, buffer: &mut B) {
-                let anarchy = rng.anarchy();
-                if anarchy {
-                    return;
-                }
                 let i = rng.gen_range(0..$len);
                 alt_match_arm!(0, self, rng, buffer, i; $($id)*);
             }

diff --git a/src/lib.rs b/src/lib.rs
@@ -49,7 +49,13 @@ where
     R: AntiNomRng,
     B: Buffer,
 {
-    fn gen(&mut self, rng: &mut R, buffer: &mut B);
+    fn gen_one(&mut self, rng: &mut R, buffer: &mut B);
+
+    fn gen(&mut self, rng: &mut R, buffer: &mut B) {
+        if !rng.anarchy() {
+            self.gen_one(rng, buffer);
+        }
+    }
 }
 
 impl<R, B, F> Generator<R, B> for F
@@ -58,7 +64,7 @@ where
     B: Buffer,
     F: FnMut(&mut R, &mut B),
 {
-    fn gen(&mut self, rng: &mut R, buffer: &mut B) {
+    fn gen_one(&mut self, rng: &mut R, buffer: &mut B) {
         self(rng, buffer);
     }
 }