Handle multi-operator fixity declarations in the extraction script

amesgen · Dec 17, 2021 · aa9ea5e · aa9ea5e
1 parent d477a0b
commit aa9ea5e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/extract-hackage-info/hackage-info.json b/extract-hackage-info/hackage-info.json
diff --git a/extract-hackage-info/src/Main.hs b/extract-hackage-info/src/Main.hs
@@ -7,6 +7,7 @@
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeApplications #-}
 
 module Main (main) where
@@ -295,15 +296,20 @@ extractFixitiesFromFile
           foldl' @[]
             (onFixityDecl packageName)
             state'
-            (fromFixityDecl <$> fixityDecls fileContent)
+            (concatMap @[] fromFixityDecl $ fixityDecls fileContent)
         fromSymbolDecl match = capture @"declOpName" match
         fromFixityDecl match =
-          ( capture @"fixDir" match,
-            capture @"fixPrec" match,
+          (capture @"fixDir" match,capture @"fixPrec" match,)
+            <$> splitInfixOpNames (capture @"infixOpNames" match)
+        splitInfixOpNames "" = []
+        splitInfixOpNames s = case [regex|^(?:\s*?,\s*?)?(?<infixOpName>[^,\s]+)(?<remaining>.*)$|] s of
+          [match] ->
             capture @"infixOpName" match
-          )
+              : splitInfixOpNames (capture @"remaining" match)
+          _ -> error $ "remaining text: " ++ T.unpack s
+
         symbolDecls = [regex|(?m)^\s*?(?<declOpName>\([^)]+?\))\s*?::.*$|]
-        fixityDecls = [regex|(?m)^\s*?(?<fixDir>infix[rl]?)\s+?(?<fixPrec>[0-9])\s+?(?<infixOpName>[^\s]+)\s*$|]
+        fixityDecls = [regex|(?m)^\s*?(?<fixDir>infix[rl]?)\s+?(?<fixPrec>[0-9])\s+?(?<infixOpNames>(?:[^,\s]+\s*?,\s*?)*?[^,\s]+)\s*$|]
     return state'' {sProcessedFiles = sProcessedFiles + 1}
 
 -- | Process the whole Hoogle database and return a map associating each