From 88075ee569b5301e6fdf9dc7248aa1406bc38636 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Fri, 20 Jan 2017 11:06:54 -0500
Subject: 0.12.0 template related; doc abstraction

---
 org/ao_abstract_doc_source.org | 18 ++++++++++++------
 org/ao_conf_make_meta.org      |  1 -
 org/sdp.org                    |  6 +++---
 3 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'org')

diff --git a/org/ao_abstract_doc_source.org b/org/ao_abstract_doc_source.org
index f77a5ad..2100faf 100644
--- a/org/ao_abstract_doc_source.org
+++ b/org/ao_abstract_doc_source.org
@@ -24,7 +24,7 @@
 +/
 template SiSUdocAbstraction() {
   private:
-  struct Abstraction {
+  struct SiSUdocAbstraction {
     /+ ↓ abstraction imports +/
     <<abs_imports>>
     /+ ↓ abstraction mixins +/
@@ -32,12 +32,18 @@ template SiSUdocAbstraction() {
     /+ ↓ abstraction struct init +/
     <<abs_init_struct>>
     /+ ↓ abstract marked up document +/
-    auto abstract_doc_source(
-      char[][]               markup_sourcefile_content,
-      string[string][string] dochead_make_aa,
-      string[string][string] dochead_meta_aa,
-      bool[string]           opt_action_bool,
+    auto SiSUdocAbstraction(Src,Make,Meta,Opt)(
+      Src                  markup_sourcefile_content,
+      Make                 dochead_make_aa,
+      Meta                 dochead_meta_aa,
+      Opt                  opt_action_bool,
     ) {
+      debug(asserts){
+        static assert(is(typeof(markup_sourcefile_content) == char[][]));
+        static assert(is(typeof(dochead_make_aa) == string[string][string]));
+        static assert(is(typeof(dochead_meta_aa) == string[string][string]));
+        static assert(is(typeof(opt_action_bool) == bool[string]));
+      }
       /+ ↓ abstraction init +/
       <<abs_init_rest>>
       /+ abstraction init ↑ +/
diff --git a/org/ao_conf_make_meta.org b/org/ao_conf_make_meta.org
index 94236e7..1655d4d 100644
--- a/org/ao_conf_make_meta.org
+++ b/org/ao_conf_make_meta.org
@@ -94,7 +94,6 @@ template SiSUheaderExtractSDLang() {
     mixin RgxInit;
     auto rgx = Rgx();
     <<ao_conf_make_meta_sdl>>
-    <<ao_conf_make_meta_sdl_to_aa>>
   }
 }
 #+END_SRC
diff --git a/org/sdp.org b/org/sdp.org
index 663ead0..493540a 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -24,7 +24,7 @@ struct Version {
   int minor;
   int patch;
 }
-enum ver = Version(0, 11, 0);
+enum ver = Version(0, 12, 0);
 #+END_SRC
 
 ** sdp src/sdp.d                                                       :sdp:
@@ -207,7 +207,7 @@ mixin SiSUoutputHub;
 #+BEGIN_SRC d
 auto raw = MarkupRaw();
 auto head = HeaderDocMetadataAndMake();
-auto abs = Abstraction();
+auto abs = SiSUdocAbstraction();
 auto dbg = SDPoutputDebugs();
 auto output = SDPoutput();
 /+
@@ -420,7 +420,7 @@ static assert(_0_make_1_dochead_meta_tuple.length==2);
 #+NAME: sdp_each_file_do_document_abstraction
 #+BEGIN_SRC d
 /+ ↓ document abstraction: process document, return abstraction as tuple +/
-auto t = abs.abstract_doc_source(
+auto t = abs.SiSUdocAbstraction(
   (_0_header_1_body_content_2_insert_filelist_tuple[1]),
   (_0_make_1_dochead_meta_tuple[0]),
   (_0_make_1_dochead_meta_tuple[1]),
-- 
cgit v1.2.3