From 0ce4e986fcd5af430d9f7bfdd625da7a58a1527e Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 4 Feb 2020 17:10:57 -0500 Subject: imports related, mostly cosmetic --- src/doc_reform/io_in/paths_source.d | 3 ++- src/doc_reform/io_out/create_zip_file.d | 9 +++++---- src/doc_reform/io_out/epub3.d | 3 +-- src/doc_reform/io_out/html.d | 4 +--- src/doc_reform/io_out/hub.d | 2 +- src/doc_reform/io_out/latex.d | 2 +- src/doc_reform/io_out/metadata.d | 5 +++-- src/doc_reform/io_out/paths_output.d | 3 ++- src/doc_reform/io_out/sqlite.d | 6 +++--- src/doc_reform/io_out/xmls.d | 4 +--- src/doc_reform/meta/metadoc.d | 10 +--------- src/doc_reform/meta/metadoc_from_src.d | 2 +- src/doc_reform/spine.d | 19 +++++++++---------- 13 files changed, 31 insertions(+), 41 deletions(-) (limited to 'src/doc_reform') diff --git a/src/doc_reform/io_in/paths_source.d b/src/doc_reform/io_in/paths_source.d index 85738d1..0cf0478 100644 --- a/src/doc_reform/io_in/paths_source.d +++ b/src/doc_reform/io_in/paths_source.d @@ -4,7 +4,8 @@ meta_config_files.d +/ module doc_reform.io_in.paths_source; -import std.array, +import + std.array, std.file, std.path, std.regex, diff --git a/src/doc_reform/io_out/create_zip_file.d b/src/doc_reform/io_out/create_zip_file.d index 0ad8ada..ea7e5f6 100644 --- a/src/doc_reform/io_out/create_zip_file.d +++ b/src/doc_reform/io_out/create_zip_file.d @@ -1,9 +1,10 @@ module doc_reform.io_out.create_zip_file; template createZipFile() { - import std.file; - import std.outbuffer; - import std.string; - import std.zip; + import + std.file, + std.outbuffer, + std.string, + std.zip; @safe void createZipFile( string zip_file_name, void[] compressed_zip_data, diff --git a/src/doc_reform/io_out/epub3.d b/src/doc_reform/io_out/epub3.d index 9d29968..14c328b 100644 --- a/src/doc_reform/io_out/epub3.d +++ b/src/doc_reform/io_out/epub3.d @@ -1,14 +1,13 @@ module doc_reform.io_out.epub3; template outputEPub3() { - import doc_reform.io_out; import - std.digest.sha, std.file, std.outbuffer, std.uri, std.zip, std.conv : to; import + doc_reform.io_out, doc_reform.io_out.create_zip_file, doc_reform.io_out.xmls, doc_reform.io_out.xmls_css; diff --git a/src/doc_reform/io_out/html.d b/src/doc_reform/io_out/html.d index ee530ca..6a15614 100644 --- a/src/doc_reform/io_out/html.d +++ b/src/doc_reform/io_out/html.d @@ -1,14 +1,12 @@ module doc_reform.io_out.html; template outputHTML() { - import doc_reform.io_out; import - std.digest.sha, std.file, std.outbuffer, std.uri, - std.zip, std.conv : to; import + doc_reform.io_out, doc_reform.io_out.create_zip_file, doc_reform.io_out.xmls, doc_reform.io_out.xmls_css; diff --git a/src/doc_reform/io_out/hub.d b/src/doc_reform/io_out/hub.d index e275348..548cceb 100644 --- a/src/doc_reform/io_out/hub.d +++ b/src/doc_reform/io_out/hub.d @@ -10,7 +10,6 @@ template outputHub() { doc_reform.io_out.odt, doc_reform.io_out.create_zip_file, doc_reform.io_out.paths_output; - import std.parallelism; @system void outputHub(D,I)( const D doc_abstraction, I doc_matters @@ -93,6 +92,7 @@ template outputHub() { Scheduled!()(schedule, doc_abstraction, doc_matters); } } else { + import std.parallelism; foreach(schedule; parallel(doc_matters.opt.action.output_task_scheduler)) { Scheduled!()(schedule, doc_abstraction, doc_matters); } diff --git a/src/doc_reform/io_out/latex.d b/src/doc_reform/io_out/latex.d index ff5b0df..8ec144b 100644 --- a/src/doc_reform/io_out/latex.d +++ b/src/doc_reform/io_out/latex.d @@ -1,12 +1,12 @@ module doc_reform.io_out.latex; template outputLaTeX() { - import doc_reform.io_out; import std.digest.sha, std.file, std.outbuffer, std.uri, std.conv : to; + import doc_reform.io_out; mixin InternalMarkup; // watch mixin spineRgxOut; static auto rgx = RgxO(); diff --git a/src/doc_reform/io_out/metadata.d b/src/doc_reform/io_out/metadata.d index 5dfdfe2..65f40b2 100644 --- a/src/doc_reform/io_out/metadata.d +++ b/src/doc_reform/io_out/metadata.d @@ -1,8 +1,9 @@ module doc_reform.io_out.metadata; template outputMetadata() { @safe void outputMetadata(T)( T doc_matters) { - import std.file; - import std.format; + import + std.file, + std.format; import doc_reform.io_out; mixin InternalMarkup; string[] metadata_; diff --git a/src/doc_reform/io_out/paths_output.d b/src/doc_reform/io_out/paths_output.d index f01f88b..83c9728 100644 --- a/src/doc_reform/io_out/paths_output.d +++ b/src/doc_reform/io_out/paths_output.d @@ -2,7 +2,8 @@ default settings +/ module doc_reform.io_out.paths_output; -import std.array, +import + std.array, std.path, std.regex, std.stdio; diff --git a/src/doc_reform/io_out/sqlite.d b/src/doc_reform/io_out/sqlite.d index d24fc00..1a30204 100644 --- a/src/doc_reform/io_out/sqlite.d +++ b/src/doc_reform/io_out/sqlite.d @@ -2,10 +2,10 @@ module doc_reform.io_out.sqlite; import doc_reform.io_out; import std.file, - std.uri, - std.conv : to; -import d2sqlite3; + std.uri; +import std.conv : to; import std.typecons : Nullable; +import d2sqlite3; mixin spineRgxOut; mixin InternalMarkup; static auto rgx = RgxO(); diff --git a/src/doc_reform/io_out/xmls.d b/src/doc_reform/io_out/xmls.d index b640d81..89180eb 100644 --- a/src/doc_reform/io_out/xmls.d +++ b/src/doc_reform/io_out/xmls.d @@ -1,14 +1,12 @@ module doc_reform.io_out.xmls; template outputXHTMLs() { - import doc_reform.io_out; import - std.digest.sha, std.file, std.outbuffer, std.uri, - std.zip, std.conv : to; import + doc_reform.io_out, doc_reform.io_out.create_zip_file, doc_reform.io_out.xmls, doc_reform.io_out.xmls_css; diff --git a/src/doc_reform/meta/metadoc.d b/src/doc_reform/meta/metadoc.d index 90fec4a..b0b4fdc 100644 --- a/src/doc_reform/meta/metadoc.d +++ b/src/doc_reform/meta/metadoc.d @@ -1,21 +1,13 @@ module doc_reform.meta.metadoc; template spineAbstraction() { import - std.datetime, - std.getopt, - std.file, - std.path, - std.process; + std.datetime; import doc_reform.meta, - doc_reform.meta.metadoc_harvest, - doc_reform.meta.metadoc_harvests_authors, - doc_reform.meta.metadoc_harvests_topics, doc_reform.meta.metadoc_from_src, doc_reform.meta.conf_make_meta_structs, doc_reform.meta.conf_make_meta_json, doc_reform.meta.defaults, - doc_reform.meta.doc_debugs, doc_reform.meta.rgx, doc_reform.io_in.paths_source, doc_reform.io_in.read_config_files, diff --git a/src/doc_reform/meta/metadoc_from_src.d b/src/doc_reform/meta/metadoc_from_src.d index 3ce25b5..b6438a0 100644 --- a/src/doc_reform/meta/metadoc_from_src.d +++ b/src/doc_reform/meta/metadoc_from_src.d @@ -6,7 +6,6 @@ module doc_reform.meta.metadoc_from_src; template docAbstraction() { /+ ↓ abstraction imports +/ - import doc_reform.meta; import std.algorithm, std.container, @@ -14,6 +13,7 @@ template docAbstraction() { std.json, std.path; import + doc_reform.meta, doc_reform.meta.defaults, doc_reform.meta.metadoc_object_setter, doc_reform.meta.rgx; diff --git a/src/doc_reform/spine.d b/src/doc_reform/spine.d index 67ee838..53161c7 100755 --- a/src/doc_reform/spine.d +++ b/src/doc_reform/spine.d @@ -51,17 +51,22 @@ +/ module doc_reform.sisu_document_parser; +/++ +name "spine" +description "A SiSU inspired document parser writen in D." +homepage "http://sisudoc.org" ++/ import - doc_reform.conf.compile_time_info, - doc_reform.meta.metadoc; -import + std.algorithm, std.datetime, std.getopt, std.file, std.path, std.process; import + doc_reform.conf.compile_time_info, doc_reform.meta, + doc_reform.meta.metadoc, doc_reform.meta.metadoc_harvest, doc_reform.meta.metadoc_harvests_authors, doc_reform.meta.metadoc_harvests_topics, @@ -75,17 +80,10 @@ import doc_reform.io_in.read_config_files, doc_reform.io_in.read_source_files, doc_reform.io_out.hub; -import std.algorithm; -import std.parallelism; mixin(import("version.txt")); mixin CompileTimeInfo; string project_name = "spine"; string program_name = "spine"; -/++ -name "spine" -description "A SiSU inspired document parser writen in D." -homepage "http://sisudoc.org" -+/ @system void main(string[] args) { mixin spineRgxIn; mixin contentJSONtoSpineStruct; @@ -724,6 +722,7 @@ homepage "http://sisudoc.org" if (_manifests.length > 1 // _manifests[0] initialized dummy element && _opt_action.abstraction) { if (_opt_action.parallelise) { // see else + import std.parallelism; foreach(manifest; parallel(_manifests[1..$])) { if (!empty(manifest.src.filename)) { scope(success) { -- cgit v1.2.3