Hello community,
here is the log from the commit of package cpphs for openSUSE:Factory checked
in at 2016-05-31 12:24:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cpphs (Old)
and /work/SRC/openSUSE:Factory/.cpphs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cpphs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cpphs/cpphs.changes 2015-09-02
00:36:06.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cpphs.new/cpphs.changes 2016-05-31
12:24:16.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Mar 7 09:34:44 UTC 2016 - mimi...@gmail.com
+
+- update to 1.20.1
+
+-------------------------------------------------------------------
+Fri Mar 4 18:44:46 UTC 2016 - mimi...@gmail.com
+
+- update to 1.20
+* bugfixes for #if defined(FOO) && FOO(a,b)
+
+-------------------------------------------------------------------
Old:
----
cpphs-1.19.3.tar.gz
New:
----
cpphs-1.20.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cpphs.spec ++++++
--- /var/tmp/diff_new_pack.oEoEu8/_old 2016-05-31 12:24:17.000000000 +0200
+++ /var/tmp/diff_new_pack.oEoEu8/_new 2016-05-31 12:24:17.000000000 +0200
@@ -18,7 +18,7 @@
%global pkg_name cpphs
Name: cpphs
-Version: 1.19.3
+Version: 1.20.1
Release: 0
Summary: A liberalised re-implementation of cpp, the C pre-processor
License: GPL-2.0+
++++++ cpphs-1.19.3.tar.gz -> cpphs-1.20.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cpphs-1.19.3/CHANGELOG new/cpphs-1.20.1/CHANGELOG
--- old/cpphs-1.19.3/CHANGELOG 2015-08-23 11:09:27.000000000 +0200
+++ new/cpphs-1.20.1/CHANGELOG 2016-03-04 10:33:47.000000000 +0100
@@ -1,3 +1,8 @@
+Version 1.20
+------------
+ * bugfixes for #if defined(FOO) && FOO(a,b)
+ * (1.20.1): fix version number
+
Version 1.19
------------
* expose more of the cpphs API
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cpphs-1.19.3/Language/Preprocessor/Cpphs/CppIfdef.hs
new/cpphs-1.20.1/Language/Preprocessor/Cpphs/CppIfdef.hs
--- old/cpphs-1.19.3/Language/Preprocessor/Cpphs/CppIfdef.hs 2015-08-23
11:09:26.000000000 +0200
+++ new/cpphs-1.20.1/Language/Preprocessor/Cpphs/CppIfdef.hs 2016-03-04
10:33:47.000000000 +0100
@@ -216,16 +216,22 @@
-- | Expansion of symbols.
expandSymOrCall :: SymTab HashDefine -> TextParser String
expandSymOrCall st =
- do sym <- parseSym
+ do sym <- parseSym
+ if sym=="defined" then do arg <- skip parseSym; convert sym [arg]
+ <|>
+ do arg <- skip $ parenthesis (do x <- skip
parseSym;
+ skip (return x))
+ convert sym [arg]
+ <|> convert sym []
+ else
( do args <- parenthesis (commit $ fragment `sepBy` skip (isWord ","))
args' <- flip mapM args $ \arg->
case runParser (preExpand st) arg of
(Left msg, _) -> fail msg
(Right s, _) -> return s
convert sym args'
- <|>
- if (sym=="defined") then do arg <- skip parseSym; convert sym [arg]
- else convert sym [] )
+ <|> convert sym []
+ )
where
fragment = many1 (satisfy (`notElem`",)"))
convert "defined" [arg] =
@@ -238,14 +244,16 @@
convert sym args =
case lookupST sym st of
Nothing -> if null args then return sym
- else fail (disp sym args++" is not a defined macro")
+ else return "0"
+ -- else fail (disp sym args++" is not a defined macro")
Just (a@SymbolReplacement{}) -> do reparse (replacement a)
return ""
Just (a@MacroExpansion{}) -> do reparse (expandMacro a args False)
return ""
Just (a@AntiDefined{}) ->
if null args then return sym
- else fail (disp sym args++" explicitly undefined with -U")
+ else return "0"
+ -- else fail (disp sym args++" explicitly undefined with -U")
disp sym args = let len = length args
chars = map (:[]) ['a'..'z']
in sym ++ if null args then ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cpphs-1.19.3/README new/cpphs-1.20.1/README
--- old/cpphs-1.19.3/README 2015-08-23 11:09:27.000000000 +0200
+++ new/cpphs-1.20.1/README 2016-03-04 10:33:47.000000000 +0100
@@ -30,7 +30,7 @@
COPYRIGHT
---------
-Copyright (c) 2004-2015 Malcolm Wallace (malcolm.wall...@me.com)
+Copyright (c) 2004-2016 Malcolm Wallace (malcolm.wall...@me.com)
LICENCE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cpphs-1.19.3/cpphs.cabal new/cpphs-1.20.1/cpphs.cabal
--- old/cpphs-1.19.3/cpphs.cabal 2015-08-23 11:09:27.000000000 +0200
+++ new/cpphs-1.20.1/cpphs.cabal 2016-03-04 10:33:47.000000000 +0100
@@ -1,6 +1,6 @@
Name: cpphs
-Version: 1.19.3
-Copyright: 2004-2015, Malcolm Wallace
+Version: 1.20.1
+Copyright: 2004-2016, Malcolm Wallace
License: LGPL
License-File: LICENCE-LGPL
Cabal-Version: >= 1.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cpphs-1.19.3/cpphs.hs new/cpphs-1.20.1/cpphs.hs
--- old/cpphs-1.19.3/cpphs.hs 2015-08-23 11:09:26.000000000 +0200
+++ new/cpphs-1.20.1/cpphs.hs 2016-03-04 10:33:47.000000000 +0100
@@ -20,7 +20,7 @@
import Data.List ( isPrefixOf )
version :: String
-version = "1.19.3"
+version = "1.20.1"
main :: IO ()
main = do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cpphs-1.19.3/docs/index.html
new/cpphs-1.20.1/docs/index.html
--- old/cpphs-1.19.3/docs/index.html 2015-08-23 11:09:27.000000000 +0200
+++ new/cpphs-1.20.1/docs/index.html 2016-03-04 10:33:47.000000000 +0100
@@ -198,12 +198,12 @@
<b>Current stable version:</b>
<p>
-cpphs-1.19.3, release date 2015-08-23<br>
+cpphs-1.20, release date 2016-03-04<br>
By HTTP:
<a href="http://hackage.haskell.org/package/cpphs";>Hackage</a>.
<ul>
-<li> bugfix for hlint ticket #161, for
- the interaction of --unlit and --linepragma options
+<li> bugfix for #if defined(FOO) && FOO(a,b)
+<li> (1.20.1) fix version number
</ul>
<p>
@@ -227,6 +227,15 @@
<b>Older versions:</b>
<p>
+cpphs-1.19.3, release date 2015-08-23<br>
+By HTTP:
+<a href="http://hackage.haskell.org/package/cpphs";>Hackage</a>.
+<ul>
+<li> bugfix for hlint ticket #161, for
+ the interaction of --unlit and --linepragma options
+</ul>
+
+<p>
cpphs-1.19.2, release date 2015-07-31<br>
By HTTP:
<a href="http://hackage.haskell.org/package/cpphs";>Hackage</a>.
@@ -753,7 +762,7 @@
malcolm.wall...@me.com</a>
</ul>
-<p><b>Copyright:</b> © 2004-2015 Malcolm Wallace
+<p><b>Copyright:</b> © 2004-2016 Malcolm Wallace
<p><b>License:</b> The library modules in cpphs are distributed under
the terms of the LGPL (see file <a href="LICENCE-LGPL">LICENCE-LGPL</a>
