From 9c42b4567f35aceacce1298a6d4789d6789e5bfe Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Tue, 17 Dec 2019 13:22:51 -0500
Subject: specify Tuple content for read in files, remove traits.std

---
 src/doc_reform/meta/conf_make_meta_json.d    |  1 -
 src/doc_reform/meta/conf_make_meta_structs.d |  1 -
 src/doc_reform/meta/conf_make_meta_yaml.d    |  1 -
 src/doc_reform/meta/doc_debugs.d             |  1 -
 src/doc_reform/meta/metadoc.d                |  2 --
 src/doc_reform/meta/metadoc_from_src.d       | 26 ++++++++++++--------------
 src/doc_reform/meta/metadoc_harvest.d        |  1 -
 src/doc_reform/meta/metadoc_show_config.d    |  1 -
 src/doc_reform/meta/metadoc_show_make.d      |  1 -
 src/doc_reform/meta/metadoc_show_metadata.d  |  1 -
 src/doc_reform/meta/metadoc_show_summary.d   |  1 -
 src/doc_reform/meta/package.d                |  1 -
 12 files changed, 12 insertions(+), 26 deletions(-)

(limited to 'src/doc_reform/meta')

diff --git a/src/doc_reform/meta/conf_make_meta_json.d b/src/doc_reform/meta/conf_make_meta_json.d
index 95f9c2a..4f33108 100644
--- a/src/doc_reform/meta/conf_make_meta_json.d
+++ b/src/doc_reform/meta/conf_make_meta_json.d
@@ -11,7 +11,6 @@ static template contentJSONtoSpineStruct() {
     std.regex,
     std.stdio,
     std.string,
-    std.traits,
     std.typecons,
     std.utf,
     std.conv : to;
diff --git a/src/doc_reform/meta/conf_make_meta_structs.d b/src/doc_reform/meta/conf_make_meta_structs.d
index 7f220aa..c1d6f2c 100644
--- a/src/doc_reform/meta/conf_make_meta_structs.d
+++ b/src/doc_reform/meta/conf_make_meta_structs.d
@@ -6,7 +6,6 @@ import
   std.regex,
   std.stdio,
   std.string,
-  std.traits,
   std.typecons,
   std.utf,
   std.conv : to;
diff --git a/src/doc_reform/meta/conf_make_meta_yaml.d b/src/doc_reform/meta/conf_make_meta_yaml.d
index 1467fea..69ec567 100644
--- a/src/doc_reform/meta/conf_make_meta_yaml.d
+++ b/src/doc_reform/meta/conf_make_meta_yaml.d
@@ -12,7 +12,6 @@ static template contentYAMLtoSpineStruct() {
     std.regex,
     std.stdio,
     std.string,
-    std.traits,
     std.typecons,
     std.utf,
     std.conv : to;
diff --git a/src/doc_reform/meta/doc_debugs.d b/src/doc_reform/meta/doc_debugs.d
index 4a9a591..2815e4f 100644
--- a/src/doc_reform/meta/doc_debugs.d
+++ b/src/doc_reform/meta/doc_debugs.d
@@ -18,7 +18,6 @@ template spineDebugs() {
     std.range,
     std.regex,
     std.string,
-    std.traits,
     std.typecons,
     std.utf,
     std.conv : to;
diff --git a/src/doc_reform/meta/metadoc.d b/src/doc_reform/meta/metadoc.d
index e45139d..0db5d96 100644
--- a/src/doc_reform/meta/metadoc.d
+++ b/src/doc_reform/meta/metadoc.d
@@ -52,7 +52,6 @@ template spineAbstraction() {
     }
     auto _header_body_insertfilelist_imagelist
       = spineRawMarkupContent!()(_opt_action, _manifest.src.path_and_fn);
-    static assert(!isTypeTuple!(_header_body_insertfilelist_imagelist));
     static assert(_header_body_insertfilelist_imagelist.length==4);
     if ((_opt_action.debug_do)
     || (_opt_action.very_verbose)
@@ -95,7 +94,6 @@ template spineAbstraction() {
       _manifest,
       true,
     );
-    static assert(!isTypeTuple!(da));
     static assert(da.length==2);
     auto doc_abstraction = da[docAbst.doc_abstract_obj]; /+ head ~ toc ~ body ~ endnotes_seg ~ glossary ~ bibliography ~ bookindex ~ blurb; +/
     auto _doc_has_struct = da[docAbst.doc_has];
diff --git a/src/doc_reform/meta/metadoc_from_src.d b/src/doc_reform/meta/metadoc_from_src.d
index 5e61237..99de32c 100644
--- a/src/doc_reform/meta/metadoc_from_src.d
+++ b/src/doc_reform/meta/metadoc_from_src.d
@@ -1186,7 +1186,6 @@ template docAbstraction() {
                                                                                 /+ ↓ post loop markup document/text +/
     auto en_tuple
       = note_section.endnote_objects(obj_cite_digits, opt_action);
-    static assert(!isTypeTuple!(en_tuple));
     auto the_endnotes_section = en_tuple[0];
     obj_cite_digits = en_tuple[1];
     debug(endnotes) {
@@ -1338,7 +1337,6 @@ template docAbstraction() {
         opt_action,
       );
     destroy(bookindex_unordered_hashes);
-    static assert(!isTypeTuple!(bi_tuple));
     auto the_bookindex_section = bi_tuple[0];
     obj_cite_digits = bi_tuple[1];
     debug(bookindex) {
@@ -4327,7 +4325,7 @@ template docAbstraction() {
       }
       return obj_txt_in;
     }
-    auto footnotes_endnotes_markup_and_number_or_stars()(string obj_txt_in, bool reset_note_numbers) @safe {
+    Tuple!(string, bool, bool, bool) footnotes_endnotes_markup_and_number_or_stars()(string obj_txt_in, bool reset_note_numbers) @safe {
       /+ endnotes (regular) +/
       bool flg_notes_reg  = false;
       bool flg_notes_star = false;
@@ -4383,7 +4381,7 @@ template docAbstraction() {
       } else {
         obj_txt_out = obj_txt_in;
       }
-      auto t = tuple(
+      Tuple!(string, bool, bool, bool) t = tuple(
         obj_txt_out,
         flg_notes_reg,
         flg_notes_star,
@@ -4391,7 +4389,7 @@ template docAbstraction() {
       );
       return t;
     }
-    private auto object_notes_and_links_()(
+    private Tuple!(string, bool, bool, bool, bool, bool) object_notes_and_links_()(
       string obj_txt_in,
       bool reset_note_numbers=false
     ) @safe {
@@ -4425,7 +4423,7 @@ template docAbstraction() {
         obj_txt_in = obj_txt_in
           .replaceAll(rgx.para_inline_link_anchor, "┃$1┃");
       }
-      auto ftn = footnotes_endnotes_markup_and_number_or_stars(obj_txt_in, reset_note_numbers);
+      Tuple!(string, bool, bool, bool) ftn = footnotes_endnotes_markup_and_number_or_stars(obj_txt_in, reset_note_numbers);
       obj_txt_out = ftn[0];
       debug(footnotes) {
         writeln(obj_txt_out, tail);
@@ -4438,7 +4436,7 @@ template docAbstraction() {
           writeln(m.hit);
         }
       }
-      auto t = tuple(
+      Tuple!(string, bool, bool, bool, bool, bool) t = tuple(
         obj_txt_out,
         ftn[1],
         ftn[2],
@@ -4449,7 +4447,7 @@ template docAbstraction() {
       return t;
     }
     auto init() {
-      auto t = object_notes_and_links_("");
+      Tuple!(string, bool, bool, bool, bool, bool) t = object_notes_and_links_("");
       return t;
     }
     invariant() {
@@ -4462,7 +4460,7 @@ template docAbstraction() {
        .replaceFirst(rgx.heading, "")
        .replaceFirst(rgx.object_number_off_all, "")
        .strip;
-      auto t = object_notes_and_links_(obj_txt["munge"], reset_note_numbers);
+      Tuple!(string, bool, bool, bool, bool, bool) t = object_notes_and_links_(obj_txt["munge"], reset_note_numbers);
       debug(munge) {
         writeln(__LINE__);
         writeln(obj_txt_in);
@@ -4477,7 +4475,7 @@ template docAbstraction() {
       obj_txt["munge"]=(obj_txt_in)
         .replaceFirst(rgx.para_attribs, "")
         .replaceFirst(rgx.object_number_off_all, "");
-      auto t = object_notes_and_links_(obj_txt["munge"]);
+      Tuple!(string, bool, bool, bool, bool, bool) t = object_notes_and_links_(obj_txt["munge"]);
       debug(munge) {
         writeln(__LINE__);
         writeln(obj_txt_in);
@@ -4494,21 +4492,21 @@ template docAbstraction() {
     }
     auto munge_group(string obj_txt_in) @safe {
       obj_txt["munge"]=obj_txt_in;
-      auto t = object_notes_and_links_(obj_txt["munge"]);
+      Tuple!(string, bool, bool, bool, bool, bool) t = object_notes_and_links_(obj_txt["munge"]);
       return t;
     }
     invariant() {
     }
     auto munge_block()(string obj_txt_in) @safe {
       obj_txt["munge"]=obj_txt_in;
-      auto t = object_notes_and_links_(obj_txt["munge"]);
+      Tuple!(string, bool, bool, bool, bool, bool) t = object_notes_and_links_(obj_txt["munge"]);
       return t;
     }
     invariant() {
     }
     auto munge_verse()(string obj_txt_in) @safe {
       obj_txt["munge"]=obj_txt_in;
-      auto t = object_notes_and_links_(obj_txt["munge"]);
+      Tuple!(string, bool, bool, bool, bool, bool) t = object_notes_and_links_(obj_txt["munge"]);
       return t;
     }
     invariant() {
@@ -4618,7 +4616,7 @@ template docAbstraction() {
         obj_notes_and_links["image_no_dimensions"] = x[5];
         break;
       }
-      auto t = tuple(
+      Tuple!(string, string, bool, bool, bool, bool) t = tuple(
         obj_txt["munge"],
         anchor_tag,
         obj_notes_and_links["notes_reg"],
diff --git a/src/doc_reform/meta/metadoc_harvest.d b/src/doc_reform/meta/metadoc_harvest.d
index 362ba34..4bb62ae 100644
--- a/src/doc_reform/meta/metadoc_harvest.d
+++ b/src/doc_reform/meta/metadoc_harvest.d
@@ -13,7 +13,6 @@ template spineMetaDocHarvest() {
       std.regex,
       std.stdio,
       std.string,
-      std.traits,
       std.typecons,
       std.uni,
       std.utf,
diff --git a/src/doc_reform/meta/metadoc_show_config.d b/src/doc_reform/meta/metadoc_show_config.d
index 6e18516..b71fbab 100644
--- a/src/doc_reform/meta/metadoc_show_config.d
+++ b/src/doc_reform/meta/metadoc_show_config.d
@@ -12,7 +12,6 @@ template spineShowConfig() {
       std.regex,
       std.stdio,
       std.string,
-      std.traits,
       std.typecons,
       std.uni,
       std.utf,
diff --git a/src/doc_reform/meta/metadoc_show_make.d b/src/doc_reform/meta/metadoc_show_make.d
index ed334d0..e656a29 100644
--- a/src/doc_reform/meta/metadoc_show_make.d
+++ b/src/doc_reform/meta/metadoc_show_make.d
@@ -12,7 +12,6 @@ template spineShowMake() {
       std.regex,
       std.stdio,
       std.string,
-      std.traits,
       std.typecons,
       std.uni,
       std.utf,
diff --git a/src/doc_reform/meta/metadoc_show_metadata.d b/src/doc_reform/meta/metadoc_show_metadata.d
index e860452..0bd6854 100644
--- a/src/doc_reform/meta/metadoc_show_metadata.d
+++ b/src/doc_reform/meta/metadoc_show_metadata.d
@@ -12,7 +12,6 @@ template spineShowMetaData() {
       std.regex,
       std.stdio,
       std.string,
-      std.traits,
       std.typecons,
       std.uni,
       std.utf,
diff --git a/src/doc_reform/meta/metadoc_show_summary.d b/src/doc_reform/meta/metadoc_show_summary.d
index 71d8d87..9f2e34b 100644
--- a/src/doc_reform/meta/metadoc_show_summary.d
+++ b/src/doc_reform/meta/metadoc_show_summary.d
@@ -13,7 +13,6 @@ template spineMetaDocSummary() {
       std.regex,
       std.stdio,
       std.string,
-      std.traits,
       std.typecons,
       std.uni,
       std.utf,
diff --git a/src/doc_reform/meta/package.d b/src/doc_reform/meta/package.d
index 2981b6a..89334c0 100644
--- a/src/doc_reform/meta/package.d
+++ b/src/doc_reform/meta/package.d
@@ -10,7 +10,6 @@ public import
   std.regex,
   std.stdio,
   std.string,
-  std.traits,
   std.typecons,
   // std.uni,
   std.utf,
-- 
cgit v1.2.3