diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2016-07-17 00:12:52 +0200 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-07-17 00:12:53 +0200 |
| commit | 0f0cdb6827803015a9a3924fdafaef8dbcde048f (patch) | |
| tree | c35159a2c5ba6b4c9d9bfe4aa759c1878fa06813 /libraries/base/GHC/Read.hs | |
| parent | 24f5f368d8ed0b5f113c2753b2b2bdc99957dcb2 (diff) | |
| download | haskell-0f0cdb6827803015a9a3924fdafaef8dbcde048f.tar.gz | |
Bugfix for bug 11632: `readLitChar` should consume null characters
Test Plan: The tests have been included. This change deals with a
relatively minor edge case and should not break unrelated functionality.
Reviewers: thomie, #core_libraries_committee, ekmett, bgamari
Reviewed By: #core_libraries_committee, ekmett, bgamari
Subscribers: bgamari, ekmett
Differential Revision: https://phabricator.haskell.org/D2391
GHC Trac Issues: #11632
Diffstat (limited to 'libraries/base/GHC/Read.hs')
| -rw-r--r-- | libraries/base/GHC/Read.hs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libraries/base/GHC/Read.hs b/libraries/base/GHC/Read.hs index 54fbc287a8..d7df82f1f6 100644 --- a/libraries/base/GHC/Read.hs +++ b/libraries/base/GHC/Read.hs @@ -229,7 +229,13 @@ lex s = readP_to_S L.hsLex s -- lexLitChar :: ReadS String -- As defined by H2010 lexLitChar = readP_to_S (do { (s, _) <- P.gather L.lexChar ; - return s }) + let s' = removeNulls s in + return s' }) + where + -- remove nulls from end of the character if they exist + removeNulls [] = [] + removeNulls ('\\':'&':xs) = removeNulls xs + removeNulls (first:rest) = first : removeNulls rest -- There was a skipSpaces before the P.gather L.lexChar, -- but that seems inconsistent with readLitChar |