From 45e1b786144b8ef0a70a235f8a1a89e90a752d8f Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Thu, 12 Jan 2017 20:51:12 -0500
Subject: 0.11.0 improved message passing, using templates

---
 src/sdp/ao_read_source_files.d | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/sdp/ao_read_source_files.d')

diff --git a/src/sdp/ao_read_source_files.d b/src/sdp/ao_read_source_files.d
index 5ff0ec1..a2bf75d 100644
--- a/src/sdp/ao_read_source_files.d
+++ b/src/sdp/ao_read_source_files.d
@@ -43,7 +43,7 @@ template SiSUmarkupRaw() {
   private
   struct MarkupRawUnit {
     private import std.file;
-    final private string readInMarkupSource(in string fn_src) {
+    final private string readInMarkupSource(in char[] fn_src) {
       enforce(
         exists(fn_src)!=0,
         "file not found"
@@ -102,7 +102,10 @@ template SiSUmarkupRaw() {
       );
       return t;
     }
-    final char[][] getInsertMarkupSourceContentRawLineArray(in string fn_src, Regex!(char) rgx_file) {
+    final char[][] getInsertMarkupSourceContentRawLineArray(
+      in char[] fn_src,
+      Regex!(char) rgx_file
+    ) {
       enforce(
         match(fn_src, rgx_file),
         "not a sisu markup filename"
@@ -166,7 +169,7 @@ template SiSUmarkupRaw() {
           auto insert_fn = m.captures[2];
           auto insert_sub_pth = m.captures[1];
           auto fn_src_insert =
-            to!string(markup_src_file_path ~ insert_sub_pth ~ insert_fn);
+            chainPath(markup_src_file_path, insert_sub_pth ~ insert_fn).array;
           auto raw = MarkupRawUnit();
           auto markup_sourcesubfile_insert_content =
             raw.getInsertMarkupSourceContentRawLineArray(fn_src_insert, rgx.src_fn_find_inserts);
@@ -227,7 +230,7 @@ template SiSUmarkupRaw() {
           auto insert_fn = m.captures[2];
           auto insert_sub_pth = m.captures[1];
           auto fn_src_insert =
-            to!string(markup_src_file_path ~ insert_sub_pth ~ insert_fn);
+            chainPath(markup_src_file_path, insert_sub_pth ~ insert_fn).array;
           auto raw = MarkupRawUnit();
           /+ TODO +/
           if (auto ma = match(line, rgx.src_fn_text)) {
-- 
cgit v1.2.3