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

2 files changed, 12 insertions, 12 deletions

diff --git a/extraction/Makefile b/extraction/Makefile
index d4163bb..ac162db 100644
--- a/extraction/Makefile
+++ b/extraction/Makefile
@@ -23,13 +23,13 @@ extraction:
 	rm -f [:lower:]*.mli [:lower:]*.ml
 	$(COQEXEC) extraction.v
 	@echo "Fixing file names..."
-	@mv list.ml CList.ml
-	@mv list.mli CList.mli
-	@mv string.ml CString.ml
-	@mv string.mli CString.mli
-	@mv int.ml CInt.ml
-	@mv int.mli CInt.mli
-	@echo "Conversion List -> CList, String -> CString, Int -> CInt..."
+	@mv list.ml CoqList.ml
+	@mv list.mli CoqList.mli
+	@mv string.ml CoqString.ml
+	@mv string.mli CoqString.mli
+	@mv int.ml CoqInt.ml
+	@mv int.mli CoqInt.mli
+	@echo "Conversion List -> CoqList, String -> CoqString, Int -> CoqInt..."
 	@./convert *.mli *.ml
 	@echo "Patching files..."
 	@for i in *.patch; do patch < $$i; done
diff --git a/extraction/convert b/extraction/convert
index b3d2533..879cfe5 100755
--- a/extraction/convert
+++ b/extraction/convert
@@ -1,9 +1,9 @@
 #!/usr/bin/perl -pi
 
-s/\bList\b/CList/g;
-s/\bString\b/CString/g;
-s/\bInt\.Z_as_Int\b/CInt.Z_as_Int/g;
-s/\bInt\.Int\b/CInt.Int/g;
-s/\bInt\.MoreInt\b/CInt.MoreInt/g;
+s/\bList\b/CoqList/g;
+s/\bString\b/CoqString/g;
+s/\bInt\.Z_as_Int\b/CoqInt.Z_as_Int/g;
+s/\bInt\.Int\b/CoqInt.Int/g;
+s/\bInt\.MoreInt\b/CoqInt.MoreInt/g;
 s/^open Int$//;