From 203fa77f01c460b60ea50342676a55c4a80b5a42 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 4 Jul 2017 07:36:45 -0400
Subject: sdl extract and composite conf (make)

---
 src/sdp/ao/conf_make_meta.d | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/sdp/ao/conf_make_meta.d')

diff --git a/src/sdp/ao/conf_make_meta.d b/src/sdp/ao/conf_make_meta.d
index 0f6d27d..1d7d86d 100644
--- a/src/sdp/ao/conf_make_meta.d
+++ b/src/sdp/ao/conf_make_meta.d
@@ -9,7 +9,7 @@
   program internally. Moved to associative array.
 +/
 module sdp.ao.conf_make_meta;
-template SiSUheaderExtractHub() {
+template docHeaderMakeAndMetaTupExtractAndConvertToAA() {
   import
     std.exception,
     std.regex,
@@ -25,21 +25,23 @@ template SiSUheaderExtractHub() {
     sdp.ao.rgx;
   mixin SiSUrgxInit;
   mixin SiSUheaderExtractNative;
-  mixin SiSUheaderExtractSDLang;
+  mixin SiSUextractSDLang;
   auto rgx = Rgx();
-  auto SiSUheaderExtractHub(Src, DocMake)(
+  auto docHeaderMakeAndMetaTupExtractAndConvertToAA(DocMake, Src)(
+    DocMake conf_doc_make_aa,
     Src     header_src,
-    DocMake conf_doc_make_aa
   ) {
     debug(asserts){
       static assert(is(typeof(header_src)       == char[]));
       static assert(is(typeof(conf_doc_make_aa) == string[string][string]));
     }
     auto head_native = HeaderDocMetadataAndMakeNativeToAA();
-    auto head_sdlang = HeaderExtractSDL();
+    auto header_sdlang_tag = (!(header_src.match(rgx.native_header_meta_title)))
+    ? extractSDL().docHeaderSDLtagGet(header_src) // sdlang.ast.Tag
+    : null;
     auto header_make_and_meta_tuple = (header_src.match(rgx.native_header_meta_title))
     ? (head_native.headerNativeToAA(header_src))
-    : (head_sdlang.headerSDLangToAA(header_src, conf_doc_make_aa));
+    : (extractSDL().docHeaderSDLtoAA(conf_doc_make_aa, header_sdlang_tag));
     static assert(!isTypeTuple!(header_make_and_meta_tuple));
     static assert(header_make_and_meta_tuple.length==2);
     return header_make_and_meta_tuple;
-- 
cgit v1.2.3