git.iko.soy/typeable/xml-isogen
on master help sign in
Fix TH compatibility
commit86ae2ce9584b5c01e429cf8cea51851815e31e02 authorDenis Redozubov <denis.redozubov@gmail.com> dateTue 13 Mar 2018, 10:36 (9 years ago) parent03c1dd8
2 files changed+4−5
compare with master
unifiedsplit
src/Data/THGen/Compat.hs+1−1 src/Data/THGen/XML.hs+3−4
src/Data/THGen/Compat.hs+1−1
@@ -38,7 +38,7 @@ newtypeD name = TH.newtypeD (return []) name []
3838
3939#if MIN_VERSION_template_haskell(2,11,0)
4040nonStrictType :: TH.TypeQ -> TH.BangTypeQ
41−nonStrictType = TH.bangType (TH.bang TH.noSourceUnpackedness TH.sourceLazy)
41+nonStrictType = TH.bangType (TH.bang TH.noSourceUnpackedness TH.noSourceStrictness)
4242#else
4343nonStrictType :: TH.TypeQ -> TH.StrictTypeQ
4444nonStrictType = TH.strictType TH.notStrict
src/Data/THGen/XML.hs+3−4
@@ -233,7 +233,7 @@ infix 0 =:=
233233instance Description PrefixName IsoXmlDescRecord where
234234 prefixName =:= descRecord =
235235 let descRecordParts = descRecord ^. _IsoXmlDescRecord
236− in isoXmlGenerateRecord prefixName (reverse descRecordParts)
236+ in isoXmlGenerateDatatype prefixName (reverse descRecordParts)
237237
238238record :: IsoXmlDescRecord
239239record = IsoXmlDescRecord []
@@ -312,8 +312,8 @@ isoXmlGenerateEnum (ExhaustivenessName strName' exh) enumCons = do
312312 return $ enumDecls ++ [toXmlInst, toXmlAttributeInst,
313313 fromDomInst, fromAttributeInst]
314314
315−isoXmlGenerateRecord :: PrefixName -> [IsoXmlDescRecordPart] -> TH.DecsQ
316−isoXmlGenerateRecord (PrefixName strName' strPrefix') descRecordParts = do
315+isoXmlGenerateDatatype :: PrefixName -> [IsoXmlDescRecordPart] -> TH.DecsQ
316+isoXmlGenerateDatatype (PrefixName strName' strPrefix') descRecordParts = do
317317 let
318318 isNewtype = length descRecordParts == 1
319319 strName = "Xml" ++ strName'
@@ -347,7 +347,6 @@ isoXmlGenerateRecord (PrefixName strName' strPrefix') descRecordParts = do
347347 XmlAttributePluralOptional -> [t| Maybe $attributeType |]
348348 in
349349 varStrictType fName (strictType fType)
350−<<<<<<< HEAD
351350 dataD
352351 name
353352 [TH.recC name fields]