| 1 | From ab3fac1e3b354890a3925235881673b97691dba2 Mon Sep 17 00:00:00 2001
|
| 2 | From: unc0rr <[email protected]>
|
| 3 | Date: Fri, 16 Jun 2023 08:10:45 +0200
|
| 4 | Subject: [PATCH] Fix pas2c build erroring after parsec added function we
|
| 5 | already define
|
| 6 |
|
| 7 | ---
|
| 8 | tools/pas2c/PascalBasics.hs | 2 +-
|
| 9 | tools/pas2c/PascalParser.hs | 2 +-
|
| 10 | tools/pas2c/PascalPreprocessor.hs | 2 +-
|
| 11 | 3 files changed, 3 insertions(+), 3 deletions(-)
|
| 12 |
|
| 13 | diff --git a/tools/pas2c/PascalBasics.hs b/tools/pas2c/PascalBasics.hs
|
| 14 | index f4eba72f87..eaf4d596db 100644
|
| 15 | |
| 16 | |
| 17 | @@ -2,7 +2,7 @@
|
| 18 | module PascalBasics where
|
| 19 |
|
| 20 | import Text.Parsec.Combinator
|
| 21 | -import Text.Parsec.Char
|
| 22 | +import Text.Parsec.Char hiding (string')
|
| 23 | import Text.Parsec.Prim
|
| 24 | import Text.Parsec.Token
|
| 25 | import Text.Parsec.Language
|
| 26 | diff --git a/tools/pas2c/PascalParser.hs b/tools/pas2c/PascalParser.hs
|
| 27 | index 2edd7a2479..c97bb359aa 100644
|
| 28 | |
| 29 | |
| 30 | @@ -4,7 +4,7 @@ module PascalParser (
|
| 31 | )
|
| 32 | where
|
| 33 |
|
| 34 | -import Text.Parsec
|
| 35 | +import Text.Parsec hiding (string')
|
| 36 | import Text.Parsec.Token
|
| 37 | import Text.Parsec.Expr
|
| 38 | import Control.Monad
|
| 39 | diff --git a/tools/pas2c/PascalPreprocessor.hs b/tools/pas2c/PascalPreprocessor.hs
|
| 40 | index 4db8eaa8ae..93a176209c 100644
|
| 41 | |
| 42 | |
| 43 | @@ -1,7 +1,7 @@
|
| 44 | {-# LANGUAGE ScopedTypeVariables #-}
|
| 45 | module PascalPreprocessor where
|
| 46 |
|
| 47 | -import Text.Parsec
|
| 48 | +import Text.Parsec hiding (string')
|
| 49 | import Control.Monad.IO.Class
|
| 50 | import Control.Monad
|
| 51 | import System.IO
|