more tweaks

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

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/Cabal/Distribution/FieldGrammar/Described.hs b/Cabal/Distribution/FieldGrammar/Described.hs
@@ -52,7 +52,7 @@ class (Pretty a, Parsec a) => Described a where
 -- | Pretty-print description.
 --
 -- >>> describeDoc ([] :: [Bool])
--- \mathop{\mathord{"}\mathtt{True}\mathord{"}}\mid\mathop{\mathord{"}\mathtt{False}\mathord{"}}
+-- \left\{ \mathop{\mathord{``}\mathtt{True}\mathord{"}}\mid\mathop{\mathord{``}\mathtt{False}\mathord{"}} \right\}
 --
 describeDoc :: Described a => proxy a -> PP.Doc
 describeDoc p = regexDoc (describe p)

diff --git a/Cabal/Distribution/Types/Dependency.hs b/Cabal/Distribution/Types/Dependency.hs
@@ -95,6 +95,9 @@ versionGuardMultilibs expr = do
 -- >>> simpleParsec "mylib:{ sub1 , sub2 } ^>= 42" :: Maybe Dependency
 -- Just (Dependency (PackageName "mylib") (MajorBoundVersion (mkVersion [42])) (fromList [LSubLibName (UnqualComponentName "sub1"),LSubLibName (UnqualComponentName "sub2")]))
 --
+-- >>> simpleParsec "mylib:{ } ^>= 42" :: Maybe Dependency
+-- Just (Dependency (PackageName "mylib") (MajorBoundVersion (mkVersion [42])) (fromList []))
+--
 -- Spaces around colon are not allowed:
 --
 -- >>> simpleParsec "mylib: sub" :: Maybe Dependency

diff --git a/Cabal/Distribution/Utils/Regex.hs b/Cabal/Distribution/Utils/Regex.hs
@@ -107,12 +107,12 @@ reVar1 = REVar (Just Nothing)
 -- |
 --
 -- >>> regexDoc $ REString "True"
--- \mathop{\mathord{"}\mathtt{True}\mathord{"}}
+-- \mathop{\mathord{``}\mathtt{True}\mathord{"}}
 --
 -- Note: we don't simplify regexps yet:
 --
 -- >>> regexDoc $ REString "foo" <> REString "bar"
--- \mathop{\mathord{"}\mathtt{foo}\mathord{"}}\mathop{\mathord{"}\mathtt{bar}\mathord{"}}
+-- \mathop{\mathord{``}\mathtt{foo}\mathord{"}}\mathop{\mathord{``}\mathtt{bar}\mathord{"}}
 --
 regexDoc :: Regex Void -> PP.Doc
 regexDoc = go 0 . vacuous where

diff --git a/Cabal/doc/buildinfo-fields-reference.rst b/Cabal/doc/buildinfo-fields-reference.rst
@@ -123,10 +123,10 @@ Optional comma separated
         \mathrm{optcommalist}(\mathit{element}) =
         \left\{ \begin{gathered}{\mathop{\mathit{element}}}^\ast_{\bullet}\\{\mathop{\mathit{element}}}^\ast_{\left(\circ\mathop{\mathord{``}\mathtt{\text{,}}\mathord{"}}\circ\right)}\\\mathop{\mathord{``}\mathtt{\text{,}}\mathord{"}}\circ{\mathop{\mathit{element}}}^+_{\left(\circ\mathop{\mathord{``}\mathtt{\text{,}}\mathord{"}}\circ\right)}\\{\mathop{\mathit{element}}}^+_{\left(\circ\mathop{\mathord{``}\mathtt{\text{,}}\mathord{"}}\circ\right)}\circ\mathop{\mathord{``}\mathtt{\text{,}}\mathord{"}}\end{gathered} \right\}
 
-Terminals
+Non-terminals
 -------------
 
-In the syntax definitions below the following terminal symbols are used:
+In the syntax definitions below the following non-terminal symbols are used:
 
 hs-string
     String as in Haskell; it's recommended to avoid using Haskell-specific escapes.

diff --git a/buildinfo-reference-generator/template.zinza b/buildinfo-reference-generator/template.zinza
@@ -123,10 +123,10 @@ Optional comma separated
         \mathrm{optcommalist}(\mathit{element}) =
         {{optCommaList}}
 
-Terminals
+Non-terminals
 -------------
 
-In the syntax definitions below the following terminal symbols are used:
+In the syntax definitions below the following non-terminal symbols are used:
 
 {% for production in productions %}
 {{ production.name }}