Handle pretty and base <> collision

BNFC · Mar 27, 2018 · 39d32fb · 39d32fb
1 parent 7c9e859
commit 39d32fb
Show file tree

Hide file tree

Showing 34 changed files with 140 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,10 +1,14 @@
+{-# LANGUAGE NoImplicitPrelude #-}
+
 module BNFC.Backend.Haskell.Utils
   ( parserName
   , hsReservedWords
   , catToType
   , 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
@@ -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
@@ -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)
-        <> "'"
+        <> "'"
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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