From 8d8134c7f69ef0c3e680699b19320165c791d75b Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 31 Aug 2016 11:34:22 -0400
Subject: 0.6.6 resolves dmd frame pointer access issue (ldc was ok)

* output struct hub nests output structs such as html, resolves issue
  with dmd frame pointer access
---
 org/output.org | 108 +++++++++++++++++++++++++++------------------------------
 1 file changed, 52 insertions(+), 56 deletions(-)

(limited to 'org/output.org')

diff --git a/org/output.org b/org/output.org
index 773aeef..9db43f4 100644
--- a/org/output.org
+++ b/org/output.org
@@ -1452,8 +1452,8 @@ struct SDPoutputHTML {
     auto ref const C         contents,
     string[][string][string] bookindex_unordered_hashes,
     JSONValue[]              biblio,
-    // JSONValue[string]        dochead_make,
-    // JSONValue[string]        dochead_meta,
+    string[string][string]   dochead_make,
+    string[string][string]   dochead_meta,
     string                   fn_src,
     bool[string]             opt_action_bool
   ) {
@@ -1534,58 +1534,6 @@ struct SDPoutputHTML {
 ** odt                                                                  :odt:
 ** sqlite [#B]                                                       :sqlite:
 ** pgsql                                                              :pgsql:
-** TODO check selection                                              :output:
-
-#+NAME: output_selection
-#+BEGIN_SRC d
-struct SDPoutput {
-  void hub(S)(
-    auto ref const S         contents,
-    string[][string][string] bookindex_unordered_hashes,
-    JSONValue[]              biblio,
-    string[string][string]   dochead_make_json,
-    string[string][string]   dochead_meta_json,
-    string                   fn_src,
-    bool[string]             opt_action_bool
-  ) {
-    auto rgx = Rgx();
-    if (opt_action_bool["source"]) {
-      writeln("sisupod source");
-    }
-    if (opt_action_bool["sisupod"]) {
-      writeln("sisupod source");
-    }
-    if (opt_action_bool["text"]) {
-      writeln("text processing");
-      // auto text=SDPoutput_text();
-      // text.scroll(contents, bookindex_unordered_hashes, biblio, fn_src, opt_action_bool);
-      // // text.scroll(contents, bookindex_unordered_hashes, biblio, dochead_make, dochead_meta, fn_src, opt_action_bool);
-    }
-    if (opt_action_bool["html"]) {
-      auto html=SDPoutputHTML();
-      html.css_write;
-      html.scroll(contents, bookindex_unordered_hashes, biblio, fn_src, opt_action_bool);
-      // html.scroll(contents, bookindex_unordered_hashes, biblio, dochead_make_aa, dochead_meta_aa, fn_src, opt_action_bool);
-    }
-    if (opt_action_bool["epub"]) {
-      writeln("epub processing");
-    }
-    if (opt_action_bool["pdf"]) {
-      writeln("pdf processing");
-    }
-    if (opt_action_bool["odt"]) {
-      writeln("odt processing");
-    }
-    if (opt_action_bool["sqlite"]) {
-      writeln("sqlite processing");
-    }
-    if (opt_action_bool["postgresql"]) {
-      writeln("pgsql processing");
-    }
-  }
-}
-#+END_SRC
-
 * tangles                                                            :tangle:
 ** code structure:                                                :output.d:
 
@@ -1595,11 +1543,59 @@ struct SDPoutput {
   output_hub.d
 +/
 template SiSUoutputHub() {
-  <<output_selection>>
-  <<output_html>>
+  struct SDPoutput {
+    void hub(S)(
+      auto ref const S         contents,
+      string[][string][string] bookindex_unordered_hashes,
+      JSONValue[]              biblio,
+      string[string][string]   dochead_make,
+      string[string][string]   dochead_meta,
+      string                   fn_src,
+      bool[string]             opt_action_bool
+    ) {
+      auto rgx = Rgx();
+      if (opt_action_bool["source"]) {
+        writeln("sisupod source");
+      }
+      if (opt_action_bool["sisupod"]) {
+        writeln("sisupod source");
+      }
+      if (opt_action_bool["text"]) {
+        writeln("text processing");
+        // auto text=SDPoutput_text();
+        // text.scroll(contents, bookindex_unordered_hashes, biblio, dochead_make, dochead_meta, fn_src, opt_action_bool);
+      }
+      if (opt_action_bool["html"]) {
+        auto html=SDPoutputHTML();
+        html.css_write;
+        html.scroll(contents, bookindex_unordered_hashes, biblio, dochead_make, dochead_meta, fn_src, opt_action_bool);
+      }
+      if (opt_action_bool["epub"]) {
+        writeln("epub processing");
+      }
+      if (opt_action_bool["pdf"]) {
+        writeln("pdf processing");
+      }
+      if (opt_action_bool["odt"]) {
+        writeln("odt processing");
+      }
+      if (opt_action_bool["sqlite"]) {
+        writeln("sqlite processing");
+      }
+      if (opt_action_bool["postgresql"]) {
+        writeln("pgsql processing");
+      }
+    }
+    <<output_html>>
+  }
 }
 #+END_SRC
 
+*** notes
+
+0.6.6 using nested structs hub and outputs within it e.g. html
+0.6.5 dmd had problems compiling with hub and outputs such as html as separate structs see comment
+
 * +other+
 ** example head
 
-- 
cgit v1.2.3