From 24c9ed3645178a6ee2abbd9201fa4643dba068e2 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Tue, 14 May 2019 11:35:24 -0400
Subject: review, reduce use of auto

---
 src/doc_reform/doc_reform.d | 80 ++++++++++++++++++++++-----------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

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

diff --git a/src/doc_reform/doc_reform.d b/src/doc_reform/doc_reform.d
index ae92a97..2c63dcb 100755
--- a/src/doc_reform/doc_reform.d
+++ b/src/doc_reform/doc_reform.d
@@ -216,13 +216,13 @@ void main(string[] args) {
   }
   enum outTask { pod, source, sqlite, sqlite_multi, epub, html_scroll, html_seg, html_stuff }
   struct OptActions {
-    auto assertions() {
+    bool assertions() {
       return opts["assertions"];
     }
-    auto concordance() {
+    bool concordance() {
       return opts["concordance"];
     }
-    auto css_theme_default() {
+    bool css_theme_default() {
       bool _is_light;
       if (opts["light"] || opts["theme-light"]) {
         _is_light = true;
@@ -233,79 +233,79 @@ void main(string[] args) {
       }
       return _is_light;
     }
-    auto debug_do() {
+    bool debug_do() {
       return opts["debug"];
     }
-    auto digest() {
+    bool digest() {
       return opts["digest"];
     }
-    auto epub() {
+    bool epub() {
       return opts["epub"];
     }
-    auto html() {
+    bool html() {
       bool _is;
       if ( opts["html"] || opts["html-seg"] || opts["html-scroll"])
         { _is = true; } else { _is = false; }
       return _is;
     }
-    auto html_seg() {
+    bool html_seg() {
       bool _is;
       if ( opts["html"] || opts["html-seg"])
         { _is = true; } else { _is = false; }
       return _is;
     }
-    auto html_scroll() {
+    bool html_scroll() {
       bool _is;
       if ( opts["html"] || opts["html-scroll"])
         { _is = true; } else { _is = false; }
       return _is;
     }
-    auto html_stuff() {
+    bool html_stuff() {
       bool _is;
       if (opts["html"] || opts["html-scroll"] || opts["html-seg"])
         { _is = true; } else { _is = false; }
       return _is;
     }
-    auto manifest() {
+    bool manifest() {
       return opts["manifest"];
     }
-    auto ocn() {
+    bool ocn() {
       return opts["ocn"];
     }
-    auto quiet() {
+    bool quiet() {
       return opts["quiet"];
     }
-    auto pod() {
+    bool pod() {
       return opts["pod"];
     }
-    auto source() {
+    bool source() {
       return opts["source"];
     }
-    auto sqlite_discrete() {
+    bool sqlite_discrete() {
       return opts["sqlite-discrete"];
     }
-    auto sqlite_db_drop() {
+    bool sqlite_db_drop() {
       bool _is;
       if ( opts["sqlite-db-recreate"] || opts["sqlite-db-drop"])
         { _is = true; } else { _is = false; }
       return _is;
     }
-    auto sqlite_db_create() {
+    bool sqlite_db_create() {
       bool _is;
       if ( opts["sqlite-db-recreate"] || opts["sqlite-db-create"])
         { _is = true; } else { _is = false; }
       return _is;
     }
-    auto sqlite_delete() {
+    bool sqlite_delete() {
       return opts["sqlite-delete"];
     }
-    auto sqlite_update() {
+    bool sqlite_update() {
       bool _is;
       if (opts["sqlite-update"] || opts["sqlite-insert"])
         { _is = true; } else { _is = false; }
       return _is;
     }
-    auto sqlite_shared_db_action() {
+    bool sqlite_shared_db_action() {
       bool _is;
       if (opts["sqlite-db-recreate"]
         || opts["sqlite-db-create"]
@@ -315,49 +315,49 @@ void main(string[] args) {
       ) { _is = true; } else { _is = false; }
       return _is;
     }
-    auto text() {
+    bool text() {
       return opts["text"];
     }
-    auto verbose() {
+    bool verbose() {
       bool _is;
       if (opts["verbose"] || opts["very-verbose"])
         { _is = true; } else { _is = false; }
       return _is;
     }
-    auto very_verbose() {
+    bool very_verbose() {
       return opts["very-verbose"];
     }
-    auto xhtml() {
+    bool xhtml() {
       return opts["xhtml"];
     }
-    auto section_toc() {
+    bool section_toc() {
       return opts["section_toc"];
     }
-    auto section_body() {
+    bool section_body() {
       return opts["section_body"];
     }
-    auto section_endnotes() {
+    bool section_endnotes() {
       return opts["section_endnotes"];
     }
-    auto section_glossary() {
+    bool section_glossary() {
       return opts["section_glossary"];
     }
-    auto section_biblio() {
+    bool section_biblio() {
       return opts["section_biblio"];
     }
-    auto section_bookindex() {
+    bool section_bookindex() {
       return opts["section_bookindex"];
     }
-    auto section_blurb() {
+    bool section_blurb() {
       return opts["section_blurb"];
     }
-    auto backmatter() {
+    bool backmatter() {
       return opts["backmatter"];
     }
-    auto skip_output() {
+    bool skip_output() {
       return opts["skip-output"];
     }
-    auto workon() {
+    bool workon() {
       return opts["workon"];
     }
     auto languages_set() {
@@ -369,7 +369,7 @@ void main(string[] args) {
     auto sqlite_filename() {
       return settings["sqlite-filename"];
     }
-    auto parallelise() {
+    bool parallelise() {
       bool _is;
       if (opts["parallel"] == true) {
         _is = true;
@@ -390,7 +390,7 @@ void main(string[] args) {
       } else { _is = false; }
       return _is;
     }
-    auto parallelise_subprocesses() {
+    bool parallelise_subprocesses() {
       return opts["parallel-subprocesses"];
     }
     auto output_task_scheduler() {
@@ -418,7 +418,7 @@ void main(string[] args) {
       }
       return schedule.sort().uniq;
     }
-    auto abstraction() {
+    bool abstraction() {
       bool _is;
       if (opts["abstraction"]
         || concordance
@@ -440,7 +440,7 @@ void main(string[] args) {
       string name() {
         return program_name;
       }
-      auto ver() {
+      string ver() {
         string ver_ = format(
           "%s.%s.%s",
           _ver.major, _ver.minor, _ver.patch,
@@ -504,7 +504,7 @@ void main(string[] args) {
           contents_location ~ "»"
         );
         auto contents_location_pth_ = (contents_location).to!string;
-        auto lang_rgx_ = regex(r"/(" ~ _opt_action.languages_set.join("|") ~ ")/");
+        Regex!(char) lang_rgx_ = regex(r"/(" ~ _opt_action.languages_set.join("|") ~ ")/");
         if (_opt_action.languages_set[0] == "all"
           || (contents_location_pth_).match(lang_rgx_)
         ) {
-- 
cgit v1.2.3