1 |
commit: 4374ffb53aad9978c19f0d3007eb3478bf84f3bf |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Aug 8 16:14:16 2017 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 8 19:57:02 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4374ffb5 |
7 |
|
8 |
dev-haskell/haskell-src-exts: remove unused patch |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/5357 |
11 |
|
12 |
.../haskell-src-exts-0.2-hiding-isSymbol.patch | 68 ---------------------- |
13 |
1 file changed, 68 deletions(-) |
14 |
|
15 |
diff --git a/dev-haskell/haskell-src-exts/files/haskell-src-exts-0.2-hiding-isSymbol.patch b/dev-haskell/haskell-src-exts/files/haskell-src-exts-0.2-hiding-isSymbol.patch |
16 |
deleted file mode 100644 |
17 |
index df83e026fe0..00000000000 |
18 |
--- a/dev-haskell/haskell-src-exts/files/haskell-src-exts-0.2-hiding-isSymbol.patch |
19 |
+++ /dev/null |
20 |
@@ -1,68 +0,0 @@ |
21 |
-diff -urwpN haskell-src-exts.org/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs haskell-src-exts/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs |
22 |
---- haskell-src-exts.org/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs 2005-05-01 22:40:45.000000000 +0100 |
23 |
-+++ haskell-src-exts/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs 2006-10-11 19:42:53.000000000 +0100 |
24 |
-@@ -207,9 +207,9 @@ special_varids = [ |
25 |
- ( "hiding", KW_Hiding ) |
26 |
- ] |
27 |
- |
28 |
--isIdent, isSymbol :: Char -> Bool |
29 |
-+isIdent, isSymbol' :: Char -> Bool |
30 |
- isIdent c = isAlpha c || isDigit c || c == '\'' || c == '_' |
31 |
--isSymbol c = elem c ":!#$%&*+./<=>?@\\^|-~" |
32 |
-+isSymbol' c = elem c ":!#$%&*+./<=>?@\\^|-~" |
33 |
- |
34 |
- matchChar :: Char -> String -> Lex a () |
35 |
- matchChar c msg = do |
36 |
-@@ -242,7 +242,7 @@ lexWhiteSpace bol = do |
37 |
- bol <- lexNestedComment bol |
38 |
- (bol, _) <- lexWhiteSpace bol |
39 |
- return (bol, True) |
40 |
-- '-':'-':s | all (== '-') (takeWhile isSymbol s) -> do |
41 |
-+ '-':'-':s | all (== '-') (takeWhile isSymbol' s) -> do |
42 |
- lexWhile (== '-') |
43 |
- lexWhile (/= '\n') |
44 |
- lexNewline |
45 |
-@@ -489,8 +489,8 @@ lexStdToken = do |
46 |
- Just keyword -> keyword |
47 |
- Nothing -> VarId ident |
48 |
- |
49 |
-- | isSymbol c -> do |
50 |
-- sym <- lexWhile isSymbol |
51 |
-+ | isSymbol' c -> do |
52 |
-+ sym <- lexWhile isSymbol' |
53 |
- return $ case lookup sym (reserved_ops ++ special_varops) of |
54 |
- Just t -> t |
55 |
- Nothing -> case c of |
56 |
-@@ -586,9 +586,9 @@ lexConIdOrQual qual = do |
57 |
- discard 1 |
58 |
- lexConIdOrQual qual' |
59 |
- |
60 |
-- | isSymbol c -> do -- qualified symbol? |
61 |
-+ | isSymbol' c -> do -- qualified symbol? |
62 |
- discard 1 |
63 |
-- sym <- lexWhile isSymbol |
64 |
-+ sym <- lexWhile isSymbol' |
65 |
- case lookup sym reserved_ops of |
66 |
- -- cannot qualify a reserved operator |
67 |
- Just _ -> just_a_conid |
68 |
-diff -urwpN haskell-src-exts.org/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs haskell-src-exts/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs |
69 |
---- haskell-src-exts.org/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs 2005-04-08 16:17:29.000000000 +0100 |
70 |
-+++ haskell-src-exts/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs 2006-10-11 19:40:49.000000000 +0100 |
71 |
-@@ -1270,7 +1270,7 @@ trRPat s linear rp = case rp of |
72 |
- HsIdent n -> fail $ "Attempting to bind variable "++n++ |
73 |
- " inside the context of a numerable regular pattern" |
74 |
- _ -> fail $ "This should never ever ever happen...\ |
75 |
-- \ how the ¤#% did you do it??!?" |
76 |
-+ \ how the #% did you do it??!?" |
77 |
- |
78 |
- where -- | Generate a declaration for a @ binding. |
79 |
- mkAsDecl :: SrcLoc -> MFunMetaInfo -> Tr HsName |
80 |
-@@ -1429,7 +1429,7 @@ trRPat s linear rp = case rp of |
81 |
- -- of transformations of optional patterns should be able to call it...) |
82 |
- mkOptDecl :: SrcLoc -> Bool -> MFunMetaInfo -> Tr MFunMetaInfo |
83 |
- mkOptDecl s greedy nvt@(_, vs, t) = do |
84 |
-- -- Un nome, s'il vouz plaît. |
85 |
-+ -- Un nome, s'il vouz plaît. |
86 |
- n <- genMatchName |
87 |
- let -- Generate a generator for matching the subpattern |
88 |
- (g, val) = mkGenExp s nvt -- (harp_valX, (foo, bar, ...)) <- harp_matchY |