From 4ff01a81f048c0b496cc03627324b69b7aebd368 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 7 Sep 2017 16:54:23 -0400 Subject: 0.19.0 conf make meta, composite struct, instead of associative array * remove conf make meta associative arrays, including native doc header (which revisit) --- src/sdp/sdp.d | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/sdp/sdp.d') diff --git a/src/sdp/sdp.d b/src/sdp/sdp.d index 429b6bd..c3b307c 100755 --- a/src/sdp/sdp.d +++ b/src/sdp/sdp.d @@ -8,7 +8,6 @@ module sdp.sisu_document_parser; import sdp.conf.compile_time_info, sdp.meta.metadoc; -/+ sdp: sisu document parser, see http://sisudoc.org +/ import sdp.meta; import std.getopt, @@ -16,10 +15,10 @@ import import sdp.meta.metadoc_summary, sdp.meta.metadoc_from_src, - sdp.meta.composite_make, sdp.meta.conf_make_meta, // sdp.meta.conf_make_meta_native, sdp.meta.conf_make_meta_sdlang, + sdp.meta.conf_make_meta_composite, sdp.meta.defaults, sdp.meta.doc_debugs, sdp.meta.read_config_files, @@ -152,10 +151,6 @@ void main(string[] args) { "pwd" : environment["PWD"], "home" : environment["HOME"], ]; - auto sdl_root_config_share = configRead!()("config_share", env); - auto sdl_root_config_local = configRead!()("config_local", env); - auto conf_composite_static_aa = extractSDL().sdlangToAA(conf_aa_empty, sdl_root_config_share); - conf_composite_static_aa = extractSDL().sdlangToAA(conf_composite_static_aa, sdl_root_config_local); if (!(opts["skip-output"])) { outputHubOp!()(opts); } @@ -184,8 +179,7 @@ void main(string[] args) { fn_src.match(rgx.src_pth), "not a sisu markup filename" ); - auto t = - SiSUabstraction!()(fn_src, opts, env); + auto t = SiSUabstraction!()(fn_src, opts, env); static assert(!isTypeTuple!(t)); static assert(t.length==2); auto doc_abstraction = t[dAM.abstraction]; -- cgit v1.2.3