1 files changed, 51 insertions, 4 deletions

diff --git a/src/parser/clang/entities.rs b/src/parser/clang/entities.rs
index cbc17b7..a5b6462 100644
--- a/src/parser/clang/entities.rs
+++ b/src/parser/clang/entities.rs
@@ -14,6 +14,7 @@ pub(super) struct Children {
     variables: Option<BTreeMap<Usr, Described<Variable>>>,
     structs: Option<BTreeMap<Usr, Described<Struct>>>,
     functions: Option<BTreeMap<Usr, Described<Function>>>,
+    typedefs: Option<BTreeMap<Usr, Described<Typedef>>>,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -22,6 +23,7 @@ pub(super) enum ClangEntityKind {
     Variable(VariableKind),
     Struct(StructKind),
     Function(FunctionKind),
+    Typedef,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -52,6 +54,7 @@ impl ClangEntityKind {
             ClangEntityKind::Struct(StructKind::Class) => "class",
             ClangEntityKind::Function(FunctionKind::Function) => "function",
             ClangEntityKind::Function(FunctionKind::Method) => "method",
+            ClangEntityKind::Typedef => "typedef",
         }
     }
 
@@ -64,6 +67,7 @@ impl ClangEntityKind {
             ClangEntityKind::Struct(StructKind::Class) => "classes",
             ClangEntityKind::Function(FunctionKind::Function) => "functions",
             ClangEntityKind::Function(FunctionKind::Method) => "methods",
+            ClangEntityKind::Typedef => "typedefs",
         }
     }
 }
@@ -80,12 +84,19 @@ impl TryFrom<EntityKind> for ClangEntityKind {
             EntityKind::Namespace => ClangEntityKind::Namespace,
             EntityKind::VarDecl => ClangEntityKind::Variable(VariableKind::Variable),
             EntityKind::FieldDecl => ClangEntityKind::Variable(VariableKind::Field),
-            EntityKind::FunctionDecl => ClangEntityKind::Function(FunctionKind::Function),
-            EntityKind::Method | EntityKind::Constructor => {
+            EntityKind::FunctionDecl | EntityKind::FunctionTemplate => {
+                ClangEntityKind::Function(FunctionKind::Function)
+            }
+            EntityKind::Method | EntityKind::Constructor | EntityKind::Destructor => {
                 ClangEntityKind::Function(FunctionKind::Method)
             }
             EntityKind::StructDecl => ClangEntityKind::Struct(StructKind::Struct),
-            EntityKind::ClassDecl => ClangEntityKind::Struct(StructKind::Class),
+            EntityKind::ClassDecl | EntityKind::ClassTemplate => {
+                ClangEntityKind::Struct(StructKind::Class)
+            }
+            EntityKind::TypedefDecl
+            | EntityKind::TypeAliasDecl
+            | EntityKind::TypeAliasTemplateDecl => ClangEntityKind::Typedef,
             kind => return Err(TryFromEntityKindError(format!("{:?}", kind))),
         })
     }
@@ -106,6 +117,9 @@ pub(super) trait ClangEntity {
     fn get_member_functions(&mut self) -> Option<&mut BTreeMap<Usr, Described<Function>>> {
         None
     }
+    fn get_member_typedefs(&mut self) -> Option<&mut BTreeMap<Usr, Described<Typedef>>> {
+        None
+    }
 
     fn into_children(self) -> Children
     where
@@ -116,6 +130,7 @@ pub(super) trait ClangEntity {
             variables: None,
             structs: None,
             functions: None,
+            typedefs: None,
         }
     }
 }
@@ -169,12 +184,23 @@ where
     }
 }
 
+impl<U> NamespaceParentManipulation<Typedef> for U
+where
+    U: ClangEntity,
+{
+    fn get_members_mut(&mut self) -> Option<&mut BTreeMap<Usr, Described<Typedef>>> {
+        self.get_member_typedefs()
+    }
+}
+
 fn entity_id(usr: Usr) -> EntityId {
     // This is a somewhat ugly workaround, because Pandoc parses markdown identifiers as alphanum
     // or one of "-_:.", which means Pandoc can't parse libclang's USRs in title ids and related.
     //
     // <https://github.com/jgm/pandoc/blob/2.9/src/Text/Pandoc/Readers/Markdown.hs#L581>
-    EntityId(usr.0.replace("@", "::").replace("#", ".").replace("$", "-"))
+    EntityId(
+        usr.0.replace("@", "::").replace("#", ".").replace("$", "-")
+    )
 }
 
 fn append_children<T: ClangEntity>(
@@ -243,6 +269,7 @@ pub(super) struct Namespace {
     pub(super) member_variables: BTreeMap<Usr, Described<Variable>>,
     pub(super) member_structs: BTreeMap<Usr, Described<Struct>>,
     pub(super) member_functions: BTreeMap<Usr, Described<Function>>,
+    pub(super) member_typedefs: BTreeMap<Usr, Described<Typedef>>,
 }
 
 impl ClangEntity for Namespace {
@@ -262,6 +289,9 @@ impl ClangEntity for Namespace {
     fn get_member_functions(&mut self) -> Option<&mut BTreeMap<Usr, Described<Function>>> {
         Some(&mut self.member_functions)
     }
+    fn get_member_typedefs(&mut self) -> Option<&mut BTreeMap<Usr, Described<Typedef>>> {
+        Some(&mut self.member_typedefs)
+    }
 
     fn into_children(self) -> Children {
         Children {
@@ -269,6 +299,7 @@ impl ClangEntity for Namespace {
             variables: Some(self.member_variables),
             structs: Some(self.member_structs),
             functions: Some(self.member_functions),
+            typedefs: Some(self.member_typedefs),
         }
     }
 }
@@ -314,6 +345,7 @@ pub(super) struct Struct {
     pub(super) member_variables: BTreeMap<Usr, Described<Variable>>,
     pub(super) member_structs: BTreeMap<Usr, Described<Struct>>,
     pub(super) member_functions: BTreeMap<Usr, Described<Function>>,
+    pub(super) member_typedefs: BTreeMap<Usr, Described<Typedef>>,
 }
 
 impl ClangEntity for Struct {
@@ -330,6 +362,9 @@ impl ClangEntity for Struct {
     fn get_member_functions(&mut self) -> Option<&mut BTreeMap<Usr, Described<Function>>> {
         Some(&mut self.member_functions)
     }
+    fn get_member_typedefs(&mut self) -> Option<&mut BTreeMap<Usr, Described<Typedef>>> {
+        Some(&mut self.member_typedefs)
+    }
 
     fn into_children(self) -> Children {
         Children {
@@ -337,6 +372,7 @@ impl ClangEntity for Struct {
             variables: Some(self.member_variables),
             structs: Some(self.member_structs),
             functions: Some(self.member_functions),
+            typedefs: Some(self.member_typedefs),
         }
     }
 }
@@ -381,3 +417,14 @@ pub(super) struct FunctionArgument {
     pub(super) name: String,
     pub(super) r#type: String,
 }
+
+#[derive(Debug, Clone)]
+pub(super) struct Typedef {
+    pub(super) referee: String,
+}
+
+impl ClangEntity for Typedef {
+    fn kind(&self) -> ClangEntityKind {
+        ClangEntityKind::Typedef
+    }
+}