Fix pas2c build erroring after parsec added function we already define
authorunc0rr
Fri, 16 Jun 2023 08:10:45 +0200
changeset 15988 24545642473f
parent 15987 e8d94f84d294
child 15989 723be7e392e5
Fix pas2c build erroring after parsec added function we already define
tools/pas2c/PascalBasics.hs
tools/pas2c/PascalParser.hs
tools/pas2c/PascalPreprocessor.hs
--- a/tools/pas2c/PascalBasics.hs	Thu May 25 17:46:57 2023 +0200
+++ b/tools/pas2c/PascalBasics.hs	Fri Jun 16 08:10:45 2023 +0200
@@ -2,7 +2,7 @@
 module PascalBasics where
 
 import Text.Parsec.Combinator
-import Text.Parsec.Char
+import Text.Parsec.Char hiding (string')
 import Text.Parsec.Prim
 import Text.Parsec.Token
 import Text.Parsec.Language
--- a/tools/pas2c/PascalParser.hs	Thu May 25 17:46:57 2023 +0200
+++ b/tools/pas2c/PascalParser.hs	Fri Jun 16 08:10:45 2023 +0200
@@ -4,7 +4,7 @@
     )
     where
 
-import Text.Parsec
+import Text.Parsec hiding (string')
 import Text.Parsec.Token
 import Text.Parsec.Expr
 import Control.Monad
--- a/tools/pas2c/PascalPreprocessor.hs	Thu May 25 17:46:57 2023 +0200
+++ b/tools/pas2c/PascalPreprocessor.hs	Fri Jun 16 08:10:45 2023 +0200
@@ -1,7 +1,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 module PascalPreprocessor where
 
-import Text.Parsec
+import Text.Parsec hiding (string')
 import Control.Monad.IO.Class
 import Control.Monad
 import System.IO