From d7ed4f0aa862615fbba630ac278ae21b1b96e812 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 27 Jun 2016 01:30:24 -0400 Subject: registers, minor cleaning --- src/sdp.d | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/sdp.d') diff --git a/src/sdp.d b/src/sdp.d index 127a8ad..c032607 100755 --- a/src/sdp.d +++ b/src/sdp.d @@ -97,8 +97,9 @@ mixin CompileTimeInfo; mixin RgxInit; void main(string[] args) { - mixin SiSUheaderRegister; + mixin SiSUregisters; mixin SiSUheaderExtractHub; + mixin SiSUheaderExtractSDLang; mixin SiSUbiblio; mixin SiSUrgxInitFlags; mixin SiSUconfigSDLangHub; @@ -208,6 +209,8 @@ void main(string[] args) { auto conf = ConfigHub(); auto sdl_root_configuration = conf.configSDLang("conf.sdl"); auto sdl_root_document_make = conf.configSDLang("sisu_document_make"); + auto confsdl = HeaderExtractSDL(); + auto conf_doc_make_json = confsdl.documentMakeSDLangToJSONmake(sdl_root_document_make); foreach(fn_src; fns_src) { // foreach(fn_src; fns_src) { if (!empty(fn_src)) { @@ -242,7 +245,7 @@ void main(string[] args) { writeln(header_and_content_tuple.length); writeln(sourcefile_content[0]); } - auto header_make_and_meta_tuple = head.headerContentJSON(header); + auto header_make_and_meta_tuple = head.headerContentJSON(header, conf_doc_make_json); static assert(!isTypeTuple!(header_make_and_meta_tuple)); JSONValue[string] dochead_make_json = header_make_and_meta_tuple[0]; JSONValue[string] dochead_meta_json = header_make_and_meta_tuple[1]; -- cgit v1.2.3