summaryrefslogtreecommitdiff
path: root/dev-haskell/haskell-src-exts/files
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-haskell/haskell-src-exts/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-haskell/haskell-src-exts/files')
-rw-r--r--dev-haskell/haskell-src-exts/files/haskell-src-exts-0.2-hiding-isSymbol.patch68
-rw-r--r--dev-haskell/haskell-src-exts/files/haskell-src-exts-1.10.2-Setup.hs8
2 files changed, 76 insertions, 0 deletions
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
new file mode 100644
index 000000000000..df83e026fe0e
--- /dev/null
+++ b/dev-haskell/haskell-src-exts/files/haskell-src-exts-0.2-hiding-isSymbol.patch
@@ -0,0 +1,68 @@
+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
+--- haskell-src-exts.org/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs 2005-05-01 22:40:45.000000000 +0100
++++ haskell-src-exts/src/haskell-src-exts/Language/Haskell/Hsx/Lexer.hs 2006-10-11 19:42:53.000000000 +0100
+@@ -207,9 +207,9 @@ special_varids = [
+ ( "hiding", KW_Hiding )
+ ]
+
+-isIdent, isSymbol :: Char -> Bool
++isIdent, isSymbol' :: Char -> Bool
+ isIdent c = isAlpha c || isDigit c || c == '\'' || c == '_'
+-isSymbol c = elem c ":!#$%&*+./<=>?@\\^|-~"
++isSymbol' c = elem c ":!#$%&*+./<=>?@\\^|-~"
+
+ matchChar :: Char -> String -> Lex a ()
+ matchChar c msg = do
+@@ -242,7 +242,7 @@ lexWhiteSpace bol = do
+ bol <- lexNestedComment bol
+ (bol, _) <- lexWhiteSpace bol
+ return (bol, True)
+- '-':'-':s | all (== '-') (takeWhile isSymbol s) -> do
++ '-':'-':s | all (== '-') (takeWhile isSymbol' s) -> do
+ lexWhile (== '-')
+ lexWhile (/= '\n')
+ lexNewline
+@@ -489,8 +489,8 @@ lexStdToken = do
+ Just keyword -> keyword
+ Nothing -> VarId ident
+
+- | isSymbol c -> do
+- sym <- lexWhile isSymbol
++ | isSymbol' c -> do
++ sym <- lexWhile isSymbol'
+ return $ case lookup sym (reserved_ops ++ special_varops) of
+ Just t -> t
+ Nothing -> case c of
+@@ -586,9 +586,9 @@ lexConIdOrQual qual = do
+ discard 1
+ lexConIdOrQual qual'
+
+- | isSymbol c -> do -- qualified symbol?
++ | isSymbol' c -> do -- qualified symbol?
+ discard 1
+- sym <- lexWhile isSymbol
++ sym <- lexWhile isSymbol'
+ case lookup sym reserved_ops of
+ -- cannot qualify a reserved operator
+ Just _ -> just_a_conid
+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
+--- haskell-src-exts.org/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs 2005-04-08 16:17:29.000000000 +0100
++++ haskell-src-exts/src/haskell-src-exts/Language/Haskell/Hsx/Transform.hs 2006-10-11 19:40:49.000000000 +0100
+@@ -1270,7 +1270,7 @@ trRPat s linear rp = case rp of
+ HsIdent n -> fail $ "Attempting to bind variable "++n++
+ " inside the context of a numerable regular pattern"
+ _ -> fail $ "This should never ever ever happen...\
+- \ how the ¤#% did you do it??!?"
++ \ how the #% did you do it??!?"
+
+ where -- | Generate a declaration for a @ binding.
+ mkAsDecl :: SrcLoc -> MFunMetaInfo -> Tr HsName
+@@ -1429,7 +1429,7 @@ trRPat s linear rp = case rp of
+ -- of transformations of optional patterns should be able to call it...)
+ mkOptDecl :: SrcLoc -> Bool -> MFunMetaInfo -> Tr MFunMetaInfo
+ mkOptDecl s greedy nvt@(_, vs, t) = do
+- -- Un nome, s'il vouz plaît.
++ -- Un nome, s'il vouz plaît.
+ n <- genMatchName
+ let -- Generate a generator for matching the subpattern
+ (g, val) = mkGenExp s nvt -- (harp_valX, (foo, bar, ...)) <- harp_matchY
diff --git a/dev-haskell/haskell-src-exts/files/haskell-src-exts-1.10.2-Setup.hs b/dev-haskell/haskell-src-exts/files/haskell-src-exts-1.10.2-Setup.hs
new file mode 100644
index 000000000000..63a6c22bf33c
--- /dev/null
+++ b/dev-haskell/haskell-src-exts/files/haskell-src-exts-1.10.2-Setup.hs
@@ -0,0 +1,8 @@
+import Distribution.Simple
+import System.Process (rawSystem)
+import System.Exit (ExitCode(..))
+import System.FilePath ((</>))
+main = defaultMainWithHooks $ simpleUserHooks { runTests = \args _ _ _ -> do
+ ExitSuccess <- rawSystem "runhaskell" ("-package-conf=dist/package.conf.inplace" : "Test/Runner.hs" : args)
+ return ()
+ }