Fix totality, unicode, examples, paragraph parsing

Also simplify specs and parsers while we're at it. Some parsers were
made more generic.

This commit is a part of GHC pre-merge squash, email
fuuzetsu@fuuzetsu.co.uk if you need the full commit history.

1 files changed, 90 insertions, 174 deletions

diff --git a/html-test/ref/Test.html b/html-test/ref/Test.html
index 9a25f960..2a3ae350 100644
--- a/html-test/ref/Test.html
+++ b/html-test/ref/Test.html
@@ -151,8 +151,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><a href=""
 	      >visible</a
 	      ></code
-	    >.
-</p
+	    >.</p
 	  ></div
 	></div
       ><div id="synopsis"
@@ -678,8 +677,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    >This comment applies to the <em
 	      >following</em
 	      > declaration
- and it continues until the next non-comment line
-</p
+ and it continues until the next non-comment line</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -702,8 +700,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >A</a
 		      ></code
-		    > constructor
-</p
+		    > constructor</p
 		  ></td
 		></tr
 	      ><tr
@@ -725,8 +722,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >B</a
 		      ></code
-		    > constructor
-</p
+		    > constructor</p
 		  ></td
 		></tr
 	      ></table
@@ -741,8 +737,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    > a b </p
 	  ><div class="doc"
 	  ><p
-	    >An abstract data declaration
-</p
+	    >An abstract data declaration</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -754,8 +749,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    > a b </p
 	  ><div class="doc"
 	  ><p
-	    >A data declaration with no documentation annotations on the constructors
-</p
+	    >A data declaration with no documentation annotations on the constructors</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -832,8 +826,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >A3</a
 		      ></code
-		    >
-</p
+		    ></p
 		  ></td
 		></tr
 	      ><tr
@@ -847,8 +840,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >B3</a
 		      ></code
-		    >
-</p
+		    ></p
 		  ></td
 		></tr
 	      ></table
@@ -863,8 +855,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    >  </p
 	  ><div class="doc"
 	  ><p
-	    >Testing alternative comment styles
-</p
+	    >Testing alternative comment styles</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -881,8 +872,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >A4</a
 		      ></code
-		    >
-</p
+		    ></p
 		  ></td
 		></tr
 	      ><tr
@@ -896,8 +886,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >B4</a
 		      ></code
-		    >
-</p
+		    ></p
 		  ></td
 		></tr
 	      ><tr
@@ -911,8 +900,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >C4</a
 		      ></code
-		    >
-</p
+		    ></p
 		  ></td
 		></tr
 	      ></table
@@ -927,8 +915,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    > a </p
 	  ><div class="doc"
 	  ><p
-	    >A newtype
-</p
+	    >A newtype</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -954,8 +941,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    > a b </p
 	  ><div class="doc"
 	  ><p
-	    >A newtype with a fieldname
-</p
+	    >A newtype with a fieldname</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -999,8 +985,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    > a b </p
 	  ><div class="doc"
 	  ><p
-	    >A newtype with a fieldname, documentation on the field
-</p
+	    >A newtype with a fieldname, documentation on the field</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -1030,8 +1015,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			  ><a href=""
 			    >n3</a
 			    ></code
-			  > field
-</p
+			  > field</p
 			></dd
 		      ></dl
 		    ><div class="clear"
@@ -1052,8 +1036,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><div class="doc"
 	  ><p
 	    >An abstract newtype - we show this one as data rather than newtype because
- the difference isn't visible to the programmer for an abstract type.
-</p
+ the difference isn't visible to the programmer for an abstract type.</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -1087,8 +1070,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			> :: a b</dt
 		      ><dd class="doc"
 		      ><p
-			>no docs on the datatype or the constructor
-</p
+			>no docs on the datatype or the constructor</p
 			></dd
 		      ></dl
 		    ><div class="clear"
@@ -1117,8 +1099,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		  ></td
 		><td class="doc"
 		><p
-		  >docs on the constructor only
-</p
+		  >docs on the constructor only</p
 		  ></td
 		></tr
 	      ><tr
@@ -1151,8 +1132,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    > a b </p
 	  ><div class="doc"
 	  ><p
-	    >docs on the newtype and the constructor
-</p
+	    >docs on the newtype and the constructor</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -1169,8 +1149,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >N7</a
 		      ></code
-		    > constructor
-</p
+		    > constructor</p
 		  ></td
 		></tr
 	      ><tr
@@ -1226,8 +1205,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	      ><a href=""
 		>s</a
 		></code
