Different quotes in error messages following lexer clean-up

27 files changed, 35 insertions, 29 deletions

diff --git a/testsuite/tests/annotations/should_fail/annfail13.stderr b/testsuite/tests/annotations/should_fail/annfail13.stderr
index fb30c66f73..8470592208 100644
--- a/testsuite/tests/annotations/should_fail/annfail13.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail13.stderr
@@ -1,2 +1,2 @@
 
-annfail13.hs:4:14: parse error on input `1'
+annfail13.hs:4:14: parse error on input ‛1’
diff --git a/testsuite/tests/ghci/prog009/ghci.prog009.stderr b/testsuite/tests/ghci/prog009/ghci.prog009.stderr
index bf608499bb..ca9a7bc591 100644
--- a/testsuite/tests/ghci/prog009/ghci.prog009.stderr
+++ b/testsuite/tests/ghci/prog009/ghci.prog009.stderr
@@ -1,8 +1,8 @@
 
-A.hs:1:16: parse error on input `where'
+A.hs:1:16: parse error on input ‛where’
 
 <interactive>:26:1:
     Not in scope: ‛yan’
     Perhaps you meant ‛tan’ (imported from Prelude)
 
-A.hs:1:16: parse error on input `where'
+A.hs:1:16: parse error on input ‛where’
diff --git a/testsuite/tests/ghci/scripts/T1914.stderr b/testsuite/tests/ghci/scripts/T1914.stderr
index fe06f7e58f..b6357f2a8b 100644
--- a/testsuite/tests/ghci/scripts/T1914.stderr
+++ b/testsuite/tests/ghci/scripts/T1914.stderr
@@ -1,2 +1,4 @@
 
-T1914A.hs:1:38: Parse error: naked expression at top level
+T1914A.hs:1:38:
+    Parse error: naked expression at top level
+    Perhaps you intended to use TemplateHaskell
diff --git a/testsuite/tests/ghci/scripts/T6106.stderr b/testsuite/tests/ghci/scripts/T6106.stderr
index 71baf476a0..ad925244a2 100644
--- a/testsuite/tests/ghci/scripts/T6106.stderr
+++ b/testsuite/tests/ghci/scripts/T6106.stderr
@@ -1,2 +1,4 @@
 
-T6106.hs:1:1: Parse error: naked expression at top level
+T6106.hs:1:1:
+    Parse error: naked expression at top level
+    Perhaps you intended to use TemplateHaskell
diff --git a/testsuite/tests/haddock/should_fail_flag_haddock/haddockE004.stderr b/testsuite/tests/haddock/should_fail_flag_haddock/haddockE004.stderr
index 3462c61a8c..ace4e814f7 100644
--- a/testsuite/tests/haddock/should_fail_flag_haddock/haddockE004.stderr
+++ b/testsuite/tests/haddock/should_fail_flag_haddock/haddockE004.stderr
@@ -1,2 +1,2 @@
 
-haddockE004.hs:3:1: parse error on input `main'
+haddockE004.hs:3:1: parse error on input ‛main’
diff --git a/testsuite/tests/layout/layout001.stdout b/testsuite/tests/layout/layout001.stdout
index 4273843584..682f863bcb 100644
--- a/testsuite/tests/layout/layout001.stdout
+++ b/testsuite/tests/layout/layout001.stdout
@@ -1,7 +1,7 @@
 Running with -XNoAlternativeLayoutRule
 Running with -XAlternativeLayoutRule
 
-layout001.hs:6:3: parse error on input `where'
+layout001.hs:6:3: parse error on input ‛where’
 Running with -XAlternativeLayoutRule -XAlternativeLayoutRuleTransitional
 
 layout001.hs:6:3: Warning:
diff --git a/testsuite/tests/layout/layout003.stdout b/testsuite/tests/layout/layout003.stdout
index 1eb86386e3..ef1a1f84bc 100644
--- a/testsuite/tests/layout/layout003.stdout
+++ b/testsuite/tests/layout/layout003.stdout
@@ -1,7 +1,7 @@
 Running with -XNoAlternativeLayoutRule
 Running with -XAlternativeLayoutRule
 
-layout003.hs:11:4: parse error on input `|'
+layout003.hs:11:4: parse error on input ‛|’
 Running with -XAlternativeLayoutRule -XAlternativeLayoutRuleTransitional
 
 layout003.hs:11:4: Warning:
diff --git a/testsuite/tests/layout/layout004.stdout b/testsuite/tests/layout/layout004.stdout
index bb5cb0661b..d8e3ab6196 100644
--- a/testsuite/tests/layout/layout004.stdout
+++ b/testsuite/tests/layout/layout004.stdout
@@ -1,7 +1,7 @@
 Running with -XNoAlternativeLayoutRule
 Running with -XAlternativeLayoutRule
 
