aboutsummaryrefslogtreecommitdiffhomepage
path: root/org/meta_read_source_files.org
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2017-12-15 14:06:16 -0500
committerRalph Amissah <ralph@amissah.com>2019-04-10 15:14:14 -0400
commit2e852762085122d1b36641a04bcc63d5235139cd (patch)
treeb0f039492688fc0604f98ff4eb588deb266f1e0d /org/meta_read_source_files.org
parent0.23.1 use output path specified if any (diff)
0.23.2 config paths for pod
Diffstat (limited to 'org/meta_read_source_files.org')
-rw-r--r--org/meta_read_source_files.org14
1 files changed, 7 insertions, 7 deletions
diff --git a/org/meta_read_source_files.org b/org/meta_read_source_files.org
index 8062f46..b4b4d69 100644
--- a/org/meta_read_source_files.org
+++ b/org/meta_read_source_files.org
@@ -47,8 +47,8 @@ module sdp.meta.read_config_files;
#+BEGIN_SRC d
static template configIn() {
<<imports_std>>
- final string configIn(C,E)(C conf_sdl, E env) {
- auto possible_config_path_locations = ConfigFilePaths!()(env).possible_config_path_locations;
+ final string configIn(M,E,C)(M manifest, E env, C conf_sdl) {
+ auto possible_config_path_locations = ConfigFilePaths!()(manifest, env).possible_config_path_locations;
string config_file_str;
foreach(pth; possible_config_path_locations) {
auto conf_file = format(
@@ -135,8 +135,8 @@ Read in sdl config file name given, and return sdl root
#+name: meta_config_file_sdlang_hub
#+BEGIN_SRC d
-final auto configRead(C,E)(C conf_sdl, E env) {
- auto configuration = configIn!()(conf_sdl, env);
+final auto configRead(M,E,C)(M manifest, E env, C conf_sdl) {
+ auto configuration = configIn!()(manifest, env, conf_sdl);
auto sdl_root = ConfigSDLang!()(configuration, conf_sdl);
return sdl_root;
}
@@ -333,7 +333,7 @@ final private char[][] markupSourceLineArray(in char[] src_text) {
auto markupSourceReadIn(in string fn_src) {
static auto rgx = Rgx();
enforce(
- fn_src.match(rgx.src_pth),
+ fn_src.match(rgx.src_pth_sst_or_ssm),
"not a sisu markup filename: «" ~
fn_src ~ "»"
);
@@ -397,7 +397,7 @@ final char[][] getInsertMarkupSourceContentRawLineArray(
#+BEGIN_SRC d
char[][] contents_insert;
auto type1 = flags_type_init;
-auto fn_pth_full = fn_src.match(rgx.src_pth);
+auto fn_pth_full = fn_src.match(rgx.src_pth_sst_or_ssm);
auto markup_src_file_path = fn_pth_full.captures[1];
#+END_SRC
@@ -505,7 +505,7 @@ return t;
#+BEGIN_SRC d
char[][] contents;
auto type = flags_type_init;
-auto fn_pth_full = fn_src.match(rgx.src_pth);
+auto fn_pth_full = fn_src.match(rgx.src_pth_sst_or_ssm);
auto markup_src_file_path = fn_pth_full.captures[1];
char[][] contents_insert;
string[] _images =[];