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

Tighten up reference with <$> and <|>.

Browse Source
This commit is contained in:
Rob Rix 2018-12-05 15:24:10 -05:00
parent c90e1605fd
commit 3d34922fe2
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,13 +145,10 @@ reference ref decl@Declaration{..} currentAddress g@ScopeGraph{..} = fromMaybe g
-- Build a path up to the declaration
go currentScope' currentAddress id
where
go currentScope address path =
case lookupDeclaration unDeclaration address g of
Just (_, index) ->
let newScope = modifyReferences currentScope (Map.insert ref (path (DPath decl index)))
in Just (g { graph = Map.insert currentAddress newScope graph })
Nothing -> traverseEdges' Superclass <|> traverseEdges' Import <|> traverseEdges' Lexical
where traverseEdges' edge = linksOfScope address g >>= Map.lookup edge >>= traverseEdges path (go currentScope) edge
go currentScope address path
= ScopeGraph . flip (Map.insert currentAddress) graph . modifyReferences currentScope . Map.insert ref . path . DPath decl . snd <$> lookupDeclaration unDeclaration address g
<|> traverseEdges' Superclass <|> traverseEdges' Import <|> traverseEdges' Lexical
where traverseEdges' edge = linksOfScope address g >>= Map.lookup edge >>= traverseEdges path (go currentScope) edge
-- | 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)