Hello community,
here is the log from the commit of package ghc-neat-interpolation for
openSUSE:Factory checked in at 2018-07-24 17:20:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-neat-interpolation (Old)
and /work/SRC/openSUSE:Factory/.ghc-neat-interpolation.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-neat-interpolation"
Tue Jul 24 17:20:18 2018 rev:4 rq:623816 version:0.3.2.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-neat-interpolation/ghc-neat-interpolation.changes
2018-05-30 12:26:30.779913137 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-neat-interpolation.new/ghc-neat-interpolation.changes
2018-07-24 17:20:19.223141204 +0200
@@ -1,0 +2,12 @@
+Wed Jul 18 14:26:33 UTC 2018 - [email protected]
+
+- Cosmetic: replace tabs with blanks, strip trailing white space,
+ and update copyright headers with spec-cleaner.
+
+-------------------------------------------------------------------
+Fri Jul 13 14:31:41 UTC 2018 - [email protected]
+
+- Update neat-interpolation to version 0.3.2.2.
+ Upstream does not provide a change log file.
+
+-------------------------------------------------------------------
@@ -20 +31,0 @@
-
Old:
----
neat-interpolation-0.3.2.1.tar.gz
New:
----
neat-interpolation-0.3.2.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-neat-interpolation.spec ++++++
--- /var/tmp/diff_new_pack.ORmUv3/_old 2018-07-24 17:20:21.351143935 +0200
+++ /var/tmp/diff_new_pack.ORmUv3/_new 2018-07-24 17:20:21.355143941 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-neat-interpolation
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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 neat-interpolation
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.3.2.1
+Version: 0.3.2.2
Release: 0
Summary: A quasiquoter for neat and simple multiline text interpolation
License: MIT
@@ -28,7 +28,7 @@
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-base-prelude-devel
-BuildRequires: ghc-parsec-devel
+BuildRequires: ghc-megaparsec-devel
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-template-haskell-devel
BuildRequires: ghc-text-devel
++++++ neat-interpolation-0.3.2.1.tar.gz -> neat-interpolation-0.3.2.2.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/neat-interpolation-0.3.2.1/library/NeatInterpolation/Parsing.hs
new/neat-interpolation-0.3.2.2/library/NeatInterpolation/Parsing.hs
--- old/neat-interpolation-0.3.2.1/library/NeatInterpolation/Parsing.hs
2016-07-16 10:12:15.000000000 +0200
+++ new/neat-interpolation-0.3.2.2/library/NeatInterpolation/Parsing.hs
2018-06-16 08:30:00.000000000 +0200
@@ -1,28 +1,58 @@
+{-# LANGUAGE CPP #-}
+{-# LANGUAGE EmptyCase #-}
+
module NeatInterpolation.Parsing where
-import BasePrelude hiding (try, (<|>), many)
-import Text.Parsec hiding (Line)
+import BasePrelude hiding (many, some, try, (<|>))
+import Data.Text (Text, pack)
+import Text.Megaparsec hiding (Line)
+import Text.Megaparsec.Char
-data Line =
+data Line =
Line {lineIndent :: Int, lineContents :: [LineContent]}
deriving (Show)
-data LineContent =
+data LineContent =
LineContentText [Char] |
LineContentIdentifier [Char]
deriving (Show)
-parseLines :: [Char] -> Either ParseError [Line]
-parseLines = parse lines "NeatInterpolation.Parsing.parseLines"
+#if ( __GLASGOW_HASKELL__ < 710 )
+data Void
+
+instance Eq Void where
+ _ == _ = True
+
+instance Ord Void where
+ compare _ _ = EQ
+
+instance ShowErrorComponent Void where
+ showErrorComponent = absurd
+
+absurd :: Void -> a
+absurd a = case a of {}
+#endif
+
+type Parser = Parsec Void String
+
+-- | Pretty parse exception for parsing lines.
+newtype ParseException = ParseException Text
+ deriving (Show, Eq)
+
+parseLines :: [Char] -> Either ParseException [Line]
+parseLines input = case parse lines "NeatInterpolation.Parsing.parseLines"
input of
+ Left err -> Left $ ParseException $ pack $ parseErrorPretty' input err
+ Right output -> Right output
where
+ lines :: Parser [Line]
lines = sepBy line newline <* eof
line = Line <$> countIndent <*> many content
countIndent = fmap length $ try $ lookAhead $ many $ char ' '
content = try escapedDollar <|> try identifier <|> contentText
- identifier = fmap LineContentIdentifier $
+ identifier = fmap LineContentIdentifier $
char '$' *> (try identifier' <|> between (char '{') (char '}')
identifier')
escapedDollar = fmap LineContentText $ char '$' *> count 1 (char '$')
- identifier' = many1 (alphaNum <|> char '\'' <|> char '_')
+ identifier' = some (alphaNumChar <|> char '\'' <|> char '_')
contentText = do
text <- manyTill anyChar end
if null text
@@ -31,6 +61,6 @@
where
end =
(void $ try $ lookAhead escapedDollar) <|>
- (void $ try $ lookAhead identifier) <|>
- (void $ try $ lookAhead newline) <|>
+ (void $ try $ lookAhead identifier) <|>
+ (void $ try $ lookAhead newline) <|>
eof
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/neat-interpolation-0.3.2.1/neat-interpolation.cabal
new/neat-interpolation-0.3.2.2/neat-interpolation.cabal
--- old/neat-interpolation-0.3.2.1/neat-interpolation.cabal 2016-07-16
10:12:15.000000000 +0200
+++ new/neat-interpolation-0.3.2.2/neat-interpolation.cabal 2018-06-16
08:30:01.000000000 +0200
@@ -1,16 +1,16 @@
name:
neat-interpolation
version:
- 0.3.2.1
+ 0.3.2.2
synopsis:
A quasiquoter for neat and simple multiline text interpolation
description:
A quasiquoter for producing Text values with support for
- a simple interpolation of input values.
- It removes the excessive indentation from the input and
- accurately manages the indentation of all lines of the interpolated
variables.
+ a simple interpolation of input values.
+ It removes the excessive indentation from the input and
+ accurately manages the indentation of all lines of the interpolated
variables.
category:
- String, QuasiQoutes
+ String, QuasiQuotes
license:
MIT
license-file:
@@ -48,7 +48,7 @@
NeatInterpolation.String
build-depends:
text == 1.*,
- parsec >= 3 && < 4,
+ megaparsec >= 6.5 && < 7,
template-haskell >= 2.8 && < 3,
base-prelude < 2,
base >= 4.6 && < 5
