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/doc_reform.org | 86 +++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'org/doc_reform.org') diff --git a/org/doc_reform.org b/org/doc_reform.org index 5b1fc23..d805744 100644 --- a/org/doc_reform.org +++ b/org/doc_reform.org @@ -415,13 +415,13 @@ if (helpInfo.helpWanted) { #+BEGIN_SRC d enum outTask { pod, source, sqlite, sqlite_multi, epub, html_scroll, html_seg, html_stuff } struct OptActions { - auto assertions() { + bool assertions() { return opts["assertions"]; } - auto concordance() { + bool concordance() { return opts["concordance"]; } - auto css_theme_default() { + bool css_theme_default() { bool _is_light; if (opts["light"] || opts["theme-light"]) { _is_light = true; @@ -432,79 +432,79 @@ struct OptActions { } return _is_light; } - auto debug_do() { + bool debug_do() { return opts["debug"]; } - auto digest() { + bool digest() { return opts["digest"]; } - auto epub() { + bool epub() { return opts["epub"]; } - auto html() { + bool html() { bool _is; if ( opts["html"] || opts["html-seg"] || opts["html-scroll"]) { _is = true; } else { _is = false; } return _is; } - auto html_seg() { + bool html_seg() { bool _is; if ( opts["html"] || opts["html-seg"]) { _is = true; } else { _is = false; } return _is; } - auto html_scroll() { + bool html_scroll() { bool _is; if ( opts["html"] || opts["html-scroll"]) { _is = true; } else { _is = false; } return _is; } - auto html_stuff() { + bool html_stuff() { bool _is; if (opts["html"] || opts["html-scroll"] || opts["html-seg"]) { _is = true; } else { _is = false; } return _is; } - auto manifest() { + bool manifest() { return opts["manifest"]; } - auto ocn() { + bool ocn() { return opts["ocn"]; } - auto quiet() { + bool quiet() { return opts["quiet"]; } - auto pod() { + bool pod() { return opts["pod"]; } - auto source() { + bool source() { return opts["source"]; } - auto sqlite_discrete() { + bool sqlite_discrete() { return opts["sqlite-discrete"]; } - auto sqlite_db_drop() { + bool sqlite_db_drop() { bool _is; if ( opts["sqlite-db-recreate"] || opts["sqlite-db-drop"]) { _is = true; } else { _is = false; } return _is; } - auto sqlite_db_create() { + bool sqlite_db_create() { bool _is; if ( opts["sqlite-db-recreate"] || opts["sqlite-db-create"]) { _is = true; } else { _is = false; } return _is; } - auto sqlite_delete() { + bool sqlite_delete() { return opts["sqlite-delete"]; } - auto sqlite_update() { + bool sqlite_update() { bool _is; if (opts["sqlite-update"] || opts["sqlite-insert"]) { _is = true; } else { _is = false; } return _is; } - auto sqlite_shared_db_action() { + bool sqlite_shared_db_action() { bool _is; if (opts["sqlite-db-recreate"] || opts["sqlite-db-create"] @@ -514,49 +514,49 @@ struct OptActions { ) { _is = true; } else { _is = false; } return _is; } - auto text() { + bool text() { return opts["text"]; } - auto verbose() { + bool verbose() { bool _is; if (opts["verbose"] || opts["very-verbose"]) { _is = true; } else { _is = false; } return _is; } - auto very_verbose() { + bool very_verbose() { return opts["very-verbose"]; } - auto xhtml() { + bool xhtml() { return opts["xhtml"]; } - auto section_toc() { + bool section_toc() { return opts["section_toc"]; } - auto section_body() { + bool section_body() { return opts["section_body"]; } - auto section_endnotes() { + bool section_endnotes() { return opts["section_endnotes"]; } - auto section_glossary() { + bool section_glossary() { return opts["section_glossary"]; } - auto section_biblio() { + bool section_biblio() { return opts["section_biblio"]; } - auto section_bookindex() { + bool section_bookindex() { return opts["section_bookindex"]; } - auto section_blurb() { + bool section_blurb() { return opts["section_blurb"]; } - auto backmatter() { + bool backmatter() { return opts["backmatter"]; } - auto skip_output() { + bool skip_output() { return opts["skip-output"]; } - auto workon() { + bool workon() { return opts["workon"]; } auto languages_set() { @@ -568,7 +568,7 @@ struct OptActions { auto sqlite_filename() { return settings["sqlite-filename"]; } - auto parallelise() { + bool parallelise() { bool _is; if (opts["parallel"] == true) { _is = true; @@ -589,7 +589,7 @@ struct OptActions { } else { _is = false; } return _is; } - auto parallelise_subprocesses() { + bool parallelise_subprocesses() { return opts["parallel-subprocesses"]; } auto output_task_scheduler() { @@ -617,7 +617,7 @@ struct OptActions { } return schedule.sort().uniq; } - auto abstraction() { + bool abstraction() { bool _is; if (opts["abstraction"] || concordance @@ -646,7 +646,7 @@ auto program_info() { string name() { return program_name; } - auto ver() { + string ver() { string ver_ = format( "%s.%s.%s", _ver.major, _ver.minor, _ver.patch, @@ -716,7 +716,7 @@ foreach(arg; args[1..$]) { contents_location ~ "ยป" ); auto contents_location_pth_ = (contents_location).to!string; - auto lang_rgx_ = regex(r"/(" ~ _opt_action.languages_set.join("|") ~ ")/"); + Regex!(char) lang_rgx_ = regex(r"/(" ~ _opt_action.languages_set.join("|") ~ ")/"); if (_opt_action.languages_set[0] == "all" || (contents_location_pth_).match(lang_rgx_) ) { @@ -1247,9 +1247,9 @@ if ((_opt_action.debug_do) #+BEGIN_SRC d :tangle "../src/doc_reform/meta/metadoc_summary.d" module doc_reform.meta.metadoc_summary; template DocReformAbstractionSummary() { - auto DocReformAbstractionSummary(S,T)( - auto ref const S doc_abstraction, - auto ref T doc_matters, + void DocReformAbstractionSummary(S,T)( + const S doc_abstraction, + T doc_matters, ) { <> mixin InternalMarkup; -- cgit v1.2.3