haskell-tools-ast 0.7.0.0 → 0.8.0.0

raw patch · 5 files changed

+19/−7 lines, 5 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• Language/Haskell/Tools/AST/Helpers.hs +1/−1
• Language/Haskell/Tools/AST/Representation/Decls.hs +2/−2
• Language/Haskell/Tools/AST/SemaInfoClasses.hs +1/−1
• Language/Haskell/Tools/AST/SemaInfoTypes.hs +14/−2
• haskell-tools-ast.cabal +1/−1

@@ -126,7 +126,7 @@                   &+& localFixity&fixityOperators&annList&operatorName
 
 inScope :: GHC.Name -> Scope -> Bool
-inScope n sc = any (n `elem`) sc
+inScope n sc = any ((n `elem`) . map fst) sc
 
 -- * Pattern synonyms for annotated lists and maybes
 

@@ -21,7 +21,7 @@   | UTypeFamilyDecl       { _declTypeFamily :: Ann UTypeFamily dom stage
                           } -- ^ A type family declaration ( @type family F x@ )
   | UClosedTypeFamilyDecl { _declHead :: Ann UDeclHead dom stage
-                          , _declKind :: AnnMaybeG UKindConstraint dom stage
+                          , _declSpec :: AnnMaybeG UTypeFamilySpec dom stage
                           , _declDecl :: AnnListG UTypeEqn dom stage -- ^ cannot be empty
                           } -- ^ A closed type family declaration
   | UDataDecl             { _declNewtype :: Ann UDataOrNewtypeKeyword dom stage
@@ -222,7 +222,7 @@ 
 -- | Injectivity annotation for type families (@ = r | r -> a @)
 data UInjectivityAnn dom stage
-  = UInjectivityAnn { _injAnnRes :: Ann UName dom stage
+  = UInjectivityAnn { _injAnnRes :: Ann UTyVar dom stage
                     , _injAnnDeps :: AnnListG UName dom stage
                     }
 

@@ -4,7 +4,7 @@            , TypeFamilies
            , UndecidableInstances
            #-}
-module Language.Haskell.Tools.AST.SemaInfoClasses where
+module Language.Haskell.Tools.AST.SemaInfoClasses (module Language.Haskell.Tools.AST.SemaInfoClasses, UsageSpec(..)) where
 
 import GHC
 import Id as GHC (Id, idName)

@@ -8,7 +8,7 @@ module Language.Haskell.Tools.AST.SemaInfoTypes
   ( -- types
     NoSemanticInfo, ScopeInfo, NameInfo, CNameInfo, ModuleInfo, ImportInfo, ImplicitFieldInfo
-  , Scope
+  , Scope, UsageSpec(..)
     -- references
   , exprScopedLocals, nameScopedLocals, nameIsDefined, nameInfo, ambiguousName, nameLocation
   , implicitName, cnameScopedLocals, cnameIsDefined, cnameInfo, cnameFixity
@@ -35,7 +35,19 @@ 
 import Control.Reference
 
-type Scope = [[Name]]
+type Scope = [[(Name, Maybe [UsageSpec])]]
+
+data UsageSpec = UsageSpec { usageQualified :: Bool
+                           , usageQualifier :: String
+                           , usageAs :: String
+                           }
+  deriving (Eq, Data)
+
+instance Outputable UsageSpec where
+  ppr (UsageSpec q useQ asQ)
+    = GHC.text $ (if q then "qualified " else "") ++ "as " ++ (if useQ == asQ || q then asQ else asQ ++ " or " ++ useQ)
+  pprPrec _ (UsageSpec q useQ asQ)
+    = GHC.text $ (if q then "qualified " else "") ++ "as " ++ (if useQ == asQ || q then asQ else asQ ++ " or " ++ useQ)
 
 -- | Semantic info type for any node not
 -- carrying additional semantic information

@@ -1,5 +1,5 @@ name:                haskell-tools-ast
-version:             0.7.0.0
+version:             0.8.0.0
 synopsis:            Haskell AST for efficient tooling
 description:         A representation of a Haskell Syntax tree that contain source-related and semantic annotations. These annotations help developer tools to work with the defined program. The source information enables refactoring and program transformation tools to change the source code without losing the original format (layout, comments) of the source. Semantic information helps analyzing the program. The representation is different from the GHC's syntax tree. It contains information from all representations in GHC (different version of syntax trees, lexical and module-level information). The module is split up to put the representation of different language elements into different modules. Additionally, it contains the representation of semantic and source annotations, helper functions and generated instances for the representation of language elements. Because langauge elements may refer each other (there can be a pattern inside an expression in case of a pattern match and an expression inside a pattern if view patterns are enabled), we use hs-boot files to break up dependency cycles.