From 71307d6518325392968353c52259287026dbda1e Mon Sep 17 00:00:00 2001 From: Thomas Hallgren Date: Fri, 18 Jan 2019 14:44:45 +0100 Subject: [PATCH] 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 --- src/compiler/GF/Grammar/Canonical.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 ":"