Populate Parsec.Lagacy

Author: phadej

Cabal/Distribution/PackageDescription/Parsec/Legacy.hs

@@ -41,10 +41,79 @@ patches :: Map.Map (BS.ByteString, Fingerprint) (Fingerprint, BS.ByteString -> B
 patches = Map.fromList
     -- http://hackage.haskell.org/package/unicode-transforms-0.3.3
     -- other-modules: .
+    -- ReadP assumed dot is empty line
     [ mk "-- This file has been generated from package.yaml by hpack version 0.17.0.\n--\n-- see: https://github.com/sol/hpack\n\nname:                unicode-transforms\nversion:             0.3.3\nsynopsis:            Unicode normalization\ndescription:         Fast Unic"
          (Fingerprint 15958160436627155571 10318709190730872881)
          (Fingerprint 11008465475756725834 13815629925116264363)
          (bsRemove "  other-modules:\n      .\n") -- TODO: remove traling \n to test structural-diff
+    -- http://hackage.haskell.org/package/DSTM-0.1.2
+    -- http://hackage.haskell.org/package/DSTM-0.1.1
+    -- http://hackage.haskell.org/package/DSTM-0.1
+    -- Other Modules: no dash
+    -- ReadP parsed as section
+    , mk "Name: DSTM\nVersion: 0.1.2\nCopyright: (c) 2010, Frank Kupke\nLicense: LGPL\nLicense-File: LICENSE\nAuthor: Frank Kupke\nMaintainer: [email protected]\nCabal-Version: >= 1.2.3\nStability: provisional\nSynopsis: A framework for using STM within distributed "
+         (Fingerprint 6919263071548559054 9050746360708965827)
+         (Fingerprint 17015177514298962556 11943164891661867280)
+         (bsReplace "Other modules:" "-- ")
+    , mk "Name: DSTM\nVersion: 0.1.1\nCopyright: (c) 2010, Frank Kupke\nLicense: LGPL\nLicense-File: LICENSE\nAuthor: Frank Kupke\nMaintainer: [email protected]\nCabal-Version: >= 1.2.3\nStability: provisional\nSynopsis: A framework for using STM within distributed "
+         (Fingerprint 17313105789069667153 9610429408495338584)
+         (Fingerprint 17250946493484671738 17629939328766863497)
+         (bsReplace "Other modules:" "-- ")
+    , mk "Name: DSTM\nVersion: 0.1\nCopyright: (c) 2010, Frank Kupke\nLicense: LGPL\nLicense-File: LICENSE\nAuthor: Frank Kupke\nMaintainer: [email protected]\nCabal-Version: >= 1.2.3\nStability: provisional\nSynopsis: A framework for using STM within distributed sy"
+         (Fingerprint 10502599650530614586 16424112934471063115)
+         (Fingerprint 13562014713536696107 17899511905611879358)
+         (bsReplace "Other modules:" "-- ")
+    -- http://hackage.haskell.org/package/control-monad-exception-mtl-0.10.3
+    , mk "name: control-monad-exception-mtl\nversion: 0.10.3\nCabal-Version:  >= 1.10\nbuild-type: Simple\nlicense: PublicDomain\nauthor: Pepe Iborra\nmaintainer: [email protected]\nhomepage: http://pepeiborra.github.com/control-monad-exception\nsynopsis: MTL instances f"
+         (Fingerprint 18274748422558568404 4043538769550834851)
+         (Fingerprint 11395257416101232635 4303318131190196308)
+         (bsReplace " default- extensions:" "unknown-section")
+    -- http://hackage.haskell.org/package/vacuum-opengl-0.0
+    -- \DEL character
+    , mk "Name:                vacuum-opengl\nVersion:             0.0\nSynopsis:            Visualize live Haskell data structures using vacuum, graphviz and OpenGL.\nDescription:         \DELVisualize live Haskell data structures using vacuum, graphviz and OpenGL.\n     "
+         (Fingerprint 5946760521961682577 16933361639326309422)
+         (Fingerprint 14034745101467101555 14024175957788447824)
+         (bsRemove "\DEL")
+    , mk "Name:                vacuum-opengl\nVersion:             0.0.1\nSynopsis:            Visualize live Haskell data structures using vacuum, graphviz and OpenGL.\nDescription:         \DELVisualize live Haskell data structures using vacuum, graphviz and OpenGL.\n   "
+         (Fingerprint 10790950110330119503 1309560249972452700)
+         (Fingerprint 1565743557025952928 13645502325715033593)
+         (bsRemove "\DEL")
+    -- http://hackage.haskell.org/package/ixset-1.0.4
+    -- {- comments -}
+    , mk "Name:                ixset\nVersion:             1.0.4\nSynopsis:            Efficient relational queries on Haskell sets.\nDescription:\n    Create and query sets that are indexed by multiple indices.\nLicense:             BSD3\nLicense-file:        COPYING\nAut"
+         (Fingerprint 11886092342440414185 4150518943472101551)
+         (Fingerprint 5731367240051983879 17473925006273577821)
+         (bsRemoveStarting "{-")
+    -- : after section
+    -- http://hackage.haskell.org/package/ds-kanren
+    , mk "name:                ds-kanren\nversion:             0.2.0.0\nsynopsis:            A subset of the miniKanren language\ndescription:\n  ds-kanren is an implementation of the <http://minikanren.org miniKanren> language.\n  .\n  == What's in ds-kanren?\n  .\n  ['dis"
+         (Fingerprint 2804006762382336875 9677726932108735838)
+         (Fingerprint 9830506174094917897 12812107316777006473)
+         (bsReplace "Test-Suite test-unify:" "Test-Suite \"test-unify:\"" . bsReplace "Test-Suite test-list-ops:" "Test-Suite \"test-list-ops:\"")
+    , mk "name:                ds-kanren\nversion:             0.2.0.1\nsynopsis:            A subset of the miniKanren language\ndescription:\n  ds-kanren is an implementation of the <http://minikanren.org miniKanren> language.\n\nlicense:             MIT\nlicense-file:  "
+         (Fingerprint 9130259649220396193 2155671144384738932)
+         (Fingerprint 1847988234352024240 4597789823227580457)
+         (bsReplace "Test-Suite test-unify:" "Test-Suite \"test-unify:\"" . bsReplace "Test-Suite test-list-ops:" "Test-Suite \"test-list-ops:\"")
+    , mk "name:                metric\nversion:             0.1.4\nsynopsis:            Metric spaces.\nlicense:             MIT\nlicense-file:        LICENSE\nauthor:              Vikram Verma\nmaintainer:          [email protected]\ncategory:            Data\nbuild-type:"
+         (Fingerprint 6150019278861565482 3066802658031228162)
+         (Fingerprint 9124826020564520548 15629704249829132420)
+         (bsReplace "test-suite metric-tests:" "test-suite \"metric-tests:\"")
+    , mk "name:                metric\nversion:             0.2.0\nsynopsis:            Metric spaces.\nlicense:             MIT\nlicense-file:        LICENSE\nauthor:              Vikram Verma\nmaintainer:          [email protected]\ncategory:            Data\nbuild-type:"
+         (Fingerprint 4639805967994715694 7859317050376284551)
+         (Fingerprint 5566222290622325231 873197212916959151)
+         (bsReplace "test-suite metric-tests:" "test-suite \"metric-tests:\"")
+    , mk "name:          phasechange\ncategory:      Data\nversion:       0.1\nauthor:        G\195\161bor Lehel\nmaintainer:    G\195\161bor Lehel <[email protected]>\nhomepage:      http://github.com/glehel/phasechange\ncopyright:     Copyright (C) 2012 G\195\161bor Lehel\nlicense:     "
+         (Fingerprint 10546509771395401582 245508422312751943)
+         (Fingerprint 5169853482576003304 7247091607933993833)
+         (bsReplace "impl(ghc >= 7.4):" "erroneous-section" . bsReplace "impl(ghc >= 7.6):" "erroneous-section")
+    , mk "Name:                smartword\nSynopsis:            Web based flash card for Word Smart I and II vocabularies\nVersion:             0.0.0.5\nHomepage:            http://kyagrd.dyndns.org/~kyagrd/project/smartword/\nCategory:            Web,Education\nLicense: "
+         (Fingerprint 7803544783533485151 10807347873998191750)
+         (Fingerprint 1665635316718752601 16212378357991151549)
+         (bsReplace "build depends:" "--")
+    , mk "name:           shelltestrunner\n-- sync with README.md, ANNOUNCE:\nversion:        1.3\ncategory:       Testing\nsynopsis:       A tool for testing command-line programs.\ndescription:\n shelltestrunner is a cross-platform tool for testing command-line\n program"
+         (Fingerprint 4403237110790078829 15392625961066653722)
+         (Fingerprint 10218887328390239431 4644205837817510221)
+         (bsReplace "other modules:" "--")
     ]
   where
     mk a b c d = ((a, b), (c, d))
@@ -56,14 +125,14 @@ _makePatchKey fp transform = do
     let output = transform contents
     let Fingerprint hi lo = md5 contents
     let Fingerprint hi' lo' = md5 output
-    putStrLn 
-        $ showString "mk "
+    putStrLn
+        $ showString "    , mk "
         . shows (BS.take 256 contents)
-        . showString "\n   (Fingerprint "
+        . showString "\n         (Fingerprint "
         . shows hi
         . showString " "
         . shows lo
-        . showString ")\n   (Fingerprint "
+        . showString ")\n         (Fingerprint "
         . shows hi'
         . showString " "
         . shows lo'
@@ -79,3 +148,18 @@ bsRemove
     -> BS.ByteString -> BS.ByteString
 bsRemove needle haystack = case BS.breakSubstring needle haystack of
     (h, t) -> BS.append h (BS.drop (BS.length needle) t)
+
+bsReplace
+    :: BS.ByteString -- ^ needle
+    -> BS.ByteString -- ^ replacement
+    -> BS.ByteString -> BS.ByteString
+bsReplace needle repl haystack = case BS.breakSubstring needle haystack of
+    (h, t)
+        | not (BS.null t) -> BS.append h (BS.append repl (BS.drop (BS.length needle) t))
+        | otherwise -> haystack
+
+bsRemoveStarting
+    :: BS.ByteString  -- ^ needle
+    -> BS.ByteString -> BS.ByteString
+bsRemoveStarting needle haystack = case BS.breakSubstring needle haystack of
+    (h, _) -> h

Cabal/tests/ParserHackageTests.hs

@@ -95,7 +95,6 @@ compareTest
     :: String  -- ^ prefix of first packages to start traversal
     -> FilePath -> BSL.ByteString -> IO (Sum Int, Sum Int, M Parsec.PWarnType (Sum Int))
 compareTest pfx fpath bsl
-    | any ($ fpath) problematicFiles = mempty
     | not $ pfx `isPrefixOf` fpath   = mempty
     | otherwise = do
     let str = ignoreBOM $ fromUTF8LBS bsl
@@ -132,7 +131,8 @@ compareTest pfx fpath bsl
         else parsec0
 
     -- Compare two parse results
-    unless (readp0 == parsec1) $ do
+    -- ixset-1.0.4 has invalid prof-options, it's the only exception!
+    unless (readp0 == parsec1 || fpath == "ixset/1.0.4/ixset.cabal") $ do
 #if HAS_STRUCT_DIFF
             prettyResultIO $ diff readp parsec
 #else
@@ -149,20 +149,22 @@ compareTest pfx fpath bsl
 
     when (readpWarnCount > parsecWarnCount) $ do
         putStrLn "There are more readpWarnings"
-        exitFailure
+        -- hint has -- in brace syntax, readp thinks it's a section
+        -- http://hackage.haskell.org/package/hint-0.3.2.3/revision/0.cabal
+        unless ("/hint.cabal" `isSuffixOf` fpath) exitFailure
 
     let parsecWarnMap   = foldMap (\(Parsec.PWarning t _ _) -> M $ Map.singleton t 1) warnings
     return (readpWarnCount, parsecWarnCount, parsecWarnMap)
 
 parseReadpTest :: FilePath -> BSL.ByteString -> IO ()
-parseReadpTest fpath bsl = unless (any ($ fpath) problematicFiles) $ do
-    let str = fromUTF8LBS bsl
+parseReadpTest fpath bsl = do
+    let str = ignoreBOM $ fromUTF8LBS bsl
     case ReadP.parseGenericPackageDescription str of
         ReadP.ParseOk _ _     -> return ()
-        ReadP.ParseFailed err -> print err >> exitFailure
+        ReadP.ParseFailed err -> putStrLn fpath >> print err >> exitFailure
 
 parseParsecTest :: FilePath -> BSL.ByteString -> IO ()
-parseParsecTest fpath bsl = unless (any ($ fpath) problematicFiles) $ do
+parseParsecTest fpath bsl = do
     let bs = bslToStrict bsl
     let (_warnings, errors, parsec) = Parsec.runParseResult $ Parsec.parseGenericPackageDescription bs
     case parsec of
@@ -171,36 +173,6 @@ parseParsecTest fpath bsl = unless (any ($ fpath) problematicFiles) $ do
             traverse_ (putStrLn . Parsec.showPError fpath) errors
             exitFailure
 
-problematicFiles :: [FilePath -> Bool]
-problematicFiles =
-    [
-    -- Indent failure
-      eq "control-monad-exception-mtl/0.10.3/control-monad-exception-mtl.cabal"
-    -- Other modules <- no dash
-    , eq "DSTM/0.1/DSTM.cabal"
-    , eq "DSTM/0.1.1/DSTM.cabal"
-    , eq "DSTM/0.1.2/DSTM.cabal"
-    -- colon : after section header
-    , eq "ds-kanren/0.2.0.0/ds-kanren.cabal"
-    , eq "ds-kanren/0.2.0.1/ds-kanren.cabal"
-    , eq "metric/0.1.4/metric.cabal"
-    , eq "metric/0.2.0/metric.cabal"
-    , eq "phasechange/0.1/phasechange.cabal"
-    , eq "shelltestrunner/1.3/shelltestrunner.cabal"
-    , eq "smartword/0.0.0.5/smartword.cabal"
-    -- \DEL
-    , eq "vacuum-opengl/0.0/vacuum-opengl.cabal"
-    , eq "vacuum-opengl/0.0.1/vacuum-opengl.cabal"
-    -- dashes in version, not even tag
-    , isPrefixOf "free-theorems-webui/"
-    -- {- comment -}
-    , eq "ixset/1.0.4/ixset.cabal"
-    -- comments in braces
-    , isPrefixOf "hint/"
-    ]
-  where
-    eq = (==)
-
 main :: IO ()
 main = do
     args <- getArgs