Merge pull request #2102 from wilzbach/better-error-ddoc

andralex · web-flow · commit b6635f26e546 · 2018-01-18T21:48:57.000-05:00
Use a better error message for the Ddoc preprocessor
diff --git a/ddoc_preprocessor.d b/ddoc_preprocessor.d
@@ -123,9 +123,14 @@ auto parseToc(string text)
     {
         auto entry = TocEntry(id, name);
         if (isH2)
+        {
             toc ~= TocTopEntry(entry, null);
+        }
         else
+        {
+            assert(toc.length > 0, "TOC generation error: $(H2) needs to come before $(H3)");
             toc.back.children ~= entry;
+        }
     }
     while (!text.empty)
     {
diff --git a/posix.mak b/posix.mak
@@ -970,7 +970,7 @@ $G/contributors_list.ddoc:  | $(STABLE_RDMD) $(TOOLS_DIR) $(INSTALLER_DIR)
 ################################################################################
 
 $(DDOC_BIN): ddoc_preprocessor.d | $(STABLE_DMD)
-	$(STABLE_DMD) -of$@ $<
+	$(STABLE_DMD) -g -of$@ $<
 
 ################################################################################
 # Build and render the DMD man page

Original file line number	Diff line number	Diff line change
`@@ -123,9 +123,14 @@ auto parseToc(string text)`
`123`	`123`	`{`
`124`	`124`	`auto entry = TocEntry(id, name);`
`125`	`125`	`if (isH2)`
	`126`	`+ {`
`126`	`127`	`toc ~= TocTopEntry(entry, null);`
	`128`	`+ }`
`127`	`129`	`else`
	`130`	`+ {`
	`131`	`+ assert(toc.length > 0, "TOC generation error: $(H2) needs to come before $(H3)");`
`128`	`132`	`toc.back.children ~= entry;`
	`133`	`+ }`
`129`	`134`	`}`
`130`	`135`	`while (!text.empty)`
`131`	`136`	`{`