-	      >.
-</p
+	      >.</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -1244,8 +1222,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >C1</a
 		      ></code
-		    > record constructor, with the following fields:
-</p
+		    > record constructor, with the following fields:</p
 		  ></td
 		></tr
 	      ><tr
@@ -1266,8 +1243,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			  ><a href=""
 			    >p</a
 			    ></code
-			  > field
-</p
+			  > field</p
 			></dd
 		      ><dt class="src"
 		      ><a name="v:q" class="def"
@@ -1281,8 +1257,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			  ><a href=""
 			    >q</a
 			    ></code
-			  > field
-</p
+			  > field</p
 			></dd
 		      ><dt class="src"
 		      ><a name="v:r" class="def"
@@ -1300,8 +1275,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			  ><a href=""
 			    >s</a
 			    ></code
-			  >
-</p
+			  ></p
 			></dd
 		      ><dt class="src"
 		      ><a name="v:s" class="def"
@@ -1319,8 +1293,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			  ><a href=""
 			    >s</a
 			    ></code
-			  >
-</p
+			  ></p
 			></dd
 		      ></dl
 		    ><div class="clear"
@@ -1339,8 +1312,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >C2</a
 		      ></code
-		    > record constructor, also with some fields:
-</p
+		    > record constructor, also with some fields:</p
 		  ></td
 		></tr
 	      ><tr
@@ -1409,8 +1381,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    >  </p
 	  ><div class="doc"
 	  ><p
-	    >Testing different record commenting styles
-</p
+	    >Testing different record commenting styles</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -1427,8 +1398,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><a href=""
 		      >C3</a
 		      ></code
-		    > record constructor
-</p
+		    > record constructor</p
 		  ></td
 		></tr
 	      ><tr
@@ -1449,8 +1419,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			  ><a href=""
 			    >s1</a
 			    ></code
-			  > record selector
-</p
+			  > record selector</p
 			></dd
 		      ><dt class="src"
 		      ><a name="v:s2" class="def"
@@ -1464,8 +1433,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			  ><a href=""
 			    >s2</a
 			    ></code
-			  > record selector
-</p
+			  > record selector</p
 			></dd
 		      ><dt class="src"
 		      ><a name="v:s3" class="def"
@@ -1479,8 +1447,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			  ><a href=""
 			    >s3</a
 			    ></code
-			  > record selector
-</p
+			  > record selector</p
 			></dd
 		      ></dl
 		    ><div class="clear"
@@ -1493,8 +1460,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ></div
 	><div class="doc"
 	><p
-	  >test that we can export record selectors on their own:
-</p
+	  >test that we can export record selectors on their own:</p
 	  ></div
 	><h1 id="g:4"
 	>Class declarations</h1
@@ -1517,8 +1483,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	      ><a href=""
 		>C</a
 		></code
-	      > class)
-</p
+	      > class)</p
 	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
@@ -1535,8 +1500,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><a href=""
 		  >a</a
 		  ></code
-		> method
-</p
+		> method</p
 	      ></div
 	    ><p class="src"
 	    ><a name="v:b" class="def"
@@ -1548,8 +1512,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><a href=""
 		  >b</a
 		  ></code
-		> method
-</p
+		> method</p
 	      ></div
 	    ></div
 	  ></div
@@ -1564,8 +1527,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ></p
 	  ><div class="doc"
 	  ><p
-	    >This is a class declaration with no separate docs for the methods
-</p
+	    >This is a class declaration with no separate docs for the methods</p
 	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
@@ -1619,8 +1581,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    > a </p
 	  ><div class="doc"
 	  ><p
-	    >This is a class declaration with no methods (or no methods exported)
-</p
+	    >This is a class declaration with no methods (or no methods exported)</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -1643,8 +1604,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ></div
 	><div class="doc"
 	><p
-	  >Test that we can export a class method on its own:
-</p
+	  >Test that we can export a class method on its own:</p
 	  ></div
 	><h1 id="g:5"
 	>Function types</h1
@@ -1669,39 +1629,37 @@ using double quotes: <a href=""
 	      >Foo</a
 	      >.  We can add emphasis <em
 	      >like this</em
-	      >.
-</p
+	      >.</p
 	    ><ul
 	    ><li
-	      > This is a bulleted list
+	      >This is a bulleted list
 </li
 	      ><li
-	      > This is the next item (different kind of bullet)
+	      >This is the next item (different kind of bullet)
 </li
 	      ></ul
 	    ><ol
 	    ><li
