Skip to content

disallow package names with "words" consisting solely of numbers #1338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgsloan merged 1 commit into from
Nov 14, 2015
Merged

disallow package names with "words" consisting solely of numbers #1338

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/Stack/Types/PackageName.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import qualified Data.ByteString.Char8 as S8
import Data.Char (isLetter)
import Data.Data
import Data.Hashable
import Data.List (intercalate)
import Data.Map (Map)
import qualified Data.Map as Map
import Data.Text (Text)
Expand Down Expand Up @@ -88,14 +89,13 @@ instance FromJSON PackageName where
-- | Attoparsec parser for a package name from bytestring.
packageNameParser :: Parser PackageName
packageNameParser =
fmap (PackageName . S8.pack)
(appending (many1 (satisfy isAlphaNum))
(concating (many (alternating
(pured (satisfy isAlphaNum))
(appending (pured (satisfy (== '-')))
(pured (satisfy isLetter)))))))
fmap (PackageName . S8.pack . intercalate "-")
(sepBy1 word (char '-'))
where
isAlphaNum c = isLetter c || isDigit c
word = concat <$> sequence [many digit,
pured letter,
many (alternating letter digit)]
letter = satisfy isLetter

-- | Make a package name.
mkPackageName :: String -> Q Exp
Expand Down