Skip to content

GH-81 Record fields name fix for JSON instances #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
schernichkin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

GH-81 Record fields name fix for JSON instances #82

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions hprotoc/Text/ProtocolBuffers/ProtoCompile/Gen.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,7 @@ instanceToJSON di
makePair fld =
let fldName = getFname fld
fldName' = dropWhileEnd (== '\'') fldName
arg = Paren () (lvar fldName $$ lvar msgVar)
arg = Paren () (lvar (baseNamePrefix' (fieldName fld) ++ fldName) $$ lvar msgVar)
toJSONCall = case (isRequired fld, canRepeat fld) of
(True, False) -> toJSONFun fld $$ arg
(_, _) -> pvar "toJSON" $$ Paren () (preludevar "fmap" $$ toJSONFun fld $$ arg)
Expand Down Expand Up @@ -929,8 +929,8 @@ instanceFromJSON di
]
in Generator () (patvar fldName) parseFieldCall''
updates =
(map (\fld -> FieldUpdate () (local (getFname fld)) (lvar (getFname fld))) flds) ++
(map (\oi -> FieldUpdate () (local (getOneofFname oi)) (lvar (getOneofFname oi))) os)
(map (\fld -> FieldUpdate () (local (baseNamePrefix' (fieldName fld) ++ getFname fld)) (lvar (getFname fld))) flds) ++
(map (\oi -> FieldUpdate () (local (baseNamePrefix' (oneofFName oi) ++ getOneofFname oi)) (lvar (getOneofFname oi))) os)
retVal =
case updates of
[] -> pvar "defaultValue"
Expand Down