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
---
src/sdp.d | 4 ++--
src/sdp/ao_abstract_doc_source.d | 18 ++++++++++++------
src/sdp/ao_conf_make_meta_sdlang.d | 1 -
3 files changed, 14 insertions(+), 9 deletions(-)
(limited to 'src')
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;
}
-
}
}
--
cgit v1.2.3