[Git][ghc/ghc][wip/ttg/types/basic] move RuleName to L.H.S.Basic

Hassan Al-Awwadi (@hassan.awwadi) gitlab at gitlab.haskell.org
Mon Oct 21 13:26:52 UTC 2024



Hassan Al-Awwadi pushed to branch wip/ttg/types/basic at Glasgow Haskell Compiler / GHC


Commits:
b83a69b1 by Hassan Al-Awwadi at 2024-10-21T15:26:36+02:00
move RuleName to L.H.S.Basic

- - - - -


3 changed files:

- compiler/GHC/Types/Basic.hs
- compiler/Language/Haskell/Syntax/Basic.hs
- compiler/Language/Haskell/Syntax/Decls.hs


Changes:

=====================================
compiler/GHC/Types/Basic.hs
=====================================
@@ -102,16 +102,15 @@ module GHC.Types.Basic (
 import GHC.Prelude
 
 import GHC.ForeignSrcLang
-import GHC.Data.FastString
 import GHC.Utils.Outputable
 import GHC.Utils.Panic ( panic )
 import GHC.Utils.Binary
-import GHC.Types.SourceText
 import qualified GHC.LanguageExtensions as LangExt
 
 import Language.Haskell.Syntax.Basic  (Boxity(..), isBoxed, ConTag, TyConFlavour(..)
                                       , TypeOrData(..), tyConFlavourAssoc_maybe
-                                      , Arity, VisArity, RepArity, JoinArity, FullArgCount,
+                                      , Arity, VisArity, RepArity, JoinArity, FullArgCount
+                                      , RuleName
                                       )
 import {-# SOURCE #-} Language.Haskell.Syntax.Type (PromotionFlag(..), isPromoted)
 import {-# SOURCE #-} Language.Haskell.Syntax.Expr (HsDoFlavour)
@@ -404,7 +403,6 @@ instance Binary FunctionOrData where
 ************************************************************************
 -}
 
-type RuleName = FastString
 
 pprRuleName :: RuleName -> SDoc
 pprRuleName rn = doubleQuotes (ftext rn)


=====================================
compiler/Language/Haskell/Syntax/Basic.hs
=====================================
@@ -12,6 +12,16 @@ import GHC.Data.FastString (FastString)
 import GHC.Prelude (Functor, Maybe(..))
 import Control.DeepSeq
 
+{-
+************************************************************************
+*                                                                      *
+                Rules
+*                                                                      *
+************************************************************************
+-}
+
+type RuleName = FastString
+
 {-
 ************************************************************************
 *                                                                      *


=====================================
compiler/Language/Haskell/Syntax/Decls.hs
=====================================
@@ -95,11 +95,10 @@ import {-# SOURCE #-} Language.Haskell.Syntax.Expr
 import Language.Haskell.Syntax.Binds
 import Language.Haskell.Syntax.Extension
 import Language.Haskell.Syntax.Type
-import Language.Haskell.Syntax.Basic (Role, LexicalFixity, TyConFlavour(..), TypeOrData(..))
+import Language.Haskell.Syntax.Basic (Role, LexicalFixity, TyConFlavour(..), TypeOrData(..), RuleName)
 import Language.Haskell.Syntax.Specificity (Specificity)
 import Language.Haskell.Syntax.InlinePragma(Activation)
 import Language.Haskell.Syntax.OverlapPragma(LOverlapMode)
-import GHC.Types.Basic (RuleName)
 import GHC.Types.ForeignCall (CType, CCallConv, Safety, Header, CLabelString, CCallTarget, CExportSpec)
 
 import GHC.Unit.Module.Warnings (WarningTxt)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b83a69b1cc85c1f92bb5271ee88eea9f393c0e09

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/b83a69b1cc85c1f92bb5271ee88eea9f393c0e09
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20241021/70ae453f/attachment-0001.html>


More information about the ghc-commits mailing list