diff options
| author | Escherichia | 2024-03-25 12:06:05 +0100 |
|---|---|---|
| committer | Escherichia | 2024-03-28 15:27:35 +0100 |
| commit | d6ea35868e30bbc7542bfa09bb04d5b6cbe93b22 (patch) | |
| tree | 14c7bca01e105ec6bf3db8ccedb21d64ae4ae756 /compiler/InterpreterLoopsMatchCtxs.ml | |
| parent | 9b1a0d82c19375619904efe7e18e064701fb947b (diff) | |
Inverted meta and config argument orders (from meta -> config to config -> meta)
Diffstat (limited to '')
| -rw-r--r-- | compiler/InterpreterLoopsMatchCtxs.ml | 8 | ||||
| -rw-r--r-- | compiler/InterpreterLoopsMatchCtxs.mli | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/compiler/InterpreterLoopsMatchCtxs.ml b/compiler/InterpreterLoopsMatchCtxs.ml index 033e51c1..2e700c50 100644 --- a/compiler/InterpreterLoopsMatchCtxs.ml +++ b/compiler/InterpreterLoopsMatchCtxs.ml @@ -1400,7 +1400,7 @@ let ctxs_are_equivalent (meta : Meta.meta) (fixed_ids : ids_sets) (ctx0 : eval_c (match_ctxs meta check_equivalent fixed_ids lookup_shared_value lookup_shared_value ctx0 ctx1) -let prepare_match_ctx_with_target (meta : Meta.meta) (config : config) (loop_id : LoopId.id) +let prepare_match_ctx_with_target (config : config) (meta : Meta.meta) (loop_id : LoopId.id) (fixed_ids : ids_sets) (src_ctx : eval_ctx) : cm_fun = fun cf tgt_ctx -> (* Debug *) @@ -1528,8 +1528,8 @@ let prepare_match_ctx_with_target (meta : Meta.meta) (config : config) (loop_id (* Exception: end the corresponding borrows, and continue *) let cc = match e with - | LoanInRight bid -> InterpreterBorrows.end_borrow meta config bid - | LoansInRight bids -> InterpreterBorrows.end_borrows meta config bids + | LoanInRight bid -> InterpreterBorrows.end_borrow config meta bid + | LoansInRight bids -> InterpreterBorrows.end_borrows config meta bids | AbsInRight _ | AbsInLeft _ | LoanInLeft _ | LoansInLeft _ -> craise meta "Unexpected" in @@ -1837,7 +1837,7 @@ let match_ctx_with_target (config : config) (loop_id : LoopId.id) BorrowId.Set.of_list (List.map snd (BorrowId.Map.bindings !src_fresh_borrows_map)) in - let cc = InterpreterBorrows.end_borrows meta config new_borrows in + let cc = InterpreterBorrows.end_borrows config meta new_borrows in (* Compute the loop input values *) let input_values = diff --git a/compiler/InterpreterLoopsMatchCtxs.mli b/compiler/InterpreterLoopsMatchCtxs.mli index 0db1ff1d..4a6d24a9 100644 --- a/compiler/InterpreterLoopsMatchCtxs.mli +++ b/compiler/InterpreterLoopsMatchCtxs.mli @@ -300,8 +300,8 @@ val prepare_match_ctx_with_target : - [src_ctx] *) val match_ctx_with_target : - Meta.meta -> config -> + Meta.meta -> loop_id -> bool -> borrow_loan_corresp -> |