aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--org/ao_conf_make_meta.org11
-rw-r--r--org/sdp.org4
-rwxr-xr-xsrc/sdp.d4
-rw-r--r--src/sdp/ao_conf_make_meta.d11
4 files changed, 22 insertions, 8 deletions
diff --git a/org/ao_conf_make_meta.org b/org/ao_conf_make_meta.org
index 1655d4d..eb39f73 100644
--- a/org/ao_conf_make_meta.org
+++ b/org/ao_conf_make_meta.org
@@ -32,11 +32,18 @@ template SiSUheaderExtractHub() {
std.regex;
private import
ao_rgx;
- struct HeaderDocMetadataAndMake {
+ struct SiSUheaderExtractHub {
mixin SiSUheaderExtractNative;
mixin SiSUheaderExtractSDLang;
auto rgx = Rgx();
- private auto headerContentAA(char[] header_src, string[string][string] conf_doc_make_aa) {
+ private auto SiSUheaderExtractHub(Src, DocMake)(
+ 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_make_and_meta_tuple = (match(header_src, rgx.native_header_meta_title))
diff --git a/org/sdp.org b/org/sdp.org
index 00363ca..6c204f4 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -206,7 +206,7 @@ mixin outputHub;
#+NAME: sdp_args
#+BEGIN_SRC d
auto raw = MarkupRaw();
-auto head = HeaderDocMetadataAndMake();
+auto head = SiSUheaderExtractHub();
auto abs = SiSUdocAbstraction();
auto dbg = SDPoutputDebugs();
/+
@@ -408,7 +408,7 @@ debug(header_and_body) {
#+BEGIN_SRC d
/+ ↓ split header into make and meta +/
auto _0_make_1_dochead_meta_tuple =
- head.headerContentAA(_0_header_1_body_content_2_insert_filelist_tuple[0], conf_doc_make_aa);
+ head.SiSUheaderExtractHub(_0_header_1_body_content_2_insert_filelist_tuple[0], conf_doc_make_aa);
static assert(!isTypeTuple!(_0_make_1_dochead_meta_tuple));
static assert(_0_make_1_dochead_meta_tuple.length==2);
#+END_SRC
diff --git a/src/sdp.d b/src/sdp.d
index 58954c6..4fcabfb 100755
--- a/src/sdp.d
+++ b/src/sdp.d
@@ -58,7 +58,7 @@ void main(string[] args) {
mixin SiSUoutputDebugs;
mixin outputHub;
auto raw = MarkupRaw();
- auto head = HeaderDocMetadataAndMake();
+ auto head = SiSUheaderExtractHub();
auto abs = SiSUdocAbstraction();
auto dbg = SDPoutputDebugs();
/+
@@ -216,7 +216,7 @@ void main(string[] args) {
}
/+ ↓ split header into make and meta +/
auto _0_make_1_dochead_meta_tuple =
- head.headerContentAA(_0_header_1_body_content_2_insert_filelist_tuple[0], conf_doc_make_aa);
+ head.SiSUheaderExtractHub(_0_header_1_body_content_2_insert_filelist_tuple[0], conf_doc_make_aa);
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 +/
diff --git a/src/sdp/ao_conf_make_meta.d b/src/sdp/ao_conf_make_meta.d
index 4056914..e0ac269 100644
--- a/src/sdp/ao_conf_make_meta.d
+++ b/src/sdp/ao_conf_make_meta.d
@@ -13,11 +13,18 @@ template SiSUheaderExtractHub() {
std.regex;
private import
ao_rgx;
- struct HeaderDocMetadataAndMake {
+ struct SiSUheaderExtractHub {
mixin SiSUheaderExtractNative;
mixin SiSUheaderExtractSDLang;
auto rgx = Rgx();
- private auto headerContentAA(char[] header_src, string[string][string] conf_doc_make_aa) {
+ private auto SiSUheaderExtractHub(Src, DocMake)(
+ 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_make_and_meta_tuple = (match(header_src, rgx.native_header_meta_title))