summaryrefslogtreecommitdiff
path: root/src/compiler/GF/Grammar
diff options
context:
space:
mode:
authorThomas Hallgren <th-github@altocumulus.org>2019-01-18 14:44:45 +0100
committerThomas Hallgren <th-github@altocumulus.org>2019-01-18 14:44:45 +0100
commit71307d6518325392968353c52259287026dbda1e (patch)
tree73dad3e2873695c3566e74456450ed880c413903 /src/compiler/GF/Grammar
parentfc1b51aa95ec9e1a628b1255722202472484ee37 (diff)
Two fixes in GF.Grammar.Canonical
+ Hide Prelude.<> to avoid ambiguity with ghc-8.6 + Vertical alternative in the pretty printer for table types A => B
Diffstat (limited to 'src/compiler/GF/Grammar')
-rw-r--r--src/compiler/GF/Grammar/Canonical.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/GF/Grammar/Canonical.hs b/src/compiler/GF/Grammar/Canonical.hs
index 2a164c578..8d61a8a53 100644
--- a/src/compiler/GF/Grammar/Canonical.hs
+++ b/src/compiler/GF/Grammar/Canonical.hs
@@ -2,6 +2,7 @@
-- high-level constructions such as functors and opers have been eliminated
-- by partial evaluation.
module GF.Grammar.Canonical where
+import Prelude hiding ((<>))
import GF.Text.Pretty
-- | A Complete grammar
@@ -169,7 +170,7 @@ instance Pretty LinType where
ParamType pt -> pp pt
RecordType rs -> block rs
StrType -> pp "Str"
- TableType pt lt -> pt <+> "=>" <+> lt
+ TableType pt lt -> sep [pt <+> "=>",pp lt]
TupleType lts -> "<"<>punctuate "," lts<>">"
instance RhsSeparator LinType where rhsSep _ = pp ":"