🔥 the parent addr from the import & scope graph analyses.

Author: robrix

semantic-core/src/Analysis/ImportGraph.hs

@@ -41,7 +41,7 @@ instance Monoid Value where
   mempty = Value Abstract mempty
 
 data Semi
-  = Closure Loc User (Term Core.Core User) User
+  = Closure Loc User (Term Core.Core User)
   -- FIXME: Bound String values.
   | String Text
   | Abstract
@@ -58,7 +58,6 @@ importGraph
 runFile :: ( Carrier sig m
            , Effect sig
            , Member Fresh sig
-           , Member (Reader (FrameId User)) sig
            , Member (State (Heap User Value)) sig
            )
         => File (Term Core.Core User)
@@ -72,7 +71,6 @@ runFile file = traverse run file
 -- FIXME: decompose into a product domain and two atomic domains
 importGraphAnalysis :: ( Alternative m
                        , Carrier sig m
-                       , Member (Reader (FrameId User)) sig
                        , Member (Reader Loc) sig
                        , Member (State (Heap User Value)) sig
                        , MonadFail m
@@ -86,9 +84,8 @@ importGraphAnalysis = Analysis{..}
         assign addr ty = modify (Map.insertWith (<>) addr (Set.singleton ty))
         abstract _ name body = do
           loc <- ask
-          FrameId parentAddr <- ask
-          pure (Value (Closure loc name body parentAddr) mempty)
-        apply eval (Value (Closure loc name body _) _) a = local (const loc) $ do
+          pure (Value (Closure loc name body) mempty)
+        apply eval (Value (Closure loc name body) _) a = local (const loc) $ do
           addr <- alloc name
           assign addr a
           bind name addr (eval body)

semantic-core/src/Analysis/ScopeGraph.hs

@@ -49,7 +49,7 @@ instance Monoid Value where
   mempty = Value Abstract mempty
 
 data Semi
-  = Closure Loc User (Term Core.Core User) User
+  = Closure Loc User (Term Core.Core User)
   | Abstract
   deriving (Eq, Ord, Show)
 
@@ -65,7 +65,6 @@ runFile
   :: ( Carrier sig m
      , Effect sig
      , Member Fresh sig
-     , Member (Reader (FrameId User)) sig
      , Member (State (Heap User Value)) sig
      )
   => File (Term Core.Core User)
@@ -80,7 +79,6 @@ runFile file = traverse run file
 scopeGraphAnalysis
   :: ( Alternative m
      , Carrier sig m
-     , Member (Reader (FrameId User)) sig
      , Member (Reader Loc) sig
      , Member (State (Heap User Value)) sig
      , MonadFail m
@@ -94,9 +92,8 @@ scopeGraphAnalysis = Analysis{..}
         assign addr ty = modify (Map.insertWith (<>) addr (Set.singleton ty))
         abstract _ name body = do
           loc <- ask
-          FrameId parentAddr <- ask
-          pure (Value (Closure loc name body parentAddr) mempty)
-        apply eval (Value (Closure loc name body _) _) a = local (const loc) $ do
+          pure (Value (Closure loc name body) mempty)
+        apply eval (Value (Closure loc name body) _) a = local (const loc) $ do
           addr <- alloc name
           assign addr a
           bind name addr (eval body)