cvs commit: fptools/ghc/compiler/deSugar DsMeta.hs fptools/ghc/compiler/hsSyn Convert.lhs fptools/ghc/compiler/typecheck TcExpr.lhs TcSplice.lhs fptools/libraries/haskell-src/Language/Haskell THSyntax.hs fptools/testsuite/tests/ghc-regress/th TH_repPrim.stderr TH_spliceDecl1.hs TH_spliceDecl3_Lib.hs

[Simon Marlow]

simonmar    2003/05/23 06:19:43 PDT

  Modified files:        (Branch: ghc-6-0-branch)
    ghc/compiler/deSugar DsMeta.hs 
    ghc/compiler/hsSyn   Convert.lhs 
    ghc/compiler/typecheck TcExpr.lhs TcSplice.lhs 
    libraries/haskell-src/Language/Haskell THSyntax.hs 
    testsuite/tests/ghc-regress/th TH_repPrim.stderr 
                                   TH_spliceDecl1.hs 
                                   TH_spliceDecl3_Lib.hs 
  Log:
  Unmerge the Template Haskell renaming changes.  Namely, these revisions:
  
    1.36      +75 -75    fptools/ghc/compiler/deSugar/DsMeta.hs
    1.37      +382 -320  fptools/ghc/compiler/deSugar/DsMeta.hs
  
    1.30      +90 -89    fptools/ghc/compiler/hsSyn/Convert.lhs
  
    1.29      +392 -361  fptools/libraries/haskell-src/Language/Haskell/THSyntax.hs
    1.30      +13 -13    fptools/libraries/haskell-src/Language/Haskell/THSyntax.hs
  
    1.2       +3 -3      fptools/testsuite/tests/ghc-regress/th/TH_repPrim.stderr
    1.3       +1 -1      fptools/testsuite/tests/ghc-regress/th/TH_spliceDecl1.hs
    1.3       +3 -3      fptools/testsuite/tests/ghc-regress/th/TH_spliceDecl3_Lib.hs
    1.153     +2 -2      fptools/ghc/compiler/typecheck/TcExpr.lhs
    1.23      +5 -5      fptools/ghc/compiler/typecheck/TcSplice.lhs
  
  Revision  Changes    Path
  1.35.2.3  +334 -396  fptools/ghc/compiler/deSugar/DsMeta.hs
  1.29.2.2  +89 -90    fptools/ghc/compiler/hsSyn/Convert.lhs
  1.152.2.2 +2 -2      fptools/ghc/compiler/typecheck/TcExpr.lhs
  1.22.2.2  +5 -5      fptools/ghc/compiler/typecheck/TcSplice.lhs
  1.28.2.4  +366 -397  fptools/libraries/haskell-src/Language/Haskell/THSyntax.hs
  1.1.2.2   +3 -3      fptools/testsuite/tests/ghc-regress/th/TH_repPrim.stderr
  1.2.2.2   +1 -1      fptools/testsuite/tests/ghc-regress/th/TH_spliceDecl1.hs
  1.2.2.2   +3 -3      fptools/testsuite/tests/ghc-regress/th/TH_spliceDecl3_Lib.hs