commit ghc-protobuf-simple for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-protobuf-simple for
openSUSE:Factory checked in at 2017-04-29 10:53:18
Comparing /work/SRC/openSUSE:Factory/ghc-protobuf-simple (Old)
and /work/SRC/openSUSE:Factory/.ghc-protobuf-simple.new (New)
Package is "ghc-protobuf-simple"
Sat Apr 29 10:53:18 2017 rev:4 rq:491692 version:0.1.0.4
Changes:
--- /work/SRC/openSUSE:Factory/ghc-protobuf-simple/ghc-protobuf-simple.changes
2017-04-20 20:55:59.217228624 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-protobuf-simple.new/ghc-protobuf-simple.changes
2017-04-29 10:53:20.545769496 +0200
@@ -1,0 +2,5 @@
+Wed Apr 19 13:32:41 UTC 2017 - psim...@suse.com
+
+- Update to version 0.1.0.4 with cabal2obs.
+
+---
Old:
protobuf-simple-0.1.0.3.tar.gz
New:
protobuf-simple-0.1.0.4.tar.gz
Other differences:
--
++ ghc-protobuf-simple.spec ++
--- /var/tmp/diff_new_pack.0md9Vd/_old 2017-04-29 10:53:21.217674577 +0200
+++ /var/tmp/diff_new_pack.0md9Vd/_new 2017-04-29 10:53:21.221674012 +0200
@@ -19,7 +19,7 @@
%global pkg_name protobuf-simple
%bcond_with tests
Name: ghc-%{pkg_name}
-Version:0.1.0.3
+Version:0.1.0.4
Release:0
Summary:Simple Protocol Buffers library (proto2)
License:MIT
++ protobuf-simple-0.1.0.3.tar.gz -> protobuf-simple-0.1.0.4.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-simple-0.1.0.3/protobuf-simple.cabal
new/protobuf-simple-0.1.0.4/protobuf-simple.cabal
--- old/protobuf-simple-0.1.0.3/protobuf-simple.cabal 2017-03-30
15:17:31.0 +0200
+++ new/protobuf-simple-0.1.0.4/protobuf-simple.cabal 2017-04-12
13:48:08.0 +0200
@@ -3,7 +3,7 @@
name:protobuf-simple
synopsis:Simple Protocol Buffers library (proto2)
-version: 0.1.0.3
+version: 0.1.0.4
homepage:https://github.com/sru-systems/protobuf-simple
license: MIT
license-file:LICENSE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-simple-0.1.0.3/src/Data/ProtoBufInt.hs
new/protobuf-simple-0.1.0.4/src/Data/ProtoBufInt.hs
--- old/protobuf-simple-0.1.0.3/src/Data/ProtoBufInt.hs 2017-03-30
14:28:59.0 +0200
+++ new/protobuf-simple-0.1.0.4/src/Data/ProtoBufInt.hs 2017-04-12
13:47:24.0 +0200
@@ -41,7 +41,7 @@
import Data.Set as Export (fromList)
import Data.Text.Lazyas Export (Text, pack)
import Data.Word as Export (Word32, Word64)
-import Prelude as Export (Double, Eq, Float, Ord, Show)
+import Prelude as Export (Double, Eq, Float, Ord, Show, return)
-- | Append a value to a Seq.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/protobuf-simple-0.1.0.3/src/Parser/MessageGenerator.hs
new/protobuf-simple-0.1.0.4/src/Parser/MessageGenerator.hs
--- old/protobuf-simple-0.1.0.3/src/Parser/MessageGenerator.hs 2017-03-30
14:28:59.0 +0200
+++ new/protobuf-simple-0.1.0.4/src/Parser/MessageGenerator.hs 2017-04-12
13:47:24.0 +0200
@@ -69,7 +69,9 @@
getImports :: FileDesc -> MessageDesc -> State GenState Builder
getImports f md = return $
-getUnqualifiedImport "Control.Applicative" "(<$>)" <>
+(if MessageDesc.getFields md == []
+ then fromString ""
+ else getUnqualifiedImport "Control.Applicative" "(<$>)") <>
getUnqualifiedImport "Prelude" "" <>
getQualifiedAsImport "Data.ProtoBufInt" "PB" <>
getExtraImports f md
@@ -276,7 +278,9 @@
mergeableLines <- getMergeableLines fields
return $
fromString "instance PB.Mergeable " <> fromString name <> fromString "
where" <> nl <>
- tab <> fromString "merge a b = " <> fromString name <> nl <>
+ tab <> (if mergeableLines == fromString ""
+then fromString "merge _ _ = "
+else fromString "merge a b = ") <> fromString name <> nl <>
tab <> tab <> fromString "{ " <>
mergeableLines <> nl <>
tab <> tab <> fromString "}" <> nl
@@ -368,8 +372,10 @@
return $
fromString "instance PB.WireMessage " <> fromString name <> fromString "
where" <> nl <>
flines <> nl <>
- tab <> fromString "messageToFields self = do" <> nl <>
- mlines <> nl
+ tab <> if mlines == fromString ""
+ then fromString "messageToFields _ = PB.return ()" <> nl
+ else fromString "messageToFields self = do" <> nl <>
+mlines <> nl
where
name = MessageDesc.getName md
fields = MessageDesc.g
commit ghc-protobuf-simple for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-protobuf-simple for
openSUSE:Factory checked in at 2017-04-20 20:55:53
Comparing /work/SRC/openSUSE:Factory/ghc-protobuf-simple (Old)
and /work/SRC/openSUSE:Factory/.ghc-protobuf-simple.new (New)
Package is "ghc-protobuf-simple"
Thu Apr 20 20:55:53 2017 rev:3 rq:487961 version:0.1.0.3
Changes:
--- /work/SRC/openSUSE:Factory/ghc-protobuf-simple/ghc-protobuf-simple.changes
2017-04-07 13:55:19.898316354 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-protobuf-simple.new/ghc-protobuf-simple.changes
2017-04-20 20:55:59.217228624 +0200
@@ -1,0 +2,5 @@
+Tue Apr 4 11:04:07 UTC 2017 - psim...@suse.com
+
+- Update to version 0.1.0.3 with cabal2obs.
+
+---
Old:
protobuf-simple-0.1.0.2.tar.gz
New:
protobuf-simple-0.1.0.3.tar.gz
Other differences:
--
++ ghc-protobuf-simple.spec ++
--- /var/tmp/diff_new_pack.Snklkz/_old 2017-04-20 20:56:02.140815185 +0200
+++ /var/tmp/diff_new_pack.Snklkz/_new 2017-04-20 20:56:02.140815185 +0200
@@ -19,7 +19,7 @@
%global pkg_name protobuf-simple
%bcond_with tests
Name: ghc-%{pkg_name}
-Version:0.1.0.2
+Version:0.1.0.3
Release:0
Summary:Simple Protocol Buffers library (proto2)
License:MIT
++ protobuf-simple-0.1.0.2.tar.gz -> protobuf-simple-0.1.0.3.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-simple-0.1.0.2/protobuf-simple.cabal
new/protobuf-simple-0.1.0.3/protobuf-simple.cabal
--- old/protobuf-simple-0.1.0.2/protobuf-simple.cabal 2016-09-26
10:41:50.0 +0200
+++ new/protobuf-simple-0.1.0.3/protobuf-simple.cabal 2017-03-30
15:17:31.0 +0200
@@ -3,7 +3,7 @@
name:protobuf-simple
synopsis:Simple Protocol Buffers library (proto2)
-version: 0.1.0.2
+version: 0.1.0.3
homepage:https://github.com/sru-systems/protobuf-simple
license: MIT
license-file:LICENSE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-simple-0.1.0.2/src/Parser/ProtoParser.hs
new/protobuf-simple-0.1.0.3/src/Parser/ProtoParser.hs
--- old/protobuf-simple-0.1.0.2/src/Parser/ProtoParser.hs 2016-05-05
15:37:14.0 +0200
+++ new/protobuf-simple-0.1.0.3/src/Parser/ProtoParser.hs 2017-03-30
15:06:41.0 +0200
@@ -426,7 +426,13 @@
int32 :: Parsec String u Int32
-int32 = read <$> lexeme (many1 digit)
+int32 = read <$> lexeme ((:) <$> char '0' <*> zeroStart
+ <|> many1 digit)
+ where
+zeroStart = choice [ (:) <$> oneOf "xX" <*> many1 hexDigit
+ , (:) <$> oneOf "oO" <*> many1 octDigit
+ , many digit
+ ]
keyword :: String -> Parsec String u String
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/protobuf-simple-0.1.0.2/test/Parser/ProtoParserSpec.hs
new/protobuf-simple-0.1.0.3/test/Parser/ProtoParserSpec.hs
--- old/protobuf-simple-0.1.0.2/test/Parser/ProtoParserSpec.hs 2016-04-21
17:28:52.0 +0200
+++ new/protobuf-simple-0.1.0.3/test/Parser/ProtoParserSpec.hs 2017-03-30
15:09:10.0 +0200
@@ -133,15 +133,15 @@
, "optional fixed32 f04 = 4;"
, "optional fixed64 f05 = 5;"
, "optional float f06 = 6;"
-, "optional int32 f07 = 7;"
-, "optional int64 f08 = 8;"
+, "optional int32 f07 = 0o7;"
+, "optional int64 f08 = 0o10;"
, "optional sfixed32 f09 = 9;"
, "optional sfixed64 f10 = 10;"
, "optional sint32 f11 = 11;"
, "optional sint64 f12 = 12;"
, "optional string f13 = 13;"
-, "optional uint32 f14 = 14;"
-, "optional uint64 f15 = 15;"
+, "optional uint32 f14 = 0xe;"
+, "optional uint64 f15 = 0xF;"
, "}"
])
`shouldParse`
@@ -195,11 +195,11 @@
it "parses a message with a enum field" $
parseProto "Test.proto" (unlines
[ "message EnumMessage {"
-, "optional EnumType value = 1;"
+, "optional EnumType value = 0x1;"
, "}"
, "enum EnumType {"
, "UNKNOWN = 0;"
-, "INIT = 1;"
+, "INIT = 0x1;"
, "}"
])
`shouldParse`
commit ghc-protobuf-simple for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-protobuf-simple for
openSUSE:Factory checked in at 2017-04-07 13:55:14
Comparing /work/SRC/openSUSE:Factory/ghc-protobuf-simple (Old)
and /work/SRC/openSUSE:Factory/.ghc-protobuf-simple.new (New)
Package is "ghc-protobuf-simple"
Fri Apr 7 13:55:14 2017 rev:2 rq:483133 version:0.1.0.2
Changes:
--- /work/SRC/openSUSE:Factory/ghc-protobuf-simple/ghc-protobuf-simple.changes
2017-03-28 15:19:55.233125002 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-protobuf-simple.new/ghc-protobuf-simple.changes
2017-04-07 13:55:19.898316354 +0200
@@ -1,0 +2,5 @@
+Sat Oct 1 17:18:13 UTC 2016 - psim...@suse.com
+
+- Update to version 0.1.0.2 with cabal2obs.
+
+---
Old:
protobuf-simple-0.1.0.1.tar.gz
New:
protobuf-simple-0.1.0.2.tar.gz
Other differences:
--
++ ghc-protobuf-simple.spec ++
--- /var/tmp/diff_new_pack.emniot/_old 2017-04-07 13:55:20.834184154 +0200
+++ /var/tmp/diff_new_pack.emniot/_new 2017-04-07 13:55:20.838183590 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-protobuf-simple
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%global pkg_name protobuf-simple
%bcond_with tests
Name: ghc-%{pkg_name}
-Version:0.1.0.1
+Version:0.1.0.2
Release:0
Summary:Simple Protocol Buffers library (proto2)
License:MIT
++ protobuf-simple-0.1.0.1.tar.gz -> protobuf-simple-0.1.0.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-simple-0.1.0.1/README.md
new/protobuf-simple-0.1.0.2/README.md
--- old/protobuf-simple-0.1.0.1/README.md 2016-05-04 22:44:30.0
+0200
+++ new/protobuf-simple-0.1.0.2/README.md 2016-05-05 20:09:13.0
+0200
@@ -65,7 +65,7 @@
protobuf-net (C#).
-## Other implementations
+## Other Implementations
There are currently multiple Protocol Buffers implementations available. This
library was created for the following reasons. Firstly, I wanted to use
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-simple-0.1.0.1/protobuf-simple.cabal
new/protobuf-simple-0.1.0.2/protobuf-simple.cabal
--- old/protobuf-simple-0.1.0.1/protobuf-simple.cabal 2016-05-05
19:47:04.0 +0200
+++ new/protobuf-simple-0.1.0.2/protobuf-simple.cabal 2016-09-26
10:41:50.0 +0200
@@ -3,7 +3,7 @@
name:protobuf-simple
synopsis:Simple Protocol Buffers library (proto2)
-version: 0.1.0.1
+version: 0.1.0.2
homepage:https://github.com/sru-systems/protobuf-simple
license: MIT
license-file:LICENSE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/protobuf-simple-0.1.0.1/src/Parser/Generator.hs
new/protobuf-simple-0.1.0.2/src/Parser/Generator.hs
--- old/protobuf-simple-0.1.0.1/src/Parser/Generator.hs 2016-05-05
17:33:47.0 +0200
+++ new/protobuf-simple-0.1.0.2/src/Parser/Generator.hs 2016-09-26
10:26:10.0 +0200
@@ -133,14 +133,9 @@
getFullEnumName :: FileDesc -> EnumDesc -> String
-getFullEnumName fd ed = case FileDesc.getPackage fd of
-Just val -> val ++ "." ++ name
-Nothing -> name
- where name = EnumDesc.getName ed
+getFullEnumName fd ed = (getNamespace fd) ++ "." ++ (EnumDesc.getName ed)
getFullMessageName :: FileDesc -> MessageDesc -> String
-getFullMessageName fd md = case FileDesc.getPackage fd of
-Just val -> val ++ "." ++ name
-Nothing -> name
- where name = MessageDesc.getName md
+getFullMessageName fd md = (getNamespace fd) ++ "." ++ (MessageDesc.getName md)
+
