From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 23 Jul 2021 22:29:48 +0000 (+0100)
Subject: wip parsing, record loc
X-Git-Tag: hippotat/1.0.0~510
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=222d225d5c49e050027d72dc36f58fb19f57a07a;p=hippotat.git

wip parsing, record loc

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/config.rs b/src/config.rs
index 66325b7..8e1f26a 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -67,7 +67,9 @@ pub enum SectionName {
 }
 pub use SectionName as SN;
 
-type SectionMap = HashMap<String, (Option<String>, Arc<PathBuf>)>;
+#[derive(Debug,Clone)]
+struct RawVal { val: Option<String>, loc: Arc<PathBuf> }
+type SectionMap = HashMap<String, RawVal>;
 
 pub struct Config {
   opts: Opts,
@@ -143,7 +145,7 @@ impl Aggregate {
         .or_default()
         .extend(
           vars.into_iter()
-            .map(|(k,v)| (k, (v, loc.clone())))
+            .map(|(k,val)| (k, RawVal { val, loc: loc.clone() }))
         );
     }
     None