From c4d2cedb930a48d6439d6ff2076183fd48fc6a5a Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Sat, 25 Jan 2020 12:22:01 -0500
Subject: address compilation issues with dmd (v2.090.0)

---
 org/default_regex.org       |  3 ---
 org/in_source_files.org     | 45 +++++++++++++++++++++++++++++----------------
 org/meta_conf_make_meta.org |  6 +++---
 3 files changed, 32 insertions(+), 22 deletions(-)

(limited to 'org')

diff --git a/org/default_regex.org b/org/default_regex.org
index 6891147..02f3e3a 100644
--- a/org/default_regex.org
+++ b/org/default_regex.org
@@ -30,14 +30,12 @@ http://dlang.org/phobos/std_regex.html
 
 ** _module template_                                                  :module:
 
-#+NAME: tangle_meta_rgx
 #+BEGIN_SRC d :tangle "../src/doc_reform/meta/rgx.d"
 /++
   regex: regular expressions used in sisu document parser
 +/
 module doc_reform.meta.rgx;
 static template spineRgxInit() {
-  import doc_reform.meta.defaults;
   static struct Rgx {
     <<meta_rgx>>
     <<prgmkup_rgx>>
@@ -363,7 +361,6 @@ http://dlang.org/phobos/std_regex.html
 
 ** _module template_                                           :module:output:
 
-#+NAME: tangle_meta_rgx
 #+BEGIN_SRC d :tangle "../src/doc_reform/io_out/rgx.d"
 /++
   regex: regular expressions used in sisu document parser
diff --git a/org/in_source_files.org b/org/in_source_files.org
index b958c22..720a47e 100644
--- a/org/in_source_files.org
+++ b/org/in_source_files.org
@@ -16,14 +16,20 @@
 
 [[./spine.org][spine]]  [[./][org/]]
 * imports
+** std
 
 #+NAME: imports_std
 #+BEGIN_SRC d
-import
-  doc_reform.meta,
-  doc_reform.io_in.paths_source,
-  std.file,
-  std.path;
+std.file,
+std.path
+#+END_SRC
+
+** spine
+
+#+NAME: imports_spine
+#+BEGIN_SRC d
+doc_reform.meta,
+doc_reform.io_in.paths_source
 #+END_SRC
 
 * A. get _config file_ (read in)
@@ -36,6 +42,10 @@ import
   meta_config_files.d
 +/
 module doc_reform.io_in.read_config_files;
+import
+  <<imports_std>>,
+  <<imports_spine>>,
+  doc_reform.meta.rgx;
 <<meta_config_file_in>>
 <<meta_config_file_hub>>
 #+END_SRC
@@ -45,12 +55,9 @@ module doc_reform.io_in.read_config_files;
 
 #+NAME: meta_config_file_hub
 #+BEGIN_SRC d
-static template readConfigSite() {
-  import
-    doc_reform.meta.rgx;
-  <<imports_std>>
-  mixin spineRgxInit;
+template readConfigSite() {
   @system final auto readConfigSite(C)(C _conf_file_details) {
+    mixin spineRgxInit;
     static auto rgx = Rgx();
     string conf_filename = "NONE";
     string config_file_str;
@@ -154,10 +161,11 @@ webserv:
 #+BEGIN_SRC d
 static template readConfigDoc() {
   import
+    <<imports_std>>,
+    <<imports_spine>>,
     doc_reform.meta.rgx;
-  <<imports_std>>
-  mixin spineRgxInit;
   @system final auto readConfigDoc(M,E)(M _manifested, E _env) {
+    mixin spineRgxInit;
     static auto rgx = Rgx();
     string config_file_str;
     string conf_filename = "NONE";
@@ -208,7 +216,9 @@ static template readConfigDoc() {
 #+NAME: meta_config_file_hub
 #+BEGIN_SRC d
 static template configReadSiteYAML() {
-  <<imports_std>>
+  import
+    <<imports_std>>,
+    <<imports_spine>>;
   @safe final YAMLDocument configReadSiteYAML(M,E)(M _manifested, E _env) {
     string _configuration = configReadInSiteYAML!()(_manifested, _env);
     auto _conf_file_details = ConfigFilePaths!()(_manifested, _env);
@@ -218,7 +228,9 @@ static template configReadSiteYAML() {
   }
 }
 static template configReadDocYAML() {
-  <<imports_std>>
+  import
+    <<imports_std>>,
+    <<imports_spine>>;
   @safe final YAMLDocument configReadDocYAML(M,E)(M _manifested, E _env) {
     string _configuration = configReadInDocYAML!()(_manifested, _env);
     auto _conf_file_details = ConfigFilePaths!()(_manifested, _env);
@@ -239,10 +251,11 @@ static template configReadDocYAML() {
   - if master file scan for addional files to import/insert
 +/
 module doc_reform.io_in.read_source_files;
-static template spineRawMarkupContent() {
+template spineRawMarkupContent() {
   import
+    <<imports_std>>,
+    <<imports_spine>>,
     doc_reform.meta.rgx;
-  <<imports_std>>
   mixin spineRgxInit;
   static auto rgx = Rgx();
   string[] _images=[];
diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org
index 898db4f..9468614 100644
--- a/org/meta_conf_make_meta.org
+++ b/org/meta_conf_make_meta.org
@@ -339,7 +339,7 @@ JSONValue config_jsonstr = `{
   extract yaml header return struct
 +/
 module doc_reform.meta.conf_make_meta_yaml;
-static template contentYAMLtoSpineStruct() {
+template contentYAMLtoSpineStruct() {
   import
     std.algorithm,
     std.array,
@@ -1816,7 +1816,7 @@ if ("rights" in _json.object) {
 ** 1. parse Yaml config return spineStruct
 
 #+BEGIN_SRC d :tangle "../src/doc_reform/meta/conf_make_meta_yaml.d"
-static template configParseYAMLreturnSpineStruct() {
+template configParseYAMLreturnSpineStruct() {
   import dyaml;
   import
     doc_reform.meta.conf_make_meta_structs,
@@ -1847,7 +1847,7 @@ static template configParseYAMLreturnSpineStruct() {
 ** 2. parse YAML header to +(JSON then)+ Struct
 
 #+BEGIN_SRC d :tangle "../src/doc_reform/meta/conf_make_meta_yaml.d"
-static template docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct() {
+template docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct() {
   import
     std.exception,
     std.regex,
-- 
cgit v1.2.3