Use assert_writeln_magic in dpl-docs

Author: wilzbach

ddoc/.gitignore

@@ -1,3 +1,4 @@
 /libddoc_preprocessor.a
 /ddoc_preprocessor
 /ddoc_preprocessor-test-application
+/ddoc_preprocessor-test-library

ddoc/dub.sdl

@@ -1,4 +1,9 @@
 name "ddoc_preprocessor"
 description "Preprocesses source code before running Ddoc over it"
 dependency "libdparse" version="0.7.2-alpha.4"
-targetType "executable"
+configuration "executable" {
+	versions "IsExecutable"
+	targetType "executable"
+}
+configuration "library" {
+}

ddoc/source/assert_writeln_magic.d

@@ -192,15 +192,32 @@ void parseString(Visitor)(ubyte[] sourceCode, Visitor visitor)
     visitor.visit(m);
 }
 
-auto assertWriteln(string fileText)
+private auto assertWritelnModuleImpl(string fileText)
 {
     import std.string : representation;
     auto fl = FileLines(fileText);
     auto visitor = new TestVisitor!(typeof(fl))(fl);
     // libdparse doesn't allow to work on immutable source code
     parseString(cast(ubyte[]) fileText.representation, visitor);
     delete visitor;
-    return fl.buildLines;
+    return fl;
+}
+
+auto assertWritelnModule(string fileText)
+{
+    return assertWritelnModuleImpl(fileText).buildLines;
+}
+auto assertWritelnBlock(string fileText)
+{
+    auto source = "unittest{\n" ~ fileText ~ "}\n";
+    auto fl = assertWritelnModuleImpl(source);
+    auto app = appender!string;
+    foreach (line; fl.lines[1 .. $ - 2])
+    {
+        app ~= line;
+        app ~= "\n";
+    }
+    return app.data;
 }
 
 /**

ddoc/source/preprocessor.d

@@ -28,7 +28,7 @@ struct Config
 }
 Config config;
 
-version(unittest) {} else
+version(IsExecutable)
 int main(string[] rootArgs)
 {
     import assert_writeln_magic;
@@ -64,7 +64,7 @@ All unknown options are passed to the compiler.
     text = genSwitches(text);
 
     if (inputFile.endsWith(".d"))
-        text = assertWriteln(text);
+        text = assertWritelnModule(text);
 
     // inject custom, "dynamic" macros
     if (inputFile.endsWith(".dd", "index.d"))

dpl-docs/dub.json

@@ -1,7 +1,10 @@
 {
 	"name": "dpl-docs",
 	"dependencies": {
-		"ddox": "~>0.16.7"
+		"ddox": "~>0.16.7",
+		"ddoc_preprocessor": {
+		  "path": "../ddoc"
+		}
 	},
 	"versions": ["VibeNoSSL"],
 	"subConfigurations": { "eventcore": "libasync"}

dpl-docs/source/ddox_main.d

@@ -226,7 +226,9 @@ int cmdFilterDocs(string[] args)
 					if (last_decl["comment"].opt!string.empty) {
 						writefln("Warning: Cannot add documented unit test %s to %s, which is not documented.", name, last_decl["name"].opt!string);
 					} else {
-						last_decl["comment"] ~= format("Example:\n%s$(DDOX_UNITTEST_HEADER %s)\n---\n%s\n---\n$(DDOX_UNITTEST_FOOTER %s)\n", comment.strip, name, source, name);
+					    import assert_writeln_magic;
+                        auto rewrittenSource = assertWritelnBlock(source);
+                        last_decl["comment"] ~= format("Example:\n%s$(DDOX_UNITTEST_HEADER %s)\n---\n%s\n---\n$(DDOX_UNITTEST_FOOTER %s)\n", comment.strip, name, rewrittenSource, name);
 					}
 				} catch (Exception e) {
 					writefln("Failed to add documented unit test %s:%s as example: %s",

posix.mak

@@ -858,7 +858,7 @@ test_dspec: dspec_tester.d $(DMD) $(PHOBOS_LIB)
 	$(DMD) -run $< --compiler=$(DMD)
 
 .PHONY:
-test: $test_dspec test/next_version.sh all | $(STABLE_DMD)
+test: test_dspec test/next_version.sh all | $(STABLE_DMD) $(DUB)
 	@echo "Searching for trailing whitespace"
 	@grep -n '[[:blank:]]$$' $$(find . -type f -name "*.dd" | grep -v .generated) ; test $$? -eq 1
 	@echo "Searching for tabs"
@@ -867,7 +867,7 @@ test: $test_dspec test/next_version.sh all | $(STABLE_DMD)
 	$(STABLE_RDMD) -main -unittest check_ddoc.d
 	$(STABLE_RDMD) check_ddoc.d $$(find $W -type f -name "*.html" -not -path "$W/phobos/*")
 	@echo "Executing ddoc_preprocessor tests"
-	dub -C ddoc test
+	$(DUB) test --compiler=${STABLE_DMD} --root ddoc
 	@echo "Executing next_version tests"
 	test/next_version.sh