aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/doc_reform
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2020-01-25 12:22:01 -0500
committerRalph Amissah <ralph@amissah.com>2020-02-26 09:59:18 -0500
commitc4d2cedb930a48d6439d6ff2076183fd48fc6a5a (patch)
tree8fbcd699336a971983e169298b8f3b80e2009616 /src/doc_reform
parentupdate headers and year (diff)
address compilation issues with dmd (v2.090.0)
Diffstat (limited to 'src/doc_reform')
-rw-r--r--src/doc_reform/io_in/read_config_files.d38
-rw-r--r--src/doc_reform/io_in/read_source_files.d9
-rw-r--r--src/doc_reform/meta/conf_make_meta_yaml.d6
-rw-r--r--src/doc_reform/meta/rgx.d1
4 files changed, 25 insertions, 29 deletions
diff --git a/src/doc_reform/io_in/read_config_files.d b/src/doc_reform/io_in/read_config_files.d
index ce16f24..4889e4f 100644
--- a/src/doc_reform/io_in/read_config_files.d
+++ b/src/doc_reform/io_in/read_config_files.d
@@ -4,17 +4,16 @@
meta_config_files.d
+/
module doc_reform.io_in.read_config_files;
+import
+ std.file,
+ std.path,
+ doc_reform.meta,
+ doc_reform.io_in.paths_source,
+ doc_reform.meta.rgx;
-static template readConfigSite() {
- import
- doc_reform.meta.rgx;
- import
- doc_reform.meta,
- doc_reform.io_in.paths_source,
- std.file,
- std.path;
- mixin spineRgxInit;
+template readConfigSite() {
@system final auto readConfigSite(C)(C _conf_file_details) {
+ mixin spineRgxInit;
static auto rgx = Rgx();
string conf_filename = "NONE";
string config_file_str;
@@ -112,14 +111,13 @@ webserv:
}
static template readConfigDoc() {
import
- doc_reform.meta.rgx;
- import
+ std.file,
+ std.path,
doc_reform.meta,
doc_reform.io_in.paths_source,
- std.file,
- std.path;
- mixin spineRgxInit;
+ doc_reform.meta.rgx;
@system final auto readConfigDoc(M,E)(M _manifested, E _env) {
+ mixin spineRgxInit;
static auto rgx = Rgx();
string config_file_str;
string conf_filename = "NONE";
@@ -165,10 +163,10 @@ static template readConfigDoc() {
}
static template configReadSiteYAML() {
import
- doc_reform.meta,
- doc_reform.io_in.paths_source,
std.file,
- std.path;
+ std.path,
+ doc_reform.meta,
+ doc_reform.io_in.paths_source;
@safe final YAMLDocument configReadSiteYAML(M,E)(M _manifested, E _env) {
string _configuration = configReadInSiteYAML!()(_manifested, _env);
auto _conf_file_details = ConfigFilePaths!()(_manifested, _env);
@@ -179,10 +177,10 @@ static template configReadSiteYAML() {
}
static template configReadDocYAML() {
import
- doc_reform.meta,
- doc_reform.io_in.paths_source,
std.file,
- std.path;
+ std.path,
+ doc_reform.meta,
+ doc_reform.io_in.paths_source;
@safe final YAMLDocument configReadDocYAML(M,E)(M _manifested, E _env) {
string _configuration = configReadInDocYAML!()(_manifested, _env);
auto _conf_file_details = ConfigFilePaths!()(_manifested, _env);
diff --git a/src/doc_reform/io_in/read_source_files.d b/src/doc_reform/io_in/read_source_files.d
index fcbd075..041ec91 100644
--- a/src/doc_reform/io_in/read_source_files.d
+++ b/src/doc_reform/io_in/read_source_files.d
@@ -4,14 +4,13 @@
- if master file scan for addional files to import/insert
+/
module doc_reform.io_in.read_source_files;
-static template spineRawMarkupContent() {
- import
- doc_reform.meta.rgx;
+template spineRawMarkupContent() {
import
+ std.file,
+ std.path,
doc_reform.meta,
doc_reform.io_in.paths_source,
- std.file,
- std.path;
+ doc_reform.meta.rgx;
mixin spineRgxInit;
static auto rgx = Rgx();
string[] _images=[];
diff --git a/src/doc_reform/meta/conf_make_meta_yaml.d b/src/doc_reform/meta/conf_make_meta_yaml.d
index e55a24f..5355a58 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 contentYAMLtoSpineStruct() {
+template contentYAMLtoSpineStruct() {
import
std.algorithm,
std.array,
@@ -788,7 +788,7 @@ static template contentYAMLtoSpineStruct() {
return _struct_composite;
}
}
-static template configParseYAMLreturnSpineStruct() {
+template configParseYAMLreturnSpineStruct() {
import dyaml;
import
doc_reform.meta.conf_make_meta_structs,
@@ -814,7 +814,7 @@ static template configParseYAMLreturnSpineStruct() {
return _make_and_meta_struct;
}
}
-static template docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct() {
+template docHeaderMakeAndMetaTupYamlExtractAndConvertToStruct() {
import
std.exception,
std.regex,
diff --git a/src/doc_reform/meta/rgx.d b/src/doc_reform/meta/rgx.d
index b6d23bf..c7a110b 100644
--- a/src/doc_reform/meta/rgx.d
+++ b/src/doc_reform/meta/rgx.d
@@ -3,7 +3,6 @@
+/
module doc_reform.meta.rgx;
static template spineRgxInit() {
- import doc_reform.meta.defaults;
static struct Rgx {
/+ misc +/
// static true_dollar = ctRegex!(`\$`, "gm");