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

Merge branch 'abstract-analysis-parsing' into abstract-a-la-carte-terms

Browse Source
This commit is contained in:
Rob Rix 2019-10-18 18:21:18 -04:00
commit ffab2423b1
No known key found for this signature in database
GPG Key ID: F188A01508EA1CF7
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Semantic/Analysis.hs
View File

@ -17,7 +17,6 @@ import Data.Abstract.Evaluatable
import Data.Abstract.Module
import Data.Abstract.ModuleTable as ModuleTable
import Data.Language (Language)
import Source.Loc
import Source.Span
type ModuleC address value m
@ -150,19 +149,19 @@ runDomainEffects runTerm
--
-- This calls out to the 'Evaluatable' instances, and can have other functions composed after it to e.g. intercept effects arising in the evaluation of the term.
evalTerm :: ( Carrier sig m
, AbstractValue (term Loc) address value m
, AccessControls (term Loc)
, Declarations (term Loc)
, Evaluatable (Base (term Loc))
, FreeVariables (term Loc)
, HasSpan (term Loc)
, AbstractValue term address value m
, AccessControls term
, Declarations term
, Evaluatable (Base term)
, FreeVariables term
, HasSpan term
, Member (Allocator address) sig
, Member (Bitwise value) sig
, Member (Boolean value) sig
, Member (Deref value) sig
, Member (Error (LoopControl value)) sig
, Member (Error (Return value)) sig
, Member (Function (term Loc) address value) sig
, Member (Function term address value) sig
, Member (Modules address value) sig
, Member (Numeric value) sig
, Member (Object address value) sig
@ -175,7 +174,7 @@ evalTerm :: ( Carrier sig m
, Member (Resumable (BaseError (HeapError address))) sig
, Member (Resumable (BaseError (ScopeError address))) sig
, Member (Resumable (BaseError (UnspecializedError address value))) sig
, Member (Resumable (BaseError (EvalError (term Loc) address value))) sig
, Member (Resumable (BaseError (EvalError term address value))) sig
, Member (Resumable (BaseError ResolutionError)) sig
, Member (State (Heap address address value)) sig
, Member (State (ScopeGraph address)) sig
@ -188,10 +187,10 @@ evalTerm :: ( Carrier sig m
, Member Fresh sig
, Member Trace sig
, Ord address
, Recursive (term Loc)
, Recursive term
, Show address
)
=> Open (term Loc -> Evaluator (term Loc) address value m value)
-> term Loc -> Evaluator (term Loc) address value m value
=> Open (term -> Evaluator term address value m value)
-> term -> Evaluator term address value m value
-- NB: We use a lazy pattern match for the lambda’s argument to postpone evaluating the pair until eval/ref is called.
evalTerm perTerm = fst (fix (\ ~(ev, re) -> (perTerm (eval ev re . project), ref ev re . project)))