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

Return the currentScope' if pathDeclarationScope is a DPath

Browse Source 
Co-Authored-By: Rick Winfrey <rick.winfrey@gmail.com>
This commit is contained in:
joshvera 2018-11-15 14:39:59 -05:00
parent 393da1897b
commit 78d543c60f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Control/Abstract/ScopeGraph.hs
View File

@ -187,7 +187,10 @@ lookupDeclarationScope :: ( Member (Resumable (BaseError (ScopeError address)))
, Ord address
, Show address
) => Declaration -> Evaluator term address value m address
lookupDeclarationScope decl = maybeM (throwScopeError $ LookupDeclarationScopeError decl) . ScopeGraph.pathDeclarationScope =<< lookupScopePath decl
lookupDeclarationScope decl = do
path <- lookupScopePath decl
currentScope' <- currentScope
maybeM (throwScopeError $ LookupDeclarationScopeError decl) (ScopeGraph.pathDeclarationScope currentScope' path)
associatedScope :: (Ord address, Member (State (ScopeGraph address)) sig, Carrier sig m) => Declaration -> Evaluator term address value m (Maybe address)
associatedScope decl = ScopeGraph.associatedScope decl <$> get