From e280a374991a3a6db3c40fd1fa03a2d9c6fa66eb Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 6 Jun 2017 17:58:10 -0400
Subject: naming mostly

---
 org/sdp.org | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

(limited to 'org/sdp.org')

diff --git a/org/sdp.org b/org/sdp.org
index 4a7e848..2f58357 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -60,15 +60,18 @@ void main(string[] args) {
   <<sdp_args>>
   <<sdp_env>>
   <<sdp_conf_files>>
-  foreach(fn_src; fns_src) {
-    if (!empty(fn_src)) {
-      <<sdp_each_file_do_scope>>
-      <<sdp_abstraction>>
-      <<sdp_each_file_do_debugs_checkdoc>>
-      <<sdp_each_file_do_selected_output>>
-      <<sdp_each_file_do_scope_exit>>
-    } else {
-      <<sdp_no_filename_provided>>
+  <<sdp_do_selected>>
+  if (fns_src.length > 0) {
+    foreach(fn_src; fns_src) {
+      if (!empty(fn_src)) {
+        <<sdp_each_file_do_scope>>
+        <<sdp_abstraction>>
+        <<sdp_each_file_do_debugs_checkdoc>>
+        <<sdp_each_file_do_selected_output>>
+        <<sdp_each_file_do_scope_exit>>
+      } else {
+        <<sdp_no_filename_provided>>
+      }
     }
   }
 }
@@ -308,8 +311,8 @@ auto env = [
 
 #+NAME: sdp_conf_files
 #+BEGIN_SRC d
-auto sdl_root_configuration = ConfigHub!()("conf.sdl", env);
-auto sdl_root_doc_make = ConfigHub!()("sisu_document_make", env);
+auto sdl_root_configuration = configRead!()("conf.sdl", env);
+auto sdl_root_doc_make = configRead!()("sisu_document_make", env);
 auto confsdl = HeaderExtractSDL();
 auto conf_settings_aa = confsdl.configSettingsSDLangToAAmake(sdl_root_configuration);
 auto conf_doc_make_aa = confsdl.documentMakeSDLangToAAmake(sdl_root_doc_make);
@@ -486,10 +489,10 @@ debug(header_and_body) {
 #+NAME: sdp_each_file_do_split_sisu_markup_file_header_into_make_and_meta
 #+BEGIN_SRC d
 /+ ↓ split header into make and meta +/
-auto _make_and_meta =
+auto _make_and_meta_tup =
   SiSUheaderExtractHub!()(_header_body_inserts[headBody.header], conf_doc_make_aa);
-static assert(!isTypeTuple!(_make_and_meta));
-static assert(_make_and_meta.length==2);
+static assert(!isTypeTuple!(_make_and_meta_tup));
+static assert(_make_and_meta_tup.length==2);
 #+END_SRC
 
 ** 3. _document abstraction, tuple_ (pre-output-processing)       :processing:
@@ -511,8 +514,8 @@ static assert(_make_and_meta.length==2);
 /+ ↓ document abstraction: process document, return abstraction as tuple +/
 auto da = SiSUdocAbstraction!()(
   _header_body_inserts[headBody.body_content],
-  _make_and_meta[makeMeta.make],
-  _make_and_meta[makeMeta.meta],
+  _make_and_meta_tup[makeMeta.make],
+  _make_and_meta_tup[makeMeta.meta],
   opts
 );
 static assert(!isTypeTuple!(da));
@@ -546,11 +549,11 @@ struct DocumentMatters {
     return _k;
   }
   auto dochead_make() {
-    string[string][string] _k = _make_and_meta[makeMeta.make];
+    string[string][string] _k = _make_and_meta_tup[makeMeta.make];
     return _k;
   }
   auto dochead_meta() {
-    string[string][string] _k = _make_and_meta[makeMeta.meta];
+    string[string][string] _k = _make_and_meta_tup[makeMeta.meta];
     return _k;
   }
   auto src_path_info() {
-- 
cgit v1.2.3