attempt to inline hssplice but we need it elsewhere...wip/romes/ttg-splices-improvements-alt

4 files changed, 14 insertions, 32 deletions

diff --git a/compiler/Language/Haskell/Syntax/Expr.hs b/compiler/Language/Haskell/Syntax/Expr.hs
index 542f648c84..54bba3455e 100644
--- a/compiler/Language/Haskell/Syntax/Expr.hs
+++ b/compiler/Language/Haskell/Syntax/Expr.hs
@@ -596,7 +596,20 @@ data HsExpr p
   --         'GHC.Parser.Annotation.AnnClose'
 
   -- For details on above see Note [exact print annotations] in GHC.Parser.Annotation
-  | HsSpliceE  (XSpliceE p) (HsSplice p)
+  | HsTypedSplice        --  $$z  or $$(f 4)
+        (XTypedSplice p)
+        SpliceDecoration -- Whether $$( ) variant found, for pretty printing
+        (LHsExpr p)      -- See Note [Pending Splices]
+
+  | HsUntypedSplice      --  $z  or $(f 4)
+        (XUntypedSplice p)
+        SpliceDecoration -- Whether $( ) variant found, for pretty printing
+        (LHsExpr p)      -- See Note [Pending Splices]
+
+  | HsQuasiQuote         -- See Note [Quasi-quote overview]
+        (XQuasiQuote p)
+        SrcSpan          -- The span of the enclosed string
+        FastString       -- The enclosed string
 
   -----------------------------------------------------------
   -- Arrow notation extension
@@ -1541,26 +1554,6 @@ However, you can do this in patterns as well as terms.  Because of this,
 the splice is run by the *renamer* rather than the type checker.
 -}
 
--- | Haskell Splice
-data HsSplice id
-   = HsTypedSplice       --  $$z  or $$(f 4)
-        (XTypedSplice id)
-        SpliceDecoration -- Whether $$( ) variant found, for pretty printing
-        (LHsExpr id)     -- See Note [Pending Splices]
-
-   | HsUntypedSplice     --  $z  or $(f 4)
-        (XUntypedSplice id)
-        SpliceDecoration -- Whether $( ) variant found, for pretty printing
-        (LHsExpr id)     -- See Note [Pending Splices]
-
-   | HsQuasiQuote        -- See Note [Quasi-quote overview]
-        (XQuasiQuote id)
-        SrcSpan          -- The span of the enclosed string
-        FastString       -- The enclosed string
-
-   | XSplice !(XXSplice id) -- Extension point; see Note [Trees That Grow]
-                            -- in Language.Haskell.Syntax.Extension
-
 -- | A splice can appear with various decorations wrapped around it. This data
 -- type captures explicitly how it was originally written, for use in the pretty
 -- printer.
@@ -1573,11 +1566,6 @@ instance Outputable SpliceDecoration where
   ppr x = text $ show x
 
 
-isTypedSplice :: HsSplice id -> Bool
-isTypedSplice (HsTypedSplice {}) = True
-isTypedSplice _                  = False   -- Quasi-quotes are untyped splices
-
-
 -- | Haskell (Untyped) Quote = Expr + Pat + Type + Var
 data HsQuote p
   = ExpBr  (XExpBr p)   (LHsExpr p)   -- [|  expr  |]
diff --git a/compiler/Language/Haskell/Syntax/Expr.hs-boot b/compiler/Language/Haskell/Syntax/Expr.hs-boot
index 3ea7e32708..eded18c6d4 100644
--- a/compiler/Language/Haskell/Syntax/Expr.hs-boot
+++ b/compiler/Language/Haskell/Syntax/Expr.hs-boot
@@ -12,9 +12,7 @@ import Data.Kind  ( Type )
 type role HsExpr nominal
 type role MatchGroup nominal nominal
 type role GRHSs nominal nominal
-type role HsSplice nominal
 data HsExpr (i :: Type)
-data HsSplice (i :: Type)
 data MatchGroup (a :: Type) (body :: Type)
 data GRHSs (a :: Type) (body :: Type)
 type family SyntaxExpr (i :: Type)
diff --git a/compiler/Language/Haskell/Syntax/Extension.hs b/compiler/Language/Haskell/Syntax/Extension.hs
index b7239868d4..8c0112f7f3 100644
--- a/compiler/Language/Haskell/Syntax/Extension.hs
+++ b/compiler/Language/Haskell/Syntax/Extension.hs
@@ -431,7 +431,6 @@ type family XExprWithTySig  x
 type family XArithSeq       x
 type family XTypedBracket   x
 type family XUntypedBracket x
-type family XSpliceE        x
 type family XProc           x
 type family XStatic         x
 type family XTick           x
@@ -467,7 +466,6 @@ type family XXTupArg  x
 type family XTypedSplice   x
 type family XUntypedSplice x
 type family XQuasiQuote    x
-type family XXSplice       x
 
 -- -------------------------------------
 -- HsQuoteBracket type families
diff --git a/compiler/Language/Haskell/Syntax/Type.hs b/compiler/Language/Haskell/Syntax/Type.hs
index 10c2c03b48..d2f20c1c20 100644
--- a/compiler/Language/Haskell/Syntax/Type.hs
+++ b/compiler/Language/Haskell/Syntax/Type.hs
@@ -58,8 +58,6 @@ module Language.Haskell.Syntax.Type (
 
 import GHC.Prelude
 
-import {-# SOURCE #-} Language.Haskell.Syntax.Expr ( HsSplice )
-
 import Language.Haskell.Syntax.Extension
 
 import GHC.Types.SourceText