entities rework, allow "inline" documentation, merge config with cli

1 files changed, 12 insertions, 4 deletions

diff --git a/src/main.rs b/src/main.rs
index 503688e..e6e36d9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,3 +1,5 @@
+#![warn(clippy::all)]
+
 //mod doxygen;
 mod cli;
 mod config;
@@ -83,13 +85,15 @@ fn start(codemap: &mut CodeMap) -> Result<()> {
     std::env::set_current_dir(&cli.directory)
         .with_context(|| format!("Cannot change current directory to: {:?}", cli.directory))?;
 
-    match cli.command {
+    match &cli.command {
         Command::Generate { file } => {
-            let extra_args = cli.extra_arg.iter().flatten().map(AsRef::as_ref).collect();
-            let manager = parse_file(file, extra_args);
+            let file = file.clone();
+            let config = load_effective_config(cli, codemap)?;
+
+            let manager = parse_file(file, &config.extra_clang_args);
 
             let base_output_dir = std::path::Path::new("doc");
-            generate(&base_output_dir, manager)?;
+            generate(&base_output_dir, manager, &config)?;
         }
         Command::Config {
             command: ConfigCommand::Default,
@@ -108,3 +112,7 @@ fn start(codemap: &mut CodeMap) -> Result<()> {
 
     Ok(())
 }
+
+fn load_effective_config(cli: cli::Cli, codemap: &mut CodeMap) -> Result<config::Config> {
+    Ok(config::load_config(".", codemap)?.merge_cli(cli))
+}