github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-11-24 08:54:07 +03:00
Code Issues Projects Releases Wiki Activity

Obj holds an Env, not a Frame.

Browse Source
This commit is contained in:
Rob Rix 2019-07-22 11:32:58 -04:00
parent 384c221ef6
commit 9b6f7dd148
No known key found for this signature in database
GPG Key ID: F188A01508EA1CF7
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
semantic-core/src/Analysis/Concrete.hs
View File

@ -44,10 +44,10 @@ data Concrete
| Unit
| Bool Bool
| String Text
| Obj Frame
| Obj Env
deriving (Eq, Ord, Show)
objectFrame :: Concrete -> Maybe Frame
objectFrame :: Concrete -> Maybe Env
objectFrame (Obj frame) = Just frame
objectFrame _ = Nothing
@ -120,7 +120,7 @@ concreteAnalysis = Analysis{..}
addr <- alloc name
assign addr value
pure (name, addr)
pure (Obj (Frame (Map.fromList fields')))
pure (Obj (Map.fromList fields'))
addr ... n = do
val <- deref addr
heap <- get
@ -133,7 +133,7 @@ lookupConcrete heap name = run . evalState IntSet.empty . runNonDet . inConcrete
where -- look up the name in a concrete value
inConcrete = inFrame <=< maybeA . objectFrame
-- look up the name in a specific 'Frame', with slots taking precedence over parents
inFrame (Frame fs) = maybeA (Map.lookup name fs)
inFrame fs = maybeA (Map.lookup name fs)
-- look up the name in the value an address points to, if we haven’t already visited it
_inAddress addr = do
visited <- get
@ -162,8 +162,7 @@ heapGraph vertex edge h = foldr (uncurry graph) G.empty (IntMap.toList h)
Bool _ -> G.empty
String _ -> G.empty
Closure _ _ _ -> G.empty
Obj frame -> fromFrame frame
fromFrame (Frame ss) = foldr (G.overlay . uncurry (edge . Right)) G.empty (Map.toList ss)
Obj frame -> foldr (G.overlay . uncurry (edge . Right)) G.empty (Map.toList frame)
heapValueGraph :: Heap -> G.Graph Concrete
heapValueGraph h = heapGraph (const id) (const fromAddr) h