diff options
| author | Ralph Amissah <ralph@amissah.com> | 2020-01-25 12:22:01 -0500 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2020-02-26 09:59:18 -0500 |
| commit | c4d2cedb930a48d6439d6ff2076183fd48fc6a5a (patch) | |
| tree | 8fbcd699336a971983e169298b8f3b80e2009616 /org/in_source_files.org | |
| parent | update headers and year (diff) | |
address compilation issues with dmd (v2.090.0)
Diffstat (limited to 'org/in_source_files.org')
| -rw-r--r-- | org/in_source_files.org | 45 |
1 files changed, 29 insertions, 16 deletions
diff --git a/org/in_source_files.org b/org/in_source_files.org index b958c22..720a47e 100644 --- a/org/in_source_files.org +++ b/org/in_source_files.org @@ -16,14 +16,20 @@ [[./spine.org][spine]] [[./][org/]] * imports +** std #+NAME: imports_std #+BEGIN_SRC d -import - doc_reform.meta, - doc_reform.io_in.paths_source, - std.file, - std.path; +std.file, +std.path +#+END_SRC + +** spine + +#+NAME: imports_spine +#+BEGIN_SRC d +doc_reform.meta, +doc_reform.io_in.paths_source #+END_SRC * A. get _config file_ (read in) @@ -36,6 +42,10 @@ import meta_config_files.d +/ module doc_reform.io_in.read_config_files; +import + <<imports_std>>, + <<imports_spine>>, + doc_reform.meta.rgx; <<meta_config_file_in>> <<meta_config_file_hub>> #+END_SRC @@ -45,12 +55,9 @@ module doc_reform.io_in.read_config_files; #+NAME: meta_config_file_hub #+BEGIN_SRC d -static template readConfigSite() { - import - doc_reform.meta.rgx; - <<imports_std>> - 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; @@ -154,10 +161,11 @@ webserv: #+BEGIN_SRC d static template readConfigDoc() { import + <<imports_std>>, + <<imports_spine>>, doc_reform.meta.rgx; - <<imports_std>> - mixin spineRgxInit; @system final auto readConfigDoc(M,E)(M _manifested, E _env) { + mixin spineRgxInit; static auto rgx = Rgx(); string config_file_str; string conf_filename = "NONE"; @@ -208,7 +216,9 @@ static template readConfigDoc() { #+NAME: meta_config_file_hub #+BEGIN_SRC d static template configReadSiteYAML() { - <<imports_std>> + import + <<imports_std>>, + <<imports_spine>>; @safe final YAMLDocument configReadSiteYAML(M,E)(M _manifested, E _env) { string _configuration = configReadInSiteYAML!()(_manifested, _env); auto _conf_file_details = ConfigFilePaths!()(_manifested, _env); @@ -218,7 +228,9 @@ static template configReadSiteYAML() { } } static template configReadDocYAML() { - <<imports_std>> + import + <<imports_std>>, + <<imports_spine>>; @safe final YAMLDocument configReadDocYAML(M,E)(M _manifested, E _env) { string _configuration = configReadInDocYAML!()(_manifested, _env); auto _conf_file_details = ConfigFilePaths!()(_manifested, _env); @@ -239,10 +251,11 @@ static template configReadDocYAML() { - if master file scan for addional files to import/insert +/ module doc_reform.io_in.read_source_files; -static template spineRawMarkupContent() { +template spineRawMarkupContent() { import + <<imports_std>>, + <<imports_spine>>, doc_reform.meta.rgx; - <<imports_std>> mixin spineRgxInit; static auto rgx = Rgx(); string[] _images=[]; |