From 96b03396ddb487816ebd85d1c6f30400019702fc Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 15 Nov 2019 23:58:15 -0500 Subject: name changes --- org/meta_conf_make_meta.org | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'org/meta_conf_make_meta.org') diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org index f87701e..056985b 100644 --- a/org/meta_conf_make_meta.org +++ b/org/meta_conf_make_meta.org @@ -68,7 +68,7 @@ import import doc_reform.meta.defaults, doc_reform.meta.rgx; -mixin DocReformRgxInit; +mixin spineRgxInit; static auto rgx = Rgx(); mixin InternalMarkup; auto mkup = InlineMarkup(); @@ -332,7 +332,7 @@ JSONValue config_jsonstr = `{ }`; #+END_SRC -* 1. YAML to DocReformStruct :module:conf_make_meta:yaml: +* 1. YAML to spineStruct :module:conf_make_meta:yaml: ** _module template_ #+BEGIN_SRC d :tangle "../src/doc_reform/meta/conf_make_meta_yaml.d" @@ -341,7 +341,7 @@ JSONValue config_jsonstr = `{ extract yaml header return struct +/ module doc_reform.meta.conf_make_meta_yaml; -static template contentYAMLtoDocReformStruct() { +static template contentYAMLtoSpineStruct() { import std.algorithm, std.array, @@ -359,13 +359,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; <> @@ -1134,7 +1134,7 @@ if ("rights" in _yaml } #+END_SRC -* 1. JSON to DocReformStruct :module:conf_make_meta:json: +* 1. JSON to spineStruct :module:conf_make_meta:json: ** _module template_ #+BEGIN_SRC d :tangle "../src/doc_reform/meta/conf_make_meta_json.d" @@ -1143,7 +1143,7 @@ if ("rights" in _yaml extract json header return json +/ module doc_reform.meta.conf_make_meta_json; -static template contentJSONtoDocReformStruct() { +static template contentJSONtoSpineStruct() { import std.algorithm, std.array, @@ -1161,8 +1161,8 @@ static template contentJSONtoDocReformStruct() { doc_reform.meta.defaults, doc_reform.meta.rgx; ConfComposite _struct_composite; - auto contentJSONtoDocReformStruct(C,J,M)(C _struct_composite, J _json, M _manifested, string _identifier) { - mixin DocReformRgxInit; + auto contentJSONtoSpineStruct(C,J,M)(C _struct_composite, J _json, M _manifested, string _identifier) { + mixin spineRgxInit; static auto rgx = Rgx(); debug (json) { writeln(">> --------------------------- >>"); @@ -1801,16 +1801,16 @@ if ("rights" in _json.object) { } #+END_SRC -** 1. parse Yaml config return DocReformStruct +** 1. parse Yaml config return spineStruct #+BEGIN_SRC d :tangle "../src/doc_reform/meta/conf_make_meta_yaml.d" -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 @@ -1819,7 +1819,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"); @@ -1847,8 +1847,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, @@ -1865,7 +1865,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