Rework ModuleEditContext to have separate modules/types/constants

pc2 · May 10, 2024 · e87c0eb · e87c0eb
1 parent 948139b
commit e87c0eb
Show file tree

Hide file tree

Showing 7 changed files with 273 additions and 227 deletions.
diff --git a/src/arena_alloc.rs b/src/arena_alloc.rs
@@ -1,19 +1,42 @@
-use std::{ops::{IndexMut, Index}, marker::PhantomData, iter::Enumerate, fmt};
+use std::{
+    ops::{IndexMut, Index},
+    marker::PhantomData,
+    iter::Enumerate,
+    fmt::{Debug, Result, Formatter},
+    hash::{Hash, Hasher}
+};
 
 use crate::block_vector::{BlockVec, BlockVecIterMut, BlockVecIter};
 
 
 // TODO add custom niche for more efficient Options, wait until custom niches are stabilized (https://internals.rust-lang.org/t/nonmaxusize-and-niche-value-optimisation/19661)
 // Maybe use NonZeroUsize (https://doc.rust-lang.org/std/num/struct.NonZeroUsize.html)
-#[derive(Clone, Copy, PartialEq, Eq, Hash)]
-pub struct UUID<IndexMarker : UUIDMarker>(usize, PhantomData<IndexMarker>);
+pub struct UUID<IndexMarker>(usize, PhantomData<IndexMarker>);
+
+impl<IndexMarker> Clone for UUID<IndexMarker> {
+    fn clone(&self) -> Self {
+        Self(self.0, PhantomData)
+    }
+}
+impl<IndexMarker> Copy for UUID<IndexMarker> {}
+impl<IndexMarker> PartialEq for UUID<IndexMarker> {
+    fn eq(&self, other: &Self) -> bool {
+        self.0 == other.0
+    }
+}
+impl<IndexMarker> Eq for UUID<IndexMarker> {}
+impl<IndexMarker> Hash for UUID<IndexMarker> {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.0.hash(state);
+    }
+}
 
 pub trait UUIDMarker {
     const DISPLAY_NAME : &'static str;
 }
 
-impl<IndexMarker : UUIDMarker> fmt::Debug for UUID<IndexMarker> {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+impl<IndexMarker : UUIDMarker> Debug for UUID<IndexMarker> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result {
         f.write_str(IndexMarker::DISPLAY_NAME)?;
         self.0.fmt(f)
     }
@@ -32,8 +55,35 @@ impl<IndexMarker : UUIDMarker> UUID<IndexMarker> {
     pub const PLACEHOLDER : Self = UUID(usize::MAX, PhantomData);
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct UUIDRange<IndexMarker : UUIDMarker>(pub UUID<IndexMarker>, pub UUID<IndexMarker>);
+pub struct UUIDRange<IndexMarker>(pub UUID<IndexMarker>, pub UUID<IndexMarker>);
+
+impl<IndexMarker : UUIDMarker> Debug for UUIDRange<IndexMarker> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result {
+        f.write_str(IndexMarker::DISPLAY_NAME)?;
+        self.0.fmt(f)?;
+        f.write_str("..")?;
+        self.1.fmt(f)
+    }
+}
+
+impl<IndexMarker> Clone for UUIDRange<IndexMarker> {
+    fn clone(&self) -> Self {
+        Self(self.0, self.1)
+    }
+}
+impl<IndexMarker> Copy for UUIDRange<IndexMarker> {}
+impl<IndexMarker> PartialEq for UUIDRange<IndexMarker> {
+    fn eq(&self, other: &Self) -> bool {
+        self.0 == other.0 && self.1 == other.1
+    }
+}
+impl<IndexMarker> Eq for UUIDRange<IndexMarker> {}
+impl<IndexMarker> Hash for UUIDRange<IndexMarker> {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        self.0.hash(state);
+        self.1.hash(state);
+    }
+}
 
 #[derive(Clone, Copy, PartialEq, Eq, Hash)]
 pub struct UUIDRangeIter<IndexMarker : UUIDMarker>(UUID<IndexMarker>, UUID<IndexMarker>);
@@ -384,7 +434,6 @@ impl<'a, T, IndexMarker : UUIDMarker> IntoIterator for &'a mut ListAllocator<T,
 
 
 
-#[derive(Debug)]
 pub struct FlatAlloc<T, IndexMarker> {
     data : Vec<T>,
     _ph : PhantomData<IndexMarker>
@@ -443,6 +492,12 @@ impl<T, IndexMarker : UUIDMarker> IndexMut<UUID<IndexMarker>> for FlatAlloc<T, I
     }
 }
 
+impl<T : Debug, IndexMarker> Debug for FlatAlloc<T, IndexMarker> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> Result {
+        f.debug_struct("FlatAlloc").field("data", &self.data).finish()
+    }
+}
+
 #[derive(Debug)]
 pub struct FlatAllocIter<'a, T, IndexMarker : UUIDMarker> {
     iter : Enumerate<std::slice::Iter<'a, T>>,

diff --git a/src/flattening/initialization.rs b/src/flattening/initialization.rs
@@ -15,14 +15,12 @@ use super::{FlatID, IdentifierType};
 
 
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct PortIDMarker;
 impl UUIDMarker for PortIDMarker {const DISPLAY_NAME : &'static str = "port_";}
 pub type PortID = UUID<PortIDMarker>;
 
 pub type PortIDRange = UUIDRange<PortIDMarker>;
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct InterfaceIDMarker;
 impl UUIDMarker for InterfaceIDMarker {const DISPLAY_NAME : &'static str = "port_";}
 pub type InterfaceID = UUID<InterfaceIDMarker>;