Skip to content

Commit 9eaf6ad

Browse files
committed
Do not pad input to blanker. This results is an extra text node at the end of the XML document, which can mess things up
1 parent f872b55 commit 9eaf6ad

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

project.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ case "$cmd" in
2626
;;
2727

2828
test)
29-
cabal new-test -j8 --enable-tests --disable-documentation \
29+
cabal new-test -j8 --enable-tests --disable-documentation --test-show-details=direct \
3030
$CABAL_FLAGS "$@"
3131
;;
3232

src/HaskellWorks/Data/Xml/Succinct/Cursor/BlankedXml.hs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ module HaskellWorks.Data.Xml.Succinct.Cursor.BlankedXml
1111
import GHC.Generics
1212
import HaskellWorks.Data.Xml.Internal.Blank
1313

14-
import qualified Data.ByteString as BS
15-
import qualified Data.ByteString.Lazy as LBS
16-
import qualified HaskellWorks.Data.ByteString as BS
14+
import qualified Data.ByteString as BS
15+
import qualified Data.ByteString.Lazy as LBS
1716

1817
newtype BlankedXml = BlankedXml
1918
{ unblankedXml :: [BS.ByteString]
@@ -26,7 +25,7 @@ class FromBlankedXml a where
2625
fromBlankedXml :: BlankedXml -> a
2726

2827
bsToBlankedXml :: BS.ByteString -> BlankedXml
29-
bsToBlankedXml bs = BlankedXml (blankXml (BS.chunkedBy 4064 bs))
28+
bsToBlankedXml bs = BlankedXml (blankXml [bs])
3029

3130
lbsToBlankedXml :: LBS.ByteString -> BlankedXml
32-
lbsToBlankedXml lbs = BlankedXml (blankXml (BS.resegmentPadded 4096 (LBS.toChunks lbs)))
31+
lbsToBlankedXml lbs = BlankedXml (blankXml (LBS.toChunks lbs))

test/HaskellWorks/Data/Xml/Succinct/CursorSpec.hs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
module HaskellWorks.Data.Xml.Succinct.CursorSpec(spec) where
1414

1515
import Control.Monad
16-
import Data.String
16+
import Data.Semigroup ((<>))
1717
import Data.Word
1818
import HaskellWorks.Data.BalancedParens.BalancedParens
1919
import HaskellWorks.Data.BalancedParens.Simple
@@ -30,15 +30,11 @@ import HaskellWorks.Hspec.Hedgehog
3030
import Hedgehog
3131
import Test.Hspec
3232

33-
import qualified Data.ByteString as BS
3433
import qualified Data.ByteString as BS
3534
import qualified Data.Text as T
3635
import qualified Data.Text.Encoding as T
3736
import qualified Data.Vector.Storable as DVS
38-
import qualified Data.Vector.Storable as DVS
3937
import qualified HaskellWorks.Data.FromByteString as BS
40-
import qualified HaskellWorks.Data.FromByteString as BS
41-
import qualified HaskellWorks.Data.TreeCursor as TC
4238
import qualified HaskellWorks.Data.TreeCursor as TC
4339
import qualified HaskellWorks.Data.Xml.Succinct.Cursor.Create as CC
4440

0 commit comments

Comments
 (0)