From 2448bd71609688be7b8bfe362a8534959531cd79 Mon Sep 17 00:00:00 2001 From: Simon Hengel Date: Sun, 8 Sep 2013 10:33:38 +0200 Subject: 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. --- html-test/ref/Test.html | 264 +++++++++++++++++------------------------------- 1 file changed, 90 insertions(+), 174 deletions(-) (limited to 'html-test/ref/Test.html') 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");}; >visible. -

.

This comment applies to the following declaration - and it continues until the next non-comment line -

A constructor -

constructor

B constructor -

constructor

a b

An abstract data declaration -

An abstract data declaration

a b

A data declaration with no documentation annotations on the constructors -

A data declaration with no documentation annotations on the constructors

A3 -

B3 -

Testing alternative comment styles -

Testing alternative comment styles

A4 -

B4 -

C4 -

a

A newtype -

A newtype

a b

A newtype with a fieldname -

A newtype with a fieldname

a b

A newtype with a fieldname, documentation on the field -

A newtype with a fieldname, documentation on the field

n3 field -

field

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. -

:: a b

no docs on the datatype or the constructor -

no docs on the datatype or the constructor

docs on the constructor only -

docs on the constructor only

a b

docs on the newtype and the constructor -

docs on the newtype and the constructor

N7 constructor -

constructor

s. -

.

C1 record constructor, with the following fields: -

record constructor, with the following fields:

p field -

field

q field -

field

s -

s -

C2 record constructor, also with some fields: -

record constructor, also with some fields:

Testing different record commenting styles -

Testing different record commenting styles

C3 record constructor -

record constructor

s1 record selector -

record selector

s2 record selector -

record selector

s3 record selector -

record selector

test that we can export record selectors on their own: -

test that we can export record selectors on their own:

Class declarations

C class) -

class)

a method -

method

b method -

method

This is a class declaration with no separate docs for the methods -

This is a class declaration with no separate docs for the methods

a

This is a class declaration with no methods (or no methods exported) -

This is a class declaration with no methods (or no methods exported)

Test that we can export a class method on its own: -

Test that we can export a class method on its own:

Function types

Foo. We can add emphasis like this. -

.

  • This is a bulleted list + >This is a bulleted list
  • This is the next item (different kind of bullet) + >This is the next item (different kind of bullet)
  1. This is an ordered list + >This is an ordered list
  2. This is the next item (different kind of bullet) + >This is the next item (different kind of bullet)
cat
a small, furry, domesticated mammal + >a small, furry, domesticated mammal
pineapple
a fruit grown in the tropics + >a fruit grown in the tropics 
-     This is a block of code, which can include other markup:      This is a block of code, which can include other markup: R
 this is another block of code
-
 this is another block of code

We can also include URLs in documentation: http://www.haskell.org/. -

.

CInt

we can export foreign declarations too -

we can export foreign declarations too

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. -

 code block in named doc

This is some documentation that is attached to a name ($aux2) -

This is some documentation that is attached to a name ($aux2)

a nested, named doc comment
-
a nested, named doc comment
with a paragraph,
-
with a paragraph,
 and a code block
test
-test1
-
 test2
   test3
@@ -1781,70 +1731,57 @@ test1
 	  >
-test1
+	  >test1
 test2
 
test3
-test4
-
-test1
+	  >test1
 test2
 
test3
-test4
-
test3
-test4
-
-test1
+	  >test1
 test2
 
aux11:
-
aux11:
test3
-test4
-
-test1
+	  >test1
 test2
 
 foo
-
 foo
 bar
-
 bar
This is some inline documentation in the export list
-
This is some inline documentation in the export list
 a code block using bird-tracks
  each line must begin with > (which isn't significant unless it
- is at the beginning of the line).
-
A hidden module
nested-style doc comments 
-
nested-style doc comments 
Existential / Universal types
 a 
A data-type using existential/universal types
-
A data-type using existential/universal types
T
-
This argument has type 'T2 Int Int'
-
This argument has type 'T2 Int Int'
This argument has type T3 Bool Bool -> T4 Float Float
-
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.
-
 ()
This is the result type
-
This is the result type
This is a function with documentation for each argument
-
This is a function with documentation for each argument
)
takes a triple
-
takes a triple
Int
-
 ()
one of the arguments
-
one of the arguments
and the return value
-
and the return value
This function has some arg docs
-
This function has some arg docs
The input float
-
The input float
The output float
-
The output float
A foreign import with argument docs
-
A foreign import with argument docs
A subsection
 a literal line
-
 a literal line
$ a non literal line $
-
 line $
f'
- but f' doesn't get link'd 'f\''
-
Comment on a definition with type signature
-
Comment on a definition with type signature
 ::  t
Comment on a definition without type signature
-
Comment on a definition without type signature