-layout004.hs:7:14: parse error on input `,'
+layout004.hs:7:14: parse error on input ‛,’
 Running with -XAlternativeLayoutRule -XAlternativeLayoutRuleTransitional
 
-layout004.hs:7:14: parse error on input `,'
+layout004.hs:7:14: parse error on input ‛,’
diff --git a/testsuite/tests/layout/layout006.stdout b/testsuite/tests/layout/layout006.stdout
index 84704ba1ab..a8986dbfe8 100644
--- a/testsuite/tests/layout/layout006.stdout
+++ b/testsuite/tests/layout/layout006.stdout
@@ -1,7 +1,7 @@
 Running with -XNoAlternativeLayoutRule
 Running with -XAlternativeLayoutRule
 
-layout006.hs:12:2: parse error on input `|'
+layout006.hs:12:2: parse error on input ‛|’
 Running with -XAlternativeLayoutRule -XAlternativeLayoutRuleTransitional
 
 layout006.hs:12:2: Warning:
diff --git a/testsuite/tests/mdo/should_fail/mdofail005.stderr b/testsuite/tests/mdo/should_fail/mdofail005.stderr
index 306df25706..e5c81c3838 100644
--- a/testsuite/tests/mdo/should_fail/mdofail005.stderr
+++ b/testsuite/tests/mdo/should_fail/mdofail005.stderr
@@ -1,2 +1,2 @@
 
-mdofail005.hs:11:14: parse error on input `<-'
+mdofail005.hs:11:14: parse error on input ‛<-’
diff --git a/testsuite/tests/module/mod76.stderr b/testsuite/tests/module/mod76.stderr
index cf7a94495c..37226abf36 100644
--- a/testsuite/tests/module/mod76.stderr
+++ b/testsuite/tests/module/mod76.stderr
@@ -1,2 +1,2 @@
 
-mod76.hs:5:1: parse error on input `module'
+mod76.hs:5:1: parse error on input ‛module’
diff --git a/testsuite/tests/parser/should_fail/ExportCommaComma.stderr b/testsuite/tests/parser/should_fail/ExportCommaComma.stderr
index f93d83f6ac..99b8d6a777 100644
--- a/testsuite/tests/parser/should_fail/ExportCommaComma.stderr
+++ b/testsuite/tests/parser/should_fail/ExportCommaComma.stderr
@@ -1,2 +1,2 @@
 
-ExportCommaComma.hs:2:38: parse error on input `,'
+ExportCommaComma.hs:2:38: parse error on input ‛,’
diff --git a/testsuite/tests/parser/should_fail/ParserNoLambdaCase.stderr b/testsuite/tests/parser/should_fail/ParserNoLambdaCase.stderr
index 11f087896b..00dd88b53f 100644
--- a/testsuite/tests/parser/should_fail/ParserNoLambdaCase.stderr
+++ b/testsuite/tests/parser/should_fail/ParserNoLambdaCase.stderr
@@ -1,2 +1,2 @@
 
-ParserNoLambdaCase.hs:3:6: parse error on input `case'
+ParserNoLambdaCase.hs:3:6: parse error on input ‛case’
diff --git a/testsuite/tests/parser/should_fail/position001.stderr b/testsuite/tests/parser/should_fail/position001.stderr
index 0635c8d867..dabcfe45de 100644
--- a/testsuite/tests/parser/should_fail/position001.stderr
+++ b/testsuite/tests/parser/should_fail/position001.stderr
@@ -1,2 +1,2 @@
 
-position001.hs:6:33: parse error on input `module'
+position001.hs:6:33: parse error on input ‛module’
diff --git a/testsuite/tests/parser/should_fail/position002.stderr b/testsuite/tests/parser/should_fail/position002.stderr
index 9306d42fb8..4bf5e3e808 100644
--- a/testsuite/tests/parser/should_fail/position002.stderr
+++ b/testsuite/tests/parser/should_fail/position002.stderr
@@ -1,2 +1,2 @@
 
-position002.hs:6:33: parse error on input `module'
+position002.hs:6:33: parse error on input ‛module’
diff --git a/testsuite/tests/parser/should_fail/readFail006.stderr b/testsuite/tests/parser/should_fail/readFail006.stderr
index 92ea7a484d..f80f2dd5f7 100644
--- a/testsuite/tests/parser/should_fail/readFail006.stderr
+++ b/testsuite/tests/parser/should_fail/readFail006.stderr
@@ -1,2 +1,2 @@
 
-readFail006.hs:8:12: parse error on input `@'
+readFail006.hs:8:12: parse error on input ‛@’
diff --git a/testsuite/tests/parser/should_fail/readFail011.stderr b/testsuite/tests/parser/should_fail/readFail011.stderr
index 2570aa357e..0d1e52e09a 100644
--- a/testsuite/tests/parser/should_fail/readFail011.stderr
+++ b/testsuite/tests/parser/should_fail/readFail011.stderr
@@ -1,2 +1,2 @@
 