-	      > This is an ordered list
+	      >This is an ordered list
 </li
 	      ><li
-	      > This is the next item (different kind of bullet)
+	      >This is the next item (different kind of bullet)
 </li
 	      ></ol
 	    ><dl
 	    ><dt
 	      >cat</dt
 	      ><dd
-	      > a small, furry, domesticated mammal
+	      >a small, furry, domesticated mammal
 </dd
 	      ><dt
 	      >pineapple</dt
 	      ><dd
-	      > a fruit grown in the tropics
+	      >a fruit grown in the tropics
 </dd
 	      ></dl
 	    ><pre
-	    >
-     This is a block of code, which can include other markup: <code
+	    >     This is a block of code, which can include other markup: <code
 	      ><a href=""
 		>R</a
 		></code
@@ -1711,13 +1669,11 @@ using double quotes: <a href=""
                  significant
 </pre
 	    ><pre
-	    > this is another block of code
-</pre
+	    > this is another block of code</pre
 	    ><p
 	    >We can also include URLs in documentation: <a href=""
 	      >http://www.haskell.org/</a
-	      >.
-</p
+	      >.</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -1731,8 +1687,7 @@ using double quotes: <a href=""
 	    > CInt</p
 	  ><div class="doc"
 	  ><p
-	    >we can export foreign declarations too
-</p
+	    >we can export foreign declarations too</p
 	    ></div
 	  ></div
 	><h1 id="g:6"
@@ -1741,15 +1696,13 @@ using double quotes: <a href=""
 	><p
 	  >This is some documentation that is attached to a name ($aux1)
  rather than a source declaration.  The documentation may be
- referred to in the export list using its name.
-</p
+ referred to in the export list using its name.</p
 	  ><pre
 	  > code block in named doc</pre
 	  ></div
 	><div class="doc"
 	><p
-	  >This is some documentation that is attached to a name ($aux2)
-</p
+	  >This is some documentation that is attached to a name ($aux2)</p
 	  ></div
 	><div class="doc"
 	><pre
@@ -1761,19 +1714,16 @@ using double quotes: <a href=""
 	  ></div
 	><div class="doc"
 	><p
-	  >a nested, named doc comment
-</p
+	  >a nested, named doc comment</p
 	  ><p
-	  >with a paragraph,
-</p
+	  >with a paragraph,</p
 	  ><pre
 	  > and a code block</pre
 	  ></div
 	><div class="doc"
 	><pre
 	  >test
-test1
-</pre
+test1</pre
 	  ><pre
 	  > test2
   test3
@@ -1781,70 +1731,57 @@ test1
 	  ></div
 	><div class="doc"
 	><pre
-	  >
-test1
+	  >test1
 test2
 </pre
 	  ></div
 	><div class="doc"
 	><pre
 	  >test3
-test4
-</pre
+test4</pre
 	  ></div
 	><div class="doc"
 	><pre
-	  >
-test1
+	  >test1
 test2
 </pre
 	  ><pre
 	  >test3
-test4
-</pre
+test4</pre
 	  ></div
 	><div class="doc"
 	><pre
 	  >test3
-test4
-</pre
+test4</pre
 	  ><pre
-	  >
-test1
+	  >test1
 test2
 </pre
 	  ></div
 	><div class="doc"
 	><p
-	  >aux11:
-</p
+	  >aux11:</p
 	  ><pre
 	  >test3
-test4
-</pre
+test4</pre
 	  ><pre
-	  >
-test1
+	  >test1
 test2
 </pre
 	  ></div
 	><div class="doc"
 	><pre
-	  > foo
-</pre
+	  > foo</pre
 	  ><pre
-	  > bar
-</pre
+	  > bar</pre
 	  ></div
 	><div class="doc"
 	><p
-	  >This is some inline documentation in the export list
-</p
+	  >This is some inline documentation in the export list</p
 	  ><pre
 	  > a code block using bird-tracks
  each line must begin with &gt; (which isn't significant unless it
- is at the beginning of the line).
-</pre
+ is at the beginning of the line).</pre
 	  ></div
 	><h1 id="g:7"
 	>A hidden module</h1
@@ -1868,8 +1805,7 @@ test2
 	  ></div
 	><div class="doc"
 	><p
-	  >nested-style doc comments 
-</p
+	  >nested-style doc comments </p
 	  ></div
 	><h1 id="g:9"
 	>Existential / Universal types</h1
