github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-01 17:59:10 +03:00
Code Issues Projects Releases Wiki Activity

Revert "Move the Taggable instances for Data.Syntax out."

Browse Source 
This reverts commit a30be6b59c.
This commit is contained in:
Rob Rix 2019-09-18 12:21:46 -04:00
parent f017e4ac7c
commit 962f46db48
No known key found for this signature in database
GPG Key ID: F188A01508EA1CF7
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Data/Syntax.hs
View File

@ -16,13 +16,12 @@ import GHC.TypeLits
import Diffing.Algorithm
import Prelude
import Prologue
import Reprinting.Tokenize hiding (Element, In)
import Reprinting.Tokenize hiding (Element)
import qualified Assigning.Assignment as Assignment
import qualified Data.Error as Error
import Control.Abstract.ScopeGraph (reference, Reference(..), Declaration(..))
import Control.Abstract.Heap (deref, lookupSlot)
import qualified Data.Abstract.ScopeGraph as ScopeGraph
import Tags.Taggable (Taggable(..), subtractLocation)
-- Combinators
@ -119,7 +118,7 @@ instance (Element f all, c f, Generate c all fs) => Generate c all (f ': fs) whe
newtype Identifier a = Identifier { name :: Name }
deriving newtype (Eq, Ord, Show)
deriving stock (Foldable, Functor, Generic1, Traversable)
deriving anyclass (Diffable, Hashable1, Taggable, ToJSONFields1, NFData1)
deriving anyclass (Diffable, Hashable1, ToJSONFields1, NFData1)
deriving (Eq1, Show1, Ord1) via Generically Identifier
@ -147,7 +146,7 @@ instance Declarations1 Identifier where
newtype AccessibilityModifier a = AccessibilityModifier { contents :: Text }
deriving newtype (Eq, Ord, Show)
deriving stock (Foldable, Functor, Generic1, Traversable)
deriving anyclass (Declarations1, Diffable, FreeVariables1, Hashable1, Taggable, ToJSONFields1, NFData1)
deriving anyclass (Declarations1, Diffable, FreeVariables1, Hashable1, ToJSONFields1, NFData1)
deriving (Eq1, Show1, Ord1) via Generically AccessibilityModifier
-- TODO: Implement Eval instance for AccessibilityModifier
@ -157,7 +156,7 @@ instance Evaluatable AccessibilityModifier
--
-- This can be used to represent an implicit no-op, e.g. the alternative in an 'if' statement without an 'else'.
data Empty a = Empty
deriving (Eq, Ord, Show, Foldable, Traversable, Functor, Generic1, Hashable1, Diffable, FreeVariables1, Declarations1, Taggable, ToJSONFields1, NFData1)
deriving (Eq, Ord, Show, Foldable, Traversable, Functor, Generic1, Hashable1, Diffable, FreeVariables1, Declarations1, ToJSONFields1, NFData1)
deriving (Eq1, Show1, Ord1) via Generically Empty
instance Evaluatable Empty where
@ -168,7 +167,7 @@ instance Tokenize Empty where
-- | Syntax representing a parsing or assignment error.
data Error a = Error { errorCallStack :: ErrorStack, errorExpected :: [String], errorActual :: Maybe String, errorChildren :: [a] }
deriving (Declarations1, Diffable, Eq, Foldable, FreeVariables1, Functor, Generic1, Hashable1, Ord, Show, Taggable, ToJSONFields1, Traversable, NFData1)
deriving (Declarations1, Diffable, Eq, Foldable, FreeVariables1, Functor, Generic1, Hashable1, Ord, Show, ToJSONFields1, Traversable, NFData1)
deriving (Eq1, Show1, Ord1) via Generically Error
instance Evaluatable Error
@ -244,6 +243,3 @@ instance Tokenize Context where
instance Declarations1 Context where
liftDeclaredName declaredName = declaredName . contextSubject
instance Taggable Context where
snippet ann (Context _ (Term (In subj _))) = Just (subtractLocation ann subj)

9
src/Tags/Taggable.hs
View File

@ -38,6 +38,7 @@ import Data.Text hiding (empty)
import Streaming hiding (Sum)
import Streaming.Prelude (yield)
import qualified Data.Syntax as Syntax
import qualified Data.Syntax.Comment as Comment
import qualified Data.Syntax.Declaration as Declaration
import qualified Data.Syntax.Directive as Directive
@ -138,6 +139,9 @@ instance (Taggable a) => Taggable (TermF a Location) where
snippet ann t = snippet ann (termFOut t)
symbolName t = symbolName (termFOut t)
instance Taggable Syntax.Context where
snippet ann (Syntax.Context _ (Term (In subj _))) = Just (subtractLocation ann subj)
instance Taggable Declaration.Function where
docsLiteral Python (Declaration.Function _ _ _ (Term (In _ bodyF)))
| (Term (In exprAnn exprF):_) <- toList bodyF
@ -284,6 +288,11 @@ instance Taggable Statement.Try
instance Taggable Statement.While
instance Taggable Statement.Yield
instance Taggable Syntax.Empty
instance Taggable Syntax.Error
instance Taggable Syntax.Identifier
instance Taggable Syntax.AccessibilityModifier
instance Taggable Type.Annotation
instance Taggable Type.Array
instance Taggable Type.Bool