uniprot-kb 0.1.1.1 → 0.1.1.2
raw patch · 3 files changed
+18/−8 lines, 3 filesPVP: minor bump suggested
API additions: PVP suggests at least a minor version bump
API changes (from Hackage documentation)
+ Bio.Uniprot.Parser: parseMultiLine :: Text -> Int -> Parser [String]
Files
- ChangeLog.md +3/−0
- src/Bio/Uniprot/Parser.hs +13/−6
- uniprot-kb.cabal +2/−2
ChangeLog.md view
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## 0.1.1.2+* Empty FT description bugfix+ ## 0.1.1.1 * `Generic` deriving for all types
src/Bio/Uniprot/Parser.hs view
@@ -314,8 +314,9 @@ fromEP <- parseFTEndpoint many1 space toEP <- parseFTEndpoint- many1 space- description <- splitByMagic <$> parseMultiLineComment "FT" 32+ description <- splitByMagic <$>+ ((many' (char ' ') *> parseMultiLineComment "FT" 32) <|>+ (hyphenConcat <$> parseMultiLine "FT" 32)) pure FT{..} where -- |Parse FT endpoint@@ -331,6 +332,7 @@ splitByMagic txt = pack <$> splitStr 0 [] txt where splitStr :: Int -> String -> String -> [String]+ splitStr _ _ [] = [] splitStr 0 acc ['.'] = [reverse acc] splitStr 0 acc ('.':' ':xs) = reverse acc : splitStr 0 [] xs splitStr 0 acc ('.':xs) = reverse acc : splitStr 0 [] xs@@ -420,11 +422,16 @@ parseMultiLineComment :: Text -> Int -> Parser String parseMultiLineComment start skip = do comm <- (:) <$> parseTillEnd- <*> many' (do endOfLine- string start- count (skip - 1) (char ' ') -- leave one space to separate words- parseTillEnd)+ <*> parseMultiLine start skip pure $ hyphenConcat comm++-- |Parses multiline comment from new line.+parseMultiLine :: Text -> Int -> Parser [String]+parseMultiLine start skip = many' $ do+ endOfLine+ string start+ count (skip - 1) (char ' ') -- leave one space to separate words+ parseTillEnd -- |Parses line break for multiline section. parseBreak :: Text -> Parser ()
uniprot-kb.cabal view
@@ -2,10 +2,10 @@ -- -- see: https://github.com/sol/hpack ----- hash: 06baf09e16aa4f6d0c85f1f11df2590dc51caa3604bc3c25d4d20bd37d8af80f+-- hash: 3ad04521443700a821fc0c490ffa73b63483d95f6b3ac5d48e48355ceeafd473 name: uniprot-kb-version: 0.1.1.1+version: 0.1.1.2 synopsis: UniProt-KB format parser description: Specification implementation of https://web.expasy.org/docs/userman.html category: Bio