debugs template

2 files changed, 41 insertions, 19 deletions

diff --git a/org/ao_output_debugs.org b/org/ao_output_debugs.org
index 145a7a5..fe20f17 100644
--- a/org/ao_output_debugs.org
+++ b/org/ao_output_debugs.org
@@ -21,19 +21,18 @@
 /++
   output debugs
 +/
-template SiSUoutputDebugs() {
-  struct SDPoutputDebugs {
-    auto abstract_doc_source_debugs(S,T)(
-      auto ref const S         contents,
-      auto ref T               doc_matters,
-    ) {
-      mixin SiSUrgxInit;
-      mixin InternalMarkup;
-      <<initialize>>
-      <<book_index_sorted_report>>
-      <<ao_output_debugs>>
-        <<ao_output_debugs_summary>>
-      }
+template SiSUdebugs() {
+  <<debug_imports>>
+  auto SiSUdebugs(S,T)(
+    auto ref const S         contents,
+    auto ref T               doc_matters,
+  ) {
+    mixin SiSUrgxInit;
+    mixin InternalMarkup;
+    <<initialize>>
+    <<book_index_sorted_report>>
+    <<ao_output_debugs>>
+      <<ao_output_debugs_summary>>
     }
   }
 }
@@ -42,6 +41,34 @@ template SiSUoutputDebugs() {
 * 1. output debugs                                             :debug:output:
 [[./sdp.org][sdp]]  [[./][org/]]
 
+** imports
+
+#+name: debug_imports
+#+BEGIN_SRC d
+import
+  ao_defaults,
+  ao_rgx;
+private import
+  std.algorithm,
+  std.array,
+  std.container,
+  std.exception,
+  std.getopt,
+  std.json,
+  std.process,
+  std.stdio,
+  std.file,
+  std.path,
+  std.range,
+  std.regex,
+  std.string,
+  std.traits,
+  std.typecons,
+  std.uni,
+  std.utf,
+  std.conv : to;
+#+END_SRC
+
 ** initialize                                                        :report:
 
 #+name: initialize
diff --git a/org/sdp.org b/org/sdp.org
index 16a0ecc..facd2a3 100644
--- a/org/sdp.org
+++ b/org/sdp.org
@@ -193,7 +193,6 @@ mixin SiSUrgxInitFlags;
 mixin SiSUconfigSDLangHub;
 mixin SiSUmarkupRaw;
 mixin SiSUdocAbstraction;
-mixin SiSUoutputDebugs;
 mixin outputHub;
 #+END_SRC
 
@@ -204,7 +203,6 @@ mixin outputHub;
 auto raw = MarkupRaw();
 auto head = SiSUheaderExtractHub();
 auto abs = SiSUdocAbstraction();
-auto dbg = SDPoutputDebugs();
 /+
 struct DocumentParts {
   string[string][] contents;
@@ -477,10 +475,7 @@ auto doc_matters = DocumentMatters();
 #+BEGIN_SRC d
 /+ ↓ debugs +/
 debug(checkdoc) {
-  dbg.abstract_doc_source_debugs(
-    doc_abstraction,
-    doc_matters,
-  );
+  SiSUdebugs!()(doc_abstraction, doc_matters);
 }
 #+END_SRC