balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stdlib: get rid of magic in HashPtree

Browse Source
This commit is contained in:
Pierre Chambart 2018-04-24 14:34:54 +02:00 committed by Grégoire Henry
parent 4d9292fcbb
commit 7de7043a74
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib_stdlib/hashPtree.ml
View File

@ -98,9 +98,9 @@ module Ptree_sig = struct
val node : prefix:prefix -> mask:mask -> true_:not_empty t -> false_:not_empty t -> not_empty t
val empty : empty t
val equal : 'a t -> 'b t -> bool
val equal : not_empty t -> not_empty t -> bool
val fast_partial_equal : 'a t -> 'b t -> bool
val fast_partial_equal : not_empty t -> not_empty t -> bool
(* if [fast_partial_equal x y] is true, then [equal x y] is true,
but if fast_partial_equal returns false, nothing can be
asserted. *)
@ -628,7 +628,17 @@ module Make(P:Ptree_sig.Prefix)(V:Value) = struct
let (>) = `Do_not_use_polymorphic_comparison
let compare = `Do_not_use_polymorphic_comparison
*)
let equal (E t1) (E t2) = T.equal t1 t2
let equal (E t1) (E t2) =
match t1, t2 with
| T.Empty, T.Empty -> true
| T.Empty, T.Leaf _ -> false
| T.Empty, T.Node _ -> false
| T.Leaf _, T.Empty -> false
| T.Node _, T.Empty -> false
| T.Node _, T.Node _ -> T.equal t1 t2
| T.Node _, T.Leaf _ -> T.equal t1 t2
| T.Leaf _, T.Node _ -> T.equal t1 t2
| T.Leaf _, T.Leaf _ -> T.equal t1 t2
let select_key_bit k m =
P.select_bit ~prefix:(P.key_prefix k) ~mask:m