From dcd8b767fd97e18880e54cfd84ea4c6f9ed77ad6 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Wed, 1 May 2019 10:38:15 -0400
Subject: meta_abstraction some local renaming
---
src/doc_reform/meta/metadoc_from_src.d | 78 +++++++++++++++++-----------------
1 file changed, 39 insertions(+), 39 deletions(-)
(limited to 'src')
diff --git a/src/doc_reform/meta/metadoc_from_src.d b/src/doc_reform/meta/metadoc_from_src.d
index 2633665..585306d 100644
--- a/src/doc_reform/meta/metadoc_from_src.d
+++ b/src/doc_reform/meta/metadoc_from_src.d
@@ -491,7 +491,7 @@ template DocReformDocAbstraction() {
}
if (obj_type_status["code"] == TriState.on) {
/+ block object: code +/
- line._code_block_(an_object, obj_type_status);
+ line.txt_block_code(an_object, obj_type_status);
continue;
} else if (!matchFirst(line, rgx.skip_from_regular_parse)) {
/+ object other than "code block" object
@@ -514,7 +514,7 @@ template DocReformDocAbstraction() {
obj_type_status["biblio_section"] = State.on;
obj_type_status["blurb_section"] = State.off;
if (opt_action.backmatter && opt_action.section_biblio) {
- line._biblio_block_(obj_type_status, bib_entry, biblio_entry_str_json, biblio_arr_json);
+ line.txt_block_biblio(obj_type_status, bib_entry, biblio_entry_str_json, biblio_arr_json);
debug(bibliobuild) {
writeln("- ", biblio_entry_str_json);
writeln("-> ", biblio_arr_json.length);
@@ -770,7 +770,7 @@ template DocReformDocAbstraction() {
/+ within block object: quote +/
line = line._doc_header_and_make_substitutions_(conf_make_meta);
line = line._doc_header_and_make_substitutions_fontface_(conf_make_meta);
- line._quote_block_(an_object, obj_type_status);
+ line.txt_block_quote(an_object, obj_type_status);
continue;
/+ within block object: group +/
} else if (obj_type_status["group"] == TriState.on) {
@@ -779,7 +779,7 @@ template DocReformDocAbstraction() {
line = line._doc_header_and_make_substitutions_fontface_(conf_make_meta);
line = line
.replaceAll(rgx.para_delimiter, mkup.br_paragraph ~ "$1");
- line._group_block_(an_object, obj_type_status);
+ line.txt_block_group(an_object, obj_type_status);
continue;
} else if (obj_type_status["block"] == TriState.on) {
/+ within block object: block +/
@@ -789,15 +789,15 @@ template DocReformDocAbstraction() {
line = line
.replaceAll(rgx.spaces_keep, (m.captures[1]).translate([ ' ' : mkup.nbsp ]));
}
- line._block_block_(an_object, obj_type_status);
+ line.txt_block_block(an_object, obj_type_status);
continue;
} else if (obj_type_status["poem"] == TriState.on) {
/+ within block object: poem +/
- line._poem_block_(an_object, obj_type_status, cntr, object_number_poem, conf_make_meta, tag_in_seg);
+ line.txt_block_poem(an_object, obj_type_status, cntr, object_number_poem, conf_make_meta, tag_in_seg);
continue;
} else if (obj_type_status["table"] == TriState.on) {
/+ within block object: table +/
- line._table_block_(an_object, obj_type_status, conf_make_meta);
+ line.txt_block_table(an_object, obj_type_status, conf_make_meta);
continue;
} else {
/+ not within a block group +/
@@ -814,7 +814,7 @@ template DocReformDocAbstraction() {
processing.remove("verse");
object_number_poem["start"] = obj_cite_digits.object_number.to!string;
}
- line._start_block_(obj_type_status, object_number_poem);
+ line.txt_block_start(obj_type_status, object_number_poem);
continue;
} else if (!line.empty) {
/+ line not empty +/
@@ -2507,7 +2507,7 @@ template DocReformDocAbstraction() {
}
return line;
}
- void _start_block_(L,T,N)(
+ void txt_block_start(L,T,N)(
L line,
return ref T obj_type_status,
return ref N object_number_poem
@@ -2675,7 +2675,7 @@ template DocReformDocAbstraction() {
obj_type_status["tic_table"] = TriState.on;
}
}
- void _quote_block_(L,O,T)(
+ void txt_block_quote(L,O,T)(
L line,
return ref O an_object,
return ref T obj_type_status
@@ -2718,7 +2718,7 @@ template DocReformDocAbstraction() {
}
}
}
- void _group_block_(L,O,T)(
+ void txt_block_group(L,O,T)(
L line,
return ref O an_object,
return ref T obj_type_status
@@ -2761,7 +2761,7 @@ template DocReformDocAbstraction() {
}
}
}
- void _block_block_(L,O,T)(
+ void txt_block_block(L,O,T)(
L line,
return ref O an_object,
return ref T obj_type_status
@@ -2804,7 +2804,7 @@ template DocReformDocAbstraction() {
}
}
}
- void _poem_block_(L,O,T,C,N,CMM,Ts)(
+ void txt_block_poem(L,O,T,C,N,CMM,Ts)(
L line,
return ref O an_object,
return ref T obj_type_status,
@@ -3052,7 +3052,7 @@ template DocReformDocAbstraction() {
}
}
}
- void _code_block_(L,O,T)(
+ void txt_block_code(L,O,T)(
L line,
return ref O an_object,
return ref T obj_type_status
@@ -3099,7 +3099,7 @@ template DocReformDocAbstraction() {
}
}
}
- void _table_block_(L,O,T,CMM)(
+ void txt_block_table(L,O,T,CMM)(
L line,
return ref O an_object,
return ref T obj_type_status,
@@ -3184,7 +3184,7 @@ template DocReformDocAbstraction() {
];
return btm[abr];
}
- void _biblio_block_(
+ void txt_block_biblio(
char[] line,
return ref int[string] obj_type_status,
return ref int bib_entry,
@@ -5116,37 +5116,37 @@ template DocReformDocAbstraction() {
_obj_attrib["json"] ="{";
switch (obj_is_) {
case "heading":
- _obj_attrib["json"] ~= _heading(obj_raw);
+ _obj_attrib["json"] ~= txt_heading(obj_raw);
break;
case "para":
- _obj_attrib["json"] ~= _para_and_blocks(obj_raw)
- ~ _para(obj_raw);
+ _obj_attrib["json"] ~= txt_para_and_blocks(obj_raw)
+ ~ txt_para(obj_raw);
break;
case "code":
- _obj_attrib["json"] ~= _code(obj_raw);
+ _obj_attrib["json"] ~= txt_code(obj_raw);
break;
case "group":
- _obj_attrib["json"] ~= _para_and_blocks(obj_raw)
- ~ _group(obj_raw);
+ _obj_attrib["json"] ~= txt_para_and_blocks(obj_raw)
+ ~ txt_group(obj_raw);
break;
case "block":
- _obj_attrib["json"] ~= _para_and_blocks(obj_raw)
- ~ _block(obj_raw);
+ _obj_attrib["json"] ~= txt_para_and_blocks(obj_raw)
+ ~ txt_block(obj_raw);
break;
case "verse":
- _obj_attrib["json"] ~= _verse(obj_raw);
+ _obj_attrib["json"] ~= txt_verse(obj_raw);
break;
case "quote":
- _obj_attrib["json"] ~= _quote(obj_raw);
+ _obj_attrib["json"] ~= txt_quote(obj_raw);
break;
case "table":
- _obj_attrib["json"] ~= _table(obj_raw);
+ _obj_attrib["json"] ~= txt_table(obj_raw);
break;
case "comment":
- _obj_attrib["json"] ~= _comment(obj_raw);
+ _obj_attrib["json"] ~= txt_comment(obj_raw);
break;
default:
- _obj_attrib["json"] ~= _para(obj_raw);
+ _obj_attrib["json"] ~= txt_para(obj_raw);
break;
}
_obj_attrib["json"] ~=" }";
@@ -5166,7 +5166,7 @@ template DocReformDocAbstraction() {
}
private:
string _obj_attributes;
- string _para_and_blocks(Ot)(Ot obj_txt_in)
+ string txt_para_and_blocks(Ot)(Ot obj_txt_in)
in {
debug(asserts) {
static assert(is(typeof(obj_txt_in) == string));
@@ -5196,7 +5196,7 @@ template DocReformDocAbstraction() {
}
return _obj_attributes;
}
- string _heading(Ot)(Ot obj_txt_in)
+ string txt_heading(Ot)(Ot obj_txt_in)
in {
debug(asserts) {
static assert(is(typeof(obj_txt_in) == string));
@@ -5210,7 +5210,7 @@ template DocReformDocAbstraction() {
}
invariant() {
}
- string _para(Ot)(Ot obj_txt_in)
+ string txt_para(Ot)(Ot obj_txt_in)
in {
debug(asserts) {
static assert(is(typeof(obj_txt_in) == string));
@@ -5224,7 +5224,7 @@ template DocReformDocAbstraction() {
}
invariant() {
}
- string _quote(Ot)(Ot obj_txt_in)
+ string txt_quote(Ot)(Ot obj_txt_in)
in {
debug(asserts) {
static assert(is(typeof(obj_txt_in) == string));
@@ -5238,7 +5238,7 @@ template DocReformDocAbstraction() {
}
invariant() {
}
- string _group(Ot)(Ot obj_txt_in)
+ string txt_group(Ot)(Ot obj_txt_in)
in {
debug(asserts) {
static assert(is(typeof(obj_txt_in) == string));
@@ -5252,7 +5252,7 @@ template DocReformDocAbstraction() {
}
invariant() {
}
- string _block(Ot)(Ot obj_txt_in)
+ string txt_block(Ot)(Ot obj_txt_in)
in {
debug(asserts) {
static assert(is(typeof(obj_txt_in) == string));
@@ -5266,7 +5266,7 @@ template DocReformDocAbstraction() {
}
invariant() {
}
- string _verse(Ot)(Ot obj_txt_in)
+ string txt_verse(Ot)(Ot obj_txt_in)
in {
debug(asserts) {
static assert(is(typeof(obj_txt_in) == string));
@@ -5280,7 +5280,7 @@ template DocReformDocAbstraction() {
}
invariant() {
}
- string _code(Ot)(Ot obj_txt_in)
+ string txt_code(Ot)(Ot obj_txt_in)
in {
debug(asserts) {
static assert(is(typeof(obj_txt_in) == string));
@@ -5294,7 +5294,7 @@ template DocReformDocAbstraction() {
}
invariant() {
}
- string _table(Ot)(Ot obj_txt_in)
+ string txt_table(Ot)(Ot obj_txt_in)
in {
debug(asserts) {
static assert(is(typeof(obj_txt_in) == string));
@@ -5308,7 +5308,7 @@ template DocReformDocAbstraction() {
}
invariant() {
}
- string _comment(Ot)(Ot obj_txt_in)
+ string txt_comment(Ot)(Ot obj_txt_in)
in {
debug(asserts) {
static assert(is(typeof(obj_txt_in) == string));
--
cgit v1.2.3