1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
# HG changeset patch
# User unc0rr
# Date 1686895845 -7200
# Node ID 24545642473f3a06400ace429a1e829dfdf91972
# Parent e8d94f84d294ad9089d838043fd99a4358dfc760
Fix pas2c build erroring after parsec added function we already define
diff -r e8d94f84d294 -r 24545642473f tools/pas2c/PascalBasics.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
diff -r e8d94f84d294 -r 24545642473f tools/pas2c/PascalParser.hs
--- 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
diff -r e8d94f84d294 -r 24545642473f tools/pas2c/PascalPreprocessor.hs
--- 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
|
