Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-hxt-regex-xmlschema for
openSUSE:Factory checked in at 2021-02-16 22:38:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-hxt-regex-xmlschema (Old)
and /work/SRC/openSUSE:Factory/.ghc-hxt-regex-xmlschema.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-hxt-regex-xmlschema"
Tue Feb 16 22:38:33 2021 rev:13 rq:870868 version:9.2.0.7
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-hxt-regex-xmlschema/ghc-hxt-regex-xmlschema.changes
2020-12-22 11:41:20.137613096 +0100
+++
/work/SRC/openSUSE:Factory/.ghc-hxt-regex-xmlschema.new.28504/ghc-hxt-regex-xmlschema.changes
2021-02-16 22:48:30.314559505 +0100
@@ -1,0 +2,6 @@
+Mon Feb 8 19:13:36 UTC 2021 - [email protected]
+
+- Update hxt-regex-xmlschema to version 9.2.0.7.
+ Upstream does not provide a change log file.
+
+-------------------------------------------------------------------
Old:
----
hxt-regex-xmlschema-9.2.0.3.tar.gz
hxt-regex-xmlschema.cabal
New:
----
hxt-regex-xmlschema-9.2.0.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-hxt-regex-xmlschema.spec ++++++
--- /var/tmp/diff_new_pack.fO2S9P/_old 2021-02-16 22:48:33.398561914 +0100
+++ /var/tmp/diff_new_pack.fO2S9P/_new 2021-02-16 22:48:33.402561918 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc-hxt-regex-xmlschema
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,12 @@
%global pkg_name hxt-regex-xmlschema
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 9.2.0.3
+Version: 9.2.0.7
Release: 0
Summary: A regular expression library for W3C XML Schema regular
expressions
License: MIT
URL: https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-hxt-charproperties-devel
@@ -66,7 +65,6 @@
%prep
%autosetup -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++++++ hxt-regex-xmlschema-9.2.0.3.tar.gz -> hxt-regex-xmlschema-9.2.0.7.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hxt-regex-xmlschema-9.2.0.3/hxt-regex-xmlschema.cabal
new/hxt-regex-xmlschema-9.2.0.7/hxt-regex-xmlschema.cabal
--- old/hxt-regex-xmlschema-9.2.0.3/hxt-regex-xmlschema.cabal 2016-10-18
14:09:14.000000000 +0200
+++ new/hxt-regex-xmlschema-9.2.0.7/hxt-regex-xmlschema.cabal 2021-02-08
17:09:58.000000000 +0100
@@ -1,5 +1,5 @@
Name: hxt-regex-xmlschema
-Version: 9.2.0.3
+Version: 9.2.0.7
Synopsis: A regular expression library for W3C XML Schema regular
expressions
Description: This library supports full W3C XML Schema regular
expressions
inclusive all Unicode character sets and blocks.
@@ -61,7 +61,7 @@
build-depends: base >= 4 && < 5
, bytestring >= 0.10
- , hxt-charproperties >= 9 && < 10
+ , hxt-charproperties >= 9
, parsec >= 2.1 && < 4
, text >= 0.10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hxt-regex-xmlschema-9.2.0.3/src/Text/Regex/XMLSchema/Generic/Matching.hs
new/hxt-regex-xmlschema-9.2.0.7/src/Text/Regex/XMLSchema/Generic/Matching.hs
---
old/hxt-regex-xmlschema-9.2.0.3/src/Text/Regex/XMLSchema/Generic/Matching.hs
2016-08-10 09:55:55.000000000 +0200
+++
new/hxt-regex-xmlschema-9.2.0.7/src/Text/Regex/XMLSchema/Generic/Matching.hs
2021-02-08 15:37:36.000000000 +0100
@@ -244,7 +244,7 @@
token1'' = token' re1 fcs
-- token' :: StringLike s => GenRegex s -> CharSet -> (s, Int) -> s ->
[Either s s]
- token' re' fcs' (uns, ! n) inp
+ token' re' fcs' (uns, !n) inp
| nullS inp = addUnmatched []
| otherwise = evalRes . splitWithRegexCS re' fcs' $ inp
where
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/hxt-regex-xmlschema-9.2.0.3/src/Text/Regex/XMLSchema/Generic/Regex.hs
new/hxt-regex-xmlschema-9.2.0.7/src/Text/Regex/XMLSchema/Generic/Regex.hs
--- old/hxt-regex-xmlschema-9.2.0.3/src/Text/Regex/XMLSchema/Generic/Regex.hs
2016-08-10 09:55:55.000000000 +0200
+++ new/hxt-regex-xmlschema-9.2.0.7/src/Text/Regex/XMLSchema/Generic/Regex.hs
2021-02-08 15:37:36.000000000 +0100
@@ -1,4 +1,5 @@
-{-# LANGUAGE ViewPatterns #-}
+{-# LANGUAGE CPP #-}
+{-# LANGUAGE ViewPatterns #-}
{-# LANGUAGE FlexibleInstances #-}
@@ -22,7 +23,7 @@
module Text.Regex.XMLSchema.Generic.Regex
( GenRegex
-
+
, mkZero
, mkZero'
, mkUnit
@@ -69,10 +70,15 @@
where
import Data.List (intercalate)
-import Data.Monoid ((<>))
import Data.Set.CharSet
import Data.String (IsString(..))
+#if MIN_VERSION_base(4,13,0)
+#else
+import Data.Monoid ((<>))
+#endif
+
+
import Text.Regex.XMLSchema.Generic.StringLike
{-
@@ -109,7 +115,7 @@
-- see splitWithRegex
type SubexResults s
= [(Label s, s)]
-
+
type Nullable s
= (Bool, SubexResults s)
@@ -427,7 +433,7 @@
mkCbr ss e = Cbr ss e
-- ------------------------------------------------------------
-
+
instance (StringLike s) => Show (GenRegex s) where
show (Zero e) = "{" ++ toString e ++ "}"
show Unit = "()"
@@ -471,7 +477,7 @@
show (Intl e1 e2) = "(" ++ show e1 ++ "{:}" ++ show e2 ++ ")"
show (Br l e) = "({" ++ showL l ++ "}" ++ show e ++ ")"
show (Obr l s n e) = "({" ++ showL l ++ "=" ++ toString (takeS n
s) ++ "}" ++ show e ++ ")"
- show (Cbr ss e) = "([" ++ intercalate "," (map (\ (l, s) ->
showL l ++ "=" ++ toString s) ss) ++ "]"
+ show (Cbr ss e) = "([" ++ intercalate "," (map (\ (l, s) ->
showL l ++ "=" ++ (show $ toString s)) ss) ++ "]"
++ show e ++
")"
@@ -594,6 +600,11 @@
d' e@(Star e1) = mkSeq (d' e1) e
d' (Alt e1 e2) = mkAlt (d' e1) (d' e2)
d' (Else e1 e2) = mkElse (d' e1) (d' e2)
+
+ d' (Seq e1@(Br l e1') e2)
+ | nullable e1' = mkAlt (mkSeq (d' e1) e2) -- longest submatch
first
+ (mkCbr [(l, emptyS)] (d' e2))
+
d' (Seq e1@(Obr l s n e1') e2)
| nu = mkAlt (mkSeq (d' e1) e2)
(mkCbr ((l, takeS n s) : ws) (d' e2))
@@ -610,7 +621,7 @@
d' (Exor e1 e2) = mkExor (d' e1) (d' e2)
d' (Intl e1 e2) = mkAlt (mkInterleave (d' e1) e2 )
(mkInterleave e1 (d' e2))
-
+
d' (Br l e) = d' (mkObr l inp 0 e) -- a subex parse
starts
d' (Obr l s n e) = mkObr l s (n + 1) (d' e) -- a subex parse
cont.
d' (Cbr ss e) = mkCbr ss (d' e) -- the results of a
subex parse
@@ -623,7 +634,7 @@
where
d' e@(Zero _) = e -- don't process whole input, parse has failed
d' e@(Star Dot) = e -- don't process input, derivative does not change
- d' e = delta inp' ( -- trc "delta1=" $
+ d' e = delta inp' ( -- trc ("delta(" ++ show c ++ ")=") $
delta1 c inp e)
delta _empty e
@@ -726,4 +737,3 @@
| otherwise = Nothing
-- ------------------------------------------------------------
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/hxt-regex-xmlschema-9.2.0.3/test/Date.hs
new/hxt-regex-xmlschema-9.2.0.7/test/Date.hs
--- old/hxt-regex-xmlschema-9.2.0.3/test/Date.hs 2016-08-10
09:55:55.000000000 +0200
+++ new/hxt-regex-xmlschema-9.2.0.7/test/Date.hs 2021-02-08
15:37:36.000000000 +0100
@@ -218,23 +218,23 @@
-- must be extended for weekday or semester, if neccessay
-data DateVal = DT { _year :: ! Int
- , _month :: ! Int
- , _day :: ! Int
- , _hour :: ! Int
- , _min :: ! Int
+data DateVal = DT { _year :: !Int
+ , _month :: !Int
+ , _day :: !Int
+ , _hour :: !Int
+ , _min :: !Int
}
deriving (Eq, Show)
-data DateParse = DP { _pre :: StringFct
- , _rep :: StringFct
- , _dat :: ! DateVal
+data DateParse = DP { _pre :: StringFct
+ , _rep :: StringFct
+ , _dat :: !DateVal
}
-- just a helper for result output
-data DateRep = DR { _p :: String
- , _r :: String
- , _d :: ! DateVal
+data DateRep = DR { _p :: String
+ , _r :: String
+ , _d :: !DateVal
}
deriving (Eq, Show)
