Skip to content

Commit

Permalink
updates bap-frames to core-kernel v0.11 (#11)
Browse files Browse the repository at this point in the history
  • Loading branch information
gitoleg authored and ivg committed Jan 31, 2019
1 parent e0e61e3 commit c9f9574
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion lib/frame_arch.ml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
open Core_kernel.Std
open Core_kernel

(** Type definitions from BFD library.
Expand Down
8 changes: 4 additions & 4 deletions lib/frame_enum.ml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
open Core_kernel.Std
open Core_kernel

module type Enumerated = sig
type t
Expand All @@ -16,7 +16,7 @@ end

let make_values rank xs =
List.fold ~init:Int.Map.empty
~f:(fun vals x -> Map.add vals ~key:(rank x) ~data:x) xs
~f:(fun vals x -> Map.set vals ~key:(rank x) ~data:x) xs

module type Substitution = sig
include Enumerated
Expand All @@ -34,9 +34,9 @@ module Substitute(S : Substitution) : Enumerated with type t = S.t = struct
List.fold xs ~init:(Int.Map.empty,0) ~f:(fun (vals,ind') (ind, x) ->
match List.find ~f:(fun (old_ind, new_ind) -> old_ind = ind) subs with
| None ->
Map.add vals ~key:ind ~data:(ind', x), ind' + 1
Map.set vals ~key:ind ~data:(ind', x), ind' + 1
| Some (_, new_ind) ->
Map.add vals ~key:ind ~data:(new_ind, x), new_ind + 1) in
Map.set vals ~key:ind ~data:(new_ind, x), new_ind + 1) in
fun x -> fst @@ Map.find_exn values (rank x)

let rank = new_rank
Expand Down
2 changes: 1 addition & 1 deletion lib/frame_enum.mli
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
open Core_kernel.Std
open Core_kernel

module type Enumerated = sig
type t
Expand Down
2 changes: 1 addition & 1 deletion lib/frame_events.ml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
open Core_kernel.Std
open Core_kernel
open Bap.Std
open Bap_traces.Std
open Event
Expand Down
2 changes: 1 addition & 1 deletion lib/frame_reader.ml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
open Core_kernel.Std
open Core_kernel
open Bap.Std
open Bap_traces.Std
open Binary_packing
Expand Down
2 changes: 1 addition & 1 deletion plugin/frame_trace_plugin.ml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
open Core_kernel.Std
open Core_kernel
open Bap.Std
open Bap_traces.Std
include Self()
Expand Down

0 comments on commit c9f9574

Please sign in to comment.