From bdcb9189e4cf221bec1efaf2e6e612b127e51f25 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 6 Jan 2018 20:34:42 -0500
Subject: 0.23.3 work on source & target file paths/locations

---
 src/sdp/sdp.d | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/sdp/sdp.d')

diff --git a/src/sdp/sdp.d b/src/sdp/sdp.d
index 8434841..4e43a67 100755
--- a/src/sdp/sdp.d
+++ b/src/sdp/sdp.d
@@ -303,7 +303,7 @@ void main(string[] args) {
     "home" : environment["HOME"],
   ];
   auto _manifest_start = PodManifest!()();
-  auto _manifest_matter = PodMatters!()(_opt_action, _env);
+  auto _manifest_matter = PathMatters!()(_opt_action, _env);
   auto _manifests = [ _manifest_matter ];
   foreach(arg; args[1..$]) {
     _manifest_start = PodManifest!()(arg);
@@ -340,8 +340,8 @@ void main(string[] args) {
       } else { // (file name with path \n)+
         contents_location_ = contents_location_raw_;
       }
-      auto contents_locations_arr =
-        (cast(char[]) contents_location_).split;
+      auto contents_locations_arr
+        = (cast(char[]) contents_location_).split;
       auto tmp_dir_ = (sisudoc_txt_).dirName.array;
       foreach (contents_location; contents_locations_arr) {
         assert(contents_location.match(rgx.src_pth_sst_or_ssm),
@@ -354,12 +354,12 @@ void main(string[] args) {
           || (contents_location_pth_).match(lang_rgx_)
         ) {
           auto _fns = (((tmp_dir_).chainPath(contents_location_pth_)).array).to!(string);
-          _manifest_matter = PodMatters!()(_opt_action, _env, arg, _fns, contents_locations_arr);
+          _manifest_matter = PathMatters!()(_opt_action, _env, arg, _fns, contents_locations_arr);
           _manifests ~= _manifest_matter; // TODO how to capture?
         }
       }
     } else if (arg.match(rgx.src_pth_sst_or_ssm)) {
-      _manifests ~= PodMatters!()(_opt_action, _env, arg, arg); // gather input markup source file names for processing
+      _manifests ~= PathMatters!()(_opt_action, _env, arg, arg); // gather input markup source file names for processing
     } else if (arg.match(rgx.src_pth_zip)) {
       // fns_src ~= arg;             // gather input markup source file names for processing
     } else {                      // anything remaining, unused
@@ -372,7 +372,7 @@ void main(string[] args) {
   }
   if (_manifests.length > 1) { // _manifests[0] initialized dummy element
     foreach(manifest; _manifests[1..$]) {
-      if (!empty(manifest.src_fn)) {
+      if (!empty(manifest.src.filename)) {
         scope(success) {
           debug(checkdoc) {
             writefln(
@@ -387,14 +387,14 @@ void main(string[] args) {
             stderr.writefln(
               "~ document run failure ~ (%s  v%s)\n\t%s",
               __VENDOR__, __VERSION__,
-              src_fn
+              manifest.src.filename
             );
           }
         }
         enforce(
-          manifest.src_fn.match(rgx.src_pth_types),
+          manifest.src.filename.match(rgx.src_pth_types),
           "not a sisu markup filename: «" ~
-          manifest.src_fn ~ "»"
+          manifest.src.filename ~ "»"
         );
         auto t = SiSUabstraction!()(_env, _opt_action, manifest);
         static assert(!isTypeTuple!(t));
@@ -402,24 +402,24 @@ void main(string[] args) {
         auto doc_abstraction = t[dAM.abstraction];
         auto doc_matters = t[dAM.matters];
         /+ ↓ debugs +/
-        if (doc_matters.opt_action.verbose) {
+        if (doc_matters.opt.action.verbose) {
           SiSUabstractionSummary!()(doc_abstraction, doc_matters);
         }
         /+ ↓ debugs +/
-        if ((doc_matters.opt_action.debug_do)
-        || (doc_matters.opt_action.verbose)
+        if ((doc_matters.opt.action.debug_do)
+        || (doc_matters.opt.action.verbose)
         ) {
           SiSUdebugs!()(doc_abstraction, doc_matters);
         }
         /+ ↓ output hub +/
-        if (!(doc_matters.opt_action.skip_output)) {
+        if (!(doc_matters.opt.action.skip_output)) {
           outputHub!()(doc_abstraction, doc_matters);
         }
         scope(exit) {
           debug(checkdoc) {
             writefln(
               "processed file: %s",
-              manifest.src_fn
+              manifest.src.filename
             );
           }
           destroy(manifest);
-- 
cgit v1.2.3