few more changes

haskell · Feb 25, 2020 · c10eb9e · c10eb9e
1 parent 7606f48
commit c10eb9e
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 79 deletions.
diff --git a/Cabal/Distribution/FieldGrammar/Described.hs b/Cabal/Distribution/FieldGrammar/Described.hs
@@ -83,7 +83,7 @@ reOptCommaList = REOptCommaList
 reHsString :: Regex a
 reHsString = RENamed "hs-string" impl  where
     impl = reChar '"' <> REMunch reEps (REUnion [strChar, escChar]) <> reChar '"'
-    strChar = RECharSet $ CS.intersection CS.universe (CS.fromList "\"\\")
+    strChar = RECharSet $ CS.difference CS.universe (CS.fromList "\"\\")
 
     escChar = REUnion
         [ "\\&"

diff --git a/Cabal/Distribution/Types/Dependency.hs b/Cabal/Distribution/Types/Dependency.hs
@@ -141,7 +141,7 @@ instance Described Dependency where
                 , REAppend
                     [ reChar '{'
                     , RESpaces
-                    , REMunch reSpacedComma reUnqualComponent
+                    , RECommaList reUnqualComponent
                     , RESpaces
                     , reChar '}'
                     ] 

diff --git a/Cabal/Distribution/Utils/Regex.hs b/Cabal/Distribution/Utils/Regex.hs
@@ -119,12 +119,15 @@ regexDoc = go 0 . vacuous where
     go :: Int -> Regex PP.Doc -> PP.Doc
     go _ (REAppend [])    = ""
     go d (REAppend rs)    = parensIf (d > 2) $ PP.hcat (map (go 2) rs)
-    go d (REUnion rs)     = parensIf (d > 1) $
-        if length rs < 4
-        then PP.hcat (PP.punctuate (PP.text "\\mid") (map (go 1) rs))
-        else "\\bigcup \\left\\{\\begin{gathered}" <<>>
-            PP.hcat (PP.punctuate "\\\\" (map (go 0) rs)) <<>>
-            "\\end{gathered}\\right\\}"
+    go d (REUnion [r])    = go d r
+    go _ (REUnion rs)     = PP.hsep
+        [ "\\left\\{"
+        , if length rs < 4
+          then PP.hcat (PP.punctuate (PP.text "\\mid") (map (go 0) rs))
+          else "\\begin{gathered}" <<>>
+               PP.hcat (PP.punctuate "\\\\" (map (go 0) rs)) <<>>
+              "\\end{gathered}"
+        , "\\right\\}" ]
 
     go d (REMunch sep r)  = parensIf (d > 3) $
         PP.text "{" <<>> go 4 r <<>> PP.text "}^\\ast_{" <<>> go 4 sep <<>> PP.text "}"
@@ -142,9 +145,9 @@ regexDoc = go 0 . vacuous where
     go _ RESpaces1        = "\\bullet"
 
     go _ (RECommaList r)  =
-        "\\mathrm{commalist}\\left(" <<>> go 0 r <<>> "\\right)"
+        "\\mathrm{commalist}" <<>> go 4 r
     go _ (REOptCommaList r) =
-        "\\mathrm{optcommalist}\\left(" <<>> go 0 r <<>> "\\right)"
+        "\\mathrm{optcommalist}" <<>> go 4 r
 
     go _ (REVar a)         = a
     go _ (RENamed n _)     = terminalDoc n