Emit links to all availbale manual pages. Updated things from latest registry.

Author: svenpanne

RegistryProcessor/src/Main.hs

@@ -208,7 +208,7 @@ showCommand :: API -> Command -> String
 showCommand api c =
   showString (take 80 ("-- " ++ name ++ " " ++ repeat '-') ++ "\n\n") .
 
-  showString url .
+  showString man .
 
   showString (name ++ "\n") .
   showString ("  :: " ++ signature True) .
@@ -233,9 +233,13 @@ showCommand api c =
           L.intercalate ((if withComment then " " else "") ++ " -> ")
             ([showSignatureElement withComment False t | t <- paramTypes c] ++
              [showSignatureElement withComment True (resultType c)])
-        url = maybe "" (\u -> "-- | Manual page: <" ++ u ++ ">\n") $
-                M.lookup (api, CommandName name) manPageURLs
-
+        urls = M.findWithDefault [] (api, CommandName name) manPageURLs
+        links = L.intercalate ", " (map renderURL urls)  ++ "\n"
+        man = case urls of
+                []  -> ""
+                [_] ->  "-- | Manual page: "  ++ links
+                _   ->  "-- | Manual pages: " ++ links
+        renderURL u = "<" ++ u ++ ">"
 
 showSignatureElement :: Bool -> Bool -> SignatureElement -> String
 showSignatureElement withComment isResult sigElem = el ++ comment

RegistryProcessor/src/ManPages.hs

@@ -8,9 +8,9 @@ import MangledRegistry ( API(..), CommandName(..) )
 type ManPageKey = (API, CommandName)
 type URL = String
 
-assocsGL2 :: [(ManPageKey, URL)]
+assocsGL2 :: [(ManPageKey, [URL])]
 assocsGL2 =
-  entriesFor "gl" 2 "https://www.opengl.org/sdk/docs/man2/xhtml/" ".xml" [
+  entriesFor "gl" "https://www.opengl.org/sdk/docs/man2/xhtml/" ".xml" [
   ("glAccum", "glAccum"),
   ("glActiveTexture", "glActiveTexture"),
   ("glAlphaFunc", "glAlphaFunc"),
@@ -655,9 +655,9 @@ assocsGL2 =
   ("glWindowPos3dv", "glWindowPos")
   ]
 
-assocsGLX1 :: [(ManPageKey, URL)]
+assocsGLX1 :: [(ManPageKey, [URL])]
 assocsGLX1 =
-  entriesFor "glx" 1 "https://www.opengl.org/sdk/docs/man2/xhtml/" ".xml" [
+  entriesFor "glx" "https://www.opengl.org/sdk/docs/man2/xhtml/" ".xml" [
   ("glXChooseFBConfig", "glXChooseFBConfig"),
   ("glXChooseVisual", "glXChooseVisual"),
   ("glXCopyContext", "glXCopyContext"),
@@ -703,9 +703,9 @@ assocsGLX1 =
   ("glXWaitX", "glXWaitX")
   ]
 
-assocsGL3 :: [(ManPageKey, URL)]
+assocsGL3 :: [(ManPageKey, [URL])]
 assocsGL3 =
-  entriesFor "gl" 3 "https://www.opengl.org/sdk/docs/man3/xhtml/" ".xml" [
+  entriesFor "gl" "https://www.opengl.org/sdk/docs/man3/xhtml/" ".xml" [
   ("glActiveTexture", "glActiveTexture"),
   ("glAttachShader", "glAttachShader"),
   ("glBeginConditionalRender", "glBeginConditionalRender"),
@@ -1080,9 +1080,9 @@ assocsGL3 =
   ("glWaitSync", "glWaitSync")
   ]
 
-assocsGL4 :: [(ManPageKey, URL)]
+assocsGL4 :: [(ManPageKey, [URL])]
 assocsGL4 =
-  entriesFor "gl" 4 "https://www.opengl.org/sdk/docs/man4/html/" ".xhtml" [
+  entriesFor "gl" "https://www.opengl.org/sdk/docs/man4/html/" ".xhtml" [
   ("glActiveShaderProgram", "glActiveShaderProgram"),
   ("glActiveTexture", "glActiveTexture"),
   ("glAttachShader", "glAttachShader"),
@@ -1696,11 +1696,13 @@ assocsGL4 =
   ("glWaitSync", "glWaitSync")
   ]
 
-entriesFor :: String -> Int -> String -> String -> [(String, String)] -> [(ManPageKey, URL)]
-entriesFor api _majorVersion baseURL extension assocs =
-  [ ((API api, CommandName n), baseURL ++ u ++ extension)
+entriesFor :: String -> String -> String -> [(String, String)] -> [(ManPageKey, [URL])]
+entriesFor api baseURL extension assocs =
+  [ ((API api, CommandName n), [baseURL ++ u ++ extension])
   | (n, u) <- assocs ]
 
--- More recent man pages override older ones.
-manPageURLs :: M.Map ManPageKey URL
-manPageURLs = M.fromList $ concat [ assocsGL2, assocsGL3, assocsGL4, assocsGLX1 ]
+manPageURLs :: M.Map ManPageKey [URL]
+manPageURLs =
+  M.fromListWith (++) .
+  concat $
+  reverse [ assocsGL2, assocsGL3, assocsGL4, assocsGLX1 ]

src/Graphics/Rendering/OpenGL/Raw/Compatibility45.hs

@@ -1494,7 +1494,6 @@ module Graphics.Rendering.OpenGL.Raw.Compatibility45 (
   gl_TEXTURE_ALPHA_SIZE,
   gl_TEXTURE_ALPHA_TYPE,
   gl_TEXTURE_BASE_LEVEL,
-  gl_TEXTURE_BINDING,
   gl_TEXTURE_BINDING_1D,
   gl_TEXTURE_BINDING_1D_ARRAY,
   gl_TEXTURE_BINDING_2D,

src/Graphics/Rendering/OpenGL/Raw/Core45.hs

@@ -1108,7 +1108,6 @@ module Graphics.Rendering.OpenGL.Raw.Core45 (
   gl_TEXTURE_ALPHA_SIZE,
   gl_TEXTURE_ALPHA_TYPE,
   gl_TEXTURE_BASE_LEVEL,
-  gl_TEXTURE_BINDING,
   gl_TEXTURE_BINDING_1D,
   gl_TEXTURE_BINDING_1D_ARRAY,
   gl_TEXTURE_BINDING_2D,