Date: Wednesday, December 28, 2016 @ 02:49:10 Author: felixonmars Revision: 203132
upgpkg: haskell-shakespeare 2.0.12-3 second try to fix the parser Modified: haskell-shakespeare/trunk/PKGBUILD haskell-shakespeare/trunk/issue201.patch ----------------+ PKGBUILD | 4 ++-- issue201.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-12-28 02:32:38 UTC (rev 203131) +++ PKGBUILD 2016-12-28 02:49:10 UTC (rev 203132) @@ -5,7 +5,7 @@ _hkgname=shakespeare pkgname=haskell-shakespeare pkgver=2.0.12 -pkgrel=2 +pkgrel=3 pkgdesc="A toolkit for making compile-time interpolated templates" url="http://www.yesodweb.com/book/shakespearean-templates"; license=("MIT") @@ -16,7 +16,7 @@ source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"; issue201.patch) sha256sums=('9f07d26f00bba94ea47c35197132d22d8f6cb56de53bad818c5db8382c7cae91' - '7f5fdcd7afe63168df07ad59c4c191c76b341e811d1952b4da089763a165c6ff') + '01d6550508d2651cf5d7fdceaa929a6749ab1340977dbf3a0462325eb5a317c3') prepare() { cd "${srcdir}/${_hkgname}-${pkgver}" Modified: issue201.patch =================================================================== --- issue201.patch 2016-12-28 02:32:38 UTC (rev 203131) +++ issue201.patch 2016-12-28 02:49:10 UTC (rev 203132) @@ -19,3 +19,29 @@ _ -> fail "Expected hash at end of line, got Id" Left str -> return (ContentRaw str, null str) Right deref -> return (ContentVar deref, False) +From b43ceba3f033e1aa83c3c424a661996a3e272194 Mon Sep 17 00:00:00 2001 +From: Tyler Erickson <[email protected]> +Date: Tue, 27 Dec 2016 12:22:44 -0800 +Subject: [PATCH] Reversed Test cases; NotInQuotes -> fail; otherwise -> + succeed + +--- + Text/Hamlet/Parse.hs | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/Text/Hamlet/Parse.hs b/Text/Hamlet/Parse.hs +index 27b65a7..3f77df6 100644 +--- a/Text/Hamlet/Parse.hs ++++ b/Text/Hamlet/Parse.hs +@@ -256,9 +256,8 @@ parseLine set = do + x <- parseHash + case x of + Left "#" -> case cr of +- InContent -> return (ContentRaw "#", False) +- NotInQuotesAttr -> return (ContentRaw "#", False) +- _ -> fail "Expected hash at end of line, got Id" ++ NotInQuotes -> fail "Expected hash at end of lin, got Id" ++ _ -> return (ContentRaw "#", False) + Left str -> return (ContentRaw str, null str) + Right deref -> return (ContentVar deref, False) + contentAt = do
