summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSon Ho2021-12-17 18:56:37 +0100
committerSon Ho2021-12-17 18:56:37 +0100
commit9faeb74f98b319ceda993bc6e5b7af0bfa7e1b23 (patch)
tree2dcfc5d50f12e81d4aa92c491c31e2e73fc82e84 /src
parent7bd3b03e28ac8591aad130b52376f0827af69e91 (diff)
Rename AIgnoredShared{Borrow,Loan} to AProjShared{Borrow,Loan}
Diffstat (limited to 'src')
-rw-r--r--src/Interpreter.ml48
-rw-r--r--src/Print.ml4
-rw-r--r--src/Values.ml8
3 files changed, 30 insertions, 30 deletions
diff --git a/src/Interpreter.ml b/src/Interpreter.ml
index 3101ebaf..416ba44b 100644
--- a/src/Interpreter.ml
+++ b/src/Interpreter.ml
@@ -234,7 +234,7 @@ let lookup_loan_opt (ek : exploration_kind) (l : V.BorrowId.id)
| V.AIgnoredMutLoan (bid, av) -> super#visit_AIgnoredMutLoan env bid av
| V.AEndedIgnoredMutLoan { given_back; child } ->
super#visit_AEndedIgnoredMutLoan env given_back child
- | V.AIgnoredSharedLoan asb ->
+ | V.AProjSharedLoan asb ->
(* Check the set of borrow ids *)
if borrow_in_asb l asb then raise (FoundGLoanContent (Abstract lc))
else ()
@@ -374,9 +374,9 @@ let update_aloan (ek : exploration_kind) (l : V.BorrowId.id)
| V.AIgnoredMutLoan (bid, av) -> super#visit_AIgnoredMutLoan env bid av
| V.AEndedIgnoredMutLoan { given_back; child } ->
super#visit_AEndedIgnoredMutLoan env given_back child
- | V.AIgnoredSharedLoan asb ->
+ | V.AProjSharedLoan asb ->
if borrow_in_asb l asb then update ()
- else super#visit_AIgnoredSharedLoan env asb
+ else super#visit_AProjSharedLoan env asb
method! visit_abs env abs =
if ek.enter_abs then super#visit_abs env abs else abs
@@ -429,7 +429,7 @@ let lookup_borrow_opt (ek : exploration_kind) (l : V.BorrowId.id)
if bid = l then raise (FoundGBorrowContent (Abstract bc))
else super#visit_ASharedBorrow env bid
| V.AIgnoredMutBorrow av -> super#visit_AIgnoredMutBorrow env av
- | V.AIgnoredSharedBorrow asb ->
+ | V.AProjSharedBorrow asb ->
if borrow_in_asb l asb then
raise (FoundGBorrowContent (Abstract bc))
else ()
@@ -540,9 +540,9 @@ let update_aborrow (ek : exploration_kind) (l : V.BorrowId.id)
| V.ASharedBorrow bid ->
if bid = l then update () else super#visit_ASharedBorrow env bid
| V.AIgnoredMutBorrow av -> super#visit_AIgnoredMutBorrow env av
- | V.AIgnoredSharedBorrow asb ->
+ | V.AProjSharedBorrow asb ->
if borrow_in_asb l asb then update ()
- else super#visit_AIgnoredSharedBorrow env asb
+ else super#visit_AProjSharedBorrow env asb
method! visit_abs env abs =
if ek.enter_abs then super#visit_abs env abs else abs
@@ -881,9 +881,9 @@ let end_borrow_get_borrow (io : inner_outer)
| V.AEndedIgnoredMutLoan { given_back; child } ->
(* Nothing special to do *)
V.ALoan (super#visit_AEndedIgnoredMutLoan outer given_back child)
- | V.AIgnoredSharedLoan asb ->
+ | V.AProjSharedLoan asb ->
(* Nothing special to do *)
- V.ALoan (super#visit_AIgnoredSharedLoan outer asb)
+ V.ALoan (super#visit_AProjSharedLoan outer asb)
(** We reimplement [visit_ALoan] because we may have to update the
outer borrows *)
@@ -927,7 +927,7 @@ let end_borrow_get_borrow (io : inner_outer)
| V.AIgnoredMutBorrow av ->
(* Nothing special to do *)
V.ABorrow (super#visit_AIgnoredMutBorrow outer av)
- | V.AIgnoredSharedBorrow asb ->
+ | V.AProjSharedBorrow asb ->
(* Check if the borrow we are looking for is in the asb *)
if borrow_in_asb l asb then (
(* Check there are outer borrows, or if we need to end the whole
@@ -938,10 +938,10 @@ let end_borrow_get_borrow (io : inner_outer)
(* Update the value - note that we are necessarily in the second
* of the two cases described above *)
let asb = remove_borrow_from_asb l asb in
- V.ABorrow (V.AIgnoredSharedBorrow asb))
+ V.ABorrow (V.AProjSharedBorrow asb))
else
(* Nothing special to do *)
- V.ABorrow (super#visit_AIgnoredSharedBorrow outer asb)
+ V.ABorrow (super#visit_AProjSharedBorrow outer asb)
method! visit_abs outer abs =
(* Update the outer abs *)
@@ -1086,13 +1086,13 @@ let apply_reborrows (reborrows : (V.BorrowId.id * V.BorrowId.id) list)
let bids = insert_reborrows bids in
(* Update and explore *)
super#visit_ASharedLoan env bids v av
- | V.AIgnoredSharedLoan asb ->
+ | V.AProjSharedLoan asb ->
(* Insert the reborrows *)
let insert = get_reborrows_for_asb asb in
let insert = List.map (fun bid -> V.AsbBorrow bid) insert in
let asb = List.append insert asb in
(* Update and explore *)
- super#visit_AIgnoredSharedLoan env asb
+ super#visit_AProjSharedLoan env asb
| V.AMutLoan (_, _)
| V.AEndedMutLoan { given_back = _; child = _ }
| V.AEndedSharedLoan (_, _)
@@ -1205,9 +1205,9 @@ let give_back_value (config : C.config) (bid : V.BorrowId.id)
| V.AEndedIgnoredMutLoan { given_back; child } ->
(* Nothing special to do *)
V.ALoan (super#visit_AEndedIgnoredMutLoan opt_abs given_back child)
- | V.AIgnoredSharedLoan asb ->
+ | V.AProjSharedLoan asb ->
(* Nothing special to do: we are giving back a value to a *mutable* loan *)
- V.ALoan (super#visit_AIgnoredSharedLoan opt_abs asb)
+ V.ALoan (super#visit_AProjSharedLoan opt_abs asb)
(** We are not specializing an already existing method, but adding a
new method (for projections, we need type information) *)
@@ -1310,9 +1310,9 @@ let give_back_avalue (config : C.config) (bid : V.BorrowId.id)
| V.AEndedIgnoredMutLoan { given_back; child } ->
(* Nothing special to do *)
V.ALoan (super#visit_AEndedIgnoredMutLoan opt_abs given_back child)
- | V.AIgnoredSharedLoan asb ->
+ | V.AProjSharedLoan asb ->
(* Nothing special to do *)
- V.ALoan (super#visit_AIgnoredSharedLoan opt_abs asb)
+ V.ALoan (super#visit_AProjSharedLoan opt_abs asb)
(** We are not specializing an already existing method, but adding a
new method (for projections, we need type information) *)
end
@@ -1399,16 +1399,16 @@ let give_back_shared config (bid : V.BorrowId.id) (ctx : C.eval_ctx) :
| V.AEndedIgnoredMutLoan { given_back; child } ->
(* Nothing special to do *)
V.ALoan (super#visit_AEndedIgnoredMutLoan opt_abs given_back child)
- | V.AIgnoredSharedLoan asb ->
+ | V.AProjSharedLoan asb ->
(* Check if the loan id is in the asb *)
if borrow_in_asb bid asb then (
(* Yes: filter *)
set_replaced ();
let asb = remove_borrow_from_asb bid asb in
- V.ALoan (V.AIgnoredSharedLoan asb))
+ V.ALoan (V.AProjSharedLoan asb))
else
(* No: nothing special to do *)
- V.ALoan (super#visit_AIgnoredSharedLoan opt_abs asb)
+ V.ALoan (super#visit_AProjSharedLoan opt_abs asb)
end
in
@@ -1455,14 +1455,14 @@ let reborrow_shared (original_bid : V.BorrowId.id) (new_bid : V.BorrowId.id)
V.ASharedLoan (bids', v, av))
else super#visit_ASharedLoan env bids v av
- method! visit_AIgnoredSharedLoan env asb =
+ method! visit_AProjSharedLoan env asb =
(* Check if the set of abstract shared borrows contains the borrow
* we want to duplicate *)
if borrow_in_asb original_bid asb then (
set_ref ();
let asb = V.AsbBorrow new_bid :: asb in
- V.AIgnoredSharedLoan asb)
- else super#visit_AIgnoredSharedLoan env asb
+ V.AProjSharedLoan asb)
+ else super#visit_AProjSharedLoan env asb
end
in
@@ -1507,7 +1507,7 @@ let give_back (config : C.config) (l : V.BorrowId.id) (bc : g_borrow_content)
assert (Option.is_some (lookup_loan_opt sanity_ek l ctx));
(* Update the context *)
give_back_shared config l ctx
- | Abstract (V.AIgnoredSharedBorrow asb) ->
+ | Abstract (V.AProjSharedBorrow asb) ->
(* Sanity check *)
assert (borrow_in_asb l asb);
(* Update the context *)
diff --git a/src/Print.ml b/src/Print.ml
index 6b4c3c4f..cdb74446 100644
--- a/src/Print.ml
+++ b/src/Print.ml
@@ -401,7 +401,7 @@ module Values = struct
^ "; child: "
^ typed_avalue_to_string fmt ml.child
^ "}"
- | AIgnoredSharedLoan asb ->
+ | AProjSharedLoan asb ->
"@ignored_shared_loan("
^ abstract_shared_borrows_to_string fmt asb
^ ")"
@@ -416,7 +416,7 @@ module Values = struct
| ASharedBorrow bid -> "⌊shared@" ^ V.BorrowId.to_string bid ^ "⌋"
| AIgnoredMutBorrow av ->
"@ignored_mut_borrow(" ^ typed_avalue_to_string fmt av ^ ")"
- | AIgnoredSharedBorrow sb ->
+ | AProjSharedBorrow sb ->
"@ignored_shared_borrow("
^ abstract_shared_borrows_to_string fmt sb
^ ")"
diff --git a/src/Values.ml b/src/Values.ml
index 5c38b888..c2def762 100644
--- a/src/Values.ml
+++ b/src/Values.ml
@@ -254,8 +254,8 @@ and aloan_content =
| AEndedSharedLoan of typed_value * typed_avalue
| AIgnoredMutLoan of (BorrowId.id[@opaque]) * typed_avalue
| AEndedIgnoredMutLoan of { given_back : typed_avalue; child : typed_avalue }
- | AIgnoredSharedLoan of (abstract_shared_borrows[@opaque])
- (** TODO: rename. AProjSharedLoan? *)
+ | AProjSharedLoan of (abstract_shared_borrows[@opaque])
+ (** A projected shared loan *)
(** Note that when a borrow content is ended, it is replaced by Bottom (while
we need to track ended loans more precisely, especially because of their
@@ -273,8 +273,8 @@ and aborrow_content =
| AMutBorrow of (BorrowId.id[@opaque]) * typed_avalue
| ASharedBorrow of (BorrowId.id[@opaque])
| AIgnoredMutBorrow of typed_avalue
- | AIgnoredSharedBorrow of (abstract_shared_borrows[@opaque])
- (** TODO: rename. AProjSharedBorrow? *)
+ | AProjSharedBorrow of (abstract_shared_borrows[@opaque])
+ (** A projected shared borrow *)
(* TODO: we may want to merge this with typed_value - would prevent some issues
when accessing fields... *)