-readFail011.hs:7:10: parse error on input `='
+readFail011.hs:7:10: parse error on input ‛=’
diff --git a/testsuite/tests/parser/should_fail/readFail013.stderr b/testsuite/tests/parser/should_fail/readFail013.stderr
index 9be590d0b0..114252c094 100644
--- a/testsuite/tests/parser/should_fail/readFail013.stderr
+++ b/testsuite/tests/parser/should_fail/readFail013.stderr
@@ -1,2 +1,2 @@
 
-readFail013.hs:4:5: parse error on input ``'
+readFail013.hs:4:5: parse error on input ‛`’
diff --git a/testsuite/tests/parser/should_fail/readFail014.stderr b/testsuite/tests/parser/should_fail/readFail014.stderr
index 4bb5fff2da..6582b49fcc 100644
--- a/testsuite/tests/parser/should_fail/readFail014.stderr
+++ b/testsuite/tests/parser/should_fail/readFail014.stderr
@@ -1,2 +1,2 @@
 
-readFail014.hs:3:12: parse error on input `}'
+readFail014.hs:3:12: parse error on input ‛}’
diff --git a/testsuite/tests/parser/should_fail/readFail019.stderr b/testsuite/tests/parser/should_fail/readFail019.stderr
index 65f7580599..3428176934 100644
--- a/testsuite/tests/parser/should_fail/readFail019.stderr
+++ b/testsuite/tests/parser/should_fail/readFail019.stderr
@@ -1,2 +1,2 @@
 
-readFail019.hs:3:18: parse error on input `in'
+readFail019.hs:3:18: parse error on input ‛in’
diff --git a/testsuite/tests/parser/should_fail/readFail020.stderr b/testsuite/tests/parser/should_fail/readFail020.stderr
index fb81cef861..aba8a92b78 100644
--- a/testsuite/tests/parser/should_fail/readFail020.stderr
+++ b/testsuite/tests/parser/should_fail/readFail020.stderr
@@ -1,2 +1,2 @@
 
-readFail020.hs:3:16: parse error on input `}'
+readFail020.hs:3:16: parse error on input ‛}’
diff --git a/testsuite/tests/parser/should_fail/readFail024.stderr b/testsuite/tests/parser/should_fail/readFail024.stderr
index 01d32ec450..3338410229 100644
--- a/testsuite/tests/parser/should_fail/readFail024.stderr
+++ b/testsuite/tests/parser/should_fail/readFail024.stderr
@@ -1,2 +1,2 @@
 
-readFail024.hs:5:2: parse error on input `h'
+readFail024.hs:5:2: parse error on input ‛h’
diff --git a/testsuite/tests/parser/should_fail/readFail026.stderr b/testsuite/tests/parser/should_fail/readFail026.stderr
index 2249fa0b41..3c237954b8 100644
--- a/testsuite/tests/parser/should_fail/readFail026.stderr
+++ b/testsuite/tests/parser/should_fail/readFail026.stderr
@@ -1,2 +1,2 @@
 
-readFail026.hs:3:7: parse error on input `,'
+readFail026.hs:3:7: parse error on input ‛,’
diff --git a/testsuite/tests/parser/should_fail/readFail034.stderr b/testsuite/tests/parser/should_fail/readFail034.stderr
index 19f428131f..201abd4011 100644
--- a/testsuite/tests/parser/should_fail/readFail034.stderr
+++ b/testsuite/tests/parser/should_fail/readFail034.stderr
@@ -1,2 +1,2 @@
 
-readFail034.hs:4:6: parse error on input `='
+readFail034.hs:4:6: parse error on input ‛=’
diff --git a/testsuite/tests/parser/should_fail/readFail040.stderr b/testsuite/tests/parser/should_fail/readFail040.stderr
index 794899898d..31a3618214 100644
--- a/testsuite/tests/parser/should_fail/readFail040.stderr
+++ b/testsuite/tests/parser/should_fail/readFail040.stderr
@@ -1,2 +1,2 @@
 
-readFail040.hs:7:11: parse error on input `<-'
+readFail040.hs:7:11: parse error on input ‛<-’
diff --git a/testsuite/tests/rename/should_fail/T4042.stderr b/testsuite/tests/rename/should_fail/T4042.stderr
index f8c7e433a6..a00cec60e3 100644
--- a/testsuite/tests/rename/should_fail/T4042.stderr
+++ b/testsuite/tests/rename/should_fail/T4042.stderr
@@ -1,2 +1,4 @@
 
-T4042.hs:6:1: Parse error: naked expression at top level
+T4042.hs:6:1:
+    Parse error: naked expression at top level
+    Perhaps you intended to use TemplateHaskell
diff --git a/testsuite/tests/safeHaskell/ghci/p14.stderr b/testsuite/tests/safeHaskell/ghci/p14.stderr
index 4a66d78f55..0d1b1728a7 100644
--- a/testsuite/tests/safeHaskell/ghci/p14.stderr
+++ b/testsuite/tests/safeHaskell/ghci/p14.stderr
@@ -1,2 +1,2 @@
 
-<interactive>:10:1: parse error on input `{-# RULES'
+<interactive>:10:1: parse error on input ‛{-# RULES’