From 0245c394af1a4a1400f87916bd10c398005f40da Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Tue, 14 Jun 2016 22:52:15 -0400
Subject: step4 some additional work

---
 org/ao_read_source_files.org | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'org/ao_read_source_files.org')

diff --git a/org/ao_read_source_files.org b/org/ao_read_source_files.org
index 3609fb5..26f25fb 100644
--- a/org/ao_read_source_files.org
+++ b/org/ao_read_source_files.org
@@ -106,7 +106,7 @@ final char[][] markupSourceContentRawLineArray(in string fn_src, Regex!(char) rg
 }
 #+END_SRC
 
-* inserts                                                           :inserts:
+* get markup source, master file & inserts                          :inserts:
 [[./sdp.org][sdp]]  [[./][org/]]
 
 ** scan inserts (sub-document) source                       :scan_insert_src:
@@ -130,11 +130,11 @@ auto markup_src_file_path = fn_pth_full.captures[1];
 if (type1["curly_code"] == 1) {
   type1["header_make"] = 0;
   type1["header_metadata"] = 0;
-  if (auto m = match(line, rgx.block_curly_code_close)) {
+  if (matchFirst(line, rgx.block_curly_code_close)) {
     type1["curly_code"] = 0;
   }
   contents_insert ~= line;
-} else if (auto m = match(line, rgx.block_curly_code_open)) {
+} else if (matchFirst(line, rgx.block_curly_code_open)) {
   type1["curly_code"] = 1;
   type1["header_make"] = 0;
   type1["header_metadata"] = 0;
@@ -142,25 +142,25 @@ if (type1["curly_code"] == 1) {
 } else if (type1["tic_code"] == 1) {
   type1["header_make"] = 0;
   type1["header_metadata"] = 0;
-  if (auto m = match(line, rgx.block_tic_close)) {
+  if (matchFirst(line, rgx.block_tic_close)) {
     type1["tic_code"] = 0;
   }
   contents_insert ~= line;
-} else if (auto m = match(line, rgx.block_tic_code_open)) {
+} else if (matchFirst(line, rgx.block_tic_code_open)) {
   type1["tic_code"] = 1;
   type1["header_make"] = 0;
   type1["header_metadata"] = 0;
   contents_insert ~= line;
 } else if (
   (type1["header_make"] == 1)
-  && match(line, rgx.header_sub)
+  && matchFirst(line, rgx.header_sub)
 ) {
     type1["header_make"] = 1;
     type1["header_metadata"] = 0;
     // cont_dynamic_array ~= "% " ~ line;
 } else if (
   (type1["header_metadata"] == 1)
-  && match(line, rgx.header_sub)
+  && matchFirst(line, rgx.header_sub)
 ) {
     type1["header_metadata"] = 1;
     type1["header_make"] = 0;
@@ -227,11 +227,11 @@ auto markup_src_file_path = fn_pth_full.captures[1];
 if (type["curly_code"] == 1) {
   type["header_make"] = 0;
   type["header_metadata"] = 0;
-  if (auto m = match(line, rgx.block_curly_code_close)) {
+  if (matchFirst(line, rgx.block_curly_code_close)) {
     type["curly_code"] = 0;
   }
   contents ~= line;
-} else if (auto m = match(line, rgx.block_curly_code_open)) {
+} else if (matchFirst(line, rgx.block_curly_code_open)) {
   type["curly_code"] = 1;
   type["header_make"] = 0;
   type["header_metadata"] = 0;
@@ -239,30 +239,30 @@ if (type["curly_code"] == 1) {
 } else if (type["tic_code"] == 1) {
   type["header_make"] = 0;
   type["header_metadata"] = 0;
-  if (auto m = match(line, rgx.block_tic_close)) {
+  if (matchFirst(line, rgx.block_tic_close)) {
     type["tic_code"] = 0;
   }
   contents ~= line;
-} else if (auto m = match(line, rgx.block_tic_code_open)) {
+} else if (matchFirst(line, rgx.block_tic_code_open)) {
   type["tic_code"] = 1;
   type["header_make"] = 0;
   type["header_metadata"] = 0;
   contents ~= line;
 } else if (
   (type["header_make"] == 1)
-  && match(line, rgx.header_sub)
+  && matchFirst(line, rgx.header_sub)
 ) {
   contents ~= line;
 } else if (
   (type["header_metadata"] == 1)
-  && match(line, rgx.header_sub)
+  && matchFirst(line, rgx.header_sub)
 ) {
   contents ~= line;
-} else if (auto m = match(line, rgx.header_make)) {
+} else if (matchFirst(line, rgx.header_make)) {
   type["header_make"] = 1;
   type["header_metadata"] = 0;
   contents ~= line;
-} else if (auto m = match(line, rgx.header_metadata)) {
+} else if (matchFirst(line, rgx.header_metadata)) {
   type["header_make"] = 0;
   type["header_metadata"] = 1;
   contents ~= line;
-- 
cgit v1.2.3