hydrogen-syntax 0.7.1 → 0.10
raw patch · 4 files changed
+22/−13 lines, 4 filesdep +hydrogen-parsingdep −hydrogen-utildep ~hydrogen-preludePVP ok
version bump matches the API change (PVP)
Dependencies added: hydrogen-parsing
Dependencies removed: hydrogen-util
Dependency ranges changed: hydrogen-prelude
API changes (from Hackage documentation)
+ Hydrogen.Syntax.Types: instance Constructor C1_0BlockType
+ Hydrogen.Syntax.Types: instance Constructor C1_0POP
+ Hydrogen.Syntax.Types: instance Constructor C1_0Token
+ Hydrogen.Syntax.Types: instance Constructor C1_0TokenType
+ Hydrogen.Syntax.Types: instance Constructor C1_1BlockType
+ Hydrogen.Syntax.Types: instance Constructor C1_1POP
+ Hydrogen.Syntax.Types: instance Constructor C1_1Token
+ Hydrogen.Syntax.Types: instance Constructor C1_1TokenType
+ Hydrogen.Syntax.Types: instance Constructor C1_2BlockType
+ Hydrogen.Syntax.Types: instance Constructor C1_2Token
+ Hydrogen.Syntax.Types: instance Constructor C1_2TokenType
+ Hydrogen.Syntax.Types: instance Constructor C1_3Token
+ Hydrogen.Syntax.Types: instance Constructor C1_3TokenType
+ Hydrogen.Syntax.Types: instance Constructor C1_4Token
+ Hydrogen.Syntax.Types: instance Constructor C1_5Token
+ Hydrogen.Syntax.Types: instance Constructor C1_6Token
+ Hydrogen.Syntax.Types: instance Constructor C1_7Token
+ Hydrogen.Syntax.Types: instance Datatype D1BlockType
+ Hydrogen.Syntax.Types: instance Datatype D1POP
+ Hydrogen.Syntax.Types: instance Datatype D1Token
+ Hydrogen.Syntax.Types: instance Datatype D1TokenType
+ Hydrogen.Syntax.Types: instance Eq POP
+ Hydrogen.Syntax.Types: instance Eq Token
+ Hydrogen.Syntax.Types: instance Generic BlockType
+ Hydrogen.Syntax.Types: instance Generic POP
+ Hydrogen.Syntax.Types: instance Generic Token
+ Hydrogen.Syntax.Types: instance Generic TokenType
+ Hydrogen.Syntax.Types: instance Ord BlockType
+ Hydrogen.Syntax.Types: instance Ord POP
+ Hydrogen.Syntax.Types: instance Ord Token
+ Hydrogen.Syntax.Types: instance Ord TokenType
+ Hydrogen.Syntax.Types: instance Serialize BlockType
+ Hydrogen.Syntax.Types: instance Serialize POP
+ Hydrogen.Syntax.Types: instance Serialize Token
+ Hydrogen.Syntax.Types: instance Serialize TokenType
+ Hydrogen.Syntax.Types: instance Typeable BlockType
+ Hydrogen.Syntax.Types: instance Typeable POP
+ Hydrogen.Syntax.Types: instance Typeable Token
+ Hydrogen.Syntax.Types: instance Typeable TokenType
Files
- README.md +0/−0
- hydrogen-syntax.cabal +9/−7
- src/Hydrogen/Syntax/Parser.hs +1/−1
- src/Hydrogen/Syntax/Types.hs +12/−5
+ README.md view
hydrogen-syntax.cabal view
@@ -1,15 +1,15 @@ name: hydrogen-syntax-version: 0.7.1-homepage: https://github.com/scravy/hydrogen-syntax+version: 0.10+homepage: https://scravy.de/hydrogen-syntax/ synopsis: Hydrogen Syntax license: BSD3 license-file: LICENSE-extra-source-files: CHANGELOG.md+extra-source-files: CHANGELOG.md, README.md author: Julian Fleischer-maintainer: julfleischer@paypal.com+maintainer: julian@scravy.de category: Language build-type: Simple-cabal-version: >=1.18+cabal-version: >=1.14 source-repository head type: git@@ -20,8 +20,8 @@ , Hydrogen.Syntax.Types build-depends: base ==4.7.* , containers ==0.5.* - , hydrogen-prelude ==0.7.1- , hydrogen-util ==0.7.1+ , hydrogen-prelude ==0.10+ , hydrogen-parsing ==0.10 , nicify ==1.1.* , parsec ==3.1.* , uuid ==1.3.*@@ -29,6 +29,8 @@ ghc-options: -Wall default-language: Haskell2010 default-extensions: CPP+ , DeriveDataTypeable+ , DeriveGeneric , EmptyCase , FlexibleContexts , GADTs
src/Hydrogen/Syntax/Parser.hs view
@@ -3,7 +3,7 @@ import Hydrogen.Prelude hiding ((<|>), many) import Hydrogen.Syntax.Types -import Hydrogen.Util.Parsec.Char hiding (token, tokens, space)+import Hydrogen.Parsing.Char hiding (token, tokens, space) tokenize :: String -> Parser String (Tokens Token)
src/Hydrogen/Syntax/Types.hs view
@@ -1,28 +1,34 @@ module Hydrogen.Syntax.Types where import Hydrogen.Prelude-import Hydrogen.Util.Parsec+import Hydrogen.Parsing type POPs = [(SourcePos, POP)] data POP where Token :: TokenType -> [Char] -> [Char] -> POP Block :: BlockType -> [Char] -> POPs -> POP- deriving (Show)+ deriving (Eq, Ord, Show, Typeable, Generic) +instance Serialize POP+ data TokenType where AposString :: TokenType QuotString :: TokenType TickString :: TokenType SomethingT :: TokenType- deriving (Eq, Show)+ deriving (Eq, Ord, Show, Typeable, Generic) +instance Serialize TokenType+ data BlockType where Grouping :: BlockType Brackets :: BlockType Mustache :: BlockType- deriving (Eq, Show)+ deriving (Eq, Ord, Show, Typeable, Generic) +instance Serialize BlockType+ data Token where TComma :: Token TSemicolon :: Token@@ -32,5 +38,6 @@ TIndent :: Int -> Token TSpaces :: Token TString :: [Char] -> Char -> [Char] -> Token- deriving (Show)+ deriving (Eq, Ord, Show, Typeable, Generic) +instance Serialize Token