diff --git a/Text/DescriptorProtos/DescriptorProto.hs b/Text/DescriptorProtos/DescriptorProto.hs --- a/Text/DescriptorProtos/DescriptorProto.hs +++ b/Text/DescriptorProtos/DescriptorProto.hs @@ -50,10 +50,9 @@ wirePut ft' self'@(DescriptorProto x'1 x'2 x'3 x'4 x'5 x'6 x'7 x'8) = case ft' of 10 -> put'Fields - 11 - -> do - P'.putSize (P'.wireSize 10 self') - put'Fields + 11 -> do + P'.putSize (P'.wireSize 10 self') + put'Fields _ -> P'.wirePutErr ft' self' where put'Fields @@ -79,8 +78,8 @@ 6 -> P'.fmap (\ new'Field -> old'Self{extension = P'.append (extension old'Self) new'Field}) (P'.wireGet 11) 3 -> P'.fmap (\ new'Field -> old'Self{nested_type = P'.append (nested_type old'Self) new'Field}) (P'.wireGet 11) 4 -> P'.fmap (\ new'Field -> old'Self{enum_type = P'.append (enum_type old'Self) new'Field}) (P'.wireGet 11) - 5 - -> P'.fmap (\ new'Field -> old'Self{extension_range = P'.append (extension_range old'Self) new'Field}) (P'.wireGet 11) + 5 -> P'.fmap (\ new'Field -> old'Self{extension_range = P'.append (extension_range old'Self) new'Field}) + (P'.wireGet 11) 7 -> P'.fmap (\ new'Field -> old'Self{options = P'.mergeAppend (options old'Self) (P'.Just new'Field)}) (P'.wireGet 11) _ -> P'.unknownField old'Self field'Number allowed'wire'Tags = P'.fromDistinctAscList [10, 18, 26, 34, 42, 50, 58] diff --git a/Text/DescriptorProtos/DescriptorProto/ExtensionRange.hs b/Text/DescriptorProtos/DescriptorProto/ExtensionRange.hs --- a/Text/DescriptorProtos/DescriptorProto/ExtensionRange.hs +++ b/Text/DescriptorProtos/DescriptorProto/ExtensionRange.hs @@ -29,10 +29,9 @@ wirePut ft' self'@(ExtensionRange x'1 x'2 x'3) = case ft' of 10 -> put'Fields - 11 - -> do - P'.putSize (P'.wireSize 10 self') - put'Fields + 11 -> do + P'.putSize (P'.wireSize 10 self') + put'Fields _ -> P'.wirePutErr ft' self' where put'Fields diff --git a/Text/DescriptorProtos/EnumDescriptorProto.hs b/Text/DescriptorProtos/EnumDescriptorProto.hs --- a/Text/DescriptorProtos/EnumDescriptorProto.hs +++ b/Text/DescriptorProtos/EnumDescriptorProto.hs @@ -32,10 +32,9 @@ wirePut ft' self'@(EnumDescriptorProto x'1 x'2 x'3 x'4) = case ft' of 10 -> put'Fields - 11 - -> do - P'.putSize (P'.wireSize 10 self') - put'Fields + 11 -> do + P'.putSize (P'.wireSize 10 self') + put'Fields _ -> P'.wirePutErr ft' self' where put'Fields diff --git a/Text/DescriptorProtos/EnumOptions.hs b/Text/DescriptorProtos/EnumOptions.hs --- a/Text/DescriptorProtos/EnumOptions.hs +++ b/Text/DescriptorProtos/EnumOptions.hs @@ -1,5 +1,5 @@ module Text.DescriptorProtos.EnumOptions (EnumOptions(..)) where -import Prelude ((+), (==), (<=), (&&), ( || )) +import Prelude ((+), (==), (<=), (&&)) import qualified Prelude as P' import qualified Text.ProtocolBuffers.Header as P' import qualified Text.DescriptorProtos.UninterpretedOption as DescriptorProtos (UninterpretedOption) @@ -36,10 +36,9 @@ wirePut ft' self'@(EnumOptions x'1 x'2 x'3) = case ft' of 10 -> put'Fields - 11 - -> do - P'.putSize (P'.wireSize 10 self') - put'Fields + 11 -> do + P'.putSize (P'.wireSize 10 self') + put'Fields _ -> P'.wirePutErr ft' self' where put'Fields @@ -55,9 +54,8 @@ where update'Self field'Number old'Self = case field'Number of - 999 - -> P'.fmap (\ new'Field -> old'Self{uninterpreted_option = P'.append (uninterpreted_option old'Self) new'Field}) - (P'.wireGet 11) + 999 -> P'.fmap (\ new'Field -> old'Self{uninterpreted_option = P'.append (uninterpreted_option old'Self) new'Field}) + (P'.wireGet 11) _ -> P'.unknownField old'Self field'Number allowed'wire'Tags = P'.fromDistinctAscList [7994] check'allowed wire'Tag field'Number wire'Type old'Self diff --git a/Text/DescriptorProtos/EnumValueDescriptorProto.hs b/Text/DescriptorProtos/EnumValueDescriptorProto.hs --- a/Text/DescriptorProtos/EnumValueDescriptorProto.hs +++ b/Text/DescriptorProtos/EnumValueDescriptorProto.hs @@ -32,10 +32,9 @@ wirePut ft' self'@(EnumValueDescriptorProto x'1 x'2 x'3 x'4) = case ft' of 10 -> put'Fields - 11 - -> do - P'.putSize (P'.wireSize 10 self') - put'Fields + 11 -> do + P'.putSize (P'.wireSize 10 self') + put'Fields _ -> P'.wirePutErr ft' self' where put'Fields diff --git a/Text/DescriptorProtos/EnumValueOptions.hs b/Text/DescriptorProtos/EnumValueOptions.hs --- a/Text/DescriptorProtos/EnumValueOptions.hs +++ b/Text/DescriptorProtos/EnumValueOptions.hs @@ -1,5 +1,5 @@ module Text.DescriptorProtos.EnumValueOptions (EnumValueOptions(..)) where -import Prelude ((+), (==), (<=), (&&), ( || )) +import Prelude ((+), (==), (<=), (&&)) import qualified Prelude as P' import qualified Text.ProtocolBuffers.Header as P' import qualified Text.DescriptorProtos.UninterpretedOption as DescriptorProtos (UninterpretedOption) @@ -36,10 +36,9 @@ wirePut ft' self'@(EnumValueOptions x'1 x'2 x'3) = case ft' of 10 -> put'Fields - 11 - -> do - P'.putSize (P'.wireSize 10 self') - put'Fields + 11 -> do + P'.putSize (P'.wireSize 10 self') + put'Fields _ -> P'.wirePutErr ft' self' where put'Fields @@ -55,9 +54,8 @@ where update'Self field'Number old'Self = case field'Number of - 999 - -> P'.fmap (\ new'Field -> old'Self{uninterpreted_option = P'.append (uninterpreted_option old'Self) new'Field}) - (P'.wireGet 11) + 999 -> P'.fmap (\ new'Field -> old'Self{uninterpreted_option = P'.append (uninterpreted_option old'Self) new'Field}) + (P'.wireGet 11) _ -> P'.unknownField old'Self field'Number allowed'wire'Tags = P'.fromDistinctAscList [7994] check'allowed wire'Tag field'Number wire'Type old'Self diff --git a/Text/DescriptorProtos/FieldDescriptorProto.hs b/Text/DescriptorProtos/FieldDescriptorProto.hs --- a/Text/DescriptorProtos/FieldDescriptorProto.hs +++ b/Text/DescriptorProtos/FieldDescriptorProto.hs @@ -56,10 +56,9 @@ wirePut ft' self'@(FieldDescriptorProto x'1 x'2 x'3 x'4 x'5 x'6 x'7 x'8 x'9) = case ft' of 10 -> put'Fields - 11 - -> do - P'.putSize (P'.wireSize 10 self') - put'Fields + 11 -> do + P'.putSize (P'.wireSize 10 self') + put'Fields _ -> P'.wirePutErr ft' self' where put'Fields diff --git a/Text/DescriptorProtos/FieldOptions.hs b/Text/DescriptorProtos/FieldOptions.hs --- a/Text/DescriptorProtos/FieldOptions.hs +++ b/Text/DescriptorProtos/FieldOptions.hs @@ -1,5 +1,5 @@ module Text.DescriptorProtos.FieldOptions (FieldOptions(..)) where -import Prelude ((+), (==), (<=), (&&), ( || )) +import Prelude ((+), (==), (<=), (&&)) import qualified Prelude as P' import qualified Text.ProtocolBuffers.Header as P' import qualified Text.DescriptorProtos.FieldOptions.CType as DescriptorProtos.FieldOptions (CType) @@ -41,10 +41,9 @@ wirePut ft' self'@(FieldOptions x'1 x'2 x'3 x'4 x'5) = case ft' of 10 -> put'Fields - 11 - -> do - P'.putSize (P'.wireSize 10 self') - put'Fields + 11 -> do + P'.putSize (P'.wireSize 10 self') + put'Fields _ -> P'.wirePutErr ft' self' where put'Fields @@ -64,9 +63,8 @@ = case field'Number of 1 -> P'.fmap (\ new'Field -> old'Self{ctype = P'.Just new'Field}) (P'.wireGet 14) 9 -> P'.fmap (\ new'Field -> old'Self{experimental_map_key = P'.Just new'Field}) (P'.wireGet 9) - 999 - -> P'.fmap (\ new'Field -> old'Self{uninterpreted_option = P'.append (uninterpreted_option old'Self) new'Field}) - (P'.wireGet 11) + 999 -> P'.fmap (\ new'Field -> old'Self{uninterpreted_option = P'.append (uninterpreted_option old'Self) new'Field}) + (P'.wireGet 11) _ -> P'.unknownField old'Self field'Number allowed'wire'Tags = P'.fromDistinctAscList [8, 74, 7994] check'allowed wire'Tag field'Number wire'Type old'Self diff --git a/Text/DescriptorProtos/FileDescriptorProto.hs b/Text/DescriptorProtos/FileDescriptorProto.hs --- a/Text/DescriptorProtos/FileDescriptorProto.hs +++ b/Text/DescriptorProtos/FileDescriptorProto.hs @@ -57,10 +57,9 @@ wirePut ft' self'@(FileDescriptorProto x'1 x'2 x'3 x'4 x'5 x'6 x'7 x'8 x'9) = case ft' of 10 -> put'Fields - 11 - -> do - P'.putSize (P'.wireSize 10 self') - put'Fields + 11 -> do + P'.putSize (P'.wireSize 10 self') + put'Fields _ -> P'.wirePutErr ft' self' where put'Fields diff --git a/Text/DescriptorProtos/FileDescriptorSet.hs b/Text/DescriptorProtos/FileDescriptorSet.hs --- a/Text/DescriptorProtos/FileDescriptorSet.hs +++ b/Text/DescriptorProtos/FileDescriptorSet.hs @@ -30,10 +30,9 @@ wirePut ft' self'@(FileDescriptorSet x'1 x'2) = case ft' of 10 -> put'Fields - 11 - -> do - P'.putSize (P'.wireSize 10 self') - put'Fields + 11 -> do + P'.putSize (P'.wireSize 10 self') + put'Fields _ -> P'.wirePutErr ft' self' where put'Fields diff --git a/Text/DescriptorProtos/FileOptions.hs b/Text/DescriptorProtos/FileOptions.hs --- a/Text/DescriptorProtos/FileOptions.hs +++ b/Text/DescriptorProtos/FileOptions.hs @@ -1,5 +1,5 @@ module Text.DescriptorProtos.FileOptions (FileOptions(..)) where -import Prelude ((+), (==), (<=), (&&), ( || )) +import Prelude ((+), (==), (<=), (&&)) import qualified Prelude as P' import qualified Text.ProtocolBuffers.Header as P' import qualified Text.DescriptorProtos.FileOptions.OptimizeMode as DescriptorProtos.FileOptions (OptimizeMode) @@ -49,10 +49,9 @@ wirePut ft' self'@(FileOptions x'1 x'2 x'3 x'4 x'5 x'6 x'7) = case ft' of 10 -> put'Fields - 11 - -> do - P'.putSize (P'.wireSize 10 self') - put'Fields + 11 -> do + P'.putSize (P'.wireSize 10 self') + put'Fields _ -> P'.wirePutErr ft' self' where put'Fields @@ -76,9 +75,8 @@ 8 -> P'.fmap (\ new'Field -> old'Self{java_outer_classname = P'.Just new'Field}) (P'.wireGet 9) 10 -> P'.fmap (\ new'Field -> old'Self{java_multiple_files = P'.Just new'Field}) (P'.wireGet 8) 9 -> P'.fmap (\ new'Field -> old'Self{optimize_for = P'.Just new'Field}) (P'.wireGet 14) - 999 - -> P'.fmap (\ new'Field -> old'Self{uninterpreted_option = P'.append (uninterpreted_option old'Self) new'Field}) - (P'.wireGet 11) + 999 -> P'.fmap (\ new'Field -> old'Self{uninterpreted_option = P'.append (uninterpreted_option old'Self) new'Field}) + (P'.wireGet 11) _ -> P'.unknownField old'Self field'Number allowed'wire'Tags = P'.fromDistinctAscList [10, 66, 72, 80, 7994] check'allowed wire'Tag field'Number wire'Type old'Self diff --git a/Text/DescriptorProtos/MessageOptions.hs b/Text/DescriptorProtos/MessageOptions.hs --- a/Text/DescriptorProtos/MessageOptions.hs +++ b/Text/DescriptorProtos/MessageOptions.hs @@ -1,5 +1,5 @@ module Text.DescriptorProtos.MessageOptions (MessageOptions(..)) where -import Prelude ((+), (==), (<=), (&&), ( || )) +import Prelude ((+), (==), (<=), (&&)) import qualified Prelude as P' import qualified Text.ProtocolBuffers.Header as P' import qualified Text.DescriptorProtos.UninterpretedOption as DescriptorProtos (UninterpretedOption) @@ -37,10 +37,9 @@ wirePut ft' self'@(MessageOptions x'1 x'2 x'3 x'4) = case ft' of 10 -> put'Fields - 11 - -> do - P'.putSize (P'.wireSize 10 self') - put'Fields + 11 -> do + P'.putSize (P'.wireSize 10 self') + put'Fields _ -> P'.wirePutErr ft' self' where put'Fields @@ -58,9 +57,8 @@ update'Self field'Number old'Self = case field'Number of 1 -> P'.fmap (\ new'Field -> old'Self{message_set_wire_format = P'.Just new'Field}) (P'.wireGet 8) - 999 - -> P'.fmap (\ new'Field -> old'Self{uninterpreted_option = P'.append (uninterpreted_option old'Self) new'Field}) - (P'.wireGet 11) + 999 -> P'.fmap (\ new'Field -> old'Self{uninterpreted_option = P'.append (uninterpreted_option old'Self) new'Field}) + (P'.wireGet 11) _ -> P'.unknownField old'Self field'Number allowed'wire'Tags = P'.fromDistinctAscList [8, 7994] check'allowed wire'Tag field'Number wire'Type old'Self diff --git a/Text/DescriptorProtos/MethodDescriptorProto.hs b/Text/DescriptorProtos/MethodDescriptorProto.hs --- a/Text/DescriptorProtos/MethodDescriptorProto.hs +++ b/Text/DescriptorProtos/MethodDescriptorProto.hs @@ -36,10 +36,9 @@ wirePut ft' self'@(MethodDescriptorProto x'1 x'2 x'3 x'4 x'5) = case ft' of 10 -> put'Fields - 11 - -> do - P'.putSize (P'.wireSize 10 self') - put'Fields + 11 -> do + P'.putSize (P'.wireSize 10 self') + put'Fields _ -> P'.wirePutErr ft' self' where put'Fields diff --git a/Text/DescriptorProtos/MethodOptions.hs b/Text/DescriptorProtos/MethodOptions.hs --- a/Text/DescriptorProtos/MethodOptions.hs +++ b/Text/DescriptorProtos/MethodOptions.hs @@ -1,5 +1,5 @@ module Text.DescriptorProtos.MethodOptions (MethodOptions(..)) where -import Prelude ((+), (==), (<=), (&&), ( || )) +import Prelude ((+), (==), (<=), (&&)) import qualified Prelude as P' import qualified Text.ProtocolBuffers.Header as P' import qualified Text.DescriptorProtos.UninterpretedOption as DescriptorProtos (UninterpretedOption) @@ -36,10 +36,9 @@ wirePut ft' self'@(MethodOptions x'1 x'2 x'3) = case ft' of 10 -> put'Fields - 11 - -> do - P'.putSize (P'.wireSize 10 self') - put'Fields + 11 -> do + P'.putSize (P'.wireSize 10 self') + put'Fields _ -> P'.wirePutErr ft' self' where put'Fields @@ -55,9 +54,8 @@ where update'Self field'Number old'Self = case field'Number of - 999 - -> P'.fmap (\ new'Field -> old'Self{uninterpreted_option = P'.append (uninterpreted_option old'Self) new'Field}) - (P'.wireGet 11) + 999 -> P'.fmap (\ new'Field -> old'Self{uninterpreted_option = P'.append (uninterpreted_option old'Self) new'Field}) + (P'.wireGet 11) _ -> P'.unknownField old'Self field'Number allowed'wire'Tags = P'.fromDistinctAscList [7994] check'allowed wire'Tag field'Number wire'Type old'Self diff --git a/Text/DescriptorProtos/Options.hs b/Text/DescriptorProtos/Options.hs --- a/Text/DescriptorProtos/Options.hs +++ b/Text/DescriptorProtos/Options.hs @@ -11,32 +11,30 @@ needed to make the tests below type-check, though they could have been used in 'test4', test5', and 'test7'. -@ -import Text.DescriptorProtos.Options -import Text.DescriptorProtos(fileDescriptorProto) - -test1 :: D.FileOptions -test1 = options fileDescriptorProto - -test2 :: Maybe D.MessageOptions -test2 = return fileDescriptorProto >>= descend "FieldDescriptorProto" >>= return . options - -test3 :: Maybe D.EnumOptions -test3 = return fileDescriptorProto >>= toDP "FieldDescriptorProto" >>= descend "Type" >>= return . options - -test4 :: Maybe D.EnumValueOptions -test4 = return fileDescriptorProto >>= toDP "FieldDescriptorProto" >>= toEP "Type" >>= descend "TYPE_DOUBLE" >>= return . options - -test5 :: Maybe D.FieldOptions -test5 = return fileDescriptorProto >>= toDP "DescriptorProto" >>= toDP "ExtensionRange" >>= descend "start" >>= return . options - -test6 :: Maybe D.ServiceOptions -test6 = return fileDescriptorProto >>= descend "ImaginaryService" >>= return . options - -test7 :: Maybe D.MethodOptions -test7 = return fileDescriptorProto >>= toSP "ImaginaryService" >>= descend "ImaginaryMethod" >>= return . options -@ -|-} +> import Text.DescriptorProtos.Options +> import Text.DescriptorProtos(fileDescriptorProto) +> +> test1 :: D.FileOptions +> test1 = options fileDescriptorProto +> +> test2 :: Maybe D.MessageOptions +> test2 = return fileDescriptorProto >>= descend "FieldDescriptorProto" >>= return . options +> +> test3 :: Maybe D.EnumOptions +> test3 = return fileDescriptorProto >>= toDP "FieldDescriptorProto" >>= descend "Type" >>= return . options +> +> test4 :: Maybe D.EnumValueOptions +> test4 = return fileDescriptorProto >>= toDP "FieldDescriptorProto" >>= toEP "Type" >>= descend "TYPE_DOUBLE" >>= return . options +> +> test5 :: Maybe D.FieldOptions +> test5 = return fileDescriptorProto >>= toDP "DescriptorProto" >>= toDP "ExtensionRange" >>= descend "start" >>= return . options +> +> test6 :: Maybe D.ServiceOptions +> test6 = return fileDescriptorProto >>= descend "ImaginaryService" >>= return . options +> +> test7 :: Maybe D.MethodOptions +> test7 = return fileDescriptorProto >>= toSP "ImaginaryService" >>= descend "ImaginaryMethod" >>= return . options +-} module Text.DescriptorProtos.Options(name,options,descend',descend,descendKey',descendKey ,toDP,toEP,toSP,toFP,toEVP,toMP ,NameAndOptions,DescendClass,DescendKey diff --git a/Text/DescriptorProtos/ServiceDescriptorProto.hs b/Text/DescriptorProtos/ServiceDescriptorProto.hs --- a/Text/DescriptorProtos/ServiceDescriptorProto.hs +++ b/Text/DescriptorProtos/ServiceDescriptorProto.hs @@ -34,10 +34,9 @@ wirePut ft' self'@(ServiceDescriptorProto x'1 x'2 x'3 x'4) = case ft' of 10 -> put'Fields - 11 - -> do - P'.putSize (P'.wireSize 10 self') - put'Fields + 11 -> do + P'.putSize (P'.wireSize 10 self') + put'Fields _ -> P'.wirePutErr ft' self' where put'Fields diff --git a/Text/DescriptorProtos/ServiceOptions.hs b/Text/DescriptorProtos/ServiceOptions.hs --- a/Text/DescriptorProtos/ServiceOptions.hs +++ b/Text/DescriptorProtos/ServiceOptions.hs @@ -1,5 +1,5 @@ module Text.DescriptorProtos.ServiceOptions (ServiceOptions(..)) where -import Prelude ((+), (==), (<=), (&&), ( || )) +import Prelude ((+), (==), (<=), (&&)) import qualified Prelude as P' import qualified Text.ProtocolBuffers.Header as P' import qualified Text.DescriptorProtos.UninterpretedOption as DescriptorProtos (UninterpretedOption) @@ -36,10 +36,9 @@ wirePut ft' self'@(ServiceOptions x'1 x'2 x'3) = case ft' of 10 -> put'Fields - 11 - -> do - P'.putSize (P'.wireSize 10 self') - put'Fields + 11 -> do + P'.putSize (P'.wireSize 10 self') + put'Fields _ -> P'.wirePutErr ft' self' where put'Fields @@ -55,9 +54,8 @@ where update'Self field'Number old'Self = case field'Number of - 999 - -> P'.fmap (\ new'Field -> old'Self{uninterpreted_option = P'.append (uninterpreted_option old'Self) new'Field}) - (P'.wireGet 11) + 999 -> P'.fmap (\ new'Field -> old'Self{uninterpreted_option = P'.append (uninterpreted_option old'Self) new'Field}) + (P'.wireGet 11) _ -> P'.unknownField old'Self field'Number allowed'wire'Tags = P'.fromDistinctAscList [7994] check'allowed wire'Tag field'Number wire'Type old'Self diff --git a/Text/DescriptorProtos/UninterpretedOption.hs b/Text/DescriptorProtos/UninterpretedOption.hs --- a/Text/DescriptorProtos/UninterpretedOption.hs +++ b/Text/DescriptorProtos/UninterpretedOption.hs @@ -42,10 +42,9 @@ wirePut ft' self'@(UninterpretedOption x'1 x'2 x'3 x'4 x'5 x'6 x'7) = case ft' of 10 -> put'Fields - 11 - -> do - P'.putSize (P'.wireSize 10 self') - put'Fields + 11 -> do + P'.putSize (P'.wireSize 10 self') + put'Fields _ -> P'.wirePutErr ft' self' where put'Fields diff --git a/Text/DescriptorProtos/UninterpretedOption/NamePart.hs b/Text/DescriptorProtos/UninterpretedOption/NamePart.hs --- a/Text/DescriptorProtos/UninterpretedOption/NamePart.hs +++ b/Text/DescriptorProtos/UninterpretedOption/NamePart.hs @@ -29,10 +29,9 @@ wirePut ft' self'@(NamePart x'1 x'2 x'3) = case ft' of 10 -> put'Fields - 11 - -> do - P'.putSize (P'.wireSize 10 self') - put'Fields + 11 -> do + P'.putSize (P'.wireSize 10 self') + put'Fields _ -> P'.wirePutErr ft' self' where put'Fields diff --git a/protocol-buffers-descriptor.cabal b/protocol-buffers-descriptor.cabal --- a/protocol-buffers-descriptor.cabal +++ b/protocol-buffers-descriptor.cabal @@ -1,6 +1,6 @@ name: protocol-buffers-descriptor -version: 1.2.2 -cabal-version: >= 1.2 +version: 1.4.0 +cabal-version: >= 1.6 build-type: Simple license: BSD3 license-file: LICENSE @@ -48,7 +48,7 @@ Text.DescriptorProtos.UninterpretedOption Text.DescriptorProtos.UninterpretedOption.NamePart - build-depends: protocol-buffers == 1.2.2, + build-depends: protocol-buffers == 1.4.0, containers, bytestring