aboutsummaryrefslogtreecommitdiffhomepage
path: root/org
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2019-05-01 10:38:15 -0400
committerRalph Amissah <ralph.amissah@gmail.com>2019-05-17 16:59:54 -0400
commitdcd8b767fd97e18880e54cfd84ea4c6f9ed77ad6 (patch)
tree94b6f4a464dfbddd5adad6487b3378b0a138dca5 /org
parentregex, meta_abstraction, naming of some regex submatches (diff)
meta_abstraction some local renaming
Diffstat (limited to 'org')
-rw-r--r--org/meta_abstraction.org78
1 files changed, 39 insertions, 39 deletions
diff --git a/org/meta_abstraction.org b/org/meta_abstraction.org
index e2f4638..e3d97ce 100644
--- a/org/meta_abstraction.org
+++ b/org/meta_abstraction.org
@@ -695,7 +695,7 @@ if (!line.empty) {
#+name: abs_in_loop_body_00_code_block
#+BEGIN_SRC d
/+ block object: code +/
-line._code_block_(an_object, obj_type_status);
+line.txt_block_code(an_object, obj_type_status);
continue;
#+END_SRC
@@ -728,7 +728,7 @@ if ((line.matchFirst(rgx.heading_biblio)
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);
@@ -1017,7 +1017,7 @@ if there is a blurb section you need to:
/+ 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;
#+END_SRC
@@ -1032,7 +1032,7 @@ if there is a blurb section you need to:
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;
#+END_SRC
@@ -1048,7 +1048,7 @@ if there is a blurb section you need to:
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;
#+END_SRC
@@ -1058,7 +1058,7 @@ if there is a blurb section you need to:
#+BEGIN_SRC d
} 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;
#+END_SRC
@@ -1068,7 +1068,7 @@ if there is a blurb section you need to:
#+BEGIN_SRC d
} 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;
#+END_SRC
@@ -1095,7 +1095,7 @@ if (line.matchFirst(rgx.block_poem_open)) {
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;
#+END_SRC
@@ -3226,7 +3226,7 @@ auto _doc_header_and_make_substitutions_fontface_(L,CMM)(
#+name: abs_functions_block
#+BEGIN_SRC d
-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
@@ -3492,7 +3492,7 @@ void _start_block_(L,T,N)(
#+name: abs_functions_block_code
#+BEGIN_SRC d
-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
@@ -3604,7 +3604,7 @@ final string biblio_tag_map_(A)(A abr) {
#+name: abs_functions_block_biblio
#+BEGIN_SRC d
-void _biblio_block_(
+void txt_block_biblio(
char[] line,
return ref int[string] obj_type_status,
return ref int bib_entry,
@@ -3738,7 +3738,7 @@ void _biblio_block_(
#+name: abs_functions_block_quote
#+BEGIN_SRC d
-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
@@ -3790,7 +3790,7 @@ void _quote_block_(L,O,T)(
#+name: abs_functions_block_group
#+BEGIN_SRC d
-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
@@ -3843,7 +3843,7 @@ void _group_block_(L,O,T)(
#+name: abs_functions_block_block
#+BEGIN_SRC d
-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
@@ -3894,7 +3894,7 @@ why extra object stuff only in poem/verse?
#+name: abs_functions_block_poem
#+BEGIN_SRC d
-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,
@@ -4164,7 +4164,7 @@ you need:
#+name: abs_functions_block_table
#+BEGIN_SRC d
-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,
@@ -6356,37 +6356,37 @@ struct ObjAttributes {
_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"] ~=" }";
@@ -6418,7 +6418,7 @@ struct ObjAttributes {
#+name: meta_emitters_obj_attributes_private_an_attribute
#+BEGIN_SRC d
- 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));
@@ -6454,7 +6454,7 @@ struct ObjAttributes {
#+name: meta_emitters_obj_attributes_private_an_attribute
#+BEGIN_SRC d
- 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));
@@ -6474,7 +6474,7 @@ struct ObjAttributes {
#+name: meta_emitters_obj_attributes_private_an_attribute
#+BEGIN_SRC d
- 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));
@@ -6494,7 +6494,7 @@ struct ObjAttributes {
#+name: meta_emitters_obj_attributes_private_an_attribute
#+BEGIN_SRC d
- 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));
@@ -6514,7 +6514,7 @@ struct ObjAttributes {
#+name: meta_emitters_obj_attributes_private_an_attribute
#+BEGIN_SRC d
- 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));
@@ -6534,7 +6534,7 @@ struct ObjAttributes {
#+name: meta_emitters_obj_attributes_private_an_attribute
#+BEGIN_SRC d
- 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));
@@ -6554,7 +6554,7 @@ struct ObjAttributes {
#+name: meta_emitters_obj_attributes_private_an_attribute
#+BEGIN_SRC d
- 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));
@@ -6574,7 +6574,7 @@ struct ObjAttributes {
#+name: meta_emitters_obj_attributes_private_an_attribute
#+BEGIN_SRC d
- 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));
@@ -6594,7 +6594,7 @@ struct ObjAttributes {
#+name: meta_emitters_obj_attributes_private_an_attribute
#+BEGIN_SRC d
- 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));
@@ -6614,7 +6614,7 @@ struct ObjAttributes {
#+name: meta_emitters_obj_attributes_private_an_attribute
#+BEGIN_SRC d
- 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));