diff options
| author |  xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2009-01-29 09:13:53 +0000 |
|---|---|---|
| committer | xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e> | 2009-01-29 09:13:53 +0000 |
| commit | 26fcc4dbd92f367ecb20f4457cdf887eea0b6568 (patch) | |
| tree | 0bec42a8bbb4c8d70e31d60e055409ef31e10da3 /lib | |
| parent | f6ecbb948ccf7f8a4e156eb29e3a41e7f2953407 (diff) | |
Conflict between extraction/CList and cil/obj/xxx/clist on case-insensitive file systems. Replaced CList by CoqList and likewise for CString and CInt. Removed useless references to CList in hand-written Caml code.
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@951 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Camlcoq.ml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/Camlcoq.ml b/lib/Camlcoq.ml index 98fd79c..3660a10 100644 --- a/lib/Camlcoq.ml +++ b/lib/Camlcoq.ml @@ -13,7 +13,6 @@ (* Library of useful Caml <-> Coq conversions *) open Datatypes -open CList open BinPos open BinInt @@ -91,15 +90,15 @@ let char_of_ascii (Ascii.Ascii(a0, a1, a2, a3, a4, a5, a6, a7)) = let coqstring_length s = let rec len accu = function - | CString.EmptyString -> accu - | CString.CString(_, s) -> len (accu + 1) s + | CoqString.EmptyString -> accu + | CoqString.CoqString(_, s) -> len (accu + 1) s in len 0 s let camlstring_of_coqstring s = let r = String.create (coqstring_length s) in let rec fill pos = function - | CString.EmptyString -> r - | CString.CString(c, s) -> r.[pos] <- char_of_ascii c; fill (pos + 1) s + | CoqString.EmptyString -> r + | CoqString.CoqString(c, s) -> r.[pos] <- char_of_ascii c; fill (pos + 1) s in fill 0 s (* Timing facility *) |