hydrogen-syntax 0.10 → 0.11

raw patch · 3 files changed

+12/−10 lines, 3 filesdep ~hydrogen-parsingdep ~hydrogen-preludePVP ok

version bump matches the API change (PVP)

Dependency ranges changed: hydrogen-parsing, hydrogen-prelude

API changes (from Hackage documentation)

Files

• hydrogen-syntax.cabal +3/−3
• src/Hydrogen/Syntax/Parser.hs +7/−5
• src/Hydrogen/Syntax/Types.hs +2/−2

@@ -1,5 +1,5 @@ name:                 hydrogen-syntax-version:              0.10+version:              0.11 homepage:             https://scravy.de/hydrogen-syntax/ synopsis:             Hydrogen Syntax license:              BSD3@@ -20,8 +20,8 @@                       , Hydrogen.Syntax.Types   build-depends:      base ==4.7.*                       , containers ==0.5.* -                      , hydrogen-prelude ==0.10-                      , hydrogen-parsing ==0.10+                      , hydrogen-prelude ==0.11+                      , hydrogen-parsing ==0.11                       , nicify ==1.1.*                       , parsec ==3.1.*                       , uuid ==1.3.*

@@ -71,16 +71,18 @@             ('v', '\v') ]         convert str = let [(hex, _)] = readHex str in toEnum hex +    sanitize :: [(SourcePos, Token)] -> Either SomethingBad (Tokens Token)+     sanitize (t1@(p1, v1) : ts@(_t2@(p2, v2) : tss)) = case (v1, v2) of          (TSomething k, TBraceOpen _ t) -> sanitize ((p1, TBraceOpen k t) : tss) -        (TString _ _ _, TSomething _) -> Left (p2, [])-        (TString _ _ _, TBraceOpen _ _) -> Left (p2, [])+        (TString _ _ _, TSomething _) -> Left [(p2, "")]+        (TString _ _ _, TBraceOpen _ _) -> Left [(p2, "")] -        (TBraceClose _, TSomething _) -> Left (p2, [])-        (TBraceClose _, TString _ _ _) -> Left (p2, [])-        (TBraceClose _, TBraceOpen _ _) -> Left (p2, [])+        (TBraceClose _, TSomething _) -> Left [(p2, "")]+        (TBraceClose _, TString _ _ _) -> Left [(p2, "")]+        (TBraceClose _, TBraceOpen _ _) -> Left [(p2, "")]                  (TBraceOpen _ _, TIndent _) -> sanitize (t1 : tss)         (TBraceOpen _ _, TSpaces) -> sanitize (t1 : tss)

@@ -17,7 +17,7 @@     QuotString :: TokenType     TickString :: TokenType     SomethingT :: TokenType-  deriving (Eq, Ord, Show, Typeable, Generic)+  deriving (Eq, Ord, Enum, Show, Typeable, Generic)  instance Serialize TokenType @@ -25,7 +25,7 @@     Grouping :: BlockType     Brackets :: BlockType     Mustache :: BlockType-  deriving (Eq, Ord, Show, Typeable, Generic)+  deriving (Eq, Ord, Enum, Show, Typeable, Generic)  instance Serialize BlockType