github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2025-01-07 16:07:28 +03:00
Code Issues Projects Releases Wiki Activity

Traverse superclass edges

Browse Source
This commit is contained in:
joshvera 2018-12-04 10:37:03 -05:00
parent 6a27c20c9b
commit b88dde5d5e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Data/Abstract/ScopeGraph.hs
View File

@ -156,7 +156,7 @@ reference ref decl@Declaration{..} currentAddress g@ScopeGraph{..} = fromMaybe g
scopes <- Map.lookup edge linkMap
-- Return the first path to the declaration through the scopes.
getFirst (foldMap (First . ap (go currentScope) ((path .) . EPath edge)) scopes)
in traverseEdges Import <|> traverseEdges Lexical
in traverseEdges Superclass <|> traverseEdges Import <|> traverseEdges Lexical
-- | Insert a reference into the given scope by constructing a resolution path to the declaration within the given scope graph.
insertImportReference :: Ord address => Reference -> Declaration -> address -> ScopeGraph address -> Scope address -> Maybe (Scope address)
@ -167,7 +167,7 @@ insertImportReference ref decl@Declaration{..} currentAddress g@ScopeGraph{..} s
case lookupDeclaration unDeclaration address g of
Just (_, index) ->
Just $ scope { references = Map.insert ref (path (DPath decl index)) (references scope) }
Nothing -> traverseEdges Import <|> traverseEdges Lexical
Nothing -> traverseEdges Superclass <|> traverseEdges Import <|> traverseEdges Lexical
where
traverseEdges edge = do
linkMap <- linksOfScope address g
@ -183,7 +183,7 @@ lookupScopePath declaration currentAddress g@ScopeGraph{..} = do
case lookupDeclaration declaration address g of
Just (_, index) -> Just $ path (DPath (Declaration declaration) index)
Nothing -> maybe Nothing (Just . path) (lookupReference declaration address g)
<|> traverseEdges Import <|> traverseEdges Lexical
<|> traverseEdges Superclass <|> traverseEdges Import <|> traverseEdges Lexical
where
traverseEdges edge = do
linkMap <- linksOfScope address g