Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-toml-parser for openSUSE:Factory
checked in at 2025-12-26 14:37:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-toml-parser (Old)
and /work/SRC/openSUSE:Factory/.ghc-toml-parser.new.1928 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-toml-parser"
Fri Dec 26 14:37:43 2025 rev:13 rq:1324417 version:2.0.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-toml-parser/ghc-toml-parser.changes
2025-09-12 21:10:15.945088456 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-toml-parser.new.1928/ghc-toml-parser.changes
2025-12-26 14:37:55.291465337 +0100
@@ -1,0 +2,11 @@
+Thu Dec 18 16:51:27 UTC 2025 - Peter Simons <[email protected]>
+
+- Update toml-parser to version 2.0.2.0.
+ ## 2.0.2.0
+
+ * Update for TOML 1.1.0
+ - Add \e and \x escapes
+ - Allow omitting seconds in times
+ - Allow newlines and trailing commas in inline tables
+
+-------------------------------------------------------------------
Old:
----
toml-parser-2.0.1.2.tar.gz
toml-parser.cabal
New:
----
toml-parser-2.0.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-toml-parser.spec ++++++
--- /var/tmp/diff_new_pack.EN1A9d/_old 2025-12-26 14:37:55.931491645 +0100
+++ /var/tmp/diff_new_pack.EN1A9d/_new 2025-12-26 14:37:55.931491645 +0100
@@ -20,13 +20,12 @@
%global pkgver %{pkg_name}-%{version}
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 2.0.1.2
+Version: 2.0.2.0
Release: 0
-Summary: TOML 1.0.0 parser
+Summary: TOML 1.1.0 parser
License: ISC
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: alex
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-array-devel
@@ -55,7 +54,7 @@
%description
TOML parser using generated lexers and parsers with careful attention to the
-TOML 1.0.0 semantics for defining tables.
+TOML 1.1.0 semantics for defining tables.
%package devel
Summary: Haskell %{pkg_name} library development files
@@ -85,7 +84,6 @@
%prep
%autosetup -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++++++ toml-parser-2.0.1.2.tar.gz -> toml-parser-2.0.2.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/toml-parser-2.0.1.2/ChangeLog.md
new/toml-parser-2.0.2.0/ChangeLog.md
--- old/toml-parser-2.0.1.2/ChangeLog.md 2001-09-09 03:46:40.000000000
+0200
+++ new/toml-parser-2.0.2.0/ChangeLog.md 2001-09-09 03:46:40.000000000
+0200
@@ -1,5 +1,12 @@
# Revision history for toml-parser
+## 2.0.2.0
+
+* Update for TOML 1.1.0
+ - Add \e and \x escapes
+ - Allow omitting seconds in times
+ - Allow newlines and trailing commas in inline tables
+
## 2.0.1.2
* Reject inputs with out-of-bounds time zone offsets in accordance
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/toml-parser-2.0.1.2/README.lhs
new/toml-parser-2.0.2.0/README.lhs
--- old/toml-parser-2.0.1.2/README.lhs 2001-09-09 03:46:40.000000000 +0200
+++ new/toml-parser-2.0.2.0/README.lhs 2001-09-09 03:46:40.000000000 +0200
@@ -1,6 +1,6 @@
# TOML Parser
-This package implements a validating parser for [TOML
1.0.0](https://toml.io/en/v1.0.0).
+This package implements a validating parser for [TOML
1.1.0](https://toml.io/en/v1.1.0).
This package uses an
[alex](https://haskell-alex.readthedocs.io/en/latest/)-generated
lexer and [happy](https://haskell-happy.readthedocs.io/en/latest/)-generated
parser.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/toml-parser-2.0.1.2/README.md
new/toml-parser-2.0.2.0/README.md
--- old/toml-parser-2.0.1.2/README.md 2001-09-09 03:46:40.000000000 +0200
+++ new/toml-parser-2.0.2.0/README.md 2001-09-09 03:46:40.000000000 +0200
@@ -1,6 +1,6 @@
# TOML Parser
-This package implements a validating parser for [TOML
1.0.0](https://toml.io/en/v1.0.0).
+This package implements a validating parser for [TOML
1.1.0](https://toml.io/en/v1.1.0).
This package uses an
[alex](https://haskell-alex.readthedocs.io/en/latest/)-generated
lexer and [happy](https://haskell-happy.readthedocs.io/en/latest/)-generated
parser.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/toml-parser-2.0.1.2/src/Toml/Pretty.hs
new/toml-parser-2.0.2.0/src/Toml/Pretty.hs
--- old/toml-parser-2.0.1.2/src/Toml/Pretty.hs 2001-09-09 03:46:40.000000000
+0200
+++ new/toml-parser-2.0.2.0/src/Toml/Pretty.hs 2001-09-09 03:46:40.000000000
+0200
@@ -94,12 +94,14 @@
'"' : xs -> '\\' : '"' : go xs
'\\' : xs -> '\\' : '\\' : go xs
'\b' : xs -> '\\' : 'b' : go xs
+ '\ESC':xs -> '\\' : 'e' : go xs
'\f' : xs -> '\\' : 'f' : go xs
'\n' : xs -> '\\' : 'n' : go xs
'\r' : xs -> '\\' : 'r' : go xs
'\t' : xs -> '\\' : 't' : go xs
x : xs
| isPrint x -> x : go xs
+ | x <= '\xff' -> printf "\\x%02X%s" (ord x) (go xs)
| x <= '\xffff' -> printf "\\u%04X%s" (ord x) (go xs)
| otherwise -> printf "\\U%08X%s" (ord x) (go xs)
@@ -112,6 +114,7 @@
'"' : '"' : '"' : xs -> "\"\"\\\"" ++ go xs
'\\' : xs -> '\\' : '\\' : go xs
'\b' : xs -> '\\' : 'b' : go xs
+ '\ESC':xs -> '\\' : 'e' : go xs
'\f' : xs -> '\\' : 'f' : go xs
'\t' : xs -> '\\' : 't' : go xs
'\n' : xs -> '\n' : go xs
@@ -119,6 +122,7 @@
'\r' : xs -> '\\' : 'r' : go xs
x : xs
| isPrint x -> x : go xs
+ | x <= '\xff' -> printf "\\x%02X%s" (ord x) (go xs)
| x <= '\xffff' -> printf "\\u%04X%s" (ord x) (go xs)
| otherwise -> printf "\\U%08X%s" (ord x) (go xs)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/toml-parser-2.0.1.2/src/Toml/Syntax/Lexer.x
new/toml-parser-2.0.2.0/src/Toml/Syntax/Lexer.x
--- old/toml-parser-2.0.1.2/src/Toml/Syntax/Lexer.x 2001-09-09
03:46:40.000000000 +0200
+++ new/toml-parser-2.0.2.0/src/Toml/Syntax/Lexer.x 2001-09-09
03:46:40.000000000 +0200
@@ -63,8 +63,7 @@
$literal_char = [\x09 \x20-\x26 \x28-\x7E $non_ascii]
-$mll_char = [\x09 \x20-\x26 \x28-\x7E $non_ascii]
-@mll_content = $mll_char | @newline
+@mll_content = $literal_char | @newline
@mlb_escaped_nl = \\ @ws @newline ($wschar | @newline)*
$unescaped = [$wschar \x21 \x23-\x5B \x5D-\x7E $non_ascii]
@@ -82,7 +81,7 @@
@time_numoffset = [\+\-] @offset_hour ":" @offset_minute
@time_offset = [Zz] | @time_numoffset
-@partial_time = @time_hour ":" @time_minute ":" @time_second @time_secfrac?
+@partial_time = @time_hour ":" @time_minute (":" @time_second @time_secfrac?)?
@full_date = @date_fullyear "-" @date_month "-" @date_mday
@full_time = @partial_time @time_offset
@@ -164,15 +163,18 @@
}
<mlbstr, bstr> {
- \\ U $hexdig{8} { unicodeEscape }
- \\ U { failure "\\U requires exactly 8 hex digits"}
+ \\ x $hexdig{2} { unicodeEscape }
+ \\ x { failure "\\x requires exactly 2 hex digits"}
\\ u $hexdig{4} { unicodeEscape }
\\ u { failure "\\u requires exactly 4 hex digits"}
+ \\ U $hexdig{8} { unicodeEscape }
+ \\ U { failure "\\U requires exactly 8 hex digits"}
\\ n { strFrag . (Text.singleton '\n' <$) }
\\ t { strFrag . (Text.singleton '\t' <$) }
\\ r { strFrag . (Text.singleton '\r' <$) }
\\ f { strFrag . (Text.singleton '\f' <$) }
\\ b { strFrag . (Text.singleton '\b' <$) }
+ \\ e { strFrag . (Text.singleton '\ESC' <$) }
\\ \\ { strFrag . (Text.singleton '\\' <$) }
\\ \" { strFrag . (Text.singleton '\"' <$) }
\\ . { failure "unknown escape sequence" }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/toml-parser-2.0.1.2/src/Toml/Syntax/Parser.y
new/toml-parser-2.0.2.0/src/Toml/Syntax/Parser.y
--- old/toml-parser-2.0.1.2/src/Toml/Syntax/Parser.y 2001-09-09
03:46:40.000000000 +0200
+++ new/toml-parser-2.0.2.0/src/Toml/Syntax/Parser.y 2001-09-09
03:46:40.000000000 +0200
@@ -99,8 +99,17 @@
| inlinetable { locVal ValTable $1 }
inlinetable :: { Located [(Key Position, Val Position)] }
- : lhs '{' sepBy(keyval, ',') pop '}'
- { Located $2 $3 }
+ : lhs '{' inlinetablekeyvals newlines pop '}'
+ { Located $2 (reverse $3) }
+ | lhs '{' inlinetablekeyvals newlines ',' newlines pop '}'
+ { Located $2 (reverse $3) }
+ | lhs '{' newlines pop '}'
+ { Located $2 [] }
+
+inlinetablekeyvals :: { [(Key Position, Val Position)] }
+ : newlines keyval { [$2] }
+ | inlinetablekeyvals newlines ',' newlines keyval
+ { $5 : $1 }
array :: { Located [Val Position] }
: rhs '[' newlines pop ']'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/toml-parser-2.0.1.2/src/Toml/Syntax/Token.hs
new/toml-parser-2.0.2.0/src/Toml/Syntax/Token.hs
--- old/toml-parser-2.0.1.2/src/Toml/Syntax/Token.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/toml-parser-2.0.2.0/src/Toml/Syntax/Token.hs 2001-09-09
03:46:40.000000000 +0200
@@ -108,16 +108,26 @@
-- | Format strings for local time lexemes.
localTimePatterns :: [String]
-localTimePatterns = ["%H:%M:%S%Q"]
+localTimePatterns =
+ ["%H:%M:%S%Q",
+ "%H:%M"]
-- | Format strings for local datetime lexemes.
localDateTimePatterns :: [String]
localDateTimePatterns =
["%Y-%m-%dT%H:%M:%S%Q",
- "%Y-%m-%d %H:%M:%S%Q"]
+ "%Y-%m-%d %H:%M:%S%Q",
+ "%Y-%m-%dT%H:%M",
+ "%Y-%m-%d %H:%M"]
-- | Format strings for offset datetime lexemes.
offsetDateTimePatterns :: [String]
offsetDateTimePatterns =
- ["%Y-%m-%dT%H:%M:%S%Q%Ez","%Y-%m-%dT%H:%M:%S%QZ",
- "%Y-%m-%d %H:%M:%S%Q%Ez","%Y-%m-%d %H:%M:%S%QZ"]
+ ["%Y-%m-%dT%H:%M:%S%Q%Ez",
+ "%Y-%m-%dT%H:%M:%S%QZ",
+ "%Y-%m-%d %H:%M:%S%Q%Ez",
+ "%Y-%m-%d %H:%M:%S%QZ",
+ "%Y-%m-%dT%H:%M%Ez",
+ "%Y-%m-%dT%H:%MZ",
+ "%Y-%m-%d %H:%M%Ez",
+ "%Y-%m-%d %H:%MZ"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/toml-parser-2.0.1.2/src/Toml.hs
new/toml-parser-2.0.2.0/src/Toml.hs
--- old/toml-parser-2.0.1.2/src/Toml.hs 2001-09-09 03:46:40.000000000 +0200
+++ new/toml-parser-2.0.2.0/src/Toml.hs 2001-09-09 03:46:40.000000000 +0200
@@ -10,7 +10,7 @@
It enables parsing, printing, and conversion into and out of
application-specific representations.
-This parser implements TOML 1.0.0 <https://toml.io/en/v1.0.0>
+This parser implements TOML 1.1.0 <https://toml.io/en/v1.1.0>
as carefully as possible.
Use "Toml.Schema" to implement functions mapping between TOML
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/toml-parser-2.0.1.2/test/PrettySpec.hs
new/toml-parser-2.0.2.0/test/PrettySpec.hs
--- old/toml-parser-2.0.1.2/test/PrettySpec.hs 2001-09-09 03:46:40.000000000
+0200
+++ new/toml-parser-2.0.2.0/test/PrettySpec.hs 2001-09-09 03:46:40.000000000
+0200
@@ -61,9 +61,9 @@
y = 4|]
it "renders escapes in strings" $
- fmap tomlString (parse_
"a=\"\\\\\\b\\t\\r\\n\\f\\\"\\u007f\\U0001000c\"")
+ fmap tomlString (parse_
"a=\"\\\\\\b\\t\\r\\n\\f\\e\\\"\\u007f\\U0001000c\"")
`shouldBe` Right [quoteStr|
- a = "\\\b\t\r\n\f\"\u007F\U0001000C"|]
+ a = "\\\b\t\r\n\f\e\"\x7F\U0001000C"|]
it "renders multiline strings" $
fmap tomlString (parse_ [quoteStr|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/toml-parser-2.0.1.2/toml-parser.cabal
new/toml-parser-2.0.2.0/toml-parser.cabal
--- old/toml-parser-2.0.1.2/toml-parser.cabal 2001-09-09 03:46:40.000000000
+0200
+++ new/toml-parser-2.0.2.0/toml-parser.cabal 2001-09-09 03:46:40.000000000
+0200
@@ -1,10 +1,10 @@
cabal-version: 3.0
name: toml-parser
-version: 2.0.1.2
-synopsis: TOML 1.0.0 parser
+version: 2.0.2.0
+synopsis: TOML 1.1.0 parser
description:
TOML parser using generated lexers and parsers with
- careful attention to the TOML 1.0.0 semantics for
+ careful attention to the TOML 1.1.0 semantics for
defining tables.
license: ISC
license-file: LICENSE
@@ -13,7 +13,7 @@
copyright: 2023 Eric Mertens
category: Text
build-type: Simple
-tested-with: GHC == {8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.6, 9.8.2, 9.10.1,
9.12.2}
+tested-with: GHC == {8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.7, 9.8.4, 9.10.3,
9.12.2}
extra-doc-files:
ChangeLog.md
@@ -75,7 +75,7 @@
containers ^>= {0.5, 0.6, 0.7, 0.8},
prettyprinter ^>= 1.7,
text >= 0.2 && < 3,
- time ^>= {1.9, 1.10, 1.11, 1.12, 1.14},
+ time ^>= {1.9, 1.10, 1.11, 1.12, 1.14, 1.15},
transformers ^>= {0.5, 0.6},
build-tool-depends:
alex:alex >= 3.2,
