diff options
author | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:08:33 +0200 |
---|---|---|
committer | François Pottier <francois.pottier@inria.fr> | 2015-10-23 15:17:50 +0200 |
commit | 136986c204af19341aeb455d72fe817b16fa6fff (patch) | |
tree | 02e9178d9f2cf942bd32366891d480ff161406f6 /lib/Camlcoq.ml | |
parent | c46723c0169145d41d1879c236f53314456f1ba1 (diff) | |
parent | 1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff) | |
download | compcert-136986c204af19341aeb455d72fe817b16fa6fff.tar.gz compcert-136986c204af19341aeb455d72fe817b16fa6fff.zip |
Merge remote branch 'upstream/master' into clean
Conflicts:
Makefile.extr
Diffstat (limited to 'lib/Camlcoq.ml')
-rw-r--r-- | lib/Camlcoq.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Camlcoq.ml b/lib/Camlcoq.ml index c50b3230..c5fb2e55 100644 --- a/lib/Camlcoq.ml +++ b/lib/Camlcoq.ml @@ -86,7 +86,7 @@ module P = struct if n = 0l then assert false else Coq_xO (of_int32 (Int32.shift_right_logical n 1)) - else + else if n = 1l then Coq_xH else Coq_xI (of_int32 (Int32.shift_right_logical n 1)) @@ -101,7 +101,7 @@ module P = struct if n = 0L then assert false else Coq_xO (of_int64 (Int64.shift_right_logical n 1)) - else + else if n = 1L then Coq_xH else Coq_xI (of_int64 (Int64.shift_right_logical n 1)) @@ -295,7 +295,7 @@ let intern_string s = next_atom := Pos.succ !next_atom; Hashtbl.add atom_of_string s a; Hashtbl.add string_of_atom a s; - a + a let extern_atom a = try Hashtbl.find string_of_atom a |