From 96b03396ddb487816ebd85d1c6f30400019702fc Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 15 Nov 2019 23:58:15 -0500 Subject: name changes --- src/doc_reform/meta/conf_make_meta_yaml.d | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/doc_reform/meta/conf_make_meta_yaml.d') diff --git a/src/doc_reform/meta/conf_make_meta_yaml.d b/src/doc_reform/meta/conf_make_meta_yaml.d index aa4d77d..3d39471 100644 --- a/src/doc_reform/meta/conf_make_meta_yaml.d +++ b/src/doc_reform/meta/conf_make_meta_yaml.d @@ -3,7 +3,7 @@ extract yaml header return struct +/ module doc_reform.meta.conf_make_meta_yaml; -static template contentYAMLtoDocReformStruct() { +static template contentYAMLtoSpineStruct() { import std.algorithm, std.array, @@ -21,13 +21,13 @@ static template contentYAMLtoDocReformStruct() { doc_reform.meta.defaults, doc_reform.meta.rgx; ConfComposite _struct_composite; - auto contentYAMLtoDocReformStruct(C,Y,M)( + auto contentYAMLtoSpineStruct(C,Y,M)( C _struct_composite, Y _yaml, M _manifested, string _identifier ) { - mixin DocReformRgxInit; + mixin spineRgxInit; static auto rgx = Rgx(); confCompositeMakeBuild _mk; /+ make ------------------------------------------------------------------- +/ @@ -775,13 +775,13 @@ static template contentYAMLtoDocReformStruct() { return _struct_composite; } } -static template configParseYAMLreturnDocReformStruct() { +static template configParseYAMLreturnSpineStruct() { import dyaml; import doc_reform.meta.conf_make_meta_structs, doc_reform.meta.conf_make_meta_json; - mixin contentYAMLtoDocReformStruct; - auto configParseYAMLreturnDocReformStruct(T,CCm,M)( + mixin contentYAMLtoSpineStruct; + auto configParseYAMLreturnSpineStruct(T,CCm,M)( T _document_struct, CCm _make_and_meta_struct, M _manifested @@ -790,7 +790,7 @@ static template configParseYAMLreturnDocReformStruct() { try { yaml_root = Loader.fromString(_document_struct.content).load(); _make_and_meta_struct - = contentYAMLtoDocReformStruct!()(_make_and_meta_struct, yaml_root, _manifested, _document_struct.filename); // struct from yaml + = contentYAMLtoSpineStruct!()(_make_and_meta_struct, yaml_root, _manifested, _document_struct.filename); // struct from yaml } catch { import std.stdio; writeln("ERROR failed to read content, not parsed as yaml"); @@ -813,8 +813,8 @@ static template docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct() { doc_reform.meta.conf_make_meta_structs, doc_reform.meta.conf_make_meta_json, doc_reform.meta.rgx; - mixin DocReformRgxInit; - mixin contentJSONtoDocReformStruct; + mixin spineRgxInit; + mixin contentJSONtoSpineStruct; static auto rgx = Rgx(); auto docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct(CCm,Src,M)( Src header_src, @@ -831,7 +831,7 @@ static template docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct() { } } auto _header_and_make_and_meta_struct - = contentYAMLtoDocReformStruct!()(_make_and_meta_struct, _yaml_root, _manifested, "header"); + = contentYAMLtoSpineStruct!()(_make_and_meta_struct, _yaml_root, _manifested, "header"); return _header_and_make_and_meta_struct; } } -- cgit v1.2.3