diff options
| author |  Matthieu Sozeau <mattam@mattam.org> | 2016-04-04 14:17:59 +0200 |
|---|---|---|
| committer | Matthieu Sozeau <mattam@mattam.org> | 2016-04-04 14:31:54 +0200 |
| commit | 5569a06d062f913c66cbcb8bd01d4505e603d321 (patch) | |
| tree | c1e19f1c0cccdd3bfdb706c755b8e2edbb20f870 /library/globnames.ml | |
| parent | b3315a798edcaea533b592cc442e82260502bd49 (diff) | |
| parent | 441ea07e3c8ba56b9e7d44e7802246dc06814415 (diff) | |
Merge branch 'linear-comparison' of https://github.com/aspiwack/coq into aspiwack-linear-comparison
Fixing a -1 -> +1 typo
Diffstat (limited to 'library/globnames.ml')
| -rw-r--r-- | library/globnames.ml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/library/globnames.ml b/library/globnames.ml index cf0e37174..bec463ecf 100644 --- a/library/globnames.ml +++ b/library/globnames.ml @@ -107,17 +107,16 @@ let global_eq_gen eq_cst eq_ind eq_cons x y = let global_ord_gen ord_cst ord_ind ord_cons x y = if x == y then 0 else match x, y with + | VarRef v1, VarRef v2 -> Id.compare v1 v2 + | VarRef _, _ -> -1 + | _, VarRef _ -> 1 | ConstRef cx, ConstRef cy -> ord_cst cx cy + | ConstRef _, _ -> -1 + | _, ConstRef _ -> 1 | IndRef indx, IndRef indy -> ord_ind indx indy + | IndRef _, _ -> -1 + | _ , IndRef _ -> 1 | ConstructRef consx, ConstructRef consy -> ord_cons consx consy - | VarRef v1, VarRef v2 -> Id.compare v1 v2 - - | VarRef _, (ConstRef _ | IndRef _ | ConstructRef _) -> -1 - | ConstRef _, VarRef _ -> 1 - | ConstRef _, (IndRef _ | ConstructRef _) -> -1 - | IndRef _, (VarRef _ | ConstRef _) -> 1 - | IndRef _, ConstructRef _ -> -1 - | ConstructRef _, (VarRef _ | ConstRef _ | IndRef _) -> 1 let global_hash_gen hash_cst hash_ind hash_cons gr = let open Hashset.Combine in |