From 0e0b98409b23dd84ef11aea611b104d8e20abae3 Mon Sep 17 00:00:00 2001 From: simonpj Date: Mon, 19 Dec 2005 09:32:33 +0000 Subject: [PATCH] [project @ 2005-12-19 09:32:33 by simonpj] ** Wibble to Friday's commit (fixes HEAD build) ** ----------------------------------------- Make deriving work for infix constructors ----------------------------------------- Merge to stable branch Back quotes were not being done correctly in deriving Read and Show. Now they are. I think. Test is drvrun018 --- ghc/compiler/typecheck/TcGenDeriv.lhs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ghc/compiler/typecheck/TcGenDeriv.lhs b/ghc/compiler/typecheck/TcGenDeriv.lhs index 19c8da8..faa32ec 100644 --- a/ghc/compiler/typecheck/TcGenDeriv.lhs +++ b/ghc/compiler/typecheck/TcGenDeriv.lhs @@ -54,7 +54,6 @@ import TysWiredIn ( charDataCon, intDataCon, floatDataCon, doubleDataCon, intDataCon_RDR, true_RDR, false_RDR ) import Util ( zipWithEqual, isSingleton, zipWith3Equal, nOfThem, zipEqual ) -import Char ( isAlpha ) import Constants import List ( partition, intersperse ) import Outputable @@ -776,9 +775,9 @@ gen_Read_binds get_fixity tycon infix_stmts -- a %% b, or a `T` b = [read_a1] - ++ if isSym con_str - then [bindLex (symbol_pat con_str)] - else [read_punc "`", bindLex (ident_pat con_str), read_punc "`"] + ++ (if isSym con_str + then [bindLex (symbol_pat con_str)] + else [read_punc "`", bindLex (ident_pat con_str), read_punc "`"]) ++ [read_a2] lbl_stmts -- T { f1 = a, f2 = b } -- 1.7.10.4