github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-22 06:11:49 +03:00
Code Issues Projects Releases Wiki Activity

Rename MonadFunctionAbstraction to MonadFunction.

Browse Source
This commit is contained in:
Rob Rix 2018-03-01 12:01:36 -05:00
parent dfea82f776
commit f05f0951f0
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Analysis/Abstract/Evaluating.hs
View File

@ -37,7 +37,7 @@ require :: ( AbstractValue v
, FreeVariables term , FreeVariables term
, MonadAddressable (LocationFor v) v m , MonadAddressable (LocationFor v) v m
, MonadEvaluator term v m , MonadEvaluator term v m
, MonadFunctionAbstraction term v m , MonadFunction term v m
, Recursive term , Recursive term
, Semigroup (Cell (LocationFor v) v) , Semigroup (Cell (LocationFor v) v)
) )
@ -53,7 +53,7 @@ load :: ( AbstractValue v
, Evaluatable (Base term) , Evaluatable (Base term)
, FreeVariables term , FreeVariables term
, MonadAddressable (LocationFor v) v m , MonadAddressable (LocationFor v) v m
, MonadFunctionAbstraction term v m , MonadFunction term v m
, MonadEvaluator term v m , MonadEvaluator term v m
, Recursive term , Recursive term
, Semigroup (Cell (LocationFor v) v) , Semigroup (Cell (LocationFor v) v)
@ -80,7 +80,7 @@ evaluate :: forall v term.
, Evaluatable (Base term) , Evaluatable (Base term)
, FreeVariables term , FreeVariables term
, MonadAddressable (LocationFor v) v (Evaluator (Evaluating term v) term v) , MonadAddressable (LocationFor v) v (Evaluator (Evaluating term v) term v)
, MonadFunctionAbstraction term v (Evaluator (Evaluating term v) term v) , MonadFunction term v (Evaluator (Evaluating term v) term v)
, Recursive term , Recursive term
, Semigroup (Cell (LocationFor v) v) , Semigroup (Cell (LocationFor v) v)
) )
@ -95,7 +95,7 @@ evaluates :: forall v term.
, Evaluatable (Base term) , Evaluatable (Base term)
, FreeVariables term , FreeVariables term
, MonadAddressable (LocationFor v) v (Evaluator (Evaluating term v) term v) , MonadAddressable (LocationFor v) v (Evaluator (Evaluating term v) term v)
, MonadFunctionAbstraction term v (Evaluator (Evaluating term v) term v) , MonadFunction term v (Evaluator (Evaluating term v) term v)
, Recursive term , Recursive term
, Semigroup (Cell (LocationFor v) v) , Semigroup (Cell (LocationFor v) v)
) )

10
src/Data/Abstract/Evaluatable.hs
View File

@ -6,7 +6,7 @@ module Data.Abstract.Evaluatable
, module Addressable , module Addressable
, module FreeVariables , module FreeVariables
, MonadEvaluator(..) , MonadEvaluator(..)
, MonadFunctionAbstraction(..) , MonadFunction(..)
) where ) where
import Control.Abstract.Addressable as Addressable import Control.Abstract.Addressable as Addressable
@ -37,7 +37,7 @@ class Evaluatable constr where
, FreeVariables term , FreeVariables term
, MonadAddressable (LocationFor value) value m , MonadAddressable (LocationFor value) value m
, MonadEvaluator term value m , MonadEvaluator term value m
, MonadFunctionAbstraction term value m , MonadFunction term value m
, Ord (LocationFor value) , Ord (LocationFor value)
, Semigroup (Cell (LocationFor value) value) , Semigroup (Cell (LocationFor value) value)
) )
@ -75,7 +75,7 @@ instance Evaluatable [] where
-- to the global environment. -- to the global environment.
localEnv (const (bindEnv (liftFreeVariables (freeVariables . subterm) xs) env)) (eval xs) localEnv (const (bindEnv (liftFreeVariables (freeVariables . subterm) xs) env)) (eval xs)
class MonadEvaluator t v m => MonadFunctionAbstraction t v m where class MonadEvaluator t v m => MonadFunction t v m where
abstract :: [Name] -> Subterm t (m v) -> m v abstract :: [Name] -> Subterm t (m v) -> m v
apply :: v -> [Subterm t (m v)] -> m v apply :: v -> [Subterm t (m v)] -> m v
@ -86,7 +86,7 @@ instance ( Evaluatable (Base t)
, Recursive t , Recursive t
, Semigroup (Cell location (Value location t)) , Semigroup (Cell location (Value location t))
) )
=> MonadFunctionAbstraction t (Value location t) m where => MonadFunction t (Value location t) m where
-- FIXME: Can we store the action evaluating the body in the Value instead of the body term itself -- FIXME: Can we store the action evaluating the body in the Value instead of the body term itself
abstract names (Subterm body _) = inj . Closure names body <$> askLocalEnv abstract names (Subterm body _) = inj . Closure names body <$> askLocalEnv
@ -99,7 +99,7 @@ instance ( Evaluatable (Base t)
envInsert name a <$> rest) (pure env) (zip names params) envInsert name a <$> rest) (pure env) (zip names params)
localEnv (mappend bindings) (foldSubterms eval body) localEnv (mappend bindings) (foldSubterms eval body)
instance (Alternative m, MonadEvaluator t (Type.Type t) m, MonadFresh m) => MonadFunctionAbstraction t (Type t) m where instance (Alternative m, MonadEvaluator t (Type.Type t) m, MonadFresh m) => MonadFunction t (Type t) m where
abstract names (Subterm _ body) = do abstract names (Subterm _ body) = do
(env, tvars) <- foldr (\ name rest -> do (env, tvars) <- foldr (\ name rest -> do
a <- alloc name a <- alloc name