1 files changed, 15 insertions, 10 deletions
diff --git a/oryxc/src/prelude.rs b/oryxc/src/prelude.rs
index 4e36f33..03dbc07 100644
--- a/oryxc/src/prelude.rs
+++ b/oryxc/src/prelude.rs
@@ -6,20 +6,25 @@ use std::fmt::{
 
 use crate::hashtrie::HTrie;
 
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub struct FileId(pub usize);
-
-#[repr(transparent)]
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub struct SymbolId(pub u32);
+macro_rules! mkidtype {
+	($name:ident) => {
+		#[repr(transparent)]
+		#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+		pub struct $name(pub u32);
+		impl $name {
+			#[allow(dead_code)]
+			pub const INVALID: Self = Self(u32::MAX);
+		}
+	};
+}
 
-#[repr(transparent)]
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
-pub struct ScopeId(pub usize);
+mkidtype!(FileId);
+mkidtype!(ScopeId);
+mkidtype!(SymbolId);
+mkidtype!(TypeId);
 
 impl ScopeId {
 	pub const GLOBAL: Self = Self(0);
-	pub const INVALID: Self = Self(usize::MAX);
 }
 
 #[derive(Debug)]