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/read_config_files.d | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'src/sdp/ao/read_config_files.d') diff --git a/src/sdp/ao/read_config_files.d b/src/sdp/ao/read_config_files.d index 57213c4..8f525f3 100644 --- a/src/sdp/ao/read_config_files.d +++ b/src/sdp/ao/read_config_files.d @@ -4,12 +4,12 @@ ao_config_files.d +/ module sdp.ao.read_config_files; -template ConfigIn() { +template configIn() { import sdp.ao, std.file, std.path; - final string ConfigIn(C,E)(C conf_sdl, E env) { + final string configIn(C,E)(C conf_sdl, E env) { string dot_pwd = chainPath(to!string(env["pwd"]), ".sisu").array; string underscore_pwd = chainPath(to!string(env["pwd"]), "_sisu").array; string dot_home = chainPath(to!string(env["home"]), ".sisu").array; @@ -61,26 +61,19 @@ template ConfigSDLang() { stderr.writeln("SDLang problem with content for ", conf_sdl_filename); stderr.writeln(e.msg); } - debug(sdlang) { - Value output_dir_structure_by = sdl_root_conf.tags["output_dir_structure_by"][0].values[0]; - assert(output_dir_structure_by.type == typeid(string)); - writeln(output_dir_structure_by); - writeln("conf SDL:"); - writeln(sdl_root_conf.toSDLDocument()); - } return sdl_root_conf; } } /+ +/ -template ConfigHub() { +template configRead() { import sdp.ao, std.file, std.path; - final auto ConfigHub(C,E)(C conf_sdl, E env) { - auto configuration = ConfigIn!()(conf_sdl, env); + final auto configRead(C,E)(C conf_sdl, E env) { + auto configuration = configIn!()(conf_sdl, env); auto sdl_root = ConfigSDLang!()(configuration, conf_sdl); return sdl_root; } -- cgit v1.2.3