1 files changed, 49 insertions, 5 deletions

diff --git a/src/config.rs b/src/config.rs
index 4463479..b448469 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,3 +1,5 @@
+use crate::cli::Cli;
+
 use anyhow::{anyhow, Context, Result};
 use codemap::CodeMap;
 use codemap_diagnostic::Diagnostic;
@@ -15,19 +17,61 @@ pub(super) const DEFAULT_PROJECT_CONFIGURATION_FILE_NAME: &str = "poseidoc.toml"
 #[serde(rename_all = "kebab-case", default)]
 pub(crate) struct Config {
     #[structopt(skip)]
-    pub(crate) name: String,
-    #[structopt(long, default_value = ".")]
-    pub(crate) compile_commands_location: PathBuf,
+    pub(crate) name: Option<String>,
+    #[structopt(long)]
+    pub(crate) compile_commands_location: Option<PathBuf>,
     #[structopt(skip = vec![])]
     pub(crate) extra_clang_args: Vec<String>,
+    #[structopt(flatten)]
+    pub(crate) class: ClassConfig,
+}
+
+impl Config {
+    pub(crate) fn merge_cli(self, cli: Cli) -> Self {
+        Config {
+            name: cli.common_options.name.or(self.name),
+            compile_commands_location: cli
+                .common_options
+                .compile_commands_location
+                .or(self.compile_commands_location),
+            extra_clang_args: cli
+                .extra_arg
+                .into_iter()
+                .flatten()
+                .chain(self.extra_clang_args)
+                .collect(),
+            class: self.class.merge_cli(cli.common_options.class),
+        }
+    }
 }
 
 impl Default for Config {
     fn default() -> Self {
         Config {
-            name: "My Project".into(),
-            compile_commands_location: PathBuf::from(r"."),
+            name: Some(String::from("My Project")),
+            compile_commands_location: Some(PathBuf::from(r".")),
             extra_clang_args: Vec::new(),
+            class: ClassConfig::default(),
+        }
+    }
+}
+
+#[derive(Debug, Clone, StructOpt, Deserialize, Serialize)]
+#[structopt(rename_all = "kebab-case")]
+#[serde(rename_all = "kebab-case", default)]
+pub(crate) struct ClassConfig {
+}
+
+impl ClassConfig {
+    fn merge_cli(self, _cli: ClassConfig) -> Self {
+        ClassConfig {
+        }
+    }
+}
+
+impl Default for ClassConfig {
+    fn default() -> Self {
+        ClassConfig {
         }
     }
 }