From 24c9ed3645178a6ee2abbd9201fa4643dba068e2 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 14 May 2019 11:35:24 -0400 Subject: review, reduce use of auto --- org/output_sqlite.org | 162 +++++++++++++++++++++++++------------------------- 1 file changed, 81 insertions(+), 81 deletions(-) (limited to 'org/output_sqlite.org') diff --git a/org/output_sqlite.org b/org/output_sqlite.org index c9123d3..2dc29f7 100644 --- a/org/output_sqlite.org +++ b/org/output_sqlite.org @@ -33,17 +33,17 @@ static auto rgx = Rgx(); long _metadata_tid_lastrowid; template SQLiteHubBuildTablesAndPopulate() { void SQLiteHubBuildTablesAndPopulate(D,M)( - D doc_abstraction, - M doc_matters, + const D doc_abstraction, + M doc_matters, ) { auto pth_sqlite = DocReformPathsSQLite!()(doc_matters.sqlite.filename, doc_matters.output_path); pth_sqlite.base.mkdirRecurse; auto db = Database(pth_sqlite.sqlite_file); template SQLiteDbStatementComposite() { void SQLiteDbStatementComposite(Db,D,M)( - Db db, - D doc_abstraction, - M doc_matters, + Db db, + const D doc_abstraction, + M doc_matters, ) { <> if (!(doc_matters.opt.action.quiet)) { @@ -61,17 +61,17 @@ template SQLiteHubBuildTablesAndPopulate() { #+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d" template SQLiteHubDiscreteBuildTablesAndPopulate() { void SQLiteHubDiscreteBuildTablesAndPopulate(D,M)( - D doc_abstraction, - M doc_matters, + const D doc_abstraction, + M doc_matters, ) { auto pth_sqlite = DocReformPathsSQLiteDiscrete!()(doc_matters.output_path, doc_matters.src.language); pth_sqlite.base.mkdirRecurse; auto db = Database(pth_sqlite.sqlite_file(doc_matters.src.filename)); template SQLiteDiscreteDbStatementComposite() { void SQLiteDiscreteDbStatementComposite(Db,D,M)( - Db db, - D doc_abstraction, - M doc_matters, + Db db, + const D doc_abstraction, + M doc_matters, ) { <> if (!(doc_matters.opt.action.quiet)) { @@ -202,8 +202,8 @@ template SQLiteInsertMetadata() { #+BEGIN_SRC d :tangle "../src/doc_reform/output/sqlite.d" template SQLiteInsertDocObjectsLoop() { string SQLiteInsertDocObjectsLoop(D,M)( - D doc_abstraction, - M doc_matters, + const D doc_abstraction, + M doc_matters, ) { string _uid = SQLinsertDelimiter!()(doc_matters.src.doc_uid); auto site_url = DocReformPathsUrl!()(doc_matters); @@ -343,7 +343,7 @@ import #+name: sanitize_text_for_search #+BEGIN_SRC d -auto generic_munge_sanitize_text_for_search( +string generic_munge_sanitize_text_for_search( string _txt, ) { string _notes; @@ -392,9 +392,9 @@ light html objects #+name: sanitize_and_munge_inline_html #+BEGIN_SRC d -auto munge_html(M,O)( - M doc_matters, - auto ref const O obj, +string munge_html(M,O)( + M doc_matters, + const O obj, ) { string _html_special_characters(string _txt){ _txt = _txt @@ -498,7 +498,7 @@ string html_font_face(string _txt){ #+name: sanitize_and_munge_inline_html #+BEGIN_SRC d -auto inline_images(M,O)( +string inline_images(M,O)( M doc_matters, const O obj, string _txt, @@ -529,7 +529,7 @@ auto inline_images(M,O)( #+name: sanitize_and_munge_inline_html #+BEGIN_SRC d -auto inline_links(M,O)( +string inline_links(M,O)( M doc_matters, const O obj, string _txt, @@ -637,7 +637,7 @@ auto inline_links(M,O)( #+name: sanitize_and_munge_inline_html #+BEGIN_SRC d -auto inline_notes_scroll(M,O)( +string inline_notes_scroll(M,O)( M doc_matters, const O obj, string _txt, @@ -713,7 +713,7 @@ auto inline_notes_seg(M,O)( #+name: sanitize_and_munge_inline_html #+BEGIN_SRC d string xml_type="seg"; /+ set html document type to be linked to here (seg|scroll) +/ -auto inline_markup(M,O)( +string inline_markup(M,O)( M doc_matters, const O obj, string _txt, @@ -730,9 +730,9 @@ auto inline_markup(M,O)( #+name: html_objects #+BEGIN_SRC d -auto html_heading(M,O)( - M doc_matters, - auto ref const O obj, +string html_heading(M,O)( + M doc_matters, + const O obj, ) { assert(obj.metainfo.is_of_part == "body" || "frontmatter" || "backmatter"); assert(obj.metainfo.is_of_section == "body" || "toc" || "endnotes" || "glossary" || "bibliography" || "bookindex" || "blurb"); @@ -754,9 +754,9 @@ auto html_heading(M,O)( ##+name: prepare_objects_html #+BEGIN_SRC d -auto html_heading(M,O)( - M doc_matters, - auto ref const O obj, +string html_heading(M,O)( + M doc_matters, + const O obj, ) { string o; string _txt = munge_html(doc_matters, obj); @@ -776,9 +776,9 @@ auto html_heading(M,O)( #+name: html_objects #+BEGIN_SRC d -auto html_para(M,O)( - M doc_matters, - auto ref const O obj, +string html_para(M,O)( + M doc_matters, + const O obj, ) { assert(obj.metainfo.is_of_part == "body" || "frontmatter" || "backmatter"); assert(obj.metainfo.is_of_section == "body" || "toc" || "endnotes" || "glossary" || "bibliography" || "bookindex" || "blurb"); @@ -803,9 +803,9 @@ auto html_para(M,O)( #+name: html_objects #+BEGIN_SRC d -auto html_quote(M,O)( - M doc_matters, - auto ref const O obj, +string html_quote(M,O)( + M doc_matters, + const O obj, ) { assert(obj.metainfo.is_of_part == "body"); assert(obj.metainfo.is_of_section == "body" || "glossary" || "bibliography" || "bookindex" || "blurb"); @@ -826,9 +826,9 @@ auto html_quote(M,O)( #+name: html_objects #+BEGIN_SRC d -auto html_group(M,O)( - M doc_matters, - auto ref const O obj, +string html_group(M,O)( + M doc_matters, + const O obj, ) { assert(obj.metainfo.is_of_part == "body"); assert(obj.metainfo.is_of_section == "body" || "glossary" || "bibliography" || "bookindex" || "blurb"); @@ -849,9 +849,9 @@ auto html_group(M,O)( #+name: html_objects #+BEGIN_SRC d -auto html_block(M,O)( - M doc_matters, - auto ref const O obj, +string html_block(M,O)( + M doc_matters, + const O obj, ) { assert(obj.metainfo.is_of_part == "body"); assert(obj.metainfo.is_of_section == "body" || "glossary" || "bibliography" || "bookindex" || "blurb"); @@ -871,9 +871,9 @@ auto html_block(M,O)( #+name: html_objects #+BEGIN_SRC d -auto html_verse(M,O)( - M doc_matters, - auto ref const O obj, +string html_verse(M,O)( + M doc_matters, + const O obj, ) { assert(obj.metainfo.is_of_part == "body"); assert(obj.metainfo.is_of_section == "body" || "glossary" || "bibliography" || "bookindex" || "blurb"); @@ -892,8 +892,8 @@ auto html_verse(M,O)( #+name: html_objects #+BEGIN_SRC d -auto html_code(O)( - auto ref const O obj, +string html_code(O)( + const O obj, ) { assert(obj.metainfo.is_of_part == "body"); assert(obj.metainfo.is_of_section == "body"); @@ -912,17 +912,17 @@ auto html_code(O)( #+name: html_objects #+BEGIN_SRC d -auto html_table(M,O)( - M doc_matters, - auto ref const O obj, +string html_table(M,O)( + M doc_matters, + const O obj, ) { assert(obj.metainfo.is_of_part == "body"); assert(obj.metainfo.is_of_section == "body"); assert(obj.metainfo.is_of_type == "block"); assert(obj.metainfo.is_a == "table"); auto _tablarize(O)( - auto ref const O obj, - string _txt, + const O obj, + string _txt, ) { string[] _table_rows = _txt.split(rgx.table_delimiter_row); string[] _table_cols; @@ -984,9 +984,9 @@ auto html_table(M,O)( #+name: sqlite_load_object #+BEGIN_SRC d -auto sqlite_load_string(M,O)( - auto ref M doc_matters, - auto ref const O obj, +string sqlite_load_string(M,O)( + M doc_matters, + const O obj, ) { string o; return o; @@ -995,9 +995,9 @@ auto sqlite_load_string(M,O)( #+name: sqlite_load_object #+BEGIN_SRC d -auto postgresql_load_string(M,O)( - auto ref M doc_matters, - auto ref const O obj, +string postgresql_load_string(M,O)( + M doc_matters, + const O obj, ) { string o; return o; @@ -1007,9 +1007,9 @@ auto postgresql_load_string(M,O)( #+name: sqlite_load_object #+BEGIN_SRC d string sqlite_statement(O)( - auto ref const O obj, - string _txt, - string _html, + const O obj, + string _txt, + string _html, ) { void _sql_exe(O)( string _sql, @@ -1026,9 +1026,9 @@ string sqlite_statement(O)( #+name: hub_format_and_sqlite_load_objects #+BEGIN_SRC d -auto heading(M,O)( - M doc_matters, - auto ref const O obj, +string[string] heading(M,O)( + M doc_matters, + const O obj, ) { string[string] obj_txt = [ "text": generic_munge_sanitize_text_for_search(obj.text), @@ -1055,9 +1055,9 @@ auto heading(M,O)( #+name: hub_format_and_sqlite_load_objects #+BEGIN_SRC d -auto para(M,O)( - M doc_matters, - auto ref const O obj, +string[string] para(M,O)( + M doc_matters, + const O obj, ) { string[string] obj_txt = [ "text": generic_munge_sanitize_text_for_search(obj.text), @@ -1084,9 +1084,9 @@ auto para(M,O)( #+name: hub_format_and_sqlite_load_objects #+BEGIN_SRC d -auto quote(M,O)( - M doc_matters, - auto ref const O obj, +string[string] quote(M,O)( + M doc_matters, + const O obj, ) { string[string] obj_txt = [ "text": generic_munge_sanitize_text_for_search(obj.text), @@ -1112,9 +1112,9 @@ auto quote(M,O)( #+name: hub_format_and_sqlite_load_objects #+BEGIN_SRC d -auto group(M,O)( - M doc_matters, - auto ref const O obj, +string[string] group(M,O)( + M doc_matters, + const O obj, ) { string[string] obj_txt = [ "text": generic_munge_sanitize_text_for_search(obj.text), @@ -1141,9 +1141,9 @@ auto group(M,O)( #+name: hub_format_and_sqlite_load_objects #+BEGIN_SRC d -auto block(M,O)( - M doc_matters, - auto ref const O obj, +string[string] block(M,O)( + M doc_matters, + const O obj, ) { string[string] obj_txt = [ "text": generic_munge_sanitize_text_for_search(obj.text), @@ -1170,9 +1170,9 @@ auto block(M,O)( #+name: hub_format_and_sqlite_load_objects #+BEGIN_SRC d -auto verse(M,O)( - M doc_matters, - auto ref const O obj, +string[string] verse(M,O)( + M doc_matters, + const O obj, ) { string[string] obj_txt = [ "text": generic_munge_sanitize_text_for_search(obj.text), @@ -1199,9 +1199,9 @@ auto verse(M,O)( #+name: hub_format_and_sqlite_load_objects #+BEGIN_SRC d -auto code(M,O)( - M doc_matters, - auto ref const O obj, +string[string] code(M,O)( + M doc_matters, + const O obj, ) { string[string] obj_txt = [ "text": generic_munge_sanitize_text_for_search(obj.text), @@ -1228,9 +1228,9 @@ auto code(M,O)( #+name: hub_format_and_sqlite_load_objects #+BEGIN_SRC d -auto table(M,O)( - M doc_matters, - auto ref const O obj, +string[string] table(M,O)( + M doc_matters, + const O obj, ) { string[string] obj_txt = [ "text": generic_munge_sanitize_text_for_search(obj.text), -- cgit v1.2.3