fadno-xml 1.2 → 1.2.1

raw patch · 5 files changed

+11/−6 lines, 5 filesdep ~basePVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: base

API changes (from Hackage documentation)

- Fadno.Xml.EmitXml: [XContent] :: {xtext :: XmlRep, xattrs :: [XmlRep], xels :: [XmlRep]} -> XmlRep

+ Fadno.Xml.EmitXml: [XContent] :: XmlRep -> [XmlRep] -> [XmlRep] -> XmlRep

- Fadno.Xml.ParseXsd: refvalue :: forall a_aanO5 a_aarmc. Traversal (Ref a_aanO5) (Ref a_aarmc) a_aanO5 a_aarmc

+ Fadno.Xml.ParseXsd: refvalue :: forall a_a2hw7 a_a2ld6. Traversal (Ref a_a2hw7) (Ref a_a2ld6) a_a2hw7 a_a2ld6

- Fadno.Xml.ParseXsd: resolved :: forall a_aanO5. Traversal' (Ref a_aanO5) QN

+ Fadno.Xml.ParseXsd: resolved :: forall a_a2hw7. Traversal' (Ref a_a2hw7) QN

- Fadno.Xml.ParseXsd: unresolved :: forall a_aanO5. Traversal' (Ref a_aanO5) QN

+ Fadno.Xml.ParseXsd: unresolved :: forall a_a2hw7. Traversal' (Ref a_a2hw7) QN

fadno-xml.cabal view

@@ -1,5 +1,5 @@ name:                fadno-xml-version:             1.2+version:             1.2.1 synopsis:            XML/XSD combinators/schemas/codegen description:             Library for generating code from XML schema files, with@@ -40,7 +40,7 @@   -- other-modules:   -- other-extensions:   build-depends:       Decimal >= 0.4-                     , base >= 4.9 && < 4.15+                     , base >= 4.9 && < 4.20                      , containers >= 0.5                      , lens >= 4.15                      , mtl >= 2.2

src/Fadno/Xml/Codegen.hs view

@@ -21,6 +21,7 @@ import Fadno.Xml.EmitTypes import Fadno.Xml.ParseXsd import Control.Lens hiding (Choice,element,elements)+import Control.Monad import Control.Monad.State.Strict import Control.Monad.Reader import qualified Data.Map.Strict as M

src/Fadno/Xml/ParseXsd.hs view

@@ -366,10 +366,12 @@   instance Resolvable (Ref (Either ComplexType SimpleType)) where-    resolve sch (Unresolved f) = Resolved f $ either error id-                                 ((Left <$> searchRefTarget "Either-ComplexType" complexTypes f sch)-                                  <|>-                                  (Right <$> searchRefTarget "Either-SimpleType" simpleTypes f sch))+    resolve sch (Unresolved f) = Resolved f $+        case searchRefTarget "Either-ComplexType" complexTypes f sch of+          Right r -> Left r+          Left {} -> case searchRefTarget "Either-SimpleType" simpleTypes f sch of+            Right r -> Right r+            Left e -> error e     resolve _ r = r

src/Fadno/Xml/XParse.hs view

@@ -18,6 +18,7 @@ import qualified Text.XML.Light.Cursor as C  import Control.Exception+import Control.Monad import Control.Monad.State.Strict hiding (sequence) import Control.Monad.Except hiding (sequence) import Data.Either

src/Fadno/Xml/XParser.hs view

@@ -22,6 +22,7 @@ import qualified Text.XML.Light as X  import Control.Exception+import Control.Monad import Control.Monad.State.Strict hiding (sequence) import Control.Monad.Except hiding (sequence) import Data.Either