1 files changed, 39 insertions, 50 deletions

diff --git a/src/config.rs b/src/config.rs
index b448469..72a9ff6 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,4 +1,8 @@
 use crate::cli::Cli;
+use crate::generator::config::{
+    Config as GeneratorConfig, ProvidedConfig as ProvidedGeneratorConfig,
+};
+use crate::parsing::clang::config::{Config as ClangConfig, ProvidedConfig as ProvidedClangConfig};
 
 use anyhow::{anyhow, Context, Result};
 use codemap::CodeMap;
@@ -12,71 +16,56 @@ use std::sync::Arc;
 
 pub(super) const DEFAULT_PROJECT_CONFIGURATION_FILE_NAME: &str = "poseidoc.toml";
 
-#[derive(Debug, Clone, StructOpt, Deserialize, Serialize)]
-#[structopt(rename_all = "kebab-case")]
-#[serde(rename_all = "kebab-case", default)]
+#[derive(Debug, Clone, Serialize)]
 pub(crate) struct Config {
-    #[structopt(skip)]
-    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),
-        }
-    }
+    pub(crate) name: String,
+    pub(crate) clang: ClangConfig,
+    pub(crate) generator: GeneratorConfig,
 }
 
 impl Default for Config {
     fn default() -> Self {
         Config {
-            name: Some(String::from("My Project")),
-            compile_commands_location: Some(PathBuf::from(r".")),
-            extra_clang_args: Vec::new(),
-            class: ClassConfig::default(),
+            name: String::from("My Project"),
+            clang: ClangConfig::default(),
+            generator: GeneratorConfig::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 Config {
+    pub(crate) fn from_merge(cli: Cli, conf: ProvidedConfig) -> Result<Self> {
+        Ok(Config {
+            name: cli
+                .common_options
+                .name
+                .or(conf.name)
+                .unwrap_or_else(|| String::from("My Project")),
+            clang: ClangConfig::from_merge(cli.common_options.clang, conf.clang)?,
+            generator: GeneratorConfig::from_merge(cli.common_options.generator, conf.generator),
+        })
     }
 }
 
-impl Default for ClassConfig {
-    fn default() -> Self {
-        ClassConfig {
-        }
-    }
+/// Same as ProvidedConfig but with options for when not user-provided
+#[derive(Debug, Clone, Default, StructOpt, Deserialize)]
+#[structopt(rename_all = "kebab-case")]
+#[serde(rename_all = "kebab-case")]
+pub(crate) struct ProvidedConfig {
+    #[structopt(skip)]
+    pub(crate) name: Option<String>,
+    #[structopt(flatten)]
+    #[serde(default)]
+    pub(crate) clang: ProvidedClangConfig,
+    #[structopt(skip)]
+    #[serde(default)]
+    pub(crate) generator: ProvidedGeneratorConfig,
 }
 
-pub(super) fn load_config(location: impl AsRef<Path>, codemap: &mut CodeMap) -> Result<Config> {
+pub(super) fn load_config(
+    location: impl AsRef<Path>,
+    codemap: &mut CodeMap,
+) -> Result<ProvidedConfig> {
     let location = location.as_ref();
 
     let final_path = if location.is_dir() {