Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

4 changed files:

Changes:

  • utils/haddock/haddock-api/src/Haddock/Interface/LexParseRn.hs
    ... ... @@ -155,6 +155,7 @@ rename sDocContext renamer = rn
    155 155
                   | otherwise = isTermVarOrFieldNameSpace
    
    156 156
                 typeNsChoices
    
    157 157
                   | isDataOcc occ = isTcClsNameSpace
    
    158
    +              | isSymOcc occ = isTcClsNameSpace
    
    158 159
                   | otherwise = isTvNameSpace
    
    159 160
             -- Generate the choices for the possible kind of thing this
    
    160 161
             -- is. We narrow down the possibilities with the namespace (if
    

  • utils/haddock/html-test/ref/PatternSyns.html
    ... ... @@ -308,8 +308,10 @@
    308 308
     	    ></p
    
    309 309
     	  ><div class="doc"
    
    310 310
     	  ><p
    
    311
    -	    >Doc for (<code class="inline-code"
    
    312
    -	      >&gt;&lt;</code
    
    311
    +	    >Doc for (<code
    
    312
    +	      ><a href="#" title="PatternSyns"
    
    313
    +		>&gt;&lt;</a
    
    314
    +		></code
    
    313 315
     	      >)</p
    
    314 316
     	    ></div
    
    315 317
     	  ><div class="subs constructors"
    

  • utils/haddock/html-test/ref/TypeOperators.html
    ... ... @@ -48,6 +48,34 @@
    48 48
     	><p class="caption"
    
    49 49
     	>TypeOperators</p
    
    50 50
     	></div
    
    51
    +      ><div id="description"
    
    52
    +      ><p class="caption"
    
    53
    +	>Description</p
    
    54
    +	><div class="doc"
    
    55
    +	><p
    
    56
    +	  >This documentation refers to <code
    
    57
    +	    ><a href="#" title="Data.Type.Equality"
    
    58
    +	      >~</a
    
    59
    +	      ></code
    
    60
    +	    >, <code
    
    61
    +	    ><a href="#" title="TypeOperators"
    
    62
    +	      >:-:</a
    
    63
    +	      ></code
    
    64
    +	    >, <code
    
    65
    +	    ><a href="#" title="TypeOperators"
    
    66
    +	      >:+:</a
    
    67
    +	      ></code
    
    68
    +	    >, <code
    
    69
    +	    ><a href="#" title="TypeOperators"
    
    70
    +	      >&lt;=&gt;</a
    
    71
    +	      ></code
    
    72
    +	    >, and <code
    
    73
    +	    ><a href="#" title="TypeOperators"
    
    74
    +	      >|||</a
    
    75
    +	      ></code
    
    76
    +	    >.</p
    
    77
    +	  ></div
    
    78
    +	></div
    
    51 79
           ><div id="interface"
    
    52 80
           ><h1
    
    53 81
     	>Documentation</h1
    
    ... ... @@ -142,6 +170,18 @@
    142 170
     	    ></p
    
    143 171
     	  ></div
    
    144 172
     	><div class="top"
    
    173
    +	><p class="src"
    
    174
    +	  ><span class="keyword"
    
    175
    +	    >type</span
    
    176
    +	    > <a id="t:-124--124--124-" class="def"
    
    177
    +	    >(|||)</a
    
    178
    +	    > = <a href="#" title="Data.Either"
    
    179
    +	    >Either</a
    
    180
    +	    > <a href="#" class="selflink"
    
    181
    +	    >#</a
    
    182
    +	    ></p
    
    183
    +	  ></div
    
    184
    +	><div class="top"
    
    145 185
     	><p class="src"
    
    146 186
     	  ><a id="v:biO" class="def"
    
    147 187
     	    >biO</a
    

  • utils/haddock/html-test/src/TypeOperators.hs
    1 1
     {-# LANGUAGE Haskell2010 #-}
    
    2 2
     {-# LANGUAGE TypeOperators, GADTs, MultiParamTypeClasses, FlexibleContexts #-}
    
    3
    +-- | This documentation refers to '~', ':-:', ':+:', '<=>', and '|||'.
    
    3 4
     module TypeOperators where
    
    4 5
     
    
    5 6
     data a :-: b
    
    ... ... @@ -12,6 +13,8 @@ newtype (g `O` f) a = O { unO :: g (f a) }
    12 13
     
    
    13 14
     class a <=> b
    
    14 15
     
    
    16
    +type (|||) = Either
    
    17
    +
    
    15 18
     biO :: (g `O` f) a
    
    16 19
     biO = undefined
    
    17 20