the light is getting closer

src/ir/upper/kind.rs

@@ -7,19 +7,76 @@ use std::{collections::HashMap, fmt::Debug};
 
 pub type NamePath = Vec<String>;
 
+// "effective" (externally visible) kinds
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum KindTy {
+    Type,
+    Var,
+    Struct,
+    Fn,
+}
+
+impl KindTy {
+    pub fn str(&self) -> &'static str {
+        match self {
+            KindTy::Type => "type",
+            KindTy::Var => "variable",
+            KindTy::Fn => "function",
+            KindTy::Struct => "struct",
+        }
+    }
+}
+
+pub trait Kind {
+    fn ty() -> KindTy;
+}
+
+impl Kind for UFunc {
+    fn ty() -> KindTy {
+        KindTy::Fn
+    }
+}
+
+impl Kind for UVar {
+    fn ty() -> KindTy {
+        KindTy::Var
+    }
+}
+
+impl Kind for UStruct {
+    fn ty() -> KindTy {
+        KindTy::Struct
+    }
+}
+
+impl Kind for Type {
+    fn ty() -> KindTy {
+        KindTy::Type
+    }
+}
+
+pub type FnID = ID<UFunc>;
+pub type VarID = ID<UVar>;
+pub type VarInstID = ID<VarInst>;
+pub type TypeID = ID<Type>;
+pub type GenericID = ID<UGeneric>;
+pub type StructID = ID<UStruct>;
+pub type DataID = ID<UData>;
+pub type ModID = ID<UModule>;
+
 #[derive(Clone)]
 pub struct UFunc {
     pub name: String,
     pub origin: Origin,
     pub args: Vec<VarID>,
-    pub gargs: Vec<TypeID>,
+    pub gargs: Vec<GenericID>,
     pub ret: TypeID,
     pub instructions: Vec<UInstrInst>,
 }
 
 #[derive(Clone)]
 pub struct StructField {
-    pub ty: Type,
+    pub ty: TypeID,
 }
 
 #[derive(Clone)]
@@ -27,7 +84,7 @@ pub struct UStruct {
     pub name: String,
     pub origin: Origin,
     pub fields: HashMap<String, StructField>,
-    pub generics: Vec<GenericID>,
+    pub gargs: Vec<GenericID>,
 }
 
 #[derive(Clone)]
@@ -45,15 +102,40 @@ pub struct UVar {
     pub children: Vec<VarID>,
 }
 
-#[derive(Clone, PartialEq, Eq, Hash)]
+/// these are more like "expressions", need to find good name
+/// eg. a::b::c::<T,U>.d.e
+#[derive(Clone, Debug)]
+pub struct VarInst {
+    pub status: VarStatus,
+    pub origin: Origin,
+}
+
+#[derive(Clone, Debug)]
+pub enum VarStatus {
+    Var(VarID),
+    Struct(StructID, Vec<TypeID>),
+    Unres {
+        path: ModPath,
+        name: String,
+        gargs: Vec<TypeID>,
+        fields: Vec<MemberID>,
+    },
+    Partial {
+        v: VarID,
+        fields: Vec<MemberID>,
+    },
+    Cooked,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct MemberID {
     pub name: String,
     pub origin: Origin,
 }
 
-#[derive(Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct ModPath {
-    pub m: ModID,
+    pub id: ModID,
     pub path: Vec<MemberID>,
 }
 
@@ -66,25 +148,26 @@ pub struct VarOffset {
 #[derive(Clone)]
 pub struct UData {
     pub name: String,
-    pub ty: Type,
+    pub ty: TypeID,
     pub content: Vec<u8>,
 }
 
 #[derive(Clone)]
 pub struct UModule {
     pub name: String,
-    pub members: HashMap<String, MemberID>,
+    pub members: HashMap<String, Member>,
     pub children: HashMap<String, ModID>,
     pub parent: Option<ModID>,
 }
 
-pub struct ModMissing {
-    pub import_all: Vec<ModID>,
-    pub vars: Vec<VarID>,
+#[derive(Clone)]
+pub struct Member {
+    pub id: MemberTy,
+    // pub visibility: Visibility
 }
 
 #[derive(Clone)]
-pub enum Member {
+pub enum MemberTy {
     Fn(FnID),
     Struct(StructID),
     Var(VarID),
@@ -126,12 +209,13 @@ impl<'a> Iterator for InstrIter<'a> {
     }
 }
 
-pub const NAMED_KINDS: usize = 5;
-
-pub type FnID = ID<UFunc>;
-pub type VarID = ID<UVar>;
-pub type TypeID = ID<Type>;
-pub type GenericID = ID<UGeneric>;
-pub type StructID = ID<UStruct>;
-pub type DataID = ID<UData>;
-pub type ModID = ID<Option<UModule>>;
+impl VarInst {
+    pub fn id(&self) -> Option<VarID> {
+        match &self.status {
+            VarStatus::Var(id) => Some(*id),
+            VarStatus::Unres { .. } => None,
+            VarStatus::Partial { .. } => None,
+            VarStatus::Cooked => None,
+        }
+    }
+}