c84d2f5 · elk · git.iko.soy

git.iko.soy/elk

Fix bug in multi-line string parser

It was dropping all of the content! New versions keeps it. Definitely takes up more bits, but it’s probably better this way :P

commitc84d2f5504eeb5123413685307231ea284532309 authorEvan Czaplicki <evancz@users.noreply.github.com> dateTue 30 Jan 2018, 21:00 (9 years ago) parentd227ce7

1 file changed+1−8

compare with master

unifiedsplit

src/Parse/Primitives/Utf8.hs+1−8

src/Parse/Primitives/Utf8.hs+1−8

@@ -9,7 +9,6 @@ module Parse.Primitives.Utf8

1010import Prelude hiding (length)

1111import Data.Bits

12−--import qualified Data.ByteString as B

1312import qualified Data.ByteString.Internal as B

1413import qualified Data.ByteString.UTF8 as Utf8

1514import qualified Data.Char as Char

@@ -19,12 +18,6 @@ import qualified Data.Text.Encoding as Text

1918import qualified Data.Text.Lazy as LText

2019import qualified Data.Text.Lazy.Builder as Text

2120import Foreign.ForeignPtr (ForeignPtr)

22−--import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)

23−--import Foreign.Ptr (plusPtr)

24−--import GHC.IO (stToIO, unsafeDupablePerformIO)

25−--import GHC.Exts (Int(I#), Ptr(Ptr))

26−--import qualified GHC.Prim as Prim

27−--import GHC.ST (ST(ST))

2821import GHC.Word (Word8(..))

2922

3023import Parse.Primitives.Internals (Parser(..), State(..), noError)

@@ -251,7 +244,7 @@ multiString fp offset terminal row col initialOffset builder =

251244

252245 else

253246 let !newOffset = offset + I.getCharWidth fp offset terminal word in

254− multiString fp newOffset terminal row (col + 1) newOffset builder

247+ multiString fp newOffset terminal row (col + 1) initialOffset builder

255248

256249

257250