diff options
| author | Ben Sklaroff <bsklaroff@gmail.com> | 2018-08-21 12:03:24 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-08-21 18:52:33 -0400 |
| commit | 02518f9d99c2d038384263f9e039efcb09bc96ff (patch) | |
| tree | 3e850405fc95c084053c0186031d47defd9f5224 /testsuite/tests/parser/should_fail/readFail032.stderr | |
| parent | 966aa7818222a8637b56ca32b3892901de1bf5d4 (diff) | |
| download | haskell-02518f9d99c2d038384263f9e039efcb09bc96ff.tar.gz | |
Fix #line pragmas in nested comments
When parsing a nested comment or nested doc comment in the lexer, if we
see a line starting with '#' we attempt to parse a #line pragma. This
fixes how ghc handles output of the C preproccesor (-cpp flag) when the
original source has C comments or pragmas inside haskell comments.
Updates haddock submodule.
Test Plan: ./validate
Reviewers: bgamari
Reviewed By: bgamari
Subscribers: rwbarton, thomie, carter
GHC Trac Issues: #314
Differential Revision: https://phabricator.haskell.org/D4934
Diffstat (limited to 'testsuite/tests/parser/should_fail/readFail032.stderr')
| -rw-r--r-- | testsuite/tests/parser/should_fail/readFail032.stderr | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/testsuite/tests/parser/should_fail/readFail032.stderr b/testsuite/tests/parser/should_fail/readFail032.stderr index 95852c5bbd..7cd106d69a 100644 --- a/testsuite/tests/parser/should_fail/readFail032.stderr +++ b/testsuite/tests/parser/should_fail/readFail032.stderr @@ -1,8 +1,11 @@ -readFail032.hs:21:38: - Couldn't match expected type `[Char]' with actual type `Char' +readFail032.hs:25:38: + Couldn't match type ‘Char’ with ‘[Char]’ Expected type: [[Char]] Actual type: [Char] - In the second argument of `(:)', namely `"Type error on line 21"' - In the expression: - "Type error on line 21" : "Type error on line 21" + In the second argument of ‘(:)’, namely ‘"Type error on line 25"’ + In the expression: + "Type error on line 25" : "Type error on line 25" + In an equation for ‘type_error’: + type_error = "Type error on line 25" : "Type error on line 25" + |