1 files changed, 203 insertions, 79 deletions

diff --git a/src/parser/clang/parsing.rs b/src/parser/clang/parsing.rs
index a654681..1f1691f 100644
--- a/src/parser/clang/parsing.rs
+++ b/src/parser/clang/parsing.rs
@@ -11,12 +11,15 @@ use std::collections::BTreeMap;
 use std::convert::{TryFrom, TryInto};
 use std::path::{Path, PathBuf};
 
+// TODO: check for use of Extend instead of loop+insert
+
 #[derive(Debug, Default)]
 struct TopLevel {
     namespaces: BTreeMap<Usr, Described<Namespace>>,
     variables: BTreeMap<Usr, Described<Variable>>,
     structs: BTreeMap<Usr, Described<Struct>>,
     functions: BTreeMap<Usr, Described<Function>>,
+    typedefs: BTreeMap<Usr, Described<Typedef>>,
 }
 
 /*
@@ -82,6 +85,9 @@ impl TopLevel {
                 ClangEntityKind::Struct(_) => {
                     &mut parent.get_member_structs()?.get_mut(&usr)?.entity
                 }
+                ClangEntityKind::Typedef => {
+                    &mut parent.get_member_typedefs()?.get_mut(&usr)?.entity
+                }
             })
         } else {
             Some(match path.get_kind().try_into().ok()? {
@@ -89,6 +95,7 @@ impl TopLevel {
                 ClangEntityKind::Variable(_) => &mut self.variables.get_mut(&usr)?.entity,
                 ClangEntityKind::Struct(_) => &mut self.structs.get_mut(&usr)?.entity,
                 ClangEntityKind::Function(_) => &mut self.functions.get_mut(&usr)?.entity,
+                ClangEntityKind::Typedef => &mut self.typedefs.get_mut(&usr)?.entity,
             })
         }
     }
@@ -121,7 +128,10 @@ impl TopLevel {
                     .insert(usr, entity);
                 Ok(())
             } else {
-                Err(anyhow!("has parent but no parent in tree"))
+                Err(anyhow!(
+                    "has parent: {:?} but no parent in tree",
+                    parent_path
+                ))
             }
         } else {
             self.insert_toplevel(usr, entity);
@@ -175,6 +185,12 @@ impl TopLevelManipulation<Struct> for TopLevel {
     }
 }
 
+impl TopLevelManipulation<Typedef> for TopLevel {
+    fn insert_toplevel(&mut self, usr: Usr, entity: Described<Typedef>) {
+        self.typedefs.insert(usr, entity);
+    }
+}
+
 /*
 trait FromTopLevel: ClangEntity + Sized {
     fn from_toplevel<'a>(toplevel: &'a mut TopLevel, usr: &Usr) -> Option<&'a mut Described<Self>>;
@@ -268,7 +284,7 @@ pub(crate) fn parse_compile_commands(
             &codemap,
         )?;
 
-        trace!("Changing directory to: {:?}", directory);
+        trace!("Changing directory to: {:?}", toplevel_directory);
         std::env::set_current_dir(&toplevel_directory).with_context(|| {
             format!(
                 "Cannot change current directory to: {:?}",
@@ -277,74 +293,77 @@ pub(crate) fn parse_compile_commands(
         })?;
     }
 
-    let normalized_entities = entities
-        .namespaces
-        .into_iter()
-        .map(|(usr, entity)| (EntityId(usr.0), entity.into()))
-        .chain(
-            entities
-                .variables
-                .into_iter()
-                .map(|(usr, entity)| (EntityId(usr.0), entity.into())),
-        )
-        .chain(
-            entities
-                .structs
-                .into_iter()
-                .map(|(usr, entity)| (EntityId(usr.0), entity.into())),
-        )
-        .chain(
-            entities
-                .functions
-                .into_iter()
-                .map(|(usr, entity)| (EntityId(usr.0), entity.into())),
-        )
-        .collect();
-
-    Ok(normalized_entities)
+    Ok(entities.into())
 }
 
-/*
-pub(crate) fn parse_file<T, S>(path: T, extra_args: &[S]) -> EntitiesManager
+pub(crate) fn parse_file<T>(
+    path: T,
+    config: &Config,
+    codemap: &mut CodeMap,
+) -> Result<BTreeMap<EntityId, Entity>>
 where
     T: Into<PathBuf>,
     T: AsRef<Path>,
     T: ToString,
-    S: AsRef<str>,
-    S: std::fmt::Debug,
 {
-    let mut codemap = CodeMap::new();
-    let file_map = codemap.add_file(path.to_string(), std::fs::read_to_string(&path).unwrap());
-    let file_span = file_map.span;
-
     let clang = Clang::new().unwrap();
     let index = Index::new(&clang, true, false);
-    let mut parser = index.parser(path);
-    parser.skip_function_bodies(true);
 
-    parser.arguments(&extra_args);
+    // as provided in the command line
+    let filename = path.to_string();
+    let file_map = codemap.add_file(filename.clone(), std::fs::read_to_string(&path)?);
 
-    if log_enabled!(log::Level::Debug) {
-        for extra_arg in extra_args {
-            debug!("Extra libclang argument: {:?}", extra_arg);
-        }
+    let path = path.as_ref().canonicalize()?;
+    let toplevel_directory = std::env::current_dir().context("Cannot read current directory")?;
+
+    let maybe_commands = CompilationDatabase::from_directory(&config.compile_commands_location)
+        .and_then(|database| database.get_compile_commands(&path))
+        .ok();
+    let maybe_command = maybe_commands
+        .as_ref()
+        .and_then(|commands| commands.get_commands().pop());
+
+    let mut clang_arguments = maybe_command
+        .map(|command| command.get_arguments())
+        .unwrap_or_default();
+    clang_arguments.extend_from_slice(&config.extra_args);
+
+    if let Some(command) = maybe_command {
+        let directory = command.get_directory();
+        trace!("Changing directory to: {:?}", directory);
+        std::env::set_current_dir(&directory)
+            .with_context(|| format!("Cannot change current directory to: {:?}", directory))?;
     }
 
-    let trans_unit = parser.parse().unwrap();
-    let mut entities = EntitiesManager::new();
+    let mut parser = index.parser("");
+    parser.skip_function_bodies(true);
+
+    parser.arguments(&clang_arguments);
+
+    trace!("Parsing with libclang arguments: {:?}", clang_arguments);
+
+    let mut entities = TopLevel::default();
 
     parse_unit(
-        &trans_unit,
+        &parser
+            .parse()
+            .with_context(|| format!("Could not parse file: {:?}", filename))?,
         &mut entities,
-        &std::env::current_dir().unwrap(),
-        file_span,
+        &toplevel_directory,
+        file_map.span,
         &codemap,
-    )
-    .unwrap();
+    )?;
 
-    entities
+    trace!("Changing directory to: {:?}", toplevel_directory);
+    std::env::set_current_dir(&toplevel_directory).with_context(|| {
+        format!(
+            "Cannot change current directory to: {:?}",
+            toplevel_directory
+        )
+    })?;
+
+    Ok(entities.into())
 }
-*/
 
 fn parse_unit(
     trans_unit: &TranslationUnit,
@@ -355,10 +374,7 @@ fn parse_unit(
 ) -> Result<()> {
     trans_unit.get_entity().visit_children(|entity, _parent| {
         if is_in_system_header(entity, &base_dir) {
-            trace!(
-                "Entity is in system header, skipping: USR = {:?}",
-                entity.get_display_name()
-            );
+            trace!("Entity is in system header, skipping: {:?}", entity);
             return clang::EntityVisitResult::Continue;
         }
 
@@ -374,12 +390,13 @@ fn parse_unit(
         add_entity(entity, entities, file_span, codemap)
     });
 
-    /*
     use codemap_diagnostic::{ColorConfig, Emitter};
 
     let mut emitter = Emitter::stderr(ColorConfig::Auto, Some(&codemap));
 
     for diagnostic in trans_unit.get_diagnostics().iter() {
+        warn!("{}", diagnostic);
+        /*
         let main_diag = match clang_diag_to_codemap_diag(&diagnostic, file_span) {
             Some(diag) => diag,
             None => continue,
@@ -401,8 +418,8 @@ fn parse_unit(
                 .chain(fix_it_diags)
                 .collect::<Vec<_>>(),
         );
+        */
     }
-    */
 
     Ok(())
 }
@@ -412,11 +429,12 @@ fn is_in_system_header(entity: clang::Entity, base_dir: impl AsRef<Path>) -> boo
         true
     } else if let Some(location) = entity.get_location() {
         if let Some(file) = location.get_file_location().file {
-            !file
-                .get_path()
-                .canonicalize()
-                .unwrap()
-                .starts_with(base_dir)
+            // !file
+            //     .get_path()
+            //     .canonicalize()
+            //     .unwrap()
+            //     .starts_with(base_dir)
+            false
         } else {
             // Not defined in a file? probably shouldn't document
             true
@@ -481,7 +499,8 @@ fn add_entity(
         // if current.has_documentation && !tree.has_documentation {
         //     append_documentation
         // }
-    } else if libclang_entity.is_definition() {
+    } else {
+        //if libclang_entity.is_definition() {
         // TODO: This probably means that you can't put documentation in forward declarations.
         // TODO: Ad-hoc toplevel functions are not documented
         //
@@ -492,19 +511,32 @@ fn add_entity(
         // when we see the definition.
 
         let result = match kind {
-            ClangEntityKind::Namespace => Described::<Namespace>::try_from(libclang_entity)
-                .and_then(|namespace| toplevel.insert(libclang_entity, namespace)),
+            ClangEntityKind::Namespace => {
+                if libclang_entity.get_name().is_some() {
+                    Described::<Namespace>::try_from(libclang_entity)
+                        .and_then(|namespace| toplevel.insert(libclang_entity, namespace))
+                } else {
+                    Ok(())
+                }
+            }
             ClangEntityKind::Variable(_) => Described::<Variable>::try_from(libclang_entity)
                 .and_then(|variable| toplevel.insert(libclang_entity, variable)),
             ClangEntityKind::Struct(_) => Described::<Struct>::try_from(libclang_entity)
                 .and_then(|r#struct| toplevel.insert(libclang_entity, r#struct)),
             ClangEntityKind::Function(_) => Described::<Function>::try_from(libclang_entity)
                 .and_then(|function| toplevel.insert(libclang_entity, function)),
+            ClangEntityKind::Typedef => Described::<Typedef>::try_from(libclang_entity)
+                .and_then(|function| toplevel.insert(libclang_entity, function)),
         };
         // TODO: check result
+
+        if let Err(err) = result {
+            error!("{}: {:?}", err, libclang_entity);
+            return ::clang::EntityVisitResult::Continue;
+        }
     }
 
-    if kind == ClangEntityKind::Namespace {
+    if kind == ClangEntityKind::Namespace && libclang_entity.get_name().is_some() {
         // Recurse here since namespace definitions are allowed to change between translation units.
         ::clang::EntityVisitResult::Recurse
     } else {
@@ -512,6 +544,40 @@ fn add_entity(
     }
 }
 
+impl From<TopLevel> for BTreeMap<EntityId, Entity> {
+    fn from(toplevel: TopLevel) -> Self {
+        toplevel
+            .namespaces
+            .into_iter()
+            .map(|(usr, entity)| (EntityId(usr.0), entity.into()))
+            .chain(
+                toplevel
+                    .variables
+                    .into_iter()
+                    .map(|(usr, entity)| (EntityId(usr.0), entity.into())),
+            )
+            .chain(
+                toplevel
+                    .structs
+                    .into_iter()
+                    .map(|(usr, entity)| (EntityId(usr.0), entity.into())),
+            )
+            .chain(
+                toplevel
+                    .functions
+                    .into_iter()
+                    .map(|(usr, entity)| (EntityId(usr.0), entity.into())),
+            )
+            .chain(
+                toplevel
+                    .typedefs
+                    .into_iter()
+                    .map(|(usr, entity)| (EntityId(usr.0), entity.into())),
+            )
+            .collect()
+    }
+}
+
 impl<'a, T> TryFrom<clang::Entity<'a>> for Described<T>
 where
     T: TryFrom<clang::Entity<'a>, Error = Error>,
@@ -544,6 +610,7 @@ impl<'a> TryFrom<clang::Entity<'a>> for Namespace {
             member_variables: Default::default(),
             member_structs: Default::default(),
             member_functions: Default::default(),
+            member_typedefs: Default::default(),
         })
     }
 }
@@ -580,31 +647,65 @@ impl<'a> TryFrom<clang::Entity<'a>> for Struct {
             Ok(ClangEntityKind::Struct(kind)) => {
                 struct_kind = kind;
             }
-            _ => panic!("Trying to parse a non-class into a class"),
+            _ => panic!("Trying to parse a non-struct into a struct"),
         }
         debug!("Parsing Struct: {:?}", entity);
 
         let mut member_variables = BTreeMap::new();
         let mut member_structs = BTreeMap::new();
         let mut member_functions = BTreeMap::new();
+        let mut member_typedefs = BTreeMap::new();
 
         for child in entity.get_children() {
             trace!("Struct has child: {:?}", child);
 
-            match child.get_kind().try_into() {
-                Ok(ClangEntityKind::Variable(_)) => {
-                    let child_usr = child.get_usr().ok_or_else(|| anyhow!("no usr"))?;
-                    member_variables.insert(child_usr, Described::<Variable>::try_from(child)?);
+            let kind = child.get_kind();
+
+            match kind {
+                ::clang::EntityKind::AccessSpecifier | ::clang::EntityKind::BaseSpecifier => {
+                    continue
                 }
-                Ok(ClangEntityKind::Struct(_)) => {
-                    let child_usr: Usr = child.get_usr().ok_or_else(|| anyhow!("no usr"))?;
-                    member_structs.insert(child_usr, Described::<Struct>::try_from(child)?);
+                _ => {}
+            }
+
+            let mut parse_child = || -> Result<()> {
+                match kind.try_into() {
+                    Ok(ClangEntityKind::Variable(_)) => {
+                        let child_usr = child
+                            .get_usr()
+                            .ok_or_else(|| anyhow!("no usr for: {:?}", child))?;
+                        member_variables.insert(child_usr, Described::<Variable>::try_from(child)?);
+                    }
+                    Ok(ClangEntityKind::Struct(_)) => {
+                        let child_usr: Usr = child
+                            .get_usr()
+                            .ok_or_else(|| anyhow!("no usr for: {:?}", child))?;
+                        member_structs.insert(child_usr, Described::<Struct>::try_from(child)?);
+                    }
+                    Ok(ClangEntityKind::Function(_)) => {
+                        let child_usr = child
+                            .get_usr()
+                            .ok_or_else(|| anyhow!("no usr for: {:?}", child))?;
+                        member_functions.insert(child_usr, Described::<Function>::try_from(child)?);
+                    }
+                    Ok(ClangEntityKind::Typedef) => {
+                        let child_usr = child
+                            .get_usr()
+                            .ok_or_else(|| anyhow!("no usr for: {:?}", child))?;
+                        member_typedefs.insert(child_usr, Described::<Typedef>::try_from(child)?);
+                    }
+                    Ok(other) => warn!("Unsupported child of struct {:?}: {:?}", other, child),
+                    Err(err) => info!("Error while parsing entity {:?}: {}", child, err),
                 }
-                Ok(ClangEntityKind::Function(_)) => {
-                    let child_usr = child.get_usr().ok_or_else(|| anyhow!("no usr"))?;
-                    member_functions.insert(child_usr, Described::<Function>::try_from(child)?);
+
+                Ok(())
+            };
+
+            match parse_child() {
+                Ok(()) => {}
+                Err(err) => {
+                    warn!("Error while parsing child {:?}: {}", child, err);
                 }
-                _ => trace!("Skipping child"),
             }
         }
 
@@ -613,6 +714,7 @@ impl<'a> TryFrom<clang::Entity<'a>> for Struct {
             member_functions,
             member_structs,
             member_variables,
+            member_typedefs,
         })
     }
 }
@@ -634,7 +736,9 @@ impl<'a> TryFrom<clang::Entity<'a>> for Function {
         trace!("Function has return type: {:?}", return_type);
         let arguments = entity
             .get_arguments()
-            .unwrap()
+            // TODO: this seems weird, but it fixes a None for a function that takes only a
+            // variadic argument from its own template declaration.
+            .unwrap_or_else(|| vec![])
             .into_iter()
             .map(|arg| {
                 let name = arg
@@ -654,6 +758,26 @@ impl<'a> TryFrom<clang::Entity<'a>> for Function {
     }
 }
 
+impl<'a> TryFrom<clang::Entity<'a>> for Typedef {
+    type Error = Error;
+
+    fn try_from(entity: clang::Entity) -> Result<Self, Error> {
+        match entity.get_kind().try_into() {
+            Ok(ClangEntityKind::Typedef) => {}
+            _ => panic!("Trying to parse a non-typedef into a typedef"),
+        }
+        debug!("Parsing typedef: {:?}", entity);
+
+        // TODO: unwrap (and unwrap in other similar places too)
+        let referee = entity
+            .get_typedef_underlying_type()
+            .ok_or_else(|| anyhow!("No underlying type"))?
+            .get_display_name();
+
+        Ok(Typedef { referee })
+    }
+}
+
 fn get_description(entity: clang::Entity) -> Result<Description> {
     let name = entity
         .get_display_name()