hprotoc 2.1.8 → 2.1.9
raw patch · 2 files changed
+17/−14 lines, 2 filesdep ~protocol-buffersdep ~protocol-buffers-descriptor
Dependency ranges changed: protocol-buffers, protocol-buffers-descriptor
Files
Text/ProtocolBuffers/ProtoCompile/Gen.hs view
@@ -255,10 +255,13 @@ -------------------------------------------- -- Define LANGUAGE options as [ModulePramga] ---------------------------------------------modulePragmas :: [ModulePragma]-modulePragmas = [ LanguagePragma src (map Ident ["BangPatterns","DeriveDataTypeable","FlexibleInstances","MultiParamTypeClasses"])- , OptionsPragma src (Just GHC) " -fno-warn-unused-imports "- ]+modulePragmas :: Bool -> [ModulePragma]+modulePragmas templateHaskell =+ [ LanguagePragma src (map Ident $ thPragma ++ ["BangPatterns","DeriveDataTypeable","FlexibleInstances","MultiParamTypeClasses"])+ , OptionsPragma src (Just GHC) " -fno-warn-unused-imports "+ ]+ where thPragma | templateHaskell = ["TemplateHaskell"]+ | otherwise = [] -------------------------------------------- -- EnumDescriptorProto module creation@@ -266,7 +269,7 @@ enumModule :: EnumInfo -> Module enumModule ei = let protoName = enumName ei- in Module src (ModuleName (fqMod protoName)) modulePragmas Nothing+ in Module src (ModuleName (fqMod protoName)) (modulePragmas False) Nothing (Just [EThingAll (unqualName protoName)]) (standardImports True False False) (enumDecls ei) @@ -408,7 +411,7 @@ imports = (protoImports ++) . mergeImports $ mapMaybe (importPN result m Normal) $ extendees ++ mapMaybe typeName myKeys- in Module src m modulePragmas Nothing (Just (exportKeys++exportNames)) imports+ in Module src m (modulePragmas False) Nothing (Just (exportKeys++exportNames)) imports (keysXTypeVal protoName (extensionKeys pri) ++ embed'ProtoInfo pri ++ embed'fdpBS fdpBS) where protoImports = standardImports False (not . Seq.null . extensionKeys $ pri) False ++ [ ImportDecl src (ModuleName "Text.DescriptorProtos.FileDescriptorProto") False False False Nothing Nothing@@ -462,7 +465,7 @@ [TyVar (Ident "msg'"), TyFun (TyVar (Ident "msg'")) (TyCon un), (TyCon un)] [] dataDecl = DataDecl src DataType [] (baseIdent protoName) [] [] [] mkInst s = InstDecl src Nothing [] [] s [TyCon un] []- in Module src (ModuleName (fqMod protoName)) modulePragmas Nothing (Just [EAbs un]) minimalImports+ in Module src (ModuleName (fqMod protoName)) (modulePragmas $ makeLenses di) Nothing (Just [EAbs un]) minimalImports (dataDecl : instMesAPI : map mkInst classes) -- This builds on the output of descriptorBootModule and declares a hs-boot that@@ -488,7 +491,7 @@ importTypes = mergeImports . mapMaybe (importPN result mBase KeyFile) . nubSort $ extendees ++ mapMaybe typeName myKeys declKeys = keysXTypeVal protoName'Key (keys di)- in Module src m modulePragmas Nothing (Just exportKeys) (minimalImports++importTypes) declKeys+ in Module src m (modulePragmas $ makeLenses di) Nothing (Just exportKeys) (minimalImports++importTypes) declKeys -- This builds the normal module descriptorNormalModule :: Result -> DescriptorInfo -> Module@@ -511,7 +514,7 @@ | otherwise = [] declKeys | sepKey = [] | otherwise = keysXTypeVal (descName di) (keys di)- in Module src m modulePragmas Nothing (Just (EThingAll un : exportLenses di ++ exportKeys)) imports+ in Module src m (modulePragmas $ makeLenses di) Nothing (Just (EThingAll un : exportLenses di ++ exportKeys)) imports (descriptorX di : lenses ++ declKeys ++ instancesDescriptor di) exportLenses :: DescriptorInfo -> [ExportSpec]
hprotoc.cabal view
@@ -1,5 +1,5 @@ name: hprotoc-version: 2.1.8+version: 2.1.9 cabal-version: >= 1.6 build-type: Simple license: BSD3@@ -20,8 +20,8 @@ location: git://github.com/k-bx/protocol-buffers.git Executable hprotoc- build-depends: protocol-buffers == 2.1.8,- protocol-buffers-descriptor == 2.1.8+ build-depends: protocol-buffers == 2.1.9,+ protocol-buffers-descriptor == 2.1.9 Main-Is: Text/ProtocolBuffers/ProtoCompile.hs Hs-Source-Dirs: ., protoc-gen-haskell@@ -69,8 +69,8 @@ TypeSynonymInstances Library- build-depends: protocol-buffers == 2.1.8,- protocol-buffers-descriptor == 2.1.8+ build-depends: protocol-buffers == 2.1.9,+ protocol-buffers-descriptor == 2.1.9 Hs-Source-Dirs: ., protoc-gen-haskell build-tools: alex