0.12.0 template related; doc abstraction

7 files changed, 30 insertions, 20 deletions

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]),
diff --git a/src/sdp.d b/src/sdp.d
index ba27789..743db94 100755
--- a/src/sdp.d
+++ b/src/sdp.d
@@ -59,7 +59,7 @@ void main(string[] args) {
   mixin SiSUoutputHub;
   auto raw = MarkupRaw();
   auto head = HeaderDocMetadataAndMake();
-  auto abs = Abstraction();
+  auto abs = SiSUdocAbstraction();
   auto dbg = SDPoutputDebugs();
   auto output = SDPoutput();
   /+
@@ -221,7 +221,7 @@ void main(string[] args) {
       static assert(!isTypeTuple!(_0_make_1_dochead_meta_tuple));
       static assert(_0_make_1_dochead_meta_tuple.length==2);
       /+ ↓ 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]),
diff --git a/src/sdp/ao_abstract_doc_source.d b/src/sdp/ao_abstract_doc_source.d
index 9bb5def..8b1d4cf 100644
--- a/src/sdp/ao_abstract_doc_source.d
+++ b/src/sdp/ao_abstract_doc_source.d
@@ -5,7 +5,7 @@
 +/
 template SiSUdocAbstraction() {
   private:
-  struct Abstraction {
+  struct SiSUdocAbstraction {
     /+ ↓ abstraction imports +/
     import
       ao_defaults,                  // sdp/ao_defaults.d
@@ -217,12 +217,18 @@ template SiSUdocAbstraction() {
     ObjGenericComposite comp_obj_heading, comp_obj_location, comp_obj_block, comp_obj_code, comp_obj_poem_ocn, comp_obj_comment;
     auto node_construct = NodeStructureMetadata();
     /+ ↓ 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 +/
       scope(success) {
       }
diff --git a/src/sdp/ao_conf_make_meta_sdlang.d b/src/sdp/ao_conf_make_meta_sdlang.d
index d917a34..5ced761 100644
--- a/src/sdp/ao_conf_make_meta_sdlang.d
+++ b/src/sdp/ao_conf_make_meta_sdlang.d
@@ -257,6 +257,5 @@ template SiSUheaderExtractSDLang() {
       auto header_aa_tuple = headerSDLangToAAmake(header_sdlang_tag, conf_doc_make_aa);
       return header_aa_tuple;
     }
-    
   }
 }
diff --git a/views/version.txt b/views/version.txt
index e30f08f..e07f5c1 100644
--- a/views/version.txt
+++ b/views/version.txt
@@ -4,4 +4,4 @@ struct Version {
   int minor;
   int patch;
 }
-enum ver = Version(0, 11, 0);
+enum ver = Version(0, 12, 0);