[commit: template-haskell] type-nats: Merge branch 'master' into type-nats (9a34345)

[Iavor Diatchki]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/template-haskell

On branch  : type-nats

http://hackage.haskell.org/trac/ghc/changeset/9a34345ece647d84ebc5570a89d2afd0a9efa656

>---------------------------------------------------------------

commit 9a34345ece647d84ebc5570a89d2afd0a9efa656
Merge: ec815ca... fdeb047...
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date:   Wed Mar 14 23:40:56 2012 -0700

    Merge branch 'master' into type-nats

 .darcs-boring                 |    5 -
 Language/Haskell/TH.hs        |   17 ++--
 Language/Haskell/TH/Lib.hs    |   21 ++++-
 Language/Haskell/TH/Ppr.hs    |   34 ++++----
 Language/Haskell/TH/PprLib.hs |    6 +-
 Language/Haskell/TH/Quote.hs  |   29 ++++---
 Language/Haskell/TH/Syntax.hs |  185 ++++++++++++++++++++++++++++++++---------
 template-haskell.cabal        |    2 +-
 tests/Makefile                |    7 ++
 tests/all.T                   |    1 +
 tests/dataToExpQUnit.hs       |   15 ++++
 tests/dataToExpQUnit.stderr   |    1 +
 12 files changed, 236 insertions(+), 87 deletions(-)

diff --cc Language/Haskell/TH/Syntax.hs
index 7df0076,9c464cf..1e71ff5
--- a/Language/Haskell/TH/Syntax.hs
+++ b/Language/Haskell/TH/Syntax.hs
@@@ -33,10 -34,10 +34,11 @@@ module Language.Haskell.TH.Syntax
          showName, showName', NameIs(..),
  
  	-- * The algebraic data types
+ 	-- $infix
  	Dec(..), Exp(..), Con(..), Type(..), TyVarBndr(..), Kind(..),Cxt,
 +        TyLit(..),
  	Pred(..), Match(..),  Clause(..), Body(..), Guard(..), Stmt(..),
- 	Range(..), Lit(..), Pat(..), FieldExp, FieldPat, ClassInstance(..),
+ 	Range(..), Lit(..), Pat(..), FieldExp, FieldPat, 
  	Strict(..), Foreign(..), Callconv(..), Safety(..), Pragma(..),
  	InlineSpec(..),	StrictType, VarStrictType, FunDep(..), FamFlavour(..),
  	Info(..), Loc(..), CharPos,