factor out checking whether we reached the max number of atoms into i…

…ts own function
Chia-Network · Feb 7, 2024 · 34bbdf0 · 34bbdf0
1 parent 82e74f4
commit 34bbdf0
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/src/allocator.rs b/src/allocator.rs
@@ -237,9 +237,7 @@ impl Allocator {
             return err(self.nil(), "out of memory");
         }
         let idx = self.atom_vec.len();
-        if idx + self.small_atoms == MAX_NUM_ATOMS {
-            return err(self.nil(), "too many atoms");
-        }
+        self.check_atom_limit()?;
         if v.len() <= 3 && canonical_positive_integer(v) {
             let mut ret: u32 = 0;
             for b in v {
@@ -258,9 +256,7 @@ impl Allocator {
 
     pub fn new_small_number(&mut self, v: u32) -> Result<NodePtr, EvalErr> {
         debug_assert!(v <= NODE_PTR_IDX_MASK);
-        if self.atom_vec.len() + self.small_atoms == MAX_NUM_ATOMS {
-            return err(self.nil(), "too many atoms");
-        }
+        self.check_atom_limit()?;
         self.small_atoms += 1;
         Ok(NodePtr::new(ObjectType::SmallAtom, v as usize))
     }
@@ -293,9 +289,7 @@ impl Allocator {
     }
 
     pub fn new_substr(&mut self, node: NodePtr, start: u32, end: u32) -> Result<NodePtr, EvalErr> {
-        if self.atom_vec.len() + self.small_atoms == MAX_NUM_ATOMS {
-            return err(self.nil(), "too many atoms");
-        }
+        self.check_atom_limit()?;
 
         fn bounds_check(node: NodePtr, start: u32, end: u32, len: u32) -> Result<(), EvalErr> {
             if start > len {
@@ -353,9 +347,7 @@ impl Allocator {
     }
 
     pub fn new_concat(&mut self, new_size: usize, nodes: &[NodePtr]) -> Result<NodePtr, EvalErr> {
-        if self.atom_vec.len() + self.small_atoms == MAX_NUM_ATOMS {
-            return err(self.nil(), "too many atoms");
-        }
+        self.check_atom_limit()?;
         let start = self.u8_vec.len();
         if self.heap_limit - start < new_size {
             return err(self.nil(), "out of memory");
@@ -599,6 +591,15 @@ impl Allocator {
         NodePtr::new(ObjectType::SmallAtom, 1)
     }
 
+    #[inline]
+    fn check_atom_limit(&self) -> Result<(), EvalErr> {
+        if self.atom_vec.len() + self.small_atoms == MAX_NUM_ATOMS {
+            err(self.nil(), "too many atoms")
+        } else {
+            Ok(())
+        }
+    }
+
     #[cfg(feature = "counters")]
     pub fn atom_count(&self) -> usize {
         self.atom_vec.len()