1fa91b7 · typeable/aeson

git.iko.soy/typeable/aeson

on master help sign in

Fix up a type ambiguity problem with Template Haskell

1fa91b7Bryan O'Sullivan11 years ago

Data/Aeson/TH.hs+6−4

compare with master

unifiedsplit

@@ -436,8 +436,8 @@ sumToEncoding opts multiCons conName exp

436 array (encStr opts conName <%> fexp)

437 TaggedObject{tagFieldName, contentsFieldName} ->

438 object $

439− ([|E.builder tagFieldName|] <:> encStr opts conName) <%>

439+ ([|E.text (T.pack tagFieldName)|] <:> encStr opts conName) <%>

440− ([|E.builder contentsFieldName|] <:> fexp)

440+ ([|E.text (T.pack contentsFieldName)|] <:> fexp)

441 ObjectWithSingleField ->

442 object (encStr opts conName <:> fexp)

443

@@ -500,7 +500,8 @@ argsToEncoding opts multiCons (RecC conName ts) = case (unwrapUnaryRecords opts,

500 toPair (arg, (field, _, _)) =

501 toFieldName field <:> [|E.builder|] `appE` varE arg

502

503+ toFieldName field = [|E.text|] `appE`

503− toFieldName field = [|E.builder|] `appE` fieldLabelExp opts field

504+ ([|T.pack|] `appE` fieldLabelExp opts field)

504

505

505 match (conP conName $ map varP args)

506 match (conP conName $ map varP args)

506 ( normalB

507 ( normalB

@@ -509,7 +510,8 @@ argsToEncoding opts multiCons (RecC conName ts) = case (unwrapUnaryRecords opts,

509 TwoElemArray -> array $

510 TwoElemArray -> array $

510 encStr opts conName <%> [|fromEncoding|] `appE` exp

511 encStr opts conName <%> [|fromEncoding|] `appE` exp

511 TaggedObject{tagFieldName} -> object $

512 TaggedObject{tagFieldName} -> object $

513+ ([|E.text (T.pack tagFieldName)|] <:>

512− ([|E.builder tagFieldName|] <:> encStr opts conName) <%>

514+ encStr opts conName) <%>

513 objBody

515 objBody

514 ObjectWithSingleField -> object $

516 ObjectWithSingleField -> object $

515 encStr opts conName <:> [|fromEncoding|] `appE` exp

517 encStr opts conName <:> [|fromEncoding|] `appE` exp

examples/aeson-examples.cabal−2

@@ -21,8 +21,6 @@ executable aeson-example-simplest

21 bytestring

23executable aeson-example-th

24− -- FIXME Disabled until TH support for toEncoding is implemented

25− buildable: False

26 main-is: TemplateHaskell.hs

24 main-is: TemplateHaskell.hs

27 ghc-options: -Wall

25 ghc-options: -Wall

28 build-depends:

26 build-depends: