1 files changed, 9 insertions, 10 deletions

diff --git a/src/main.rs b/src/main.rs
index e6e36d9..b42d73c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,19 +1,16 @@
 #![warn(clippy::all)]
 
-//mod doxygen;
 mod cli;
 mod config;
-mod entities;
 mod generator;
-mod pandoc;
 mod parsing;
+mod types;
 
 #[macro_use]
 extern crate log;
 
 use cli::{Command, ConfigCommand};
 use generator::generate;
-use parsing::parse_file;
 
 use anyhow::{Context, Result};
 use codemap::CodeMap;
@@ -86,14 +83,15 @@ fn start(codemap: &mut CodeMap) -> Result<()> {
         .with_context(|| format!("Cannot change current directory to: {:?}", cli.directory))?;
 
     match &cli.command {
-        Command::Generate { file } => {
-            let file = file.clone();
+        Command::Generate { file: _ } => {
+            //let file = file.clone();
             let config = load_effective_config(cli, codemap)?;
 
-            let manager = parse_file(file, &config.extra_clang_args);
+            let entities = parsing::clang::parse_compile_commands(&config.clang, codemap)?;
+            //let manager = parse_file(file, &config.extra_clang_args);
 
             let base_output_dir = std::path::Path::new("doc");
-            generate(&base_output_dir, manager, &config)?;
+            generate(&base_output_dir, entities, &config.generator)?;
         }
         Command::Config {
             command: ConfigCommand::Default,
@@ -105,7 +103,7 @@ fn start(codemap: &mut CodeMap) -> Result<()> {
         } => {
             print!(
                 "{}",
-                toml::to_string_pretty(&config::load_config(".", codemap)?)?
+                toml::to_string_pretty(&load_effective_config(cli, codemap)?)?
             );
         }
     }
@@ -114,5 +112,6 @@ fn start(codemap: &mut CodeMap) -> Result<()> {
 }
 
 fn load_effective_config(cli: cli::Cli, codemap: &mut CodeMap) -> Result<config::Config> {
-    Ok(config::load_config(".", codemap)?.merge_cli(cli))
+    let conf_file_conf = config::load_config(".", codemap)?;
+    Ok(config::Config::from_merge(cli, conf_file_conf)?)
 }