diff --git a/source/BNFC.cabal b/source/BNFC.cabal index 54ef20ab..02cc1ade 100644 --- a/source/BNFC.cabal +++ b/source/BNFC.cabal @@ -58,7 +58,7 @@ Executable bnfc deepseq build-tools: alex, happy Main-is: Main.hs - HS-source-dirs: src/ + HS-source-dirs: compat src ghc-options: -W extensions: FlexibleContexts @@ -77,6 +77,7 @@ Executable bnfc PrintBNF, ErrM, -- BNFC core + Prelude', BNFC.Utils, BNFC.CF, BNFC.ToCNFCore, @@ -202,7 +203,7 @@ Test-suite unit-tests hspec, QuickCheck >= 2.5, HUnit, temporary, containers, deepseq Main-is: unit-tests.hs - HS-source-dirs: src test + HS-source-dirs: compat src test extensions: FlexibleContexts LambdaCase diff --git a/source/compat/Prelude'.hs b/source/compat/Prelude'.hs new file mode 100644 index 00000000..c8d2ae59 --- /dev/null +++ b/source/compat/Prelude'.hs @@ -0,0 +1,15 @@ +{-# LANGUAGE CPP #-} + +-- See #227 for what's going on here. + +module Prelude' +( + module P +) +where + +#if __GLASGOW_HASKELL__ >= 803 +import Prelude as P hiding ((<>)) +#else +import Prelude as P +#endif diff --git a/source/src/BNFC/Backend/C.hs b/source/src/BNFC/Backend/C.hs index 602fa4c0..cc6bd970 100644 --- a/source/src/BNFC/Backend/C.hs +++ b/source/src/BNFC/Backend/C.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: C Main file Copyright (C) 2004 Author: Michael Pellauer @@ -18,6 +20,8 @@ -} module BNFC.Backend.C (makeC) where +import Prelude' + import BNFC.Utils import BNFC.CF import BNFC.Options diff --git a/source/src/BNFC/Backend/C/CFtoCAbs.hs b/source/src/BNFC/Backend/C/CFtoCAbs.hs index 4105f2cf..80eda084 100644 --- a/source/src/BNFC/Backend/C/CFtoCAbs.hs +++ b/source/src/BNFC/Backend/C/CFtoCAbs.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: C Abstract syntax Copyright (C) 2004 Author: Michael Pellauer @@ -40,6 +42,7 @@ module BNFC.Backend.C.CFtoCAbs (cf2CAbs) where +import Prelude' import BNFC.CF import BNFC.PrettyPrint diff --git a/source/src/BNFC/Backend/C/CFtoCPrinter.hs b/source/src/BNFC/Backend/C/CFtoCPrinter.hs index 1bac45cb..3c58bade 100644 --- a/source/src/BNFC/Backend/C/CFtoCPrinter.hs +++ b/source/src/BNFC/Backend/C/CFtoCPrinter.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: C Pretty Printer printer Copyright (C) 2004 Author: Michael Pellauer @@ -41,6 +43,8 @@ module BNFC.Backend.C.CFtoCPrinter (cf2CPrinter) where +import Prelude' + import BNFC.CF import BNFC.Utils ((+++)) import BNFC.Backend.Common (renderListSepByPrecedence) diff --git a/source/src/BNFC/Backend/C/CFtoCSkel.hs b/source/src/BNFC/Backend/C/CFtoCSkel.hs index 6e21e42e..68dbdda4 100644 --- a/source/src/BNFC/Backend/C/CFtoCSkel.hs +++ b/source/src/BNFC/Backend/C/CFtoCSkel.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: C Skeleton generator Copyright (C) 2004 Author: Michael Pellauer @@ -39,6 +41,8 @@ module BNFC.Backend.C.CFtoCSkel (cf2CSkel) where +import Prelude' + import BNFC.CF import BNFC.Utils ( (+++) ) import BNFC.Backend.Common.NamedVariables diff --git a/source/src/BNFC/Backend/C/CFtoFlexC.hs b/source/src/BNFC/Backend/C/CFtoFlexC.hs index ebe4151b..06b4b6a2 100644 --- a/source/src/BNFC/Backend/C/CFtoFlexC.hs +++ b/source/src/BNFC/Backend/C/CFtoFlexC.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: C flex generator Copyright (C) 2004 Author: Michael Pellauer @@ -37,6 +39,8 @@ -} module BNFC.Backend.C.CFtoFlexC (cf2flex, lexComments, cMacros) where +import Prelude' + import Data.Maybe (fromMaybe) import BNFC.CF diff --git a/source/src/BNFC/Backend/CPP/NoSTL/CFtoCPPAbs.hs b/source/src/BNFC/Backend/CPP/NoSTL/CFtoCPPAbs.hs index 3a15d747..5f9224ed 100644 --- a/source/src/BNFC/Backend/CPP/NoSTL/CFtoCPPAbs.hs +++ b/source/src/BNFC/Backend/CPP/NoSTL/CFtoCPPAbs.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE NoImplicitPrelude, OverloadedStrings #-} {- BNF Converter: C++ abstract syntax generator Copyright (C) 2004 Author: Michael Pellauer @@ -41,6 +41,8 @@ module BNFC.Backend.CPP.NoSTL.CFtoCPPAbs (cf2CPPAbs) where +import Prelude' + import BNFC.CF import BNFC.Utils((+++),(++++)) import BNFC.Backend.Common.NamedVariables diff --git a/source/src/BNFC/Backend/CPP/NoSTL/CFtoCVisitSkel.hs b/source/src/BNFC/Backend/CPP/NoSTL/CFtoCVisitSkel.hs index e77ca7b0..59e290cc 100644 --- a/source/src/BNFC/Backend/CPP/NoSTL/CFtoCVisitSkel.hs +++ b/source/src/BNFC/Backend/CPP/NoSTL/CFtoCVisitSkel.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: C++ Skeleton generation Copyright (C) 2004 Author: Michael Pellauer @@ -39,6 +41,8 @@ module BNFC.Backend.CPP.NoSTL.CFtoCVisitSkel (cf2CVisitSkel) where +import Prelude' + import BNFC.CF import BNFC.Utils ((+++)) import BNFC.Backend.Common.NamedVariables diff --git a/source/src/BNFC/Backend/CPP/PrettyPrinter.hs b/source/src/BNFC/Backend/CPP/PrettyPrinter.hs index a59ec8eb..0b5fabdb 100644 --- a/source/src/BNFC/Backend/CPP/PrettyPrinter.hs +++ b/source/src/BNFC/Backend/CPP/PrettyPrinter.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- ************************************************************** BNF Converter Module @@ -22,6 +24,8 @@ module BNFC.Backend.CPP.PrettyPrinter (cf2CPPPrinter, prRender) where +import Prelude' + import BNFC.CF import BNFC.Utils ((+++)) import BNFC.Backend.Common diff --git a/source/src/BNFC/Backend/CPP/STL/CFtoBisonSTL.hs b/source/src/BNFC/Backend/CPP/STL/CFtoBisonSTL.hs index da12b03c..6ab487fc 100644 --- a/source/src/BNFC/Backend/CPP/STL/CFtoBisonSTL.hs +++ b/source/src/BNFC/Backend/CPP/STL/CFtoBisonSTL.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: C++ Bison generator Copyright (C) 2004 Author: Michael Pellauer @@ -44,6 +46,8 @@ module BNFC.Backend.CPP.STL.CFtoBisonSTL (cf2Bison, union) where +import Prelude' + import Data.Char (toLower,isUpper) import Data.List (nub, intercalate) import Data.Maybe (fromMaybe) diff --git a/source/src/BNFC/Backend/Common.hs b/source/src/BNFC/Backend/Common.hs index 3e3d861c..26a5636b 100644 --- a/source/src/BNFC/Backend/Common.hs +++ b/source/src/BNFC/Backend/Common.hs @@ -1,7 +1,11 @@ +{-# LANGUAGE NoImplicitPrelude #-} + -- | Functions common to different backends. module BNFC.Backend.Common (renderListSepByPrecedence) where +import Prelude' + import BNFC.PrettyPrint -- | Helper function for c-like languages that generates the code printing diff --git a/source/src/BNFC/Backend/Common/Makefile.hs b/source/src/BNFC/Backend/Common/Makefile.hs index 8cc785d2..1e9369a2 100644 --- a/source/src/BNFC/Backend/Common/Makefile.hs +++ b/source/src/BNFC/Backend/Common/Makefile.hs @@ -1,5 +1,9 @@ +{-# LANGUAGE NoImplicitPrelude #-} + module BNFC.Backend.Common.Makefile where +import Prelude' + import BNFC.Options (SharedOptions(..)) import BNFC.Backend.Base (mkfile, Backend) import BNFC.PrettyPrint diff --git a/source/src/BNFC/Backend/Common/NamedVariables.hs b/source/src/BNFC/Backend/Common/NamedVariables.hs index 98845b1b..d32c2b3e 100644 --- a/source/src/BNFC/Backend/Common/NamedVariables.hs +++ b/source/src/BNFC/Backend/Common/NamedVariables.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE NoImplicitPrelude #-} {- BNF Converter: Named instance variables @@ -67,6 +68,8 @@ This is what this module does. module BNFC.Backend.Common.NamedVariables where +import Prelude' + import BNFC.CF import Data.Char (toLower) import Data.List (nub) diff --git a/source/src/BNFC/Backend/Haskell/CFtoAbstract.hs b/source/src/BNFC/Backend/Haskell/CFtoAbstract.hs index 49e82e43..f3aa1ff7 100644 --- a/source/src/BNFC/Backend/Haskell/CFtoAbstract.hs +++ b/source/src/BNFC/Backend/Haskell/CFtoAbstract.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: Abstract syntax Generator Copyright (C) 2004 Author: Markus Forberg @@ -19,6 +21,8 @@ module BNFC.Backend.Haskell.CFtoAbstract (cf2Abstract) where +import Prelude' + import BNFC.CF import BNFC.Utils((+++)) import BNFC.Backend.Haskell.Utils (catToType, catvars) diff --git a/source/src/BNFC/Backend/Haskell/CFtoPrinter.hs b/source/src/BNFC/Backend/Haskell/CFtoPrinter.hs index 0eeec6d8..271dee52 100644 --- a/source/src/BNFC/Backend/Haskell/CFtoPrinter.hs +++ b/source/src/BNFC/Backend/Haskell/CFtoPrinter.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: Pretty-printer generator Copyright (C) 2004 Author: Aarne Ranta @@ -19,6 +21,8 @@ module BNFC.Backend.Haskell.CFtoPrinter (cf2Printer, compareRules) where +import Prelude' + import BNFC.Backend.Haskell.Utils (hsReservedWords) import BNFC.CF import BNFC.Utils diff --git a/source/src/BNFC/Backend/Haskell/CFtoTemplate.hs b/source/src/BNFC/Backend/Haskell/CFtoTemplate.hs index 39c44352..e9266090 100644 --- a/source/src/BNFC/Backend/Haskell/CFtoTemplate.hs +++ b/source/src/BNFC/Backend/Haskell/CFtoTemplate.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: Template Generator Copyright (C) 2004 Author: Markus Forberg @@ -20,6 +22,8 @@ module BNFC.Backend.Haskell.CFtoTemplate (cf2Template) where +import Prelude' + import BNFC.Backend.Haskell.Utils (catvars) import BNFC.CF import BNFC.PrettyPrint diff --git a/source/src/BNFC/Backend/Haskell/MkErrM.hs b/source/src/BNFC/Backend/Haskell/MkErrM.hs index a57a459c..b0e3fc78 100644 --- a/source/src/BNFC/Backend/Haskell/MkErrM.hs +++ b/source/src/BNFC/Backend/Haskell/MkErrM.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: Haskell error monad Copyright (C) 2004-2007 Author: Markus Forberg, Peter Gammie, @@ -19,6 +21,8 @@ -} module BNFC.Backend.Haskell.MkErrM where +import Prelude' + import BNFC.PrettyPrint mkErrM :: String -> Bool -> Doc diff --git a/source/src/BNFC/Backend/Haskell/Utils.hs b/source/src/BNFC/Backend/Haskell/Utils.hs index 8b8128b5..e3017243 100644 --- a/source/src/BNFC/Backend/Haskell/Utils.hs +++ b/source/src/BNFC/Backend/Haskell/Utils.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + module BNFC.Backend.Haskell.Utils ( parserName , hsReservedWords @@ -5,6 +7,8 @@ module BNFC.Backend.Haskell.Utils , catvars ) where +import Prelude' + import Text.PrettyPrint import BNFC.CF (Cat(..), identCat, normCat) import BNFC.Utils (mkNames, NameStyle(..)) diff --git a/source/src/BNFC/Backend/Java.hs b/source/src/BNFC/Backend/Java.hs index b17b408b..7c4d99c4 100644 --- a/source/src/BNFC/Backend/Java.hs +++ b/source/src/BNFC/Backend/Java.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: Java Top File Copyright (C) 2004 Author: Markus Forsberg, Peter Gammie, @@ -35,6 +37,8 @@ module BNFC.Backend.Java ( makeJava ) where +import Prelude' + import System.FilePath (pathSeparator, isPathSeparator) import Data.List ( intersperse ) diff --git a/source/src/BNFC/Backend/Java/CFtoAntlr4Lexer.hs b/source/src/BNFC/Backend/Java/CFtoAntlr4Lexer.hs index ae812666..194bfd4c 100644 --- a/source/src/BNFC/Backend/Java/CFtoAntlr4Lexer.hs +++ b/source/src/BNFC/Backend/Java/CFtoAntlr4Lexer.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: Java Antlr4 Lexer generator Copyright (C) 2015 Author: Gabriele Paganelli @@ -38,6 +40,8 @@ module BNFC.Backend.Java.CFtoAntlr4Lexer ( cf2AntlrLex ) where +import Prelude' + import Text.PrettyPrint import BNFC.CF import BNFC.Backend.Java.RegToAntlrLexer @@ -197,4 +201,4 @@ lexMultiComment :: (String, String) -> Doc lexMultiComment (b,e) = "'" <> text (escapeChars b) <>"' (.)*? '"<> text (escapeChars e) - <> "'" \ No newline at end of file + <> "'" diff --git a/source/src/BNFC/Backend/Java/CFtoComposVisitor.hs b/source/src/BNFC/Backend/Java/CFtoComposVisitor.hs index 1b34a870..419ef6d8 100644 --- a/source/src/BNFC/Backend/Java/CFtoComposVisitor.hs +++ b/source/src/BNFC/Backend/Java/CFtoComposVisitor.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: Java 1.5 Compositional Vistor generator Copyright (C) 2006 Bjorn Bringert @@ -20,6 +22,8 @@ module BNFC.Backend.Java.CFtoComposVisitor (cf2ComposVisitor) where +import Prelude' + import Data.List import Data.Either (lefts) import BNFC.CF diff --git a/source/src/BNFC/Backend/Java/CFtoFoldVisitor.hs b/source/src/BNFC/Backend/Java/CFtoFoldVisitor.hs index 36f96148..44b44912 100644 --- a/source/src/BNFC/Backend/Java/CFtoFoldVisitor.hs +++ b/source/src/BNFC/Backend/Java/CFtoFoldVisitor.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: Java 1.5 Fold Vistor generator Copyright (C) 2006 Bjorn Bringert @@ -20,6 +22,8 @@ module BNFC.Backend.Java.CFtoFoldVisitor (cf2FoldVisitor) where +import Prelude' + import BNFC.CF import BNFC.Backend.Java.CFtoJavaAbs15 (typename) import BNFC.Utils ((+++)) diff --git a/source/src/BNFC/Backend/Java/CFtoJLex15.hs b/source/src/BNFC/Backend/Java/CFtoJLex15.hs index 3be19bac..0b965cd4 100644 --- a/source/src/BNFC/Backend/Java/CFtoJLex15.hs +++ b/source/src/BNFC/Backend/Java/CFtoJLex15.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: Java JLex generator Copyright (C) 2004 Author: Michael Pellauer @@ -39,6 +41,8 @@ module BNFC.Backend.Java.CFtoJLex15 ( cf2jlex ) where +import Prelude' + import BNFC.CF import BNFC.Backend.Common.NamedVariables import BNFC.Backend.Java.RegToJLex diff --git a/source/src/BNFC/Backend/Java/CFtoJavaAbs15.hs b/source/src/BNFC/Backend/Java/CFtoJavaAbs15.hs index 474cb5b0..0dea465f 100644 --- a/source/src/BNFC/Backend/Java/CFtoJavaAbs15.hs +++ b/source/src/BNFC/Backend/Java/CFtoJavaAbs15.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE NoImplicitPrelude, OverloadedStrings #-} {- BNF Converter: Java 1.5 Abstract Syntax Copyright (C) 2004 Author: Michael Pellauer, Bjorn Bringert @@ -46,6 +46,8 @@ module BNFC.Backend.Java.CFtoJavaAbs15 (cf2JavaAbs, typename, cat2JavaType) where +import Prelude' + import BNFC.CF import BNFC.Options (RecordPositions(..)) import BNFC.Utils((+++),(++++)) diff --git a/source/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs b/source/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs index 19c336c9..ba9e3f08 100644 --- a/source/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs +++ b/source/src/BNFC/Backend/Java/CFtoJavaPrinter15.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: Java Pretty Printer generator Copyright (C) 2004 Author: Michael Pellauer, Bjorn Bringert @@ -46,6 +48,8 @@ -} module BNFC.Backend.Java.CFtoJavaPrinter15 ( cf2JavaPrinter ) where +import Prelude' + import BNFC.Backend.Java.CFtoJavaAbs15 import BNFC.CF diff --git a/source/src/BNFC/Backend/Java/CFtoVisitSkel15.hs b/source/src/BNFC/Backend/Java/CFtoVisitSkel15.hs index c4a24e07..8b3121c0 100644 --- a/source/src/BNFC/Backend/Java/CFtoVisitSkel15.hs +++ b/source/src/BNFC/Backend/Java/CFtoVisitSkel15.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: Java Vistor skeleton generator Copyright (C) 2004 Author: Michael Pellauer, Bjorn Bringert @@ -40,6 +42,8 @@ -} module BNFC.Backend.Java.CFtoVisitSkel15 (cf2VisitSkel) where +import Prelude' + import BNFC.CF import BNFC.Backend.Java.CFtoJavaAbs15 (typename) import BNFC.Utils ((+++)) diff --git a/source/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs b/source/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs index 842c8717..441b3cc0 100644 --- a/source/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs +++ b/source/src/BNFC/Backend/OCaml/CFtoOCamlLex.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: ocamllex Generator Copyright (C) 2005 Author: Kristofer Johannisson @@ -22,6 +24,8 @@ module BNFC.Backend.OCaml.CFtoOCamlLex (cf2ocamllex) where +import Prelude' + import Control.Arrow ((&&&)) import Data.List import Data.Char diff --git a/source/src/BNFC/Backend/OCaml/CFtoOCamlPrinter.hs b/source/src/BNFC/Backend/OCaml/CFtoOCamlPrinter.hs index a5203d1e..1dde4fee 100644 --- a/source/src/BNFC/Backend/OCaml/CFtoOCamlPrinter.hs +++ b/source/src/BNFC/Backend/OCaml/CFtoOCamlPrinter.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: Pretty-printer generator Copyright (C) 2005 Author: Kristofer Johannisson @@ -21,6 +23,8 @@ module BNFC.Backend.OCaml.CFtoOCamlPrinter (cf2Printer) where +import Prelude' + import Data.Char(toLower) import Data.List (intersperse, sortBy) import Data.Maybe (fromJust) diff --git a/source/src/BNFC/Backend/OCaml/CFtoOCamlTest.hs b/source/src/BNFC/Backend/OCaml/CFtoOCamlTest.hs index acc50c5d..16fc50f9 100644 --- a/source/src/BNFC/Backend/OCaml/CFtoOCamlTest.hs +++ b/source/src/BNFC/Backend/OCaml/CFtoOCamlTest.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- BNF Converter: Generate main/test module for OCaml Copyright (C) 2005 Author: Kristofer Johannisson @@ -19,6 +21,8 @@ module BNFC.Backend.OCaml.CFtoOCamlTest where +import Prelude' + import Text.PrettyPrint import BNFC.CF diff --git a/source/src/BNFC/Backend/Pygments.hs b/source/src/BNFC/Backend/Pygments.hs index 5d5efdfc..fd38076b 100644 --- a/source/src/BNFC/Backend/Pygments.hs +++ b/source/src/BNFC/Backend/Pygments.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + {- Generates a Pygments lexer from a BNF grammar. - - Resources: @@ -7,6 +9,7 @@ - -} module BNFC.Backend.Pygments where +import Prelude' import AbsBNF (Reg(..)) import BNFC.Backend.Base (mkfile, Backend) diff --git a/source/src/BNFC/Lexing.hs b/source/src/BNFC/Lexing.hs index 7842cb2c..0443c60a 100644 --- a/source/src/BNFC/Lexing.hs +++ b/source/src/BNFC/Lexing.hs @@ -1,6 +1,10 @@ +{-# LANGUAGE NoImplicitPrelude #-} + module BNFC.Lexing ( mkLexer, LexType(..) ) where +import Prelude' + import Control.Arrow ((&&&)) import Data.List (inits) import AbsBNF (Reg(..)) diff --git a/source/src/BNFC/PrettyPrint.hs b/source/src/BNFC/PrettyPrint.hs index bdcd369e..0be36d22 100644 --- a/source/src/BNFC/PrettyPrint.hs +++ b/source/src/BNFC/PrettyPrint.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE NoImplicitPrelude #-} + -- Extends Text.PrettyPrint module BNFC.PrettyPrint ( module Text.PrettyPrint @@ -7,6 +9,8 @@ module BNFC.PrettyPrint , (<=>) ) where +import Prelude' + import Text.PrettyPrint -- | Pretty print separator with a dot diff --git a/source/test/doctests.hs b/source/test/doctests.hs index 9c770075..47c4853f 100644 --- a/source/test/doctests.hs +++ b/source/test/doctests.hs @@ -1,7 +1,8 @@ import Test.DocTest main = doctest - [ "-isrc" + [ "-icompat" + , "-isrc" , "-idist/build/autogen/" , "-idist/build/bnfc/bnfc-tmp" , "-XLambdaCase"