From e280a374991a3a6db3c40fd1fa03a2d9c6fa66eb Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 6 Jun 2017 17:58:10 -0400 Subject: naming mostly --- src/sdp/ao/abstraction.d | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/sdp/ao/abstraction.d') diff --git a/src/sdp/ao/abstraction.d b/src/sdp/ao/abstraction.d index c592436..317f841 100644 --- a/src/sdp/ao/abstraction.d +++ b/src/sdp/ao/abstraction.d @@ -30,8 +30,8 @@ template SiSUabstraction() { enum docAbst { doc_abstraction, section_keys, segnames, segnames_0_4, images } auto rgx = Rgx(); auto SiSUabstraction(Fn,O,E)(Fn fn_src, O opts, E env){ - auto sdl_root_configuration = ConfigHub!()("conf.sdl", env); - auto sdl_root_doc_make = ConfigHub!()("sisu_document_make", env); + auto sdl_root_configuration = configRead!()("conf.sdl", env); + auto sdl_root_doc_make = configRead!()("sisu_document_make", env); auto confsdl = HeaderExtractSDL(); auto conf_settings_aa = confsdl.configSettingsSDLangToAAmake(sdl_root_configuration); auto conf_doc_make_aa = confsdl.documentMakeSDLangToAAmake(sdl_root_doc_make); @@ -47,15 +47,15 @@ template SiSUabstraction() { writeln(_header_body_inserts.length[headBody.body_content][0]); } /+ ↓ split header into make and meta +/ - auto _make_and_meta = + auto _make_and_meta_tup = SiSUheaderExtractHub!()(_header_body_inserts[headBody.header], conf_doc_make_aa); - static assert(!isTypeTuple!(_make_and_meta)); - static assert(_make_and_meta.length==2); + static assert(!isTypeTuple!(_make_and_meta_tup)); + static assert(_make_and_meta_tup.length==2); /+ ↓ document abstraction: process document, return abstraction as tuple +/ auto da = SiSUdocAbstraction!()( _header_body_inserts[headBody.body_content], - _make_and_meta[makeMeta.make], - _make_and_meta[makeMeta.meta], + _make_and_meta_tup[makeMeta.make], + _make_and_meta_tup[makeMeta.meta], opts ); static assert(!isTypeTuple!(da)); @@ -80,11 +80,11 @@ template SiSUabstraction() { return _k; } auto dochead_make() { - string[string][string] _k = _make_and_meta[makeMeta.make]; + string[string][string] _k = _make_and_meta_tup[makeMeta.make]; return _k; } auto dochead_meta() { - string[string][string] _k = _make_and_meta[makeMeta.meta]; + string[string][string] _k = _make_and_meta_tup[makeMeta.meta]; return _k; } auto src_path_info() { -- cgit v1.2.3