Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
Cabal
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Haskell
Cabal
Commits
25e445e7
Commit
25e445e7
authored
17 years ago
by
Duncan Coutts
Browse files
Options
Downloads
Patches
Plain Diff
Don't use Data.Char.isSymbol as it doesn't exist in base-1.0
This is an alternative fix to creating a Distribution.Compat.Char
parent
300e6859
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Cabal.cabal
+0
-1
0 additions, 1 deletion
Cabal.cabal
Distribution/ParseUtils.hs
+2
-2
2 additions, 2 deletions
Distribution/ParseUtils.hs
with
2 additions
and
3 deletions
Cabal.cabal
+
0
−
1
View file @
25e445e7
...
@@ -86,7 +86,6 @@ Library
...
@@ -86,7 +86,6 @@ Library
Other-Modules:
Other-Modules:
Distribution.GetOpt,
Distribution.GetOpt,
Distribution.Compat.TempFile
Distribution.Compat.TempFile
Distribution.Compat.Char
Distribution.Compat.Exception
Distribution.Compat.Exception
Distribution.Simple.GHC.Makefile
Distribution.Simple.GHC.Makefile
...
...
This diff is collapsed.
Click to expand it.
Distribution/ParseUtils.hs
+
2
−
2
View file @
25e445e7
...
@@ -72,7 +72,7 @@ import Distribution.Simple.Utils (intercalate, lowercase)
...
@@ -72,7 +72,7 @@ import Distribution.Simple.Utils (intercalate, lowercase)
import
Language.Haskell.Extension
(
Extension
)
import
Language.Haskell.Extension
(
Extension
)
import
Text.PrettyPrint.HughesPJ
hiding
(
braces
)
import
Text.PrettyPrint.HughesPJ
hiding
(
braces
)
import
Data.Char
(
isSpace
,
isUpper
,
toLower
,
isAlphaNum
,
isSymbol
,
isDigit
)
import
Data.Char
(
isSpace
,
isUpper
,
toLower
,
isAlphaNum
,
isDigit
)
import
Data.Maybe
(
fromMaybe
)
import
Data.Maybe
(
fromMaybe
)
import
Data.Tree
as
Tree
(
Tree
(
..
),
flatten
)
import
Data.Tree
as
Tree
(
Tree
(
..
),
flatten
)
import
System.FilePath
(
normalise
)
import
System.FilePath
(
normalise
)
...
@@ -546,7 +546,7 @@ parseBuildToolName = do ns <- sepBy1 component (ReadP.char '-')
...
@@ -546,7 +546,7 @@ parseBuildToolName = do ns <- sepBy1 component (ReadP.char '-')
return
(
intercalate
"-"
ns
)
return
(
intercalate
"-"
ns
)
where
component
=
do
where
component
=
do
cs
<-
munch1
(
\
c
->
isAlphaNum
c
cs
<-
munch1
(
\
c
->
isAlphaNum
c
||
isSymbol
c
||
c
==
'+'
||
c
==
'_'
||
c
==
'_'
&&
c
/=
'-'
)
&&
c
/=
'-'
)
if
all
isDigit
cs
then
pfail
else
return
cs
if
all
isDigit
cs
then
pfail
else
return
cs
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment