hydrogen-data 0.5.1 → 0.6

raw patch · 3 files changed

+4/−45 lines, 3 filesdep ~hydrogen-preludedep ~hydrogen-syntaxdep ~hydrogen-utilPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: hydrogen-prelude, hydrogen-syntax, hydrogen-util

API changes (from Hackage documentation)

Files

• hydrogen-data.cabal +4/−4
• src/Hydrogen/Data/Parser.hs +0/−13
• src/Hydrogen/Data/Types.hs +0/−28

@@ -1,5 +1,5 @@ name:                 hydrogen-data-version:              0.5.1+version:              0.6 homepage:             https://github.com/scravy/hydrogen-data synopsis:             Hydrogen Data license:              BSD3@@ -21,9 +21,9 @@                       , Hydrogen.Data.Types   build-depends:      base ==4.7.*                       , containers ==0.5.*-                      , hydrogen-prelude ==0.5-                      , hydrogen-syntax ==0.5-                      , hydrogen-util ==0.5+                      , hydrogen-prelude ==0.6.0.1+                      , hydrogen-syntax ==0.6+                      , hydrogen-util ==0.6                       , nicify ==1.1.*                       , parsec ==3.1.*                       , uuid ==1.3.*

@@ -14,19 +14,6 @@ parseData :: Parser POPs Data parseData = either mkError Right . runIdentity . runParserT items () "-" -parseData' :: Parser POPs Document-parseData' = either mkError Right . runIdentity . runParserT items' () "-"--items' :: Monad m => ParsecT POPs u m Document-items' = do--    let left  = Left <$> (keyValue <|> node)-        right = Right <$> many (liftM2 (,) getPosition noSeparator)--    (keyValues, pops) <- partitionEithers <$> sepBy (left <|> right) separator--    return (Document (DNode (Map.fromList keyValues) []) pops)- items :: Monad m => ParsecT POPs u m Data items = do 

@@ -5,10 +5,6 @@ import Hydrogen.Prelude import Hydrogen.Prelude.Extra -import Hydrogen.Syntax.Types--import Text.Parsec.Pos- import qualified Data.Map as Map  data Data where@@ -25,8 +21,6 @@     DConstant :: String -> Data   deriving (Eq) -data Document = Document Data [POPs]- showsDNode :: String -> Data -> ShowS showsDNode pfx node xs = case node of @@ -80,26 +74,4 @@         DLink link -> (link ++)          DConstant s -> (s ++)---instance Show Document where--    showsPrec _ (Document props pops) = \xs ->-        "Properties:" ++ showsDNode "  " props ("\n\n" ++ showPopss pops xs)--      where-        showPopss pops xs = concatMap showPops pops ++ xs--        showPops pops = concatMap (\(a, b) -> printf "%s%s\n" (showPos a) (showTok "         " b)) pops ++ "\n"--        showPos :: SourcePos -> String-        showPos pos = printf "%3d%3d " (sourceLine pos) (sourceColumn pos)--        showTok :: String -> POP -> String-        showTok pfx = \case-            Token t k s -> printf "%s %s %s" (show t) k (show s)-            Block t k ts -> printf "%s %s %s" (show t) k (concatMap (\t -> '\n' : pfx' ++ showTok pfx' (snd t)) ts)-          where-            pfx' = "  " ++ pfx-