From 3e3a1a76ce4d0abe75277afb2937539fc0e9a4e6 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 27 May 2019 23:35:01 -0400 Subject: remove ./data for now, else relatively minor --- src/doc_reform/meta/conf_make_meta_json.d | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/doc_reform/meta/conf_make_meta_json.d') diff --git a/src/doc_reform/meta/conf_make_meta_json.d b/src/doc_reform/meta/conf_make_meta_json.d index d7ab551..fcd52c1 100644 --- a/src/doc_reform/meta/conf_make_meta_json.d +++ b/src/doc_reform/meta/conf_make_meta_json.d @@ -20,7 +20,7 @@ static template contentJSONtoDocReformStruct() { ConfCompositePlus _struct_composite; auto contentJSONtoDocReformStruct(C,J)(C _struct_composite, J _json, string _identifier) { mixin DocReformRgxInit; - static auto _rgx = Rgx(); + static auto rgx = Rgx(); debug (json) { writeln(">> --------------------------- >>"); foreach (tag0; _json.object.byKeyValue) { @@ -67,7 +67,7 @@ static template contentJSONtoDocReformStruct() { if (_json.object["make"]["footer"].type().to!string == "string") { char[][] __match_footer_array = (cast(char[]) _json.object["make"]["footer"].str) - .split(_rgx.make_heading_delimiter); + .split(rgx.make_heading_delimiter); _struct_composite.make_str.footer = __match_footer_array.to!(string[]); } else if (_json.object["make"]["footer"].type().to!string == "array") { string[] _match_footer_array; @@ -81,7 +81,7 @@ static template contentJSONtoDocReformStruct() { if (_json.object["make"]["headings"].type().to!string == "string") { char[][] __match_headings_array = (cast(char[]) _json.object["make"]["headings"].str) - .split(_rgx.make_heading_delimiter); + .split(rgx.make_heading_delimiter); _struct_composite.make_str.headings = __match_headings_array.to!(string[]); } else if (_json.object["make"]["headings"].type().to!string == "array") { string[] _match_headings_array; @@ -95,7 +95,7 @@ static template contentJSONtoDocReformStruct() { if (_json.object["make"]["home_button_image"].type().to!string == "string") { char[][] __match_home_button_image_array = (cast(char[]) _json.object["make"]["home_button_image"].str) - .split(_rgx.make_heading_delimiter); + .split(rgx.make_heading_delimiter); _struct_composite.make_str.home_button_image = __match_home_button_image_array.to!(string[]); } else if (_json.object["make"]["home_button_image"].type().to!string == "array") { string[] _match_home_button_image_array; @@ -201,7 +201,7 @@ static template contentJSONtoDocReformStruct() { && (_json.object["webserv"]["url_root"].type().to!string == "string") ) { _struct_composite.conf.webserv_url_doc_root = _json.object["webserv"]["url_root"].str; - if (auto m = _struct_composite.conf.webserv_url_doc_root.match(_rgx.webserv_url_doc_root)) { + if (auto m = _struct_composite.conf.webserv_url_doc_root.match(rgx.webserv_url_doc_root)) { _struct_composite.conf.webserv_url_domain = m.captures[2].to!string; _struct_composite.conf.webserv_url_doc_path = m.captures[3].to!string; } @@ -533,9 +533,9 @@ static template contentJSONtoDocReformStruct() { } string[] authors_arr; string[] authors_raw_arr - = _struct_composite.meta.creator_author.split(_rgx.arr_delimiter); + = _struct_composite.meta.creator_author.split(rgx.arr_delimiter); foreach (author_raw; authors_raw_arr) { - authors_arr ~= author_raw.replace(_rgx.raw_author_munge, "$2 $1"); + authors_arr ~= author_raw.replace(rgx.raw_author_munge, "$2 $1"); } _struct_composite.meta.creator_author = join(authors_arr, ", ").chomp.chomp; } -- cgit v1.2.3