dtd-types 0.3.0.1 → 0.4.0.0

raw patch · 2 files changed

+23/−72 lines, 2 filesdep ~basePVP ok

version bump matches the API change (PVP)

Dependency ranges changed: base

API changes (from Hackage documentation)

Files

• Data/XML/DTD/Types.hs +18/−66
• dtd-types.cabal +5/−6

@@ -1,3 +1,4 @@+{-# LANGUAGE DeriveDataTypeable #-} ------------------------------------------------------------------------------ -- | -- Module      :  Data.XML.DTD.Types@@ -64,12 +65,11 @@     -- * Notation declarations   , Notation (..)   , NotationSource (..)-  ) +  )   where  import Data.Text (Text)-import Data.Typeable ( Typeable, TypeRep, typeOf-                     , mkTyConApp, mkTyCon)+import Data.Typeable (Typeable) import Data.XML.Types (ExternalID, Instruction)  -- | A 'DTD' is a sequence components in any order.@@ -77,10 +77,7 @@              { dtdTextDecl :: Maybe DTDTextDecl              , dtdComponents :: [DTDComponent]              }-  deriving (Show, Eq)--instance Typeable DTD where-  typeOf = typeString "DTD"+  deriving (Show, Eq, Typeable)  -- | The @?xml@ text declaration at the beginning of a DTD. data DTDTextDecl =@@ -88,10 +85,7 @@        { dtdXMLVersion :: Maybe Text        , dtdEncoding :: Text        }-  deriving (Show, Eq)--instance Typeable DTDTextDecl where-  typeOf = typeString "DTDTextDecl"+  deriving (Show, Eq, Typeable)  -- | The kinds of components that can appear in a 'DTD'. data DTDComponent =@@ -104,10 +98,7 @@                                 -- the top-level flow of the DTD    | DTDInstruction Instruction -- ^ A processing instruction    | DTDComment Text            -- ^ A comment-  deriving (Show, Eq)--instance Typeable DTDComponent where-  typeOf = typeString "DTDComponent"+  deriving (Show, Eq, Typeable)  -- | A declaration of an entity. An entity is a textual substitution -- variable. General entities can be referenced in an XML document@@ -135,10 +126,7 @@        { entityDeclName :: Text        , entityDeclID :: ExternalID        }-  deriving (Show, Eq)--instance Typeable EntityDecl where-  typeOf = typeString "EntityDecl"+  deriving (Show, Eq, Typeable)  -- | The value of an internal entity may contain references to -- parameter entities; these references need to be resolved to obtain@@ -147,10 +135,7 @@ data EntityValue =      EntityText Text    | EntityPERef PERef-  deriving (Show, Eq)--instance Typeable EntityValue where-  typeOf = typeString "EntityValue"+  deriving (Show, Eq, Typeable)  -- | A parameter entity reference. It contains the name of the -- parameter entity that is being referenced.@@ -162,10 +147,7 @@       { eltDeclName :: Text       , eltDeclContent :: ContentDecl       }-  deriving (Show, Eq)--instance Typeable ElementDecl where-  typeOf = typeString "ElementDecl"+  deriving (Show, Eq, Typeable)  -- | The content that can occur in an element. data ContentDecl =@@ -173,28 +155,19 @@    | ContentAny                     -- ^ Unrestricted content    | ContentElement ContentModel    -- ^ Structured element content    | ContentMixed [Text]            -- ^ A mixture of text and elements-  deriving (Show, Eq)--instance Typeable ContentDecl where-  typeOf = typeString "ContentDecl"+  deriving (Show, Eq, Typeable)  -- | A model of structured content for an element. data ContentModel =      CMName Text Repeat             -- ^ Element name    | CMChoice [ContentModel] Repeat -- ^ Choice, delimited by @\"|\"@    | CMSeq [ContentModel] Repeat    -- ^ Sequence, delimited by @\",\"@-  deriving (Show, Eq)--instance Typeable ContentModel where-  typeOf = typeString "ContentModel"+  deriving (Show, Eq, Typeable)  -- | The number of times a production of content model syntax can -- repeat. data Repeat = One | ZeroOrOne | ZeroOrMore | OneOrMore-  deriving (Show, Eq)--instance Typeable Repeat where-  typeOf = typeString "Repeat"+  deriving (Show, Eq, Typeable)  -- | A list of attribute declarations for an element. data AttList =@@ -204,10 +177,7 @@                                     -- declarations apply        , attListDecls :: [AttDecl]        }-  deriving (Show, Eq)--instance Typeable AttList where-  typeOf = typeString "AttList"+  deriving (Show, Eq, Typeable)  -- | A declaration of an attribute that can occur in an element. data AttDecl =@@ -216,10 +186,7 @@        , attDeclType :: AttType        -- ^ The type of the attribute        , attDeclDefault :: AttDefault  -- ^ The default value specification        }-  deriving (Show, Eq)--instance Typeable AttDecl where-  typeOf = typeString "AttDecl"+  deriving (Show, Eq, Typeable)  -- | The type of value that an attribute can take. data AttType =@@ -234,10 +201,7 @@    | AttEnumType [Text]      -- ^ One of the given values    | AttNotationType [Text]  -- ^ Specified by external syntax                              -- declared as a notation-  deriving (Show, Eq)--instance Typeable AttType where-  typeOf = typeString "AttType"+  deriving (Show, Eq, Typeable)  -- | A default value specification for an attribute. data AttDefault =@@ -248,10 +212,7 @@                           -- given value    | AttDefaultValue Text -- ^ The attribute has the given default value                           -- when not supplied-  deriving (Show, Eq)--instance Typeable AttDefault where-  typeOf = typeString "AttDefault"+  deriving (Show, Eq, Typeable)  -- | A declaration of a notation. data Notation =@@ -259,10 +220,7 @@        { notationName :: Text,          notationSource :: NotationSource        }-  deriving (Show, Eq)--instance Typeable Notation where-  typeOf = typeString "Notation"+  deriving (Show, Eq, Typeable)  -- | A source for a notation. We do not use the usual 'ExternalID' -- type here, because for notations it is only optional, not required,@@ -271,10 +229,4 @@      NotationSysID Text         -- ^ A system ID    | NotationPubID Text         -- ^ A public ID    | NotationPubSysID Text Text -- ^ A public ID with a system ID-  deriving (Show, Eq)--instance Typeable NotationSource where-  typeOf = typeString "NotationSource"--typeString :: String -> a -> TypeRep-typeString str _ = mkTyConApp (mkTyCon ("Data.XML.DTD.Types." ++ str)) []+  deriving (Show, Eq, Typeable)

@@ -1,5 +1,5 @@ name: dtd-types-version: 0.3.0.1+version: 0.4.0.0 synopsis: Basic types for representing XML DTDs description:   This package provides types to represent an XML Document Type@@ -33,18 +33,17 @@ category: Data, Text, XML build-type: Simple cabal-version: >=1.6-category: Text, XML stability: experimental bug-reports: mailto:gale@sefer.org-homepage: http://projects.haskell.org/dtd/+homepage: https://ygale.github.io/dtd  source-repository head-  type: darcs-  location: http://code.haskell.org/dtd/dtd-types/+  type: git+  location: https://github.com/ygale/dtd-types.git  library   build-depends:-      base >=3 && < 5+      base >=4 && < 5     , text     , xml-types ==0.3.*