modules, collective importsdoc-reform_v0.0.15

5 files changed, 76 insertions, 64 deletions

diff --git a/src/sdp/abstraction.d b/src/sdp/abstraction.d
index 40cf4d3..351fd1f 100644
--- a/src/sdp/abstraction.d
+++ b/src/sdp/abstraction.d
@@ -1,34 +1,9 @@
 module sdp.abstraction;
 template SiSUabstraction() {
   /+ sdp: sisu document parser, see http://sisudoc.org +/
-  import
-    sdp.abstraction_summary,
-    sdp.ao_abstract_doc_source,
-    sdp.ao_conf_make_meta,
-    sdp.ao_conf_make_meta_native,
-    sdp.ao_conf_make_meta_sdlang,
-    sdp.ao_defaults,
-    sdp.ao_doc_debugs,
-    sdp.ao_read_config_files,
-    sdp.ao_read_source_files,
-    sdp.ao_rgx,
-    sdp.output_hub,
-    sdp.paths_source;
-  /+ sdlang http://sdlang.org +/
-  import sdlang;
-  /+ std +/
-  private import
-    std.array,
-    std.exception,
-    std.getopt,
-    std.process,
-    std.stdio,
-    std.regex,
-    std.string,
-    std.traits,
-    std.typecons,
-    std.utf,
-    std.conv : to;
+  import sdp.imports_for_ao;
+  
+  
   mixin SiSUrgxInit;
   mixin SiSUregisters;
   mixin SiSUheaderExtractSDLang;
diff --git a/src/sdp/imports_for_ao.d b/src/sdp/imports_for_ao.d
new file mode 100644
index 0000000..34aa1e1
--- /dev/null
+++ b/src/sdp/imports_for_ao.d
@@ -0,0 +1,41 @@
+module sdp.imports_for_ao;
+public import
+  sdp.abstraction_summary,
+  sdp.ao_abstract_doc_source,
+  sdp.ao_conf_make_meta,
+  sdp.ao_conf_make_meta_native,
+  sdp.ao_conf_make_meta_sdlang,
+  sdp.ao_defaults,
+  sdp.ao_doc_debugs,
+  sdp.ao_read_config_files,
+  sdp.ao_read_source_files,
+  sdp.ao_rgx,
+  sdp.output_hub,
+  sdp.paths_source;
+/+ sdlang http://sdlang.org +/
+public import sdlang;
+/+ aarchive https://github.com/rcythr/archive +/
+public import
+  archive.core,
+  archive.zip;
+/+ std +/
+public import
+  // std.algorithm,
+  std.array,
+  // std.container,
+  std.digest.sha,
+  std.exception,
+  std.getopt,
+  std.process,
+  std.stdio,
+  // std.file,
+  // std.path,
+  std.range,
+  // std.range,
+  std.regex,
+  std.string,
+  std.traits,
+  std.typecons,
+  std.uni,
+  std.utf,
+  std.conv : to;
diff --git a/src/sdp/imports_for_output.d b/src/sdp/imports_for_output.d
new file mode 100644
index 0000000..20b3ba1
--- /dev/null
+++ b/src/sdp/imports_for_output.d
@@ -0,0 +1,28 @@
+module sdp.imports_for_output;
+public import
+  std.regex,
+  std.algorithm,
+  std.array,
+  std.container,
+  std.exception,
+  std.getopt,
+  std.process,
+  std.stdio,
+  std.file,
+  std.path,
+  std.range,
+  std.regex,
+  std.string,
+  std.traits,
+  std.typecons,
+  std.uni,
+  std.utf;
+public import
+  sdp.defaults,
+  sdp.output_epub3,
+  sdp.output_html,
+  sdp.output_rgx,
+  sdp.output_xmls,
+  sdp.source_sisupod,
+  sdp.create_zip_file,
+  sdp.paths_output;
diff --git a/src/sdp/output_hub.d b/src/sdp/output_hub.d
index ef8156c..0ed1653 100644
--- a/src/sdp/output_hub.d
+++ b/src/sdp/output_hub.d
@@ -23,14 +23,7 @@ template outputHub() {
     std.uni,
     std.utf;
   import
-    sdp.defaults,
-    sdp.output_epub3,
-    sdp.output_html,
-    sdp.output_rgx,
-    sdp.output_xmls,
-    sdp.source_sisupod,
-    sdp.create_zip_file,
-    sdp.paths_output;
+    sdp.imports_for_output;
   void outputHub(D,I)(D doc_abstraction, I doc_matters) {
     mixin SiSUoutputRgxInit;
     auto rgx = Rgx();
diff --git a/src/sisu_d_parser.d b/src/sisu_d_parser.d
index 87b25e9..96e1359 100755
--- a/src/sisu_d_parser.d
+++ b/src/sisu_d_parser.d
@@ -6,34 +6,9 @@ import
   sdp.compile_time_info,
   sdp.abstraction;
 /+ sdp: sisu document parser, see http://sisudoc.org +/
-import
-  sdp.abstraction_summary,
-  sdp.ao_abstract_doc_source,
-  sdp.ao_conf_make_meta,
-  sdp.ao_conf_make_meta_native,
-  sdp.ao_conf_make_meta_sdlang,
-  sdp.ao_defaults,
-  sdp.ao_doc_debugs,
-  sdp.ao_read_config_files,
-  sdp.ao_read_source_files,
-  sdp.ao_rgx,
-  sdp.output_hub,
-  sdp.paths_source;
-/+ sdlang http://sdlang.org +/
-import sdlang;
-/+ std +/
-private import
-  std.array,
-  std.exception,
-  std.getopt,
-  std.process,
-  std.stdio,
-  std.regex,
-  std.string,
-  std.traits,
-  std.typecons,
-  std.utf,
-  std.conv : to;
+import sdp.imports_for_ao;
+
+
 
 mixin(import("version.txt"));
 mixin CompileTimeInfo;