@@ -1882,8 +1818,7 @@ test2
 	    > a </p
 	  ><div class="doc"
 	  ><p
-	    >A data-type using existential/universal types
-</p
+	    >A data-type using existential/universal types</p
 	    ></div
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -1958,8 +1893,7 @@ test2
 		    ><a href=""
 		      >T</a
 		      ></code
-		    >
-</p
+		    ></p
 		  ></td
 		></tr
 	      ><tr
@@ -1973,8 +1907,7 @@ test2
 		  ></td
 		><td class="doc"
 		><p
-		  >This argument has type 'T2 Int Int'
-</p
+		  >This argument has type 'T2 Int Int'</p
 		  ></td
 		></tr
 	      ><tr
@@ -1996,8 +1929,7 @@ test2
 		><p
 		  >This argument has type <code
 		    >T3 Bool Bool -&gt; T4 Float Float</code
-		    >
-</p
+		    ></p
 		  ></td
 		></tr
 	      ><tr
@@ -2009,8 +1941,7 @@ test2
 		><p
 		  >This argument has a very long description that should
  hopefully cause some wrapping to happen when it is finally
- rendered by Haddock in the generated HTML page.
-</p
+ rendered by Haddock in the generated HTML page.</p
 		  ></td
 		></tr
 	      ><tr
@@ -2020,16 +1951,14 @@ test2
 		  > ()</td
 		><td class="doc"
 		><p
-		  >This is the result type
-</p
+		  >This is the result type</p
 		  ></td
 		></tr
 	      ></table
 	    ></div
 	  ><div class="doc"
 	  ><p
-	    >This is a function with documentation for each argument
-</p
+	    >This is a function with documentation for each argument</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -2052,8 +1981,7 @@ test2
 		  >)</td
 		><td class="doc"
 		><p
-		  >takes a triple
-</p
+		  >takes a triple</p
 		  ></td
 		></tr
 	      ><tr
@@ -2067,8 +1995,7 @@ test2
 		    ><a href=""
 		      >Int</a
 		      ></code
-		    >
-</p
+		    ></p
 		  ></td
 		></tr
 	      ></table
@@ -2098,8 +2025,7 @@ test2
 		  > ()</td
 		><td class="doc"
 		><p
-		  >one of the arguments
-</p
+		  >one of the arguments</p
 		  ></td
 		></tr
 	      ><tr
@@ -2111,16 +2037,14 @@ test2
 		  ></td
 		><td class="doc"
 		><p
-		  >and the return value
-</p
+		  >and the return value</p
 		  ></td
 		></tr
 	      ></table
 	    ></div
 	  ><div class="doc"
 	  ><p
-	    >This function has some arg docs
-</p
+	    >This function has some arg docs</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -2139,8 +2063,7 @@ test2
 		  ></td
 		><td class="doc"
 		><p
-		  >The input float
-</p
+		  >The input float</p
 		  ></td
 		></tr
 	      ><tr
@@ -2152,16 +2075,14 @@ test2
 		  ></td
 		><td class="doc"
 		><p
-		  >The output float
-</p
+		  >The output float</p
 		  ></td
 		></tr
 	      ></table
 	    ></div
 	  ><div class="doc"
 	  ><p
-	    >A foreign import with argument docs
-</p
+	    >A foreign import with argument docs</p
 	    ></div
 	  ></div
 	><h1 id="g:11"
@@ -2170,13 +2091,11 @@ test2
 	>A subsection</h2
 	><div class="doc"
 	><pre
-	  > a literal line
-</pre
+	  > a literal line</pre
 	  ><p
 	  >$ a non <em
 	    >literal</em
-	    > line $
-</p
+	    > line $</p
 	  ></div
 	><div class="top"
 	><p class="src"
@@ -2192,8 +2111,7 @@ test2
 		>f'</a
 		></code
 	      >
- but f' doesn't get link'd 'f\''
-</p
+ but f' doesn't get link'd 'f\''</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -2205,8 +2123,7 @@ test2
 	    ></p
 	  ><div class="doc"
 	  ><p
-	    >Comment on a definition with type signature
-</p
+	    >Comment on a definition with type signature</p
 	    ></div
 	  ></div
 	><div class="top"
@@ -2216,8 +2133,7 @@ test2
 	    > ::  t</p
 	  ><div class="doc"
 	  ><p
-	    >Comment on a definition without type signature
-</p
+	    >Comment on a definition without type signature</p
 	    ></div
 	  ></div
